From c4d18370bf3d700361b1bbd5c01e579bdec5dfb7 Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Tue, 11 Sep 2012 21:22:22 +0300 Subject: [PATCH] major refurbish --- Gemfile | 27 +- Gemfile.lock | 222 +++++---- README | 2 +- app/assets/javascripts/application.js.coffee | 21 +- .../components/behaviors.js.coffee | 24 + .../javascripts/components/webshims.js.coffee | 5 + app/assets/stylesheets/application.css.scss | 15 +- .../stylesheets/bootstrap-custom.css.scss | 64 +++ app/assets/stylesheets/pages/home.css.scss | 21 +- app/assets/stylesheets/theme/logo.css.scss | 3 + app/assets/stylesheets/theme/navbar.css.scss | 11 + .../stylesheets/theme/overrides.css.scss | 6 +- app/controllers/application_controller.rb | 26 +- .../records_controller_common.rb | 0 app/controllers/dashboard_controller.rb | 4 - .../{ => public}/pages_controller.rb | 11 +- app/controllers/public_controller.rb | 3 + .../{ => users}/aaaas_controller.rb | 2 +- app/controllers/{ => users}/as_controller.rb | 2 +- .../{ => users}/cnames_controller.rb | 2 +- .../{ => users}/domains_controller.rb | 2 +- .../{ => users}/hosts_controller.rb | 4 +- .../{ => users}/mxes_controller.rb | 2 +- app/controllers/{ => users}/ns_controller.rb | 2 +- .../{ => users}/permissions_controller.rb | 2 +- .../{ => users}/records_controller.rb | 2 +- .../{ => users}/soas_controller.rb | 2 +- .../{ => users}/srvs_controller.rb | 2 +- .../{ => users}/txts_controller.rb | 2 +- app/controllers/users_controller.rb | 25 + app/helpers/aaaas_helper.rb | 2 - app/helpers/as_helper.rb | 2 - app/helpers/cnames_helper.rb | 2 - app/helpers/dashboard_helper.rb | 2 - app/helpers/hosts_helper.rb | 2 - app/helpers/mxes_helper.rb | 2 - app/helpers/ns_helper.rb | 2 - app/helpers/pages_helper.rb | 2 - app/helpers/permissions_helper.rb | 2 - app/helpers/public/pages_helper.rb | 5 + app/helpers/records_helper.rb | 5 - app/helpers/soas_helper.rb | 2 - app/helpers/srvs_helper.rb | 2 - app/helpers/txts_helper.rb | 2 - app/helpers/users/aaaas_helper.rb | 2 + app/helpers/users/as_helper.rb | 2 + app/helpers/users/cnames_helper.rb | 2 + app/helpers/{ => users}/domains_helper.rb | 4 +- app/helpers/users/hosts_helper.rb | 2 + app/helpers/users/mxes_helper.rb | 2 + app/helpers/users/ns_helper.rb | 2 + app/helpers/users/permissions_helper.rb | 2 + app/helpers/users/records_helper.rb | 5 + app/helpers/users/soas_helper.rb | 2 + app/helpers/users/srvs_helper.rb | 2 + app/helpers/users/txts_helper.rb | 2 + app/mailers/permission_mailer.rb | 2 +- app/models/admin.rb | 11 + app/models/domain.rb | 2 +- app/models/domain/tree_structure.rb | 2 +- app/models/permission.rb | 6 +- app/models/setting.rb | 3 + app/models/user.rb | 13 +- app/models/{ability.rb => user_ability.rb} | 2 +- app/views/dashboard/index.html.erb | 1 - app/views/layouts/admin.html.erb | 31 ++ app/views/layouts/errors.html.erb | 2 +- app/views/layouts/home.html.erb | 4 +- .../{application.html.erb => users.html.erb} | 7 +- app/views/{ => public}/pages/about.html.erb | 2 +- app/views/{ => public}/pages/contact.html.erb | 2 +- .../{ => public}/pages/contact/_form.html.erb | 0 app/views/{ => public}/pages/donate.html.erb | 7 + app/views/{ => public}/pages/help.html.erb | 0 app/views/{ => public}/pages/home.html.erb | 10 +- .../pages/home/_headlines.html.erb | 0 .../{ => public}/pages/home/_slides.html.erb | 0 app/views/{ => public}/pages/privacy.html.erb | 0 .../pages/shared/_action.html.erb | 0 .../pages/shared/_benefits.html.erb | 0 .../pages/shared/_features.html.erb | 0 .../{ => public}/pages/signed_out.html.erb | 0 app/views/{ => public}/pages/team.html.erb | 4 +- .../{ => public}/pages/team/_clyfe.html.erb | 0 .../{ => public}/pages/team/_zooz.html.erb | 0 app/views/{ => public}/pages/terms.html.erb | 0 app/views/shared/_navigation.html.erb | 4 +- app/views/shared/_public_top.html.erb | 6 +- ...{_application.html.erb => _users.html.erb} | 1 - .../{ => users}/as/_list_record.html.erb | 0 .../{ => users}/as/on_action_update.js.erb | 0 .../confirmations/new.html.erb | 2 +- .../domains/_form_association_footer.html.erb | 0 .../_horizontal_subform_record.html.erb | 0 .../domains/_list_record_columns.html.erb | 0 .../mailer/confirmation_instructions.html.erb | 0 .../reset_password_instructions.html.erb | 0 .../mailer/unlock_instructions.html.erb | 0 app/views/{ => users}/ns/destroy.js.erb | 4 +- .../{devise => users}/passwords/edit.html.erb | 2 +- .../{devise => users}/passwords/new.html.erb | 2 +- .../permission_mailer/created.html.erb | 0 .../permission_mailer/destroyed.html.erb | 0 .../registrations/edit.html.erb | 0 .../registrations/new.html.erb | 2 +- .../{devise => users}/sessions/new.html.erb | 2 +- app/views/{devise => users}/shared/_links.erb | 0 .../{devise => users}/unlocks/new.html.erb | 2 +- application-ie.css.scss | 9 + config/application.rb | 11 +- config/initializers/cancan.rb | 2 +- config/initializers/devise.rb | 4 +- config/initializers/rails_admin.rb | 447 ++++++++++++++++++ config/initializers/simple_form.rb | 12 +- config/routes.rb | 111 +++-- db/migrate/20120910185333_change_sentience.rb | 25 + .../20120910205705_devise_create_admins.rb | 46 ++ ...5758_create_rails_admin_histories_table.rb | 18 + db/migrate/20120911133449_create_settings.rb | 17 + db/samples.rb | 36 -- db/seeds.rb | 32 +- db/seeds/development/domains.seeds.rb | 17 + db/seeds/development/settings.seeds.rb | 1 + db/seeds/development/users.seeds.rb | 16 + db/seeds/seed_helper.rb | 5 + lib/tasks/samples.rake | 9 - lib/templates/erb/scaffold/_form.html.erb | 2 +- spec/controllers/aaaas_controller_spec.rb | 144 ------ spec/controllers/as_controller_spec.rb | 144 ------ spec/controllers/cnames_controller_spec.rb | 144 ------ spec/controllers/domains_controller_spec.rb | 178 ------- spec/controllers/hosts_controller_spec.rb | 158 ------- spec/controllers/mxes_controller_spec.rb | 144 ------ spec/controllers/ns_controller_spec.rb | 144 ------ spec/controllers/records_controller_spec.rb | 181 ------- spec/controllers/soas_controller_spec.rb | 144 ------ spec/controllers/srvs_controller_spec.rb | 144 ------ spec/controllers/txts_controller_spec.rb | 144 ------ .../users/aaaas_controller_spec.rb | 5 + spec/controllers/users/as_controller_spec.rb | 5 + .../users/cnames_controller_spec.rb | 5 + .../users/domains_controller_spec.rb | 39 ++ .../users/hosts_controller_spec.rb | 19 + .../controllers/users/mxes_controller_spec.rb | 5 + spec/controllers/users/ns_controller_spec.rb | 5 + .../users/records_controller_spec.rb | 42 ++ .../controllers/users/soas_controller_spec.rb | 5 + .../controllers/users/srvs_controller_spec.rb | 5 + .../controllers/users/txts_controller_spec.rb | 5 + spec/factories/admins.rb | 6 + .../{ => users}/permission_mailer_spec.rb | 2 +- spec/models/admin_spec.rb | 5 + .../{ability_spec.rb => user_ability_spec.rb} | 4 +- spec/routing/aaaas_routing_spec.rb | 35 -- spec/routing/as_routing_spec.rb | 35 -- spec/routing/cnames_routing_spec.rb | 35 -- spec/routing/domains_routing_spec.rb | 35 -- spec/routing/hosts_routing_spec.rb | 35 -- spec/routing/mxes_routing_spec.rb | 35 -- spec/routing/ns_routing_spec.rb | 35 -- spec/routing/permissions_routing_spec.rb | 35 -- spec/routing/records_routing_spec.rb | 35 -- spec/routing/soas_routing_spec.rb | 35 -- spec/routing/srvs_routing_spec.rb | 35 -- spec/routing/txts_routing_spec.rb | 35 -- spec/routing/users/aaaas_routing_spec.rb | 35 ++ spec/routing/users/as_routing_spec.rb | 35 ++ spec/routing/users/cnames_routing_spec.rb | 35 ++ spec/routing/users/domains_routing_spec.rb | 35 ++ spec/routing/users/hosts_routing_spec.rb | 35 ++ spec/routing/users/mxes_routing_spec.rb | 35 ++ spec/routing/users/ns_routing_spec.rb | 35 ++ .../routing/users/permissions_routing_spec.rb | 35 ++ spec/routing/users/records_routing_spec.rb | 35 ++ spec/routing/users/soas_routing_spec.rb | 35 ++ spec/routing/users/srvs_routing_spec.rb | 35 ++ spec/routing/users/txts_routing_spec.rb | 35 ++ .../slides.css.erb | 9 - 178 files changed, 1751 insertions(+), 2461 deletions(-) create mode 100644 app/assets/javascripts/components/behaviors.js.coffee create mode 100644 app/assets/javascripts/components/webshims.js.coffee create mode 100644 app/assets/stylesheets/bootstrap-custom.css.scss create mode 100644 app/assets/stylesheets/theme/navbar.css.scss rename app/controllers/{ => concerns}/records_controller_common.rb (100%) delete mode 100644 app/controllers/dashboard_controller.rb rename app/controllers/{ => public}/pages_controller.rb (80%) create mode 100644 app/controllers/public_controller.rb rename app/controllers/{ => users}/aaaas_controller.rb (94%) rename app/controllers/{ => users}/as_controller.rb (96%) rename app/controllers/{ => users}/cnames_controller.rb (94%) rename app/controllers/{ => users}/domains_controller.rb (98%) rename app/controllers/{ => users}/hosts_controller.rb (95%) rename app/controllers/{ => users}/mxes_controller.rb (95%) rename app/controllers/{ => users}/ns_controller.rb (97%) rename app/controllers/{ => users}/permissions_controller.rb (94%) rename app/controllers/{ => users}/records_controller.rb (97%) rename app/controllers/{ => users}/soas_controller.rb (94%) rename app/controllers/{ => users}/srvs_controller.rb (95%) rename app/controllers/{ => users}/txts_controller.rb (94%) create mode 100644 app/controllers/users_controller.rb delete mode 100644 app/helpers/aaaas_helper.rb delete mode 100644 app/helpers/as_helper.rb delete mode 100644 app/helpers/cnames_helper.rb delete mode 100644 app/helpers/dashboard_helper.rb delete mode 100644 app/helpers/hosts_helper.rb delete mode 100644 app/helpers/mxes_helper.rb delete mode 100644 app/helpers/ns_helper.rb delete mode 100644 app/helpers/pages_helper.rb delete mode 100644 app/helpers/permissions_helper.rb create mode 100644 app/helpers/public/pages_helper.rb delete mode 100644 app/helpers/records_helper.rb delete mode 100644 app/helpers/soas_helper.rb delete mode 100644 app/helpers/srvs_helper.rb delete mode 100644 app/helpers/txts_helper.rb create mode 100644 app/helpers/users/aaaas_helper.rb create mode 100644 app/helpers/users/as_helper.rb create mode 100644 app/helpers/users/cnames_helper.rb rename app/helpers/{ => users}/domains_helper.rb (92%) create mode 100644 app/helpers/users/hosts_helper.rb create mode 100644 app/helpers/users/mxes_helper.rb create mode 100644 app/helpers/users/ns_helper.rb create mode 100644 app/helpers/users/permissions_helper.rb create mode 100644 app/helpers/users/records_helper.rb create mode 100644 app/helpers/users/soas_helper.rb create mode 100644 app/helpers/users/srvs_helper.rb create mode 100644 app/helpers/users/txts_helper.rb create mode 100644 app/models/admin.rb create mode 100644 app/models/setting.rb rename app/models/{ability.rb => user_ability.rb} (98%) delete mode 100644 app/views/dashboard/index.html.erb create mode 100644 app/views/layouts/admin.html.erb rename app/views/layouts/{application.html.erb => users.html.erb} (82%) rename app/views/{ => public}/pages/about.html.erb (94%) rename app/views/{ => public}/pages/contact.html.erb (76%) rename app/views/{ => public}/pages/contact/_form.html.erb (100%) rename app/views/{ => public}/pages/donate.html.erb (91%) rename app/views/{ => public}/pages/help.html.erb (100%) rename app/views/{ => public}/pages/home.html.erb (88%) rename app/views/{ => public}/pages/home/_headlines.html.erb (100%) rename app/views/{ => public}/pages/home/_slides.html.erb (100%) rename app/views/{ => public}/pages/privacy.html.erb (100%) rename app/views/{ => public}/pages/shared/_action.html.erb (100%) rename app/views/{ => public}/pages/shared/_benefits.html.erb (100%) rename app/views/{ => public}/pages/shared/_features.html.erb (100%) rename app/views/{ => public}/pages/signed_out.html.erb (100%) rename app/views/{ => public}/pages/team.html.erb (57%) rename app/views/{ => public}/pages/team/_clyfe.html.erb (100%) rename app/views/{ => public}/pages/team/_zooz.html.erb (100%) rename app/views/{ => public}/pages/terms.html.erb (100%) rename app/views/shared/navigation/{_application.html.erb => _users.html.erb} (95%) rename app/views/{ => users}/as/_list_record.html.erb (100%) rename app/views/{ => users}/as/on_action_update.js.erb (100%) rename app/views/{devise => users}/confirmations/new.html.erb (89%) rename app/views/{ => users}/domains/_form_association_footer.html.erb (100%) rename app/views/{ => users}/domains/_horizontal_subform_record.html.erb (100%) rename app/views/{ => users}/domains/_list_record_columns.html.erb (100%) rename app/views/{devise => users}/mailer/confirmation_instructions.html.erb (100%) rename app/views/{devise => users}/mailer/reset_password_instructions.html.erb (100%) rename app/views/{devise => users}/mailer/unlock_instructions.html.erb (100%) rename app/views/{ => users}/ns/destroy.js.erb (89%) rename app/views/{devise => users}/passwords/edit.html.erb (92%) rename app/views/{devise => users}/passwords/new.html.erb (89%) rename app/views/{ => users}/permission_mailer/created.html.erb (100%) rename app/views/{ => users}/permission_mailer/destroyed.html.erb (100%) rename app/views/{devise => users}/registrations/edit.html.erb (100%) rename app/views/{devise => users}/registrations/new.html.erb (91%) rename app/views/{devise => users}/sessions/new.html.erb (90%) rename app/views/{devise => users}/shared/_links.erb (100%) rename app/views/{devise => users}/unlocks/new.html.erb (88%) create mode 100644 application-ie.css.scss create mode 100644 config/initializers/rails_admin.rb create mode 100644 db/migrate/20120910185333_change_sentience.rb create mode 100644 db/migrate/20120910205705_devise_create_admins.rb create mode 100644 db/migrate/20120910205758_create_rails_admin_histories_table.rb create mode 100644 db/migrate/20120911133449_create_settings.rb delete mode 100644 db/samples.rb create mode 100644 db/seeds/development/domains.seeds.rb create mode 100644 db/seeds/development/settings.seeds.rb create mode 100644 db/seeds/development/users.seeds.rb create mode 100644 db/seeds/seed_helper.rb delete mode 100644 lib/tasks/samples.rake delete mode 100644 spec/controllers/aaaas_controller_spec.rb delete mode 100644 spec/controllers/as_controller_spec.rb delete mode 100644 spec/controllers/cnames_controller_spec.rb delete mode 100644 spec/controllers/domains_controller_spec.rb delete mode 100644 spec/controllers/hosts_controller_spec.rb delete mode 100644 spec/controllers/mxes_controller_spec.rb delete mode 100644 spec/controllers/ns_controller_spec.rb delete mode 100644 spec/controllers/records_controller_spec.rb delete mode 100644 spec/controllers/soas_controller_spec.rb delete mode 100644 spec/controllers/srvs_controller_spec.rb delete mode 100644 spec/controllers/txts_controller_spec.rb create mode 100644 spec/controllers/users/aaaas_controller_spec.rb create mode 100644 spec/controllers/users/as_controller_spec.rb create mode 100644 spec/controllers/users/cnames_controller_spec.rb create mode 100644 spec/controllers/users/domains_controller_spec.rb create mode 100644 spec/controllers/users/hosts_controller_spec.rb create mode 100644 spec/controllers/users/mxes_controller_spec.rb create mode 100644 spec/controllers/users/ns_controller_spec.rb create mode 100644 spec/controllers/users/records_controller_spec.rb create mode 100644 spec/controllers/users/soas_controller_spec.rb create mode 100644 spec/controllers/users/srvs_controller_spec.rb create mode 100644 spec/controllers/users/txts_controller_spec.rb create mode 100644 spec/factories/admins.rb rename spec/mailers/{ => users}/permission_mailer_spec.rb (70%) create mode 100644 spec/models/admin_spec.rb rename spec/models/{ability_spec.rb => user_ability_spec.rb} (97%) delete mode 100644 spec/routing/aaaas_routing_spec.rb delete mode 100644 spec/routing/as_routing_spec.rb delete mode 100644 spec/routing/cnames_routing_spec.rb delete mode 100644 spec/routing/domains_routing_spec.rb delete mode 100644 spec/routing/hosts_routing_spec.rb delete mode 100644 spec/routing/mxes_routing_spec.rb delete mode 100644 spec/routing/ns_routing_spec.rb delete mode 100644 spec/routing/permissions_routing_spec.rb delete mode 100644 spec/routing/records_routing_spec.rb delete mode 100644 spec/routing/soas_routing_spec.rb delete mode 100644 spec/routing/srvs_routing_spec.rb delete mode 100644 spec/routing/txts_routing_spec.rb create mode 100644 spec/routing/users/aaaas_routing_spec.rb create mode 100644 spec/routing/users/as_routing_spec.rb create mode 100644 spec/routing/users/cnames_routing_spec.rb create mode 100644 spec/routing/users/domains_routing_spec.rb create mode 100644 spec/routing/users/hosts_routing_spec.rb create mode 100644 spec/routing/users/mxes_routing_spec.rb create mode 100644 spec/routing/users/ns_routing_spec.rb create mode 100644 spec/routing/users/permissions_routing_spec.rb create mode 100644 spec/routing/users/records_routing_spec.rb create mode 100644 spec/routing/users/soas_routing_spec.rb create mode 100644 spec/routing/users/srvs_routing_spec.rb create mode 100644 spec/routing/users/txts_routing_spec.rb rename vendor/assets/{javascripts => stylesheets}/slides.css.erb (90%) diff --git a/Gemfile b/Gemfile index d1d60da..66c4f35 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.6' +gem 'rails', '3.2.8' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -8,14 +8,13 @@ gem 'rails', '3.2.6' # gem 'pg' gem 'mysql2' gem 'devise', '~> 2.1.0' -gem 'cancan', '~> 1.6.7' +gem 'cancan', '= 1.6.7' gem 'squeel', '~> 1.0.0' -gem 'sentient_user', '~> 0.3.2' -gem 'userstamp_basic', '~> 0.1.0' +gem 'sentient_model', '~> 1.0.4' +gem 'userstamp', '~> 2.0.2', git: 'https://github.com/delynn/userstamp.git' gem 'validates_hostname', '~> 1.0.0', git: 'https://github.com/KimNorgaard/validates_hostname.git' gem 'nilify_blanks', '~> 1.0.0' gem 'rails_config', '~> 0.2.4' -# gem 'rails-settings-cached', :require => 'rails-settings' gem 'active-model-email-validator', '~> 1.0.2' gem 'mail_form', '~> 1.3.0' gem 'switch_user', '~> 0.6.0' @@ -26,13 +25,18 @@ gem 'rails-backbone', '~> 0.7.0' gem 'acts_as_nested_interval', '~> 0.0.7' # path: '/home/clyfe/dev/acts_as_nested_interval' # git: 'https://github.com/clyfe/acts_as_nested_interval.git' +gem 'webshims-rails', '~> 0.2' +gem 'font-awesome-sass-rails', '~> 2.0.0.0' +gem 'seedbank', '~> 0.1.3' +gem 'rails_admin', '~> 0.0.5' +gem 'rails-settings-cached', '~> 0.2.2' # Gems used only for assets and not required # in production environments by default. group :assets do gem 'sass-rails', " ~> 3.2.3" - gem 'compass-rails', '~> 1.0.0.rc.2' - gem 'bootstrap-sass', '~> 2.0.3' + gem 'compass-rails', '~> 1.0.3' + gem 'bootstrap-sass', '~> 2.1.0.0' gem 'coffee-rails', "~> 3.2.1" gem 'uglifier', '>= 1.0.3' gem 'therubyracer' @@ -40,21 +44,22 @@ end gem 'jquery-rails' gem 'dalli', '~> 1.1.3' -# gem 'foreigner' ? -gem 'active_scaffold', '~> 3.2.12', - git: 'https://github.com/activescaffold/active_scaffold.git' +gem 'active_scaffold', '~> 3.2.16' +# git: 'https://github.com/activescaffold/active_scaffold.git' # path: '/home/clyfe/dev/active_scaffold' gem 'pjax_rails', '~> 0.2.0' +# gem 'foreigner' ? group :development do gem 'capistrano', '~> 2.9.0' gem 'capistrano-ext', '~> 1.2.1' gem 'mongrel', '>= 1.2.0.pre2' + gem 'quiet_assets', '~> 1.0.1' end group :test, :development do gem 'sourcify', '~> 0.6.0.rc1' - gem 'rspec-rails', '~> 2.8.1' + gem 'rspec-rails', '~> 2.10.1' gem 'faker','~> 1.0.1' gem 'factory_girl_rails', '~> 1.6.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 0ba1144..d3fb342 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,11 +5,10 @@ GIT validates_hostname (1.0.0) GIT - remote: https://github.com/activescaffold/active_scaffold.git - revision: 0c01d763cfce3f910368491e672e2a7f493d916e + remote: https://github.com/delynn/userstamp.git + revision: 777633aa564f8457c999ddb96afa4c5ae18d319f specs: - active_scaffold (3.2.12) - rails (>= 3.1.3) + userstamp (2.0.2) GIT remote: https://github.com/jejacks0n/navigasmic.git @@ -20,15 +19,15 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.6) - actionpack (= 3.2.6) + actionmailer (3.2.8) + actionpack (= 3.2.8) mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + actionpack (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) @@ -36,27 +35,30 @@ GEM active-model-email-validator (1.0.2) activemodel mail - activemodel (3.2.6) - activesupport (= 3.2.6) + active_scaffold (3.2.16) + rails (>= 3.1.3) + activemodel (3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) + activerecord (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) + activeresource (3.2.8) + activemodel (= 3.2.8) + activesupport (= 3.2.8) + activesupport (3.2.8) i18n (~> 0.6) multi_json (~> 1.0) acts_as_nested_interval (0.0.7) rails (~> 3.2.1) - addressable (2.2.8) + addressable (2.3.2) arel (3.0.2) + bbenezech-nested_form (0.0.6) bcrypt-ruby (3.0.1) - bootstrap-sass (2.0.3.1) - builder (3.0.0) + bootstrap-sass (2.1.0.0) + builder (3.0.3) cancan (1.6.7) capistrano (2.9.0) highline @@ -73,9 +75,9 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.2) - ffi (~> 1.0.6) - chunky_png (1.2.5) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) + chunky_png (1.2.6) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -83,12 +85,12 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) - compass (0.12.1) + compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.2) - compass (>= 0.12.0, < 0.14) + compass-rails (1.0.3) + compass (>= 0.12.2, < 0.14) concerned_with (0.1.0) daemons (1.0.10) dalli (1.1.5) @@ -111,11 +113,14 @@ GEM faker (1.0.1) i18n (~> 0.4) ffi (1.0.11) - file-tail (1.0.10) - tins (~> 0.4.3) + file-tail (1.0.11) + tins (~> 0.5.0) + font-awesome-sass-rails (2.0.0.0) + railties (>= 3.1.1) + sass-rails (>= 3.1.1) fssm (0.2.9) gem_plugin (0.2.3) - guard (1.1.1) + guard (1.3.2) listen (>= 0.4.2) thor (>= 0.14.6) guard-rspec (0.6.0) @@ -123,29 +128,33 @@ GEM guard-spork (0.5.2) guard (>= 0.10.0) spork (>= 0.8.4) - highline (1.6.13) + haml (3.1.7) + highline (1.6.14) hike (1.2.1) - i18n (0.6.0) + i18n (0.6.1) journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) + jquery-rails (2.1.2) + railties (>= 3.1.0, < 5.0) thor (~> 0.14) - json (1.7.3) + jquery-ui-rails (1.1.1) + jquery-rails + railties (>= 3.1.0) + json (1.7.5) + kaminari (0.14.1) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) libnotify (0.7.4) ffi (~> 1.0.11) libv8 (3.3.10.4) - libwebsocket (0.1.3) + libwebsocket (0.1.5) addressable - listen (0.4.6) - rb-fchange (~> 0.0.5) - rb-fsevent (~> 0.9.1) - rb-inotify (~> 0.8.8) + listen (0.5.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mail_form (1.3.0) - mime-types (1.18) + mime-types (1.19) mongrel (1.2.0.pre2) daemons (~> 1.0.10) gem_plugin (~> 0.2.3) @@ -161,79 +170,99 @@ GEM nilify_blanks (1.0.0) activerecord (>= 3.0.0) activesupport (>= 3.0.0) - nokogiri (1.5.4) - orm_adapter (0.1.0) - pjax_rails (0.2.1) + nokogiri (1.5.5) + orm_adapter (0.4.0) + pjax_rails (0.2.2) jquery-rails polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) + quiet_assets (1.0.1) + railties (~> 3.1) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) + rack-pjax (0.6.0) + nokogiri (~> 1.5) + rack (~> 1.3) rack-ssl (1.3.2) rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) + rails (3.2.8) + actionmailer (= 3.2.8) + actionpack (= 3.2.8) + activerecord (= 3.2.8) + activeresource (= 3.2.8) + activesupport (= 3.2.8) bundler (~> 1.0) - railties (= 3.2.6) + railties (= 3.2.8) rails-backbone (0.7.2) coffee-script (~> 2.2.0) ejs (~> 1.0.0) railties (>= 3.1.0) + rails-settings-cached (0.2.2) + rails (>= 3.0.0) + rails_admin (0.0.5) + bbenezech-nested_form (~> 0.0.6) + bootstrap-sass (~> 2.0, >= 2.0.3) + builder (~> 3.0) + coffee-rails (~> 3.1) + haml (~> 3.1) + jquery-rails (>= 1.0.17) + jquery-ui-rails (>= 0.5, < 2) + kaminari (~> 0.12) + rack-pjax (~> 0.5) + rails (~> 3.1) + remotipart (~> 1.0) + sass-rails (~> 3.1) rails_config (0.2.7) activesupport (>= 3.0) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) + railties (3.2.8) + actionpack (= 3.2.8) + activesupport (= 3.2.8) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (0.9.2.2) - rb-fchange (0.0.5) - ffi - rb-fsevent (0.9.1) rb-inotify (0.8.8) ffi (>= 0.5.0) rdoc (3.12) json (~> 1.4) - rspec (2.8.0) - rspec-core (~> 2.8.0) - rspec-expectations (~> 2.8.0) - rspec-mocks (~> 2.8.0) - rspec-core (2.8.0) - rspec-expectations (2.8.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.8.0) - rspec-rails (2.8.1) + remotipart (1.0.2) + rspec (2.10.0) + rspec-core (~> 2.10.0) + rspec-expectations (~> 2.10.0) + rspec-mocks (~> 2.10.0) + rspec-core (2.10.1) + rspec-expectations (2.10.0) + diff-lcs (~> 1.1.3) + rspec-mocks (2.10.1) + rspec-rails (2.10.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.8.0) + rspec (~> 2.10.0) ruby2ruby (1.3.1) ruby_parser (~> 2.0) sexp_processor (~> 3.0) ruby_parser (2.3.1) sexp_processor (~> 3.0) rubyzip (0.9.9) - sass (3.1.19) + sass (3.2.1) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.24.0) + seedbank (0.1.3) + selenium-webdriver (2.25.0) childprocess (>= 0.2.5) libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip - sentient_user (0.3.2) + sentient_model (1.0.4) + bundler (>= 1.0) sexp_processor (3.2.0) simple_form (2.0.2) actionpack (~> 3.0) @@ -242,36 +271,37 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.5.3) simplecov-html (0.5.3) - sourcify (0.6.0.rc1) - file-tail (>= 1.0.5) - ruby2ruby (>= 1.2.5) - ruby_parser (>= 2.0.5) - sexp_processor (>= 3.0.5) + sourcify (0.6.0.rc2) + file-tail (~> 1.0.10) + ruby2ruby (~> 1.3.1) + ruby_parser (~> 2.3.1) + sexp_processor (~> 3.2.0) spork (1.0.0rc3) sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - squeel (1.0.6) + squeel (1.0.11) activerecord (~> 3.0) activesupport (~> 3.0) polyamorous (~> 0.5.0) switch_user (0.6.0) - therubyracer (0.10.1) + therubyracer (0.10.2) libv8 (~> 3.3.10) - thor (0.15.3) + thor (0.16.0) tilt (1.3.3) - tins (0.4.3) - treetop (1.4.9) + tins (0.5.4) + treetop (1.4.10) + polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - uglifier (1.2.5) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (~> 1.3) - userstamp_basic (0.1.0) - sentient_user (>= 0.1.0) + multi_json (~> 1.0, >= 1.0.2) warden (1.2.1) rack (>= 1.0) + webshims-rails (0.3) + rails (> 3.1.0) xpath (0.1.4) nokogiri (~> 1.3) @@ -280,21 +310,22 @@ PLATFORMS DEPENDENCIES active-model-email-validator (~> 1.0.2) - active_scaffold (~> 3.2.12)! + active_scaffold (~> 3.2.16) acts_as_nested_interval (~> 0.0.7) - bootstrap-sass (~> 2.0.3) - cancan (~> 1.6.7) + bootstrap-sass (~> 2.1.0.0) + cancan (= 1.6.7) capistrano (~> 2.9.0) capistrano-ext (~> 1.2.1) capybara (~> 1.1.1) coffee-rails (~> 3.2.1) - compass-rails (~> 1.0.0.rc.2) + compass-rails (~> 1.0.3) concerned_with (~> 0.1.0) dalli (~> 1.1.3) database_cleaner (~> 0.7.1) devise (~> 2.1.0) factory_girl_rails (~> 1.6.0) faker (~> 1.0.1) + font-awesome-sass-rails (~> 2.0.0.0) guard-rspec (~> 0.6.0) guard-spork (~> 0.5.1) jquery-rails @@ -305,13 +336,17 @@ DEPENDENCIES navigasmic (~> 0.5.6)! nilify_blanks (~> 1.0.0) pjax_rails (~> 0.2.0) - rails (= 3.2.6) + quiet_assets (~> 1.0.1) + rails (= 3.2.8) rails-backbone (~> 0.7.0) + rails-settings-cached (~> 0.2.2) + rails_admin (~> 0.0.5) rails_config (~> 0.2.4) rb-inotify (~> 0.8.8) - rspec-rails (~> 2.8.1) + rspec-rails (~> 2.10.1) sass-rails (~> 3.2.3) - sentient_user (~> 0.3.2) + seedbank (~> 0.1.3) + sentient_model (~> 1.0.4) simple_form (~> 2.0.0) simplecov sourcify (~> 0.6.0.rc1) @@ -320,5 +355,6 @@ DEPENDENCIES switch_user (~> 0.6.0) therubyracer uglifier (>= 1.0.3) - userstamp_basic (~> 0.1.0) + userstamp (~> 2.0.2)! validates_hostname (~> 1.0.0)! + webshims-rails (~> 0.2) diff --git a/README b/README index 01f9280..dab9eac 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ A DNS users frontend. ## Initialize for development # create config/database.yml and config/settings.yml from the samples -> bundle exec rake db:create db:migrate db:seed db:samples +> bundle exec rake db:drop db:create db:migrate db:seed:development ## Tests diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index b750cd5..778b9ce 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -7,25 +7,10 @@ #= require jquery #= require jquery-ui #= require jquery_ujs -## require jquery.pjax -## require pjax/page_triggers +#= require jquery.pjax +#= require pjax/page_triggers #= require slides #= require bootstrap #= require active_scaffold +#= require_tree ./components #= require_self - -$ -> - $(document).popover(selector: '[rel=popover]') - $(document).tooltip(selector: '[rel=tooltip]') - -# pjaxContainer = '[data-pjax-container]' -# $('.pjax-nav a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax(pjaxContainer) -# $pjaxContainer = $(pjaxContainer) -# $pjaxContainerParent = $(pjaxContainer).parent() -# $pjaxContainer.on 'pjax:success', (event, data, status, xhr, options) -> -# $('.pjax-nav').find('li.active').removeClass 'active' -# $(".pjax-nav a[href=\"#{window.location.pathname}\"]").parents('li').addClass 'active' -# if $pjaxContainer.find('.container').length > 0 -# $pjaxContainerParent.removeClass 'container' -# else -# $pjaxContainerParent.addClass 'container' diff --git a/app/assets/javascripts/components/behaviors.js.coffee b/app/assets/javascripts/components/behaviors.js.coffee new file mode 100644 index 0000000..23a600d --- /dev/null +++ b/app/assets/javascripts/components/behaviors.js.coffee @@ -0,0 +1,24 @@ +$ -> + $(document).popover(selector: '[rel=popover]') + $(document).tooltip(selector: '[rel=tooltip]') + + pjaxContainer = '[data-pjax-container]' + $pjaxContainer = $(pjaxContainer) + $pjaxContainerParent = $(pjaxContainer).parent() + $body = $('body') + fixLayout = -> + if $pjaxContainer.find('.container').length > 0 + $pjaxContainerParent.removeClass 'container' + else + $pjaxContainerParent.addClass 'container' + if $body.has('.page-home-section').length > 0 + $body.addClass('with-home-section') + else + $body.removeClass('with-home-section') + fixLayout() + + $('.pjax-nav a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax(pjaxContainer) + $pjaxContainer.on 'pjax:success', (event, data, status, xhr, options) -> + $('.pjax-nav').find('li.active').removeClass 'active' + $(".pjax-nav a[href=\"#{window.location.pathname}\"]").parents('li').addClass 'active' + fixLayout() diff --git a/app/assets/javascripts/components/webshims.js.coffee b/app/assets/javascripts/components/webshims.js.coffee new file mode 100644 index 0000000..0da725e --- /dev/null +++ b/app/assets/javascripts/components/webshims.js.coffee @@ -0,0 +1,5 @@ +#= require webshims/minified/extras/modernizr-custom +#= require webshims/minified/polyfiller + +$.webshims.setOptions('basePath', '/assets/webshims/minified/shims/') +$.webshims.polyfill() \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 674d2be..c4e667e 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -3,18 +3,13 @@ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * the top of the compiled file, but it's generally better to create a new file per style scope. -*= require_self -*= require theme/logo -*= require theme/layout -*= require pages/domains -*= require pages/home -*= require pages/donate *= require slides +*= require_self */ -@import "bootstrap"; +@import "bootstrap-custom"; @import "bootstrap-responsive"; +@import 'font-awesome'; @import "active_scaffold"; -@import "theme/overrides"; -@import "theme/errors"; - +@import "theme/*"; +@import "pages/*"; diff --git a/app/assets/stylesheets/bootstrap-custom.css.scss b/app/assets/stylesheets/bootstrap-custom.css.scss new file mode 100644 index 0000000..809f073 --- /dev/null +++ b/app/assets/stylesheets/bootstrap-custom.css.scss @@ -0,0 +1,64 @@ +// +// Remove icons since we use font-awesome +// +// +// Bootstrap v2.1.0 +// +// Copyright 2012 Twitter, Inc +// Licensed under the Apache License v2.0 +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Designed and built with all the love in the world @twitter by @mdo and @fat. +// Converted to Sass by @thomasmcdonald_, and distributed as bootstrap-sass + +// Core variables and mixins +@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc +@import "bootstrap/mixins"; + +// CSS Reset +@import "bootstrap/reset"; + +// Grid system and page structure +@import "bootstrap/scaffolding"; +@import "bootstrap/grid"; +@import "bootstrap/layouts"; + +// Base CSS +@import "bootstrap/type"; +@import "bootstrap/code"; +@import "bootstrap/forms"; +@import "bootstrap/tables"; + +// Components: common +@import "bootstrap/dropdowns"; +@import "bootstrap/wells"; +@import "bootstrap/component-animations"; +@import "bootstrap/close"; + +// Components: Buttons & Alerts +@import "bootstrap/buttons"; +@import "bootstrap/button-groups"; +@import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in _buttons.scss + +// Components: Nav +@import "bootstrap/navs"; +@import "bootstrap/navbar"; +@import "bootstrap/breadcrumbs"; +@import "bootstrap/pagination"; +@import "bootstrap/pager"; + +// Components: Popovers +@import "bootstrap/modals"; +@import "bootstrap/tooltip"; +@import "bootstrap/popovers"; + +// Components: Misc +@import "bootstrap/thumbnails"; +@import "bootstrap/labels-badges"; +@import "bootstrap/progress-bars"; +@import "bootstrap/accordion"; +@import "bootstrap/carousel"; +@import "bootstrap/hero-unit"; + +// Utility classes +@import "bootstrap/utilities"; // Has to be last to override when necessary \ No newline at end of file diff --git a/app/assets/stylesheets/pages/home.css.scss b/app/assets/stylesheets/pages/home.css.scss index cd755de..d465cfc 100644 --- a/app/assets/stylesheets/pages/home.css.scss +++ b/app/assets/stylesheets/pages/home.css.scss @@ -16,7 +16,7 @@ .page-home-header { @include background(image-url("page-home-incentives.png"), - radial-gradient(color-stops(#fff, #c1f1ff), bottom)); + radial-gradient(color-stops(#fff, #c1f1ff), bottom)); border-bottom: 1px solid #B9DCFF; .page-header { small { @@ -30,7 +30,7 @@ .page-home-incentives { border-top: 1px solid lighten(#DAFFCD, 5%); @include background(image-url("marketing/square_bg.png"), - radial-gradient(#fff, darken(#DAFFCD, 10%))); + radial-gradient(#fff, darken(#DAFFCD, 10%))); padding-top: 17px; padding-bottom: 17px; border-bottom: 1px solid darken(#DAFFCD, 15%); @@ -52,3 +52,20 @@ .page-home-extra { padding-top: 17px; } + +@media (max-width: 767px) { + body.with-home-section { + padding-left: 0px; + padding-right: 0px; + + .navbar-fixed-top, + .navbar-fixed-bottom { + margin-left: 0px; + margin-right: 0px; + } + .page-home-section { + padding-left: 20px; + padding-right: 20px; + } + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/theme/logo.css.scss b/app/assets/stylesheets/theme/logo.css.scss index 6f8b03a..3aff88f 100644 --- a/app/assets/stylesheets/theme/logo.css.scss +++ b/app/assets/stylesheets/theme/logo.css.scss @@ -8,4 +8,7 @@ 0 1px 0 rgba(0, 0, 0, 0.6), 0 0 10px rgba(143, 181, 200, .7) ); + &:hover { + color: #53d4ff; + } } diff --git a/app/assets/stylesheets/theme/navbar.css.scss b/app/assets/stylesheets/theme/navbar.css.scss new file mode 100644 index 0000000..3202e33 --- /dev/null +++ b/app/assets/stylesheets/theme/navbar.css.scss @@ -0,0 +1,11 @@ +.navbar-inverse .nav { + li.highlight a { + color: darken(yellow, 10%); + &:hover { + color: yellow; + } + } + li.highlight.active a { + color: yellow; + } +} diff --git a/app/assets/stylesheets/theme/overrides.css.scss b/app/assets/stylesheets/theme/overrides.css.scss index f54315f..0efef29 100644 --- a/app/assets/stylesheets/theme/overrides.css.scss +++ b/app/assets/stylesheets/theme/overrides.css.scss @@ -10,8 +10,10 @@ padding-top: 2px; padding-bottom: 1px; } - input, select, textarea { - margin-bottom: 0; + form.as_form.search { + input, select, textarea { + margin-bottom: 0; + } } a.as_cancel { vertical-align: middle; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ec95a1f..9097d47 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,15 +1,9 @@ class ApplicationController < ActionController::Base - before_filter :authenticate_user! - include SentientController protect_from_forgery before_filter :check_honeypot - helper_method :client_remote_ip, :respond_to + helper_method :client_remote_ip + layout :scoped_layout - rescue_from CanCan::AccessDenied, ActiveScaffold::ActionNotAllowed do |exception| - flash.now[:error] = exception.message - render_access_denied - end - rescue_from ActiveScaffold::ActionNotAllowed do |exception| flash.now[:error] = I18n.t("errors.action_not_allowed") render_access_denied @@ -17,15 +11,17 @@ class ApplicationController < ActionController::Base protected + def scoped_layout + return false if request.xhr? + return 'admin' if devise_controller? && resource_name == :admin + user_signed_in? ? 'users' : 'public' + end + def render_access_denied layout = request.xhr? ? false : 'errors' render :template => 'errors/access_denied', :layout => layout end - - def ensure_nested_under_domain - raise CanCan::AccessDenied, "not found" unless nested? and nested_parent_record.is_a?(Domain) - end - + def client_remote_ip @client_remote_ip ||= request.env["HTTP_X_FORWARDED_FOR"] end @@ -39,4 +35,8 @@ class ApplicationController < ActionController::Base page_path('signed_out') end + def current_ability + @current_ability ||= ::UserAbility.new(current_user) + end + end diff --git a/app/controllers/records_controller_common.rb b/app/controllers/concerns/records_controller_common.rb similarity index 100% rename from app/controllers/records_controller_common.rb rename to app/controllers/concerns/records_controller_common.rb diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb deleted file mode 100644 index 391fa2e..0000000 --- a/app/controllers/dashboard_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -class DashboardController < ApplicationController - def index - end -end diff --git a/app/controllers/pages_controller.rb b/app/controllers/public/pages_controller.rb similarity index 80% rename from app/controllers/pages_controller.rb rename to app/controllers/public/pages_controller.rb index 4824b72..f0680e6 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/public/pages_controller.rb @@ -1,9 +1,4 @@ -class PagesController < ApplicationController - skip_before_filter :authenticate_user! - layout proc{|controller| - return false if request.xhr? - user_signed_in? ? 'application' : 'public' - } +class Public::PagesController < PublicController rescue_from ActionView::MissingTemplate do |exception| if exception.message =~ %r{Missing template pages/} @@ -36,7 +31,7 @@ class PagesController < ApplicationController def contact @contact_form = ContactForm.new(params[:contact_form]) if !@contact_form.deliver - render :template => 'pages/contact' + render :template => 'public/pages/contact' else redirect_to :back, :notice => 'Your notification has been sent!' end @@ -45,7 +40,7 @@ class PagesController < ApplicationController protected def current_page - @current_page ||= "pages/#{clean_path}" + @current_page ||= "public/pages/#{clean_path}" end def clean_path diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb new file mode 100644 index 0000000..9c14b21 --- /dev/null +++ b/app/controllers/public_controller.rb @@ -0,0 +1,3 @@ +class PublicController < ApplicationController + layout :scoped_layout +end diff --git a/app/controllers/aaaas_controller.rb b/app/controllers/users/aaaas_controller.rb similarity index 94% rename from app/controllers/aaaas_controller.rb rename to app/controllers/users/aaaas_controller.rb index 2b792f6..395ea5b 100644 --- a/app/controllers/aaaas_controller.rb +++ b/app/controllers/users/aaaas_controller.rb @@ -1,4 +1,4 @@ -class AaaasController < ApplicationController +class Users::AaaasController < UsersController active_scaffold :aaaa do |conf| conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] conf.create.columns = [:name, :content, :ttl,] diff --git a/app/controllers/as_controller.rb b/app/controllers/users/as_controller.rb similarity index 96% rename from app/controllers/as_controller.rb rename to app/controllers/users/as_controller.rb index b0c6a86..c1e9755 100644 --- a/app/controllers/as_controller.rb +++ b/app/controllers/users/as_controller.rb @@ -1,4 +1,4 @@ -class AsController < ApplicationController +class Users::AsController < UsersController active_scaffold :a do |conf| conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] conf.create.columns = [:name, :content, :ttl,] diff --git a/app/controllers/cnames_controller.rb b/app/controllers/users/cnames_controller.rb similarity index 94% rename from app/controllers/cnames_controller.rb rename to app/controllers/users/cnames_controller.rb index cd6d5e6..ad4ec4e 100644 --- a/app/controllers/cnames_controller.rb +++ b/app/controllers/users/cnames_controller.rb @@ -1,4 +1,4 @@ -class CnamesController < ApplicationController +class Users::CnamesController < UsersController active_scaffold :cname do |conf| conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] conf.create.columns = [:name, :content, :ttl] diff --git a/app/controllers/domains_controller.rb b/app/controllers/users/domains_controller.rb similarity index 98% rename from app/controllers/domains_controller.rb rename to app/controllers/users/domains_controller.rb index ce56af5..84d860c 100644 --- a/app/controllers/domains_controller.rb +++ b/app/controllers/users/domains_controller.rb @@ -1,4 +1,4 @@ -class DomainsController < ApplicationController +class Users::DomainsController < UsersController active_scaffold :domain do |conf| conf.columns = [:name, :ip, :records, :soa_record, :ns_records, :apply_subdomains] conf.list.columns = [:name, :records, :permissions] diff --git a/app/controllers/hosts_controller.rb b/app/controllers/users/hosts_controller.rb similarity index 95% rename from app/controllers/hosts_controller.rb rename to app/controllers/users/hosts_controller.rb index 019cea2..274c407 100644 --- a/app/controllers/hosts_controller.rb +++ b/app/controllers/users/hosts_controller.rb @@ -1,4 +1,4 @@ -class HostsController < ApplicationController +class Users::HostsController < UsersController active_scaffold :a do |conf| conf.columns = [:name, :host_domain, :content, :ttl, :change_date, :authentication_token] conf.list.columns = [:name, :content, :ttl, :change_date, :authentication_token] @@ -41,7 +41,7 @@ class HostsController < ApplicationController end def beginning_of_chain - super.includes(:domain).where(:domains => {:name => Settings.host_domains}) + super.includes(:domain).where(:domains => {:name => Settings.host_domains}).readonly(false) end def before_create_save(record) diff --git a/app/controllers/mxes_controller.rb b/app/controllers/users/mxes_controller.rb similarity index 95% rename from app/controllers/mxes_controller.rb rename to app/controllers/users/mxes_controller.rb index 34ebe1c..34e66f1 100644 --- a/app/controllers/mxes_controller.rb +++ b/app/controllers/users/mxes_controller.rb @@ -1,4 +1,4 @@ -class MxesController < ApplicationController +class Users::MxesController < UsersController active_scaffold :mx do |conf| conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] conf.create.columns = [:content, :ttl, :prio] diff --git a/app/controllers/ns_controller.rb b/app/controllers/users/ns_controller.rb similarity index 97% rename from app/controllers/ns_controller.rb rename to app/controllers/users/ns_controller.rb index 80fdd04..906d4a3 100644 --- a/app/controllers/ns_controller.rb +++ b/app/controllers/users/ns_controller.rb @@ -1,4 +1,4 @@ -class NsController < ApplicationController +class Users::NsController < UsersController active_scaffold :ns do |conf| conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] conf.create.columns = [:name, :content, :ttl] diff --git a/app/controllers/permissions_controller.rb b/app/controllers/users/permissions_controller.rb similarity index 94% rename from app/controllers/permissions_controller.rb rename to app/controllers/users/permissions_controller.rb index 1c43e5a..54edf3d 100644 --- a/app/controllers/permissions_controller.rb +++ b/app/controllers/users/permissions_controller.rb @@ -1,4 +1,4 @@ -class PermissionsController < ApplicationController +class Users::PermissionsController < UsersController active_scaffold :permission do |conf| conf.actions.exclude :show, :search conf.columns = [:domain, :user, :user_email] diff --git a/app/controllers/records_controller.rb b/app/controllers/users/records_controller.rb similarity index 97% rename from app/controllers/records_controller.rb rename to app/controllers/users/records_controller.rb index 6fa314e..10027a6 100644 --- a/app/controllers/records_controller.rb +++ b/app/controllers/users/records_controller.rb @@ -1,4 +1,4 @@ -class RecordsController < ApplicationController +class Users::RecordsController < UsersController # override so SOA's cannot be created by themselves def self._add_sti_create_links new_action_link = active_scaffold_config.action_links.collection['new'] diff --git a/app/controllers/soas_controller.rb b/app/controllers/users/soas_controller.rb similarity index 94% rename from app/controllers/soas_controller.rb rename to app/controllers/users/soas_controller.rb index d1156fc..f58e75e 100644 --- a/app/controllers/soas_controller.rb +++ b/app/controllers/users/soas_controller.rb @@ -1,4 +1,4 @@ -class SoasController < ApplicationController +class Users::SoasController < UsersController active_scaffold :soa do |conf| conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] conf.create.columns = [:contact, :ttl] diff --git a/app/controllers/srvs_controller.rb b/app/controllers/users/srvs_controller.rb similarity index 95% rename from app/controllers/srvs_controller.rb rename to app/controllers/users/srvs_controller.rb index 4d0b6a0..d2d4f24 100644 --- a/app/controllers/srvs_controller.rb +++ b/app/controllers/users/srvs_controller.rb @@ -1,4 +1,4 @@ -class SrvsController < ApplicationController +class Users::SrvsController < UsersController active_scaffold :srv do |conf| conf.columns = [:name, :type, :content, :weight, :port, :host, :ttl, :prio, :change_date, :authentication_token] conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] diff --git a/app/controllers/txts_controller.rb b/app/controllers/users/txts_controller.rb similarity index 94% rename from app/controllers/txts_controller.rb rename to app/controllers/users/txts_controller.rb index 9643d92..d233826 100644 --- a/app/controllers/txts_controller.rb +++ b/app/controllers/users/txts_controller.rb @@ -1,4 +1,4 @@ -class TxtsController < ApplicationController +class Users::TxtsController < UsersController active_scaffold :txt do |conf| conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token] conf.create.columns = [:name, :content, :ttl] diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000..26de530 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,25 @@ +class UsersController < ApplicationController + before_filter :authenticate_user! + before_filter :set_stampers + include Userstamp + layout :scoped_layout + + rescue_from CanCan::AccessDenied, ActiveScaffold::ActionNotAllowed do |exception| + flash.now[:error] = exception.message + render_access_denied + end + + protected + + def set_stampers + User.current = current_user + User.stamper = current_user + end + + def ensure_nested_under_domain + unless nested? && nested_parent_record.is_a?(Domain) + raise CanCan::AccessDenied, "not found" + end + end + +end diff --git a/app/helpers/aaaas_helper.rb b/app/helpers/aaaas_helper.rb deleted file mode 100644 index b399968..0000000 --- a/app/helpers/aaaas_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module AaaasHelper -end \ No newline at end of file diff --git a/app/helpers/as_helper.rb b/app/helpers/as_helper.rb deleted file mode 100644 index 4978fc6..0000000 --- a/app/helpers/as_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module AsHelper -end \ No newline at end of file diff --git a/app/helpers/cnames_helper.rb b/app/helpers/cnames_helper.rb deleted file mode 100644 index d7918c6..0000000 --- a/app/helpers/cnames_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module CnamesHelper -end \ No newline at end of file diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb deleted file mode 100644 index a94ddfc..0000000 --- a/app/helpers/dashboard_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module DashboardHelper -end diff --git a/app/helpers/hosts_helper.rb b/app/helpers/hosts_helper.rb deleted file mode 100644 index 3349e1d..0000000 --- a/app/helpers/hosts_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module HostsHelper -end \ No newline at end of file diff --git a/app/helpers/mxes_helper.rb b/app/helpers/mxes_helper.rb deleted file mode 100644 index daefa67..0000000 --- a/app/helpers/mxes_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module MxesHelper -end \ No newline at end of file diff --git a/app/helpers/ns_helper.rb b/app/helpers/ns_helper.rb deleted file mode 100644 index 091f627..0000000 --- a/app/helpers/ns_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module NsHelper -end \ No newline at end of file diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb deleted file mode 100644 index 2c057fd..0000000 --- a/app/helpers/pages_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module PagesHelper -end diff --git a/app/helpers/permissions_helper.rb b/app/helpers/permissions_helper.rb deleted file mode 100644 index 88361be..0000000 --- a/app/helpers/permissions_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module PermissionsHelper -end \ No newline at end of file diff --git a/app/helpers/public/pages_helper.rb b/app/helpers/public/pages_helper.rb new file mode 100644 index 0000000..5e38f71 --- /dev/null +++ b/app/helpers/public/pages_helper.rb @@ -0,0 +1,5 @@ +module Public::PagesHelper + def progress_size(size) + size.to_i <= 10 ? 10 : size + end +end diff --git a/app/helpers/records_helper.rb b/app/helpers/records_helper.rb deleted file mode 100644 index 1d09970..0000000 --- a/app/helpers/records_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -module RecordsHelper - def record_authentication_token_column(record) - record.type == 'A' ? record.authentication_token : '-' - end -end \ No newline at end of file diff --git a/app/helpers/soas_helper.rb b/app/helpers/soas_helper.rb deleted file mode 100644 index cc71c24..0000000 --- a/app/helpers/soas_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SoasHelper -end \ No newline at end of file diff --git a/app/helpers/srvs_helper.rb b/app/helpers/srvs_helper.rb deleted file mode 100644 index 049646f..0000000 --- a/app/helpers/srvs_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SrvsHelper -end \ No newline at end of file diff --git a/app/helpers/txts_helper.rb b/app/helpers/txts_helper.rb deleted file mode 100644 index e94a08f..0000000 --- a/app/helpers/txts_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TxtsHelper -end \ No newline at end of file diff --git a/app/helpers/users/aaaas_helper.rb b/app/helpers/users/aaaas_helper.rb new file mode 100644 index 0000000..eb96ff8 --- /dev/null +++ b/app/helpers/users/aaaas_helper.rb @@ -0,0 +1,2 @@ +module Users::AaaasHelper +end \ No newline at end of file diff --git a/app/helpers/users/as_helper.rb b/app/helpers/users/as_helper.rb new file mode 100644 index 0000000..4173221 --- /dev/null +++ b/app/helpers/users/as_helper.rb @@ -0,0 +1,2 @@ +module Users::AsHelper +end \ No newline at end of file diff --git a/app/helpers/users/cnames_helper.rb b/app/helpers/users/cnames_helper.rb new file mode 100644 index 0000000..7d894df --- /dev/null +++ b/app/helpers/users/cnames_helper.rb @@ -0,0 +1,2 @@ +module Users::CnamesHelper +end \ No newline at end of file diff --git a/app/helpers/domains_helper.rb b/app/helpers/users/domains_helper.rb similarity index 92% rename from app/helpers/domains_helper.rb rename to app/helpers/users/domains_helper.rb index 98aabc8..5b1af4f 100644 --- a/app/helpers/domains_helper.rb +++ b/app/helpers/users/domains_helper.rb @@ -1,4 +1,4 @@ -module DomainsHelper +module Users::DomainsHelper def domain_list_row_class(record) cannot?(:crud_permissions, record) ? "shared-domain" : '' end @@ -6,7 +6,7 @@ module DomainsHelper # Indents and dedents to create a tree structure, # assuming that the records are sorted in preorder. # Adds a visual cue if the record is shared via permissions feature. - def domain_name_column(record) + def domain_name_column(record, column) elements = [] depth = record.depth if depth > 1 diff --git a/app/helpers/users/hosts_helper.rb b/app/helpers/users/hosts_helper.rb new file mode 100644 index 0000000..7131630 --- /dev/null +++ b/app/helpers/users/hosts_helper.rb @@ -0,0 +1,2 @@ +module Users::HostsHelper +end \ No newline at end of file diff --git a/app/helpers/users/mxes_helper.rb b/app/helpers/users/mxes_helper.rb new file mode 100644 index 0000000..1e4a6a1 --- /dev/null +++ b/app/helpers/users/mxes_helper.rb @@ -0,0 +1,2 @@ +module Users::MxesHelper +end \ No newline at end of file diff --git a/app/helpers/users/ns_helper.rb b/app/helpers/users/ns_helper.rb new file mode 100644 index 0000000..0095109 --- /dev/null +++ b/app/helpers/users/ns_helper.rb @@ -0,0 +1,2 @@ +module Users::NsHelper +end \ No newline at end of file diff --git a/app/helpers/users/permissions_helper.rb b/app/helpers/users/permissions_helper.rb new file mode 100644 index 0000000..72c7170 --- /dev/null +++ b/app/helpers/users/permissions_helper.rb @@ -0,0 +1,2 @@ +module Users::PermissionsHelper +end \ No newline at end of file diff --git a/app/helpers/users/records_helper.rb b/app/helpers/users/records_helper.rb new file mode 100644 index 0000000..5d5cc07 --- /dev/null +++ b/app/helpers/users/records_helper.rb @@ -0,0 +1,5 @@ +module Users::RecordsHelper + def record_authentication_token_column(record, column) + record.type == 'A' ? record.authentication_token : '-' + end +end \ No newline at end of file diff --git a/app/helpers/users/soas_helper.rb b/app/helpers/users/soas_helper.rb new file mode 100644 index 0000000..58bbe4b --- /dev/null +++ b/app/helpers/users/soas_helper.rb @@ -0,0 +1,2 @@ +module Users::SoasHelper +end \ No newline at end of file diff --git a/app/helpers/users/srvs_helper.rb b/app/helpers/users/srvs_helper.rb new file mode 100644 index 0000000..138547c --- /dev/null +++ b/app/helpers/users/srvs_helper.rb @@ -0,0 +1,2 @@ +module Users::SrvsHelper +end \ No newline at end of file diff --git a/app/helpers/users/txts_helper.rb b/app/helpers/users/txts_helper.rb new file mode 100644 index 0000000..166f236 --- /dev/null +++ b/app/helpers/users/txts_helper.rb @@ -0,0 +1,2 @@ +module Users::TxtsHelper +end \ No newline at end of file diff --git a/app/mailers/permission_mailer.rb b/app/mailers/permission_mailer.rb index e7d4d3c..00edbfe 100644 --- a/app/mailers/permission_mailer.rb +++ b/app/mailers/permission_mailer.rb @@ -1,4 +1,4 @@ -class PermissionMailer < ActionMailer::Base +class Users::PermissionMailer < ActionMailer::Base layout "emails" default from: Settings.support_mail diff --git a/app/models/admin.rb b/app/models/admin.rb new file mode 100644 index 0000000..3106a9f --- /dev/null +++ b/app/models/admin.rb @@ -0,0 +1,11 @@ +class Admin < ActiveRecord::Base + # Include default devise modules. Others available are: + # :token_authenticatable, :confirmable, + # :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + + # Setup accessible (or protected) attributes for your model + attr_accessible :email, :password, :password_confirmation, :remember_me + # attr_accessible :title, :body +end diff --git a/app/models/domain.rb b/app/models/domain.rb index d98796d..79a6f5d 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -1,5 +1,5 @@ class Domain < ActiveRecord::Base - self.inheritance_column = "sti_disabled" + self.inheritance_column = :sti_disabled nilify_blanks stampable diff --git a/app/models/domain/tree_structure.rb b/app/models/domain/tree_structure.rb index e1b6ba6..0ff5aee 100644 --- a/app/models/domain/tree_structure.rb +++ b/app/models/domain/tree_structure.rb @@ -29,7 +29,7 @@ class Domain < ActiveRecord::Base # If current user not present, just allow (rake tasks etc) def can_be_managed_by_current_user? return true if User.current.nil? - Ability::CRUD.all?{|operation| User.current.can?(operation, self)} + UserAbility::CRUD.all?{|operation| User.current.can?(operation, self)} end # Returns the first immediate parent, if exists (and caches the search) diff --git a/app/models/permission.rb b/app/models/permission.rb index a160cce..62fbcc6 100644 --- a/app/models/permission.rb +++ b/app/models/permission.rb @@ -18,13 +18,13 @@ class Permission < ActiveRecord::Base end after_create do - PermissionMailer.created(self).deliver + Users::PermissionMailer.created(self).deliver end after_update do - PermissionMailer.created(self).deliver if user_id_changed? + Users::PermissionMailer.created(self).deliver if user_id_changed? end after_destroy do - PermissionMailer.destroyed(self).deliver + Users::PermissionMailer.destroyed(self).deliver end def user_email diff --git a/app/models/setting.rb b/app/models/setting.rb new file mode 100644 index 0000000..6c10065 --- /dev/null +++ b/app/models/setting.rb @@ -0,0 +1,3 @@ +class Setting < RailsSettings::CachedSettings + attr_accessible :var, :value +end diff --git a/app/models/user.rb b/app/models/user.rb index 9002f88..a1dd2ea 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,6 @@ class User < ActiveRecord::Base - include SentientUser + include SentientModel + model_stamper stampable # Include default devise modules. Others available are: @@ -42,10 +43,18 @@ class User < ActiveRecord::Base options[:reload] ? _ability : (@ability ||= _ability) end + def self.do_as(user) + self.current = user + self.stamper = user + yield + self.current = nil + self.reset_stamper + end + protected def _ability - Ability.new(self) + UserAbility.new(self) end end \ No newline at end of file diff --git a/app/models/ability.rb b/app/models/user_ability.rb similarity index 98% rename from app/models/ability.rb rename to app/models/user_ability.rb index 705b10c..cfd5ef9 100644 --- a/app/models/ability.rb +++ b/app/models/user_ability.rb @@ -1,4 +1,4 @@ -class Ability +class UserAbility CRUD = [:read, :create, :update, :destroy] include CanCan::Ability diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb deleted file mode 100644 index 61c6e44..0000000 --- a/app/views/dashboard/index.html.erb +++ /dev/null @@ -1 +0,0 @@ -Some dashboard here \ No newline at end of file diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb new file mode 100644 index 0000000..c18ff7e --- /dev/null +++ b/app/views/layouts/admin.html.erb @@ -0,0 +1,31 @@ + + + + + + + + + <%= content_for?(:title) ? yield(:title) : "EntryDNS" %> + + <%= stylesheet_link_tag "application" %> + + <%= javascript_include_tag "application" %> + <%= csrf_meta_tag %> + + + +
+
+ <%= flash_display 'flash' %> + <%= yield %> +
+
+ +
+ <%= render 'shared/bottom' %> +
+ + diff --git a/app/views/layouts/errors.html.erb b/app/views/layouts/errors.html.erb index 8051f91..bbb7d46 100644 --- a/app/views/layouts/errors.html.erb +++ b/app/views/layouts/errors.html.erb @@ -12,7 +12,7 @@ <%= csrf_meta_tag %> - <%= render 'shared/top' %> + <%= render 'shared/public_top' %>
diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb index 0c77a69..6f270c7 100644 --- a/app/views/layouts/home.html.erb +++ b/app/views/layouts/home.html.erb @@ -1,6 +1,6 @@ <%= render 'shared/public_top' %> - + <%= render 'shared/navigation' %>
@@ -14,4 +14,4 @@ <%= render 'shared/bottom' %>
- + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/users.html.erb similarity index 82% rename from app/views/layouts/application.html.erb rename to app/views/layouts/users.html.erb index b135f74..17c525f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/users.html.erb @@ -8,11 +8,14 @@ <%= content_for?(:title) ? yield(:title) : "EntryDNS" %> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> <%= csrf_meta_tag %> - + <%= render 'shared/navigation' %>
diff --git a/app/views/pages/about.html.erb b/app/views/public/pages/about.html.erb similarity index 94% rename from app/views/pages/about.html.erb rename to app/views/public/pages/about.html.erb index e57ab8f..9d60192 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/public/pages/about.html.erb @@ -20,7 +20,7 @@

How can you benefit from this

-<%= render 'pages/shared/benefits' %> +<%= render 'public/pages/shared/benefits' %>

We are open to new ideas or suggestions how to make the service better for you to use. diff --git a/app/views/pages/contact.html.erb b/app/views/public/pages/contact.html.erb similarity index 76% rename from app/views/pages/contact.html.erb rename to app/views/public/pages/contact.html.erb index 87bf06b..21678c0 100644 --- a/app/views/pages/contact.html.erb +++ b/app/views/public/pages/contact.html.erb @@ -7,5 +7,5 @@ or you can contact us using the form below:

-<%= render :partial => 'pages/contact/form' %> +<%= render :partial => 'public/pages/contact/form' %> diff --git a/app/views/pages/contact/_form.html.erb b/app/views/public/pages/contact/_form.html.erb similarity index 100% rename from app/views/pages/contact/_form.html.erb rename to app/views/public/pages/contact/_form.html.erb diff --git a/app/views/pages/donate.html.erb b/app/views/public/pages/donate.html.erb similarity index 91% rename from app/views/pages/donate.html.erb rename to app/views/public/pages/donate.html.erb index 57c4072..2041f06 100644 --- a/app/views/pages/donate.html.erb +++ b/app/views/public/pages/donate.html.erb @@ -3,6 +3,13 @@ How do I contribute?
+
+ <% size = Setting['public.donations.progress'] %> +
+ <%= size -%>% Progress +
+
+

EntryDNS is a free service for everyone, but contribution is more than welcome. Like every service, it needs some hardware to run on, requires network bandwidth and maintenance. diff --git a/app/views/pages/help.html.erb b/app/views/public/pages/help.html.erb similarity index 100% rename from app/views/pages/help.html.erb rename to app/views/public/pages/help.html.erb diff --git a/app/views/pages/home.html.erb b/app/views/public/pages/home.html.erb similarity index 88% rename from app/views/pages/home.html.erb rename to app/views/public/pages/home.html.erb index 98dd3a6..f04c485 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/public/pages/home.html.erb @@ -25,11 +25,11 @@

- <%= render 'pages/home/headlines' %> - <%= render 'pages/shared/action' %> + <%= render 'public/pages/home/headlines' %> + <%= render 'public/pages/shared/action' %>
- <%= render 'pages/home/slides' %> + <%= render 'public/pages/home/slides' %>
@@ -59,7 +59,7 @@

Benefits

- <%= render 'pages/shared/benefits' %> + <%= render 'public/pages/shared/benefits' %> <%= link_to new_user_registration_path do %> Create an Account Now @@ -67,7 +67,7 @@

Features

- <%= render 'pages/shared/features' %> + <%= render 'public/pages/shared/features' %>
diff --git a/app/views/pages/home/_headlines.html.erb b/app/views/public/pages/home/_headlines.html.erb similarity index 100% rename from app/views/pages/home/_headlines.html.erb rename to app/views/public/pages/home/_headlines.html.erb diff --git a/app/views/pages/home/_slides.html.erb b/app/views/public/pages/home/_slides.html.erb similarity index 100% rename from app/views/pages/home/_slides.html.erb rename to app/views/public/pages/home/_slides.html.erb diff --git a/app/views/pages/privacy.html.erb b/app/views/public/pages/privacy.html.erb similarity index 100% rename from app/views/pages/privacy.html.erb rename to app/views/public/pages/privacy.html.erb diff --git a/app/views/pages/shared/_action.html.erb b/app/views/public/pages/shared/_action.html.erb similarity index 100% rename from app/views/pages/shared/_action.html.erb rename to app/views/public/pages/shared/_action.html.erb diff --git a/app/views/pages/shared/_benefits.html.erb b/app/views/public/pages/shared/_benefits.html.erb similarity index 100% rename from app/views/pages/shared/_benefits.html.erb rename to app/views/public/pages/shared/_benefits.html.erb diff --git a/app/views/pages/shared/_features.html.erb b/app/views/public/pages/shared/_features.html.erb similarity index 100% rename from app/views/pages/shared/_features.html.erb rename to app/views/public/pages/shared/_features.html.erb diff --git a/app/views/pages/signed_out.html.erb b/app/views/public/pages/signed_out.html.erb similarity index 100% rename from app/views/pages/signed_out.html.erb rename to app/views/public/pages/signed_out.html.erb diff --git a/app/views/pages/team.html.erb b/app/views/public/pages/team.html.erb similarity index 57% rename from app/views/pages/team.html.erb rename to app/views/public/pages/team.html.erb index ae78916..02820ef 100644 --- a/app/views/pages/team.html.erb +++ b/app/views/public/pages/team.html.erb @@ -4,9 +4,9 @@
- <%= render :partial => 'pages/team/zooz' %> + <%= render :partial => 'public/pages/team/zooz' %>
- <%= render :partial => 'pages/team/clyfe' %> + <%= render :partial => 'public/pages/team/clyfe' %>
diff --git a/app/views/pages/team/_clyfe.html.erb b/app/views/public/pages/team/_clyfe.html.erb similarity index 100% rename from app/views/pages/team/_clyfe.html.erb rename to app/views/public/pages/team/_clyfe.html.erb diff --git a/app/views/pages/team/_zooz.html.erb b/app/views/public/pages/team/_zooz.html.erb similarity index 100% rename from app/views/pages/team/_zooz.html.erb rename to app/views/public/pages/team/_zooz.html.erb diff --git a/app/views/pages/terms.html.erb b/app/views/public/pages/terms.html.erb similarity index 100% rename from app/views/pages/terms.html.erb rename to app/views/public/pages/terms.html.erb diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb index a65e106..0f1ddc5 100644 --- a/app/views/shared/_navigation.html.erb +++ b/app/views/shared/_navigation.html.erb @@ -1,4 +1,4 @@ -
+
@@ -12,7 +12,7 @@
<% if user_signed_in? %> - <%= render 'shared/navigation/application' %> + <%= render 'shared/navigation/users' %> <% else %> <%= render 'shared/navigation/public' %> <% end %> diff --git a/app/views/shared/_public_top.html.erb b/app/views/shared/_public_top.html.erb index 17db5a2..520bc74 100644 --- a/app/views/shared/_public_top.html.erb +++ b/app/views/shared/_public_top.html.erb @@ -3,6 +3,7 @@ + <%= content_for?(:title) ? yield(:title) : "EntryDNS free DNS service and dynamic DNS" %> @@ -11,7 +12,10 @@ " /> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> <%= csrf_meta_tag %> \ No newline at end of file diff --git a/app/views/shared/navigation/_application.html.erb b/app/views/shared/navigation/_users.html.erb similarity index 95% rename from app/views/shared/navigation/_application.html.erb rename to app/views/shared/navigation/_users.html.erb index 4f28ff3..2dc59a0 100644 --- a/app/views/shared/navigation/_application.html.erb +++ b/app/views/shared/navigation/_users.html.erb @@ -1,5 +1,4 @@ <% semantic_navigation :application_nav, html: { class: 'nav' } do |n| %> - <%#= link_to('Dashboard', dashboard_path, :data => {:pjax => '#main'}) %> <%= n.item '', link: domains_path do %> My Domains <% end %> diff --git a/app/views/as/_list_record.html.erb b/app/views/users/as/_list_record.html.erb similarity index 100% rename from app/views/as/_list_record.html.erb rename to app/views/users/as/_list_record.html.erb diff --git a/app/views/as/on_action_update.js.erb b/app/views/users/as/on_action_update.js.erb similarity index 100% rename from app/views/as/on_action_update.js.erb rename to app/views/users/as/on_action_update.js.erb diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/users/confirmations/new.html.erb similarity index 89% rename from app/views/devise/confirmations/new.html.erb rename to app/views/users/confirmations/new.html.erb index 3077619..1b0fb49 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/users/confirmations/new.html.erb @@ -1,4 +1,4 @@ -<%= render :partial => "devise/shared/links" %> +<%= render :partial => "users/shared/links" %> <%= simple_form_for(resource, as: resource_name, diff --git a/app/views/domains/_form_association_footer.html.erb b/app/views/users/domains/_form_association_footer.html.erb similarity index 100% rename from app/views/domains/_form_association_footer.html.erb rename to app/views/users/domains/_form_association_footer.html.erb diff --git a/app/views/domains/_horizontal_subform_record.html.erb b/app/views/users/domains/_horizontal_subform_record.html.erb similarity index 100% rename from app/views/domains/_horizontal_subform_record.html.erb rename to app/views/users/domains/_horizontal_subform_record.html.erb diff --git a/app/views/domains/_list_record_columns.html.erb b/app/views/users/domains/_list_record_columns.html.erb similarity index 100% rename from app/views/domains/_list_record_columns.html.erb rename to app/views/users/domains/_list_record_columns.html.erb diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/users/mailer/confirmation_instructions.html.erb similarity index 100% rename from app/views/devise/mailer/confirmation_instructions.html.erb rename to app/views/users/mailer/confirmation_instructions.html.erb diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/users/mailer/reset_password_instructions.html.erb similarity index 100% rename from app/views/devise/mailer/reset_password_instructions.html.erb rename to app/views/users/mailer/reset_password_instructions.html.erb diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/users/mailer/unlock_instructions.html.erb similarity index 100% rename from app/views/devise/mailer/unlock_instructions.html.erb rename to app/views/users/mailer/unlock_instructions.html.erb diff --git a/app/views/ns/destroy.js.erb b/app/views/users/ns/destroy.js.erb similarity index 89% rename from app/views/ns/destroy.js.erb rename to app/views/users/ns/destroy.js.erb index 9dfc6be..8742c5d 100644 --- a/app/views/ns/destroy.js.erb +++ b/app/views/users/ns/destroy.js.erb @@ -1,5 +1,5 @@ <%# show errors in nested %> -<% messages_id ||= nested? ? "as_domains-#{nested.parent_id}-records-messages" : active_scaffold_messages_id -%> +<% messages_id ||= nested? ? "as_users__domains-#{nested.parent_id}-users__records-messages" : active_scaffold_messages_id -%> <% if controller.send(:successful?) %> <% if render_parent? %> @@ -19,7 +19,7 @@ <% elsif (active_scaffold_config.delete.refresh_list) %> <%= render :partial => 'refresh_list' %> <% else %> - <% row_id = "as_domains-#{nested.parent_id}-records-list-#{params[:id]}-row" %> + <% row_id = "as_users__domains-#{nested.parent_id}-users__records-list-#{params[:id]}-row" %> ActiveScaffold.delete_record_row('<%= row_id %>', '<%= url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>'); <%= render :partial => 'update_calculations', :formats => [:js] %> <% end %> diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb similarity index 92% rename from app/views/devise/passwords/edit.html.erb rename to app/views/users/passwords/edit.html.erb index c72e0a5..df65864 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/users/passwords/edit.html.erb @@ -21,4 +21,4 @@
<% end %> -<%= render :partial => "devise/shared/links" %> +<%= render :partial => "users/shared/links" %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/users/passwords/new.html.erb similarity index 89% rename from app/views/devise/passwords/new.html.erb rename to app/views/users/passwords/new.html.erb index faaa4b4..f65fca5 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/users/passwords/new.html.erb @@ -1,4 +1,4 @@ -<%= render :partial => "devise/shared/links" %> +<%= render :partial => "users/shared/links" %> <%= simple_form_for(resource, as: resource_name, diff --git a/app/views/permission_mailer/created.html.erb b/app/views/users/permission_mailer/created.html.erb similarity index 100% rename from app/views/permission_mailer/created.html.erb rename to app/views/users/permission_mailer/created.html.erb diff --git a/app/views/permission_mailer/destroyed.html.erb b/app/views/users/permission_mailer/destroyed.html.erb similarity index 100% rename from app/views/permission_mailer/destroyed.html.erb rename to app/views/users/permission_mailer/destroyed.html.erb diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb similarity index 100% rename from app/views/devise/registrations/edit.html.erb rename to app/views/users/registrations/edit.html.erb diff --git a/app/views/devise/registrations/new.html.erb b/app/views/users/registrations/new.html.erb similarity index 91% rename from app/views/devise/registrations/new.html.erb rename to app/views/users/registrations/new.html.erb index 5c96662..f8eea7b 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -1,4 +1,4 @@ -<%= render :partial => "devise/shared/links" %> +<%= render :partial => "users/shared/links" %> <%= simple_form_for(resource, as: resource_name, diff --git a/app/views/devise/sessions/new.html.erb b/app/views/users/sessions/new.html.erb similarity index 90% rename from app/views/devise/sessions/new.html.erb rename to app/views/users/sessions/new.html.erb index 0999d53..4320268 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/users/sessions/new.html.erb @@ -1,4 +1,4 @@ -<%= render :partial => "devise/shared/links" %> +<%= render :partial => "users/shared/links" %> <%= simple_form_for(resource, as: resource_name, diff --git a/app/views/devise/shared/_links.erb b/app/views/users/shared/_links.erb similarity index 100% rename from app/views/devise/shared/_links.erb rename to app/views/users/shared/_links.erb diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/users/unlocks/new.html.erb similarity index 88% rename from app/views/devise/unlocks/new.html.erb rename to app/views/users/unlocks/new.html.erb index 010d3d1..4f2501f 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/users/unlocks/new.html.erb @@ -1,4 +1,4 @@ -<%= render :partial => "devise/shared/links" %> +<%= render :partial => "users/shared/links" %> <%= simple_form_for(resource, as: resource_name, diff --git a/application-ie.css.scss b/application-ie.css.scss new file mode 100644 index 0000000..97f3c38 --- /dev/null +++ b/application-ie.css.scss @@ -0,0 +1,9 @@ +/* +* This is a manifest file that'll automatically include all the stylesheets available in this directory +* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at +* the top of the compiled file, but it's generally better to create a new file per style scope. + +*= require_self +*/ + +@import 'font-awesome-ie7'; diff --git a/config/application.rb b/config/application.rb index 8a38a19..9ee5cf0 100644 --- a/config/application.rb +++ b/config/application.rb @@ -17,6 +17,10 @@ module Entrydns # Custom directories with classes and modules you want to be autoloadable. # config.autoload_paths += %W(#{config.root}/extras) + config.autoload_paths += %W( + #{config.root}/app/controllers/concerns + #{config.root}/app/models/concerns + ) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. @@ -46,9 +50,10 @@ module Entrydns config.assets.version = '1.0' config.to_prepare do - layout = proc{|controller| - l = user_signed_in? ? "application" : "public" - request.xhr? ? false : l + layout = proc { |c| + return false if request.xhr? + return 'admin' if devise_controller? && resource_name == :admin + user_signed_in? ? 'users' : 'public' } Devise::SessionsController.layout layout Devise::RegistrationsController.layout layout diff --git a/config/initializers/cancan.rb b/config/initializers/cancan.rb index c89788c..ce956e4 100644 --- a/config/initializers/cancan.rb +++ b/config/initializers/cancan.rb @@ -123,4 +123,4 @@ module CanCan end end -end +end \ No newline at end of file diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 6b3a90d..59c829f 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -158,6 +158,7 @@ Devise.setup do |config| # "users/sessions/new". It's turned off by default because it's slower if you # are using only default views. # config.scoped_views = false + config.scoped_views = true # Configure the default scope given to Warden. By default it's the first # devise role declared in your routes (usually :user). @@ -181,7 +182,8 @@ Devise.setup do |config| # config.navigational_formats = [:"*/*", "*/*", :html] # The default HTTP method used to sign out a resource. Default is :delete. - config.sign_out_via = :delete + # config.sign_out_via = :delete + config.sign_out_via = :get # ==> OmniAuth # Add a new OmniAuth provider. Check the wiki for more information on setting diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb new file mode 100644 index 0000000..0dc9a33 --- /dev/null +++ b/config/initializers/rails_admin.rb @@ -0,0 +1,447 @@ +# RailsAdmin config file. Generated on September 10, 2012 23:57 +# See github.com/sferik/rails_admin for more informations + +RailsAdmin.config do |config| + + # If your default_local is different from :en, uncomment the following 2 lines and set your default locale here: + # require 'i18n' + # I18n.default_locale = :de + + config.current_user_method { current_admin } # auto-generated + + # If you want to track changes on your models: + # config.audit_with :history, Admin + + # Or with a PaperTrail: (you need to install it first) + # config.audit_with :paper_trail, Admin + + # Set the admin name here (optional second array element will appear in a beautiful RailsAdmin red ©) + config.main_app_name = ['Entrydns', 'Admin'] + # or for a dynamic name: + # config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.titleize, controller.params['action'].titleize] } + + + # ==> Global show view settings + # Display empty fields in show views + # config.compact_show_view = false + + # ==> Global list view settings + # Number of default rows per-page: + # config.default_items_per_page = 20 + + # ==> Included models + # Add all excluded models here: + # config.excluded_models = [A, AAAA, Admin, CNAME, Domain, MX, NS, Permission, Record, SOA, SRV, TXT, User] + + # Add models here if you want to go 'whitelist mode': + # config.included_models = [A, AAAA, Admin, CNAME, Domain, MX, NS, Permission, Record, SOA, SRV, TXT, User] + + # Application wide tried label methods for models' instances + # config.label_methods << :description # Default is [:name, :title] + + # ==> Global models configuration + # config.models do + # # Configuration here will affect all included models in all scopes, handle with care! + # + # list do + # # Configuration here will affect all included models in list sections (same for show, export, edit, update, create) + # + # fields_of_type :date do + # # Configuration here will affect all date fields, in the list section, for all included models. See README for a comprehensive type list. + # end + # end + # end + # + # ==> Model specific configuration + # Keep in mind that *all* configuration blocks are optional. + # RailsAdmin will try his best to provide the best defaults for each section, for each field. + # Try to override as few things as possible, in the most generic way. Try to avoid setting labels for models and attributes, use ActiveRecord I18n API instead. + # Less code is better code! + # config.model MyModel do + # # Cross-section field configuration + # object_label_method :name # Name of the method called for pretty printing an *instance* of ModelName + # label 'My model' # Name of ModelName (smartly defaults to ActiveRecord's I18n API) + # label_plural 'My models' # Same, plural + # weight -1 # Navigation priority. Bigger is higher. + # parent OtherModel # Set parent model for navigation. MyModel will be nested below. OtherModel will be on first position of the dropdown + # navigation_label # Sets dropdown entry's name in navigation. Only for parents! + # # Section specific configuration: + # list do + # filters [:id, :name] # Array of field names which filters should be shown by default in the table header + # items_per_page 100 # Override default_items_per_page + # sort_by :id # Sort column (default is primary key) + # sort_reverse true # Sort direction (default is true for primary key, last created first) + # # Here goes the fields configuration for the list view + # end + # end + + # Your model's configuration, to help you get started: + + # All fields marked as 'hidden' won't be shown anywhere in the rails_admin unless you mark them as visible. (visible(true)) + + config.model Setting do + configure :value, :text + end + + # config.model A do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model AAAA do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model Admin do + # # Found associations: + # # Found columns: + # configure :id, :integer + # configure :email, :string + # configure :password, :password # Hidden + # configure :password_confirmation, :password # Hidden + # configure :reset_password_token, :string # Hidden + # configure :reset_password_sent_at, :datetime + # configure :remember_created_at, :datetime + # configure :sign_in_count, :integer + # configure :current_sign_in_at, :datetime + # configure :last_sign_in_at, :datetime + # configure :current_sign_in_ip, :string + # configure :last_sign_in_ip, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model CNAME do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model Domain do + # # Found associations: + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association + # configure :parent, :belongs_to_association + # configure :records, :has_many_association + # configure :permissions, :has_many_association + # configure :permitted_users, :has_many_association + # configure :soa_record, :has_one_association + # configure :soa_records, :has_many_association + # configure :ns_records, :has_many_association + # configure :a_records, :has_many_association + # configure :mx_records, :has_many_association + # configure :txt_records, :has_many_association + # configure :cname_records, :has_many_association + # configure :aaaa_records, :has_many_association + # configure :srv_records, :has_many_association + # configure :children, :has_many_association # # Found columns: + # configure :id, :integer + # configure :user_id, :integer # Hidden + # configure :name, :string + # configure :master, :string + # configure :last_check, :integer + # configure :type, :string + # configure :notified_serial, :integer + # configure :account, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :name_reversed, :string + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer + # configure :parent_id, :integer # Hidden + # configure :lftp, :integer + # configure :lftq, :integer + # configure :rgtp, :integer + # configure :rgtq, :integer + # configure :lft, :float + # configure :rgt, :float # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model MX do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model NS do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model Permission do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :user_id, :integer # Hidden + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model Record do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model SOA do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model SRV do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model TXT do + # # Found associations: + # configure :domain, :belongs_to_association + # configure :user, :belongs_to_association + # configure :creator, :belongs_to_association # # Found columns: + # configure :id, :integer + # configure :domain_id, :integer # Hidden + # configure :name, :string + # configure :type, :string + # configure :content, :string + # configure :ttl, :integer + # configure :prio, :integer + # configure :change_date, :integer + # configure :authentication_token, :string + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :user_id, :integer # Hidden + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end + # config.model User do + # # Found associations: + # configure :creator, :belongs_to_association + # configure :domains, :has_many_association + # configure :records, :has_many_association + # configure :permissions, :has_many_association + # configure :permitted_domains, :has_many_association # # Found columns: + # configure :id, :integer + # configure :email, :string + # configure :password, :password # Hidden + # configure :password_confirmation, :password # Hidden + # configure :reset_password_token, :string # Hidden + # configure :reset_password_sent_at, :datetime + # configure :remember_created_at, :datetime + # configure :sign_in_count, :integer + # configure :current_sign_in_at, :datetime + # configure :last_sign_in_at, :datetime + # configure :current_sign_in_ip, :string + # configure :last_sign_in_ip, :string + # configure :confirmation_token, :string + # configure :confirmed_at, :datetime + # configure :confirmation_sent_at, :datetime + # configure :unconfirmed_email, :string + # configure :failed_attempts, :integer + # configure :unlock_token, :string + # configure :locked_at, :datetime + # configure :created_at, :datetime + # configure :updated_at, :datetime + # configure :first_name, :string + # configure :last_name, :string + # configure :creator_id, :integer # Hidden + # configure :updator_id, :integer # # Sections: + # list do; end + # export do; end + # show do; end + # edit do; end + # create do; end + # update do; end + # end +end diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 2ebb17b..8808fed 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -46,6 +46,7 @@ SimpleForm.setup do |config| end config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b| + b.use :html5 b.use :placeholder b.use :label b.wrapper :tag => 'div', :class => 'controls' do |ba| @@ -56,6 +57,7 @@ SimpleForm.setup do |config| end config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b| + b.use :html5 b.use :placeholder b.use :label b.wrapper :tag => 'div', :class => 'controls' do |input| @@ -68,6 +70,7 @@ SimpleForm.setup do |config| end config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b| + b.use :html5 b.use :placeholder b.use :label b.wrapper :tag => 'div', :class => 'controls' do |input| @@ -92,9 +95,12 @@ SimpleForm.setup do |config| config.boolean_style = :nested # Default class for buttons + # config.button_class = 'btn' config.button_class = 'btn' - # Method used to tidy up errors. + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. # config.error_method = :first # Default tag used for error notification helper. @@ -143,7 +149,7 @@ SimpleForm.setup do |config| # Tell browsers whether to use default HTML5 validations (novalidate option). # Default is enabled. - config.browser_validations = false + config.browser_validations = true # Collection of methods to detect if a file type was given. # config.file_methods = [ :mounted_as, :file?, :public_filename ] @@ -170,4 +176,4 @@ SimpleForm.setup do |config| # Cache SimpleForm inputs discovery # config.cache_discovery = !Rails.env.development? -end +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index cfb083a..30c6184 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,71 +1,78 @@ Entrydns::Application.routes.draw do + mount RailsAdmin::Engine => '/rails_admin', :as => 'rails_admin' + + devise_for :admins + devise_for :users - devise_scope :user do - get 'users/sign_out', :to => "devise/sessions#destroy" - end - resources :domains do - as_routes - end + scope module: 'users' do + + resources :domains do + as_routes + end - resources :hosts do - as_routes - member do - put 'new_token' + resources :hosts do + as_routes + member do + put 'new_token' + end end - end - put '/records/modify/:authentication_token', :to => 'records#modify', :as => :modify_record - resources :records do - as_routes - end + match '/records/modify/:authentication_token', to: 'records#modify', as: :modify_record + resources :records do + as_routes + end - resources :soas do - as_routes - end + resources :soas do + as_routes + end - resources :ns do - as_routes - end + resources :ns do + as_routes + end - resources :mxes do - as_routes - end + resources :mxes do + as_routes + end - resources :as do - as_routes - member do - put 'new_token' + resources :as do + as_routes + member do + put 'new_token' + end end - end - resources :cnames do - as_routes - end + resources :cnames do + as_routes + end - resources :txts do - as_routes - end - - resources :aaaas do - as_routes - end - - resources :srvs do - as_routes - end - - resources :permissions do - as_routes + resources :txts do + as_routes + end + + resources :aaaas do + as_routes + end + + resources :srvs do + as_routes + end + + resources :permissions do + as_routes + end + end - get '/dashboard', :to => 'dashboard#index', :as => :dashboard - - resources :pages, :only => :show - post 'pages/contact', :to => 'pages#contact' - - root :to => 'pages#show', :id => 'home' + scope module: 'public' do + + resources :pages, only: :show + post 'pages/contact', to: 'pages#contact' + + root :to => 'pages#show', id: 'home' + + end # The priority is based upon order of creation: # first created -> highest priority. diff --git a/db/migrate/20120910185333_change_sentience.rb b/db/migrate/20120910185333_change_sentience.rb new file mode 100644 index 0000000..142372e --- /dev/null +++ b/db/migrate/20120910185333_change_sentience.rb @@ -0,0 +1,25 @@ +class ChangeSentience < ActiveRecord::Migration + def change + change_table :users do |t| + t.rename :created_by_id, :creator_id + t.rename :updated_by_id, :updator_id + end + change_table :domains do |t| + t.rename :created_by_id, :creator_id + t.rename :updated_by_id, :updator_id + end + change_table :records do |t| + t.rename :created_by_id, :creator_id + t.rename :updated_by_id, :updator_id + end + change_table :permissions do |t| + t.rename :created_by_id, :creator_id + t.rename :updated_by_id, :updator_id + end + User.reset_column_information + Domain.reset_column_information + Domain.inheritance_column = :sti_disabled + Record.reset_column_information + Permission.reset_column_information + end +end diff --git a/db/migrate/20120910205705_devise_create_admins.rb b/db/migrate/20120910205705_devise_create_admins.rb new file mode 100644 index 0000000..3dca553 --- /dev/null +++ b/db/migrate/20120910205705_devise_create_admins.rb @@ -0,0 +1,46 @@ +class DeviseCreateAdmins < ActiveRecord::Migration + def change + create_table(:admins) do |t| + ## Database authenticatable + t.string :email, :null => false, :default => "" + t.string :encrypted_password, :null => false, :default => "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, :default => 0 + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + ## Token authenticatable + # t.string :authentication_token + + + t.timestamps + end + + add_index :admins, :email, :unique => true + add_index :admins, :reset_password_token, :unique => true + # add_index :admins, :confirmation_token, :unique => true + # add_index :admins, :unlock_token, :unique => true + # add_index :admins, :authentication_token, :unique => true + end +end diff --git a/db/migrate/20120910205758_create_rails_admin_histories_table.rb b/db/migrate/20120910205758_create_rails_admin_histories_table.rb new file mode 100644 index 0000000..3c743aa --- /dev/null +++ b/db/migrate/20120910205758_create_rails_admin_histories_table.rb @@ -0,0 +1,18 @@ +class CreateRailsAdminHistoriesTable < ActiveRecord::Migration + def self.up + create_table :rails_admin_histories do |t| + t.text :message # title, name, or object_id + t.string :username + t.integer :item + t.string :table + t.integer :month, :limit => 2 + t.integer :year, :limit => 5 + t.timestamps + end + add_index(:rails_admin_histories, [:item, :table, :month, :year], :name => 'index_rails_admin_histories' ) + end + + def self.down + drop_table :rails_admin_histories + end +end diff --git a/db/migrate/20120911133449_create_settings.rb b/db/migrate/20120911133449_create_settings.rb new file mode 100644 index 0000000..033d5d8 --- /dev/null +++ b/db/migrate/20120911133449_create_settings.rb @@ -0,0 +1,17 @@ +class CreateSettings < ActiveRecord::Migration + def self.up + create_table :settings do |t| + t.string :var, :null => false + t.text :value, :null => true + t.integer :thing_id, :null => true + t.string :thing_type, :limit => 30, :null => true + t.timestamps + end + + add_index :settings, [ :thing_type, :thing_id, :var ], :unique => true + end + + def self.down + drop_table :settings + end +end diff --git a/db/samples.rb b/db/samples.rb deleted file mode 100644 index af1fc75..0000000 --- a/db/samples.rb +++ /dev/null @@ -1,36 +0,0 @@ -unless Object.const_defined?('FactoryGirl') - require 'factory_girl' - require 'faker' - require Rails.root.join('spec', 'factories.rb') -end - -# more sample users -users = [User.find_by_email('user@entrydns.net')] -for i in 1..5 do - name = "user#{i}" - user = User.new( - :first_name => name, - :last_name => name, - :email => "#{name}@entrydns.net", - :password => 'useruser', - :password_confirmation => 'useruser' - ) - user.confirmed_at = Time.now - user.save! - user.confirm! - users << user unless i > 3 -end - -entrydns_org = Domain.find_by_name('entrydns.org') -for user in users - 50.times do - domain = Factory.build(:domain, :user => user) - domain.setup(FactoryGirl.generate(:email)) - domain.save! - domain.soa_record.update_serial! - end - - 50.times do - Factory.create(:a, :user => user, :domain => entrydns_org) - end -end diff --git a/db/seeds.rb b/db/seeds.rb index f7728a3..86461dd 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,28 +1,36 @@ -# an user for administrative purposes -admin = User.new( - :first_name => 'admin', - :last_name => 'admin', +Admin.create( :email => 'admin@entrydns.net', :password => 'garlik1', :password_confirmation => 'garlik1' ) +puts 'Admin created' + +# an user for administrative purposes +admin = User.new( + first_name: 'admin', + last_name: 'admin', + email: 'admin@entrydns.net', + password: 'garlik1', + password_confirmation: 'garlik1' +) admin.confirmed_at = Time.now admin.save! admin.confirm! Settings.host_domains.each do |name| - entrydns_org = Domain.new(:name => name, :type => 'NATIVE', :user_id => admin.id) - entrydns_org.setup(admin.email) - entrydns_org.save! + host_domain = Domain.new(name: name, user_id: admin.id) + host_domain.type = 'NATIVE' + host_domain.setup(admin.email) + host_domain.save! end # sample user user = User.new( - :first_name => 'user', - :last_name => 'user', - :email => 'user@entrydns.net', - :password => 'useruser', - :password_confirmation => 'useruser' + first_name: 'user', + last_name: 'user', + email: 'user@entrydns.net', + password: 'useruser', + password_confirmation: 'useruser' ) user.confirmed_at = Time.now user.save! diff --git a/db/seeds/development/domains.seeds.rb b/db/seeds/development/domains.seeds.rb new file mode 100644 index 0000000..0fbcde9 --- /dev/null +++ b/db/seeds/development/domains.seeds.rb @@ -0,0 +1,17 @@ +after 'development:users' do + + entrydns_org = Domain.find_by_name(Settings.host_domains.first) + User.all.each do |user| + 3.times do + domain = Factory.build(:domain, :user => user) + domain.setup(FactoryGirl.generate(:email)) + domain.save! + domain.soa_record.update_serial! + end + + 50.times do + Factory.create(:a, :user => user, :domain => entrydns_org) + end + end + +end diff --git a/db/seeds/development/settings.seeds.rb b/db/seeds/development/settings.seeds.rb new file mode 100644 index 0000000..f715718 --- /dev/null +++ b/db/seeds/development/settings.seeds.rb @@ -0,0 +1 @@ +Setting['public.donations.progress'] = '0' \ No newline at end of file diff --git a/db/seeds/development/users.seeds.rb b/db/seeds/development/users.seeds.rb new file mode 100644 index 0000000..1afa077 --- /dev/null +++ b/db/seeds/development/users.seeds.rb @@ -0,0 +1,16 @@ +# more sample users +users = [User.find_by_email('user@entrydns.net')] +for i in 1..3 do + name = "user#{i}" + user = User.new( + :first_name => name, + :last_name => name, + :email => "#{name}@entrydns.net", + :password => 'useruser', + :password_confirmation => 'useruser' + ) + user.confirmed_at = Time.now + user.save! + user.confirm! + users << user unless i > 3 +end \ No newline at end of file diff --git a/db/seeds/seed_helper.rb b/db/seeds/seed_helper.rb new file mode 100644 index 0000000..e160e66 --- /dev/null +++ b/db/seeds/seed_helper.rb @@ -0,0 +1,5 @@ +unless Object.const_defined?('FactoryGirl') + require 'factory_girl' + require 'faker' + require Rails.root.join('spec', 'factories.rb') +end \ No newline at end of file diff --git a/lib/tasks/samples.rake b/lib/tasks/samples.rake deleted file mode 100644 index 676c5bc..0000000 --- a/lib/tasks/samples.rake +++ /dev/null @@ -1,9 +0,0 @@ -namespace :db do - - desc 'Create sample data from db/samples.rb' - task :samples => :environment do - samples_file = File.join(Rails.root, "db", "samples.rb") - load(samples_file) if File.exist?(samples_file) - end - -end diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb index 201a069..9c25ca0 100644 --- a/lib/templates/erb/scaffold/_form.html.erb +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -10,4 +10,4 @@
<%%= f.button :submit %>
-<%% end %> +<%% end %> \ No newline at end of file diff --git a/spec/controllers/aaaas_controller_spec.rb b/spec/controllers/aaaas_controller_spec.rb deleted file mode 100644 index 501f407..0000000 --- a/spec/controllers/aaaas_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe AaaasController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Aaaa. As you add validations to Aaaa, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all aaaas as @aaaas" do - aaaa = Aaaa.create! valid_attributes - get :index - assigns(:aaaas).should eq([aaaa]) - end - end - - describe "GET show" do - it "assigns the requested aaaa as @aaaa" do - aaaa = Aaaa.create! valid_attributes - get :show, :id => aaaa.id.to_s - assigns(:aaaa).should eq(aaaa) - end - end - - describe "GET new" do - it "assigns a new aaaa as @aaaa" do - get :new - assigns(:aaaa).should be_a_new(Aaaa) - end - end - - describe "GET edit" do - it "assigns the requested aaaa as @aaaa" do - aaaa = Aaaa.create! valid_attributes - get :edit, :id => aaaa.id.to_s - assigns(:aaaa).should eq(aaaa) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Aaaa" do - expect { - post :create, :aaaa => valid_attributes - }.to change(Aaaa, :count).by(1) - end - - it "assigns a newly created aaaa as @aaaa" do - post :create, :aaaa => valid_attributes - assigns(:aaaa).should be_a(Aaaa) - assigns(:aaaa).should be_persisted - end - - it "redirects to the created aaaa" do - post :create, :aaaa => valid_attributes - response.should redirect_to(Aaaa.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved aaaa as @aaaa" do - # Trigger the behavior that occurs when invalid params are submitted - Aaaa.any_instance.stub(:save).and_return(false) - post :create, :aaaa => {} - assigns(:aaaa).should be_a_new(Aaaa) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Aaaa.any_instance.stub(:save).and_return(false) - post :create, :aaaa => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested aaaa" do - aaaa = Aaaa.create! valid_attributes - # Assuming there are no other aaaas in the database, this - # specifies that the Aaaa created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Aaaa.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => aaaa.id, :aaaa => {'these' => 'params'} - end - - it "assigns the requested aaaa as @aaaa" do - aaaa = Aaaa.create! valid_attributes - put :update, :id => aaaa.id, :aaaa => valid_attributes - assigns(:aaaa).should eq(aaaa) - end - - it "redirects to the aaaa" do - aaaa = Aaaa.create! valid_attributes - put :update, :id => aaaa.id, :aaaa => valid_attributes - response.should redirect_to(aaaa) - end - end - - describe "with invalid params" do - it "assigns the aaaa as @aaaa" do - aaaa = Aaaa.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Aaaa.any_instance.stub(:save).and_return(false) - put :update, :id => aaaa.id.to_s, :aaaa => {} - assigns(:aaaa).should eq(aaaa) - end - - it "re-renders the 'edit' template" do - aaaa = Aaaa.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Aaaa.any_instance.stub(:save).and_return(false) - put :update, :id => aaaa.id.to_s, :aaaa => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested aaaa" do - aaaa = Aaaa.create! valid_attributes - expect { - delete :destroy, :id => aaaa.id.to_s - }.to change(Aaaa, :count).by(-1) - end - - it "redirects to the aaaas list" do - aaaa = Aaaa.create! valid_attributes - delete :destroy, :id => aaaa.id.to_s - response.should redirect_to(aaaas_url) - end - end - -end diff --git a/spec/controllers/as_controller_spec.rb b/spec/controllers/as_controller_spec.rb deleted file mode 100644 index 4bfb218..0000000 --- a/spec/controllers/as_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe AsController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # A. As you add validations to A, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all as as @as" do - a = A.create! valid_attributes - get :index - assigns(:as).should eq([a]) - end - end - - describe "GET show" do - it "assigns the requested a as @a" do - a = A.create! valid_attributes - get :show, :id => a.id.to_s - assigns(:a).should eq(a) - end - end - - describe "GET new" do - it "assigns a new a as @a" do - get :new - assigns(:a).should be_a_new(A) - end - end - - describe "GET edit" do - it "assigns the requested a as @a" do - a = A.create! valid_attributes - get :edit, :id => a.id.to_s - assigns(:a).should eq(a) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new A" do - expect { - post :create, :a => valid_attributes - }.to change(A, :count).by(1) - end - - it "assigns a newly created a as @a" do - post :create, :a => valid_attributes - assigns(:a).should be_a(A) - assigns(:a).should be_persisted - end - - it "redirects to the created a" do - post :create, :a => valid_attributes - response.should redirect_to(A.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved a as @a" do - # Trigger the behavior that occurs when invalid params are submitted - A.any_instance.stub(:save).and_return(false) - post :create, :a => {} - assigns(:a).should be_a_new(A) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - A.any_instance.stub(:save).and_return(false) - post :create, :a => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested a" do - a = A.create! valid_attributes - # Assuming there are no other as in the database, this - # specifies that the A created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - A.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => a.id, :a => {'these' => 'params'} - end - - it "assigns the requested a as @a" do - a = A.create! valid_attributes - put :update, :id => a.id, :a => valid_attributes - assigns(:a).should eq(a) - end - - it "redirects to the a" do - a = A.create! valid_attributes - put :update, :id => a.id, :a => valid_attributes - response.should redirect_to(a) - end - end - - describe "with invalid params" do - it "assigns the a as @a" do - a = A.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - A.any_instance.stub(:save).and_return(false) - put :update, :id => a.id.to_s, :a => {} - assigns(:a).should eq(a) - end - - it "re-renders the 'edit' template" do - a = A.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - A.any_instance.stub(:save).and_return(false) - put :update, :id => a.id.to_s, :a => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested a" do - a = A.create! valid_attributes - expect { - delete :destroy, :id => a.id.to_s - }.to change(A, :count).by(-1) - end - - it "redirects to the as list" do - a = A.create! valid_attributes - delete :destroy, :id => a.id.to_s - response.should redirect_to(as_url) - end - end - -end diff --git a/spec/controllers/cnames_controller_spec.rb b/spec/controllers/cnames_controller_spec.rb deleted file mode 100644 index b5965d6..0000000 --- a/spec/controllers/cnames_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe CnamesController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Cname. As you add validations to Cname, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all cnames as @cnames" do - cname = Cname.create! valid_attributes - get :index - assigns(:cnames).should eq([cname]) - end - end - - describe "GET show" do - it "assigns the requested cname as @cname" do - cname = Cname.create! valid_attributes - get :show, :id => cname.id.to_s - assigns(:cname).should eq(cname) - end - end - - describe "GET new" do - it "assigns a new cname as @cname" do - get :new - assigns(:cname).should be_a_new(Cname) - end - end - - describe "GET edit" do - it "assigns the requested cname as @cname" do - cname = Cname.create! valid_attributes - get :edit, :id => cname.id.to_s - assigns(:cname).should eq(cname) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Cname" do - expect { - post :create, :cname => valid_attributes - }.to change(Cname, :count).by(1) - end - - it "assigns a newly created cname as @cname" do - post :create, :cname => valid_attributes - assigns(:cname).should be_a(Cname) - assigns(:cname).should be_persisted - end - - it "redirects to the created cname" do - post :create, :cname => valid_attributes - response.should redirect_to(Cname.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved cname as @cname" do - # Trigger the behavior that occurs when invalid params are submitted - Cname.any_instance.stub(:save).and_return(false) - post :create, :cname => {} - assigns(:cname).should be_a_new(Cname) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Cname.any_instance.stub(:save).and_return(false) - post :create, :cname => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested cname" do - cname = Cname.create! valid_attributes - # Assuming there are no other cnames in the database, this - # specifies that the Cname created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Cname.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => cname.id, :cname => {'these' => 'params'} - end - - it "assigns the requested cname as @cname" do - cname = Cname.create! valid_attributes - put :update, :id => cname.id, :cname => valid_attributes - assigns(:cname).should eq(cname) - end - - it "redirects to the cname" do - cname = Cname.create! valid_attributes - put :update, :id => cname.id, :cname => valid_attributes - response.should redirect_to(cname) - end - end - - describe "with invalid params" do - it "assigns the cname as @cname" do - cname = Cname.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Cname.any_instance.stub(:save).and_return(false) - put :update, :id => cname.id.to_s, :cname => {} - assigns(:cname).should eq(cname) - end - - it "re-renders the 'edit' template" do - cname = Cname.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Cname.any_instance.stub(:save).and_return(false) - put :update, :id => cname.id.to_s, :cname => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested cname" do - cname = Cname.create! valid_attributes - expect { - delete :destroy, :id => cname.id.to_s - }.to change(Cname, :count).by(-1) - end - - it "redirects to the cnames list" do - cname = Cname.create! valid_attributes - delete :destroy, :id => cname.id.to_s - response.should redirect_to(cnames_url) - end - end - -end diff --git a/spec/controllers/domains_controller_spec.rb b/spec/controllers/domains_controller_spec.rb deleted file mode 100644 index c475da9..0000000 --- a/spec/controllers/domains_controller_spec.rb +++ /dev/null @@ -1,178 +0,0 @@ -require 'spec_helper' - -describe DomainsController do - - context "wiring" do - include_context "data" - - # a domain who's parent domain is not in our system - context "domain" do - before do - sign_in user - end - - it "is wired with the current user by #new_model" do - @controller.send(:new_model).user.should == user - end - - it "is wired with the current user by #before_create_save" do - domain = build(:domain) - @controller.send(:before_create_save, domain) - domain.user.should == user - end - end - - # a domain who's parent domain is in our system - context "subdomain" do - before do - sign_in user2 - end - - it "is wired with the user of the parent domain by #before_create_save" do - subdomain = build(:domain, :user => user2, :name => "x.#{domain.name}") - @controller.send(:before_create_save, subdomain) - subdomain.user.should == user - end - end - - end -end - -# TODO implement me -__END__ - -# This should return the minimal set of attributes required to create a valid -# Domain. As you add validations to Domain, be sure to -# update the return value of this method accordingly. -def valid_attributes - {} -end - -describe "GET index" do - it "assigns all domains as @domains" do - domain = Domain.create! valid_attributes - get :index - assigns(:domains).should eq([domain]) - end -end - -describe "GET show" do - it "assigns the requested domain as @domain" do - domain = Domain.create! valid_attributes - get :show, :id => domain.id.to_s - assigns(:domain).should eq(domain) - end -end - -describe "GET new" do - it "assigns a new domain as @domain" do - get :new - assigns(:domain).should be_a_new(Domain) - end -end - -describe "GET edit" do - it "assigns the requested domain as @domain" do - domain = Domain.create! valid_attributes - get :edit, :id => domain.id.to_s - assigns(:domain).should eq(domain) - end -end - -describe "POST create" do - describe "with valid params" do - it "creates a new Domain" do - expect { - post :create, :domain => valid_attributes - }.to change(Domain, :count).by(1) - end - - it "assigns a newly created domain as @domain" do - post :create, :domain => valid_attributes - assigns(:domain).should be_a(Domain) - assigns(:domain).should be_persisted - end - - it "redirects to the created domain" do - post :create, :domain => valid_attributes - response.should redirect_to(Domain.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved domain as @domain" do - # Trigger the behavior that occurs when invalid params are submitted - Domain.any_instance.stub(:save).and_return(false) - post :create, :domain => {} - assigns(:domain).should be_a_new(Domain) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Domain.any_instance.stub(:save).and_return(false) - post :create, :domain => {} - response.should render_template("new") - end - end -end - -describe "PUT update" do - describe "with valid params" do - it "updates the requested domain" do - domain = Domain.create! valid_attributes - # Assuming there are no other domains in the database, this - # specifies that the Domain created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Domain.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => domain.id, :domain => {'these' => 'params'} - end - - it "assigns the requested domain as @domain" do - domain = Domain.create! valid_attributes - put :update, :id => domain.id, :domain => valid_attributes - assigns(:domain).should eq(domain) - end - - it "redirects to the domain" do - domain = Domain.create! valid_attributes - put :update, :id => domain.id, :domain => valid_attributes - response.should redirect_to(domain) - end - end - - describe "with invalid params" do - it "assigns the domain as @domain" do - domain = Domain.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Domain.any_instance.stub(:save).and_return(false) - put :update, :id => domain.id.to_s, :domain => {} - assigns(:domain).should eq(domain) - end - - it "re-renders the 'edit' template" do - domain = Domain.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Domain.any_instance.stub(:save).and_return(false) - put :update, :id => domain.id.to_s, :domain => {} - response.should render_template("edit") - end - end -end - -describe "DELETE destroy" do - it "destroys the requested domain" do - domain = Domain.create! valid_attributes - expect { - delete :destroy, :id => domain.id.to_s - }.to change(Domain, :count).by(-1) - end - - it "redirects to the domains list" do - domain = Domain.create! valid_attributes - delete :destroy, :id => domain.id.to_s - response.should redirect_to(domains_url) - end -end - -end \ No newline at end of file diff --git a/spec/controllers/hosts_controller_spec.rb b/spec/controllers/hosts_controller_spec.rb deleted file mode 100644 index 7ecb698..0000000 --- a/spec/controllers/hosts_controller_spec.rb +++ /dev/null @@ -1,158 +0,0 @@ -require 'spec_helper' - -describe HostsController do - include_context "data" - - before do - sign_in user - @controller.stub(:nested_parent_record => host_domain) - end - - it "#new_model is wired" do - @controller.send(:new_model).user.should == user - end - - it "#before_create_save wires" do - @controller.send(:before_create_save, host_a_record) - host_a_record.user.should == user - end -end - -# TODO implement me -__END__ - -# This should return the minimal set of attributes required to create a valid -# Host. As you add validations to Host, be sure to -# update the return value of this method accordingly. -def valid_attributes - {} -end - -describe "GET index" do - it "assigns all hosts as @hosts" do - host = Host.create! valid_attributes - get :index - assigns(:hosts).should eq([host]) - end -end - -describe "GET show" do - it "assigns the requested host as @host" do - host = Host.create! valid_attributes - get :show, :id => host.id.to_s - assigns(:host).should eq(host) - end -end - -describe "GET new" do - it "assigns a new host as @host" do - get :new - assigns(:host).should be_a_new(Host) - end -end - -describe "GET edit" do - it "assigns the requested host as @host" do - host = Host.create! valid_attributes - get :edit, :id => host.id.to_s - assigns(:host).should eq(host) - end -end - -describe "POST create" do - describe "with valid params" do - it "creates a new Host" do - expect { - post :create, :host => valid_attributes - }.to change(Host, :count).by(1) - end - - it "assigns a newly created host as @host" do - post :create, :host => valid_attributes - assigns(:host).should be_a(Host) - assigns(:host).should be_persisted - end - - it "redirects to the created host" do - post :create, :host => valid_attributes - response.should redirect_to(Host.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved host as @host" do - # Trigger the behavior that occurs when invalid params are submitted - Host.any_instance.stub(:save).and_return(false) - post :create, :host => {} - assigns(:host).should be_a_new(Host) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Host.any_instance.stub(:save).and_return(false) - post :create, :host => {} - response.should render_template("new") - end - end -end - -describe "PUT update" do - describe "with valid params" do - it "updates the requested host" do - host = Host.create! valid_attributes - # Assuming there are no other hosts in the database, this - # specifies that the Host created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Host.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => host.id, :host => {'these' => 'params'} - end - - it "assigns the requested host as @host" do - host = Host.create! valid_attributes - put :update, :id => host.id, :host => valid_attributes - assigns(:host).should eq(host) - end - - it "redirects to the host" do - host = Host.create! valid_attributes - put :update, :id => host.id, :host => valid_attributes - response.should redirect_to(host) - end - end - - describe "with invalid params" do - it "assigns the host as @host" do - host = Host.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Host.any_instance.stub(:save).and_return(false) - put :update, :id => host.id.to_s, :host => {} - assigns(:host).should eq(host) - end - - it "re-renders the 'edit' template" do - host = Host.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Host.any_instance.stub(:save).and_return(false) - put :update, :id => host.id.to_s, :host => {} - response.should render_template("edit") - end - end -end - -describe "DELETE destroy" do - it "destroys the requested host" do - host = Host.create! valid_attributes - expect { - delete :destroy, :id => host.id.to_s - }.to change(Host, :count).by(-1) - end - - it "redirects to the hosts list" do - host = Host.create! valid_attributes - delete :destroy, :id => host.id.to_s - response.should redirect_to(hosts_url) - end -end - -end diff --git a/spec/controllers/mxes_controller_spec.rb b/spec/controllers/mxes_controller_spec.rb deleted file mode 100644 index af792d2..0000000 --- a/spec/controllers/mxes_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe MxesController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Mx. As you add validations to Mx, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all mxes as @mxes" do - mx = Mx.create! valid_attributes - get :index - assigns(:mxes).should eq([mx]) - end - end - - describe "GET show" do - it "assigns the requested mx as @mx" do - mx = Mx.create! valid_attributes - get :show, :id => mx.id.to_s - assigns(:mx).should eq(mx) - end - end - - describe "GET new" do - it "assigns a new mx as @mx" do - get :new - assigns(:mx).should be_a_new(Mx) - end - end - - describe "GET edit" do - it "assigns the requested mx as @mx" do - mx = Mx.create! valid_attributes - get :edit, :id => mx.id.to_s - assigns(:mx).should eq(mx) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Mx" do - expect { - post :create, :mx => valid_attributes - }.to change(Mx, :count).by(1) - end - - it "assigns a newly created mx as @mx" do - post :create, :mx => valid_attributes - assigns(:mx).should be_a(Mx) - assigns(:mx).should be_persisted - end - - it "redirects to the created mx" do - post :create, :mx => valid_attributes - response.should redirect_to(Mx.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved mx as @mx" do - # Trigger the behavior that occurs when invalid params are submitted - Mx.any_instance.stub(:save).and_return(false) - post :create, :mx => {} - assigns(:mx).should be_a_new(Mx) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Mx.any_instance.stub(:save).and_return(false) - post :create, :mx => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested mx" do - mx = Mx.create! valid_attributes - # Assuming there are no other mxes in the database, this - # specifies that the Mx created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Mx.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => mx.id, :mx => {'these' => 'params'} - end - - it "assigns the requested mx as @mx" do - mx = Mx.create! valid_attributes - put :update, :id => mx.id, :mx => valid_attributes - assigns(:mx).should eq(mx) - end - - it "redirects to the mx" do - mx = Mx.create! valid_attributes - put :update, :id => mx.id, :mx => valid_attributes - response.should redirect_to(mx) - end - end - - describe "with invalid params" do - it "assigns the mx as @mx" do - mx = Mx.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Mx.any_instance.stub(:save).and_return(false) - put :update, :id => mx.id.to_s, :mx => {} - assigns(:mx).should eq(mx) - end - - it "re-renders the 'edit' template" do - mx = Mx.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Mx.any_instance.stub(:save).and_return(false) - put :update, :id => mx.id.to_s, :mx => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested mx" do - mx = Mx.create! valid_attributes - expect { - delete :destroy, :id => mx.id.to_s - }.to change(Mx, :count).by(-1) - end - - it "redirects to the mxes list" do - mx = Mx.create! valid_attributes - delete :destroy, :id => mx.id.to_s - response.should redirect_to(mxes_url) - end - end - -end diff --git a/spec/controllers/ns_controller_spec.rb b/spec/controllers/ns_controller_spec.rb deleted file mode 100644 index 6613f41..0000000 --- a/spec/controllers/ns_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe NsController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Ns. As you add validations to Ns, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all ns as @ns" do - ns = Ns.create! valid_attributes - get :index - assigns(:ns).should eq([ns]) - end - end - - describe "GET show" do - it "assigns the requested ns as @ns" do - ns = Ns.create! valid_attributes - get :show, :id => ns.id.to_s - assigns(:ns).should eq(ns) - end - end - - describe "GET new" do - it "assigns a new ns as @ns" do - get :new - assigns(:ns).should be_a_new(Ns) - end - end - - describe "GET edit" do - it "assigns the requested ns as @ns" do - ns = Ns.create! valid_attributes - get :edit, :id => ns.id.to_s - assigns(:ns).should eq(ns) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Ns" do - expect { - post :create, :ns => valid_attributes - }.to change(Ns, :count).by(1) - end - - it "assigns a newly created ns as @ns" do - post :create, :ns => valid_attributes - assigns(:ns).should be_a(Ns) - assigns(:ns).should be_persisted - end - - it "redirects to the created ns" do - post :create, :ns => valid_attributes - response.should redirect_to(Ns.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved ns as @ns" do - # Trigger the behavior that occurs when invalid params are submitted - Ns.any_instance.stub(:save).and_return(false) - post :create, :ns => {} - assigns(:ns).should be_a_new(Ns) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Ns.any_instance.stub(:save).and_return(false) - post :create, :ns => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested ns" do - ns = Ns.create! valid_attributes - # Assuming there are no other ns in the database, this - # specifies that the Ns created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Ns.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => ns.id, :ns => {'these' => 'params'} - end - - it "assigns the requested ns as @ns" do - ns = Ns.create! valid_attributes - put :update, :id => ns.id, :ns => valid_attributes - assigns(:ns).should eq(ns) - end - - it "redirects to the ns" do - ns = Ns.create! valid_attributes - put :update, :id => ns.id, :ns => valid_attributes - response.should redirect_to(ns) - end - end - - describe "with invalid params" do - it "assigns the ns as @ns" do - ns = Ns.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Ns.any_instance.stub(:save).and_return(false) - put :update, :id => ns.id.to_s, :ns => {} - assigns(:ns).should eq(ns) - end - - it "re-renders the 'edit' template" do - ns = Ns.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Ns.any_instance.stub(:save).and_return(false) - put :update, :id => ns.id.to_s, :ns => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested ns" do - ns = Ns.create! valid_attributes - expect { - delete :destroy, :id => ns.id.to_s - }.to change(Ns, :count).by(-1) - end - - it "redirects to the ns list" do - ns = Ns.create! valid_attributes - delete :destroy, :id => ns.id.to_s - response.should redirect_to(ns_index_url) - end - end - -end diff --git a/spec/controllers/records_controller_spec.rb b/spec/controllers/records_controller_spec.rb deleted file mode 100644 index 8e94cdf..0000000 --- a/spec/controllers/records_controller_spec.rb +++ /dev/null @@ -1,181 +0,0 @@ -require 'spec_helper' - -describe RecordsController do - it_should_behave_like "wiring controller" - - describe "PUT modify" do - include_context "data" - - before do - sign_in user - end - - it "modifies @record when IP given" do - ip = '127.0.0.2' - put :modify, :authentication_token => a_record.authentication_token, :ip => ip - response.should be_success - response.body.should == RecordsController::MODIFY_OK - assigns(:record).should == a_record - assigns(:record).content.should == ip - end - - it "modifies @record with remote IP" do - ip = '127.0.0.3' - request.env["HTTP_X_FORWARDED_FOR"] = ip - put :modify, :authentication_token => a_record.authentication_token - response.should be_success - response.body.should == RecordsController::MODIFY_OK - assigns(:record).should == a_record - assigns(:record).content.should == ip - end - - it "errors when not A type @record with" do - ip = '127.0.0.3' - request.env["HTTP_X_FORWARDED_FOR"] = ip - put :modify, :authentication_token => soa_record.authentication_token - response.should be_success - response.body.should == RecordsController::MODIFY_ERROR - end - - end - -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Record. As you add validations to Record, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all records as @records" do - record = Record.create! valid_attributes - get :index - assigns(:records).should eq([record]) - end - end - - describe "GET show" do - it "assigns the requested record as @record" do - record = Record.create! valid_attributes - get :show, :id => record.id.to_s - assigns(:record).should eq(record) - end - end - - describe "GET new" do - it "assigns a new record as @record" do - get :new - assigns(:record).should be_a_new(Record) - end - end - - describe "GET edit" do - it "assigns the requested record as @record" do - record = Record.create! valid_attributes - get :edit, :id => record.id.to_s - assigns(:record).should eq(record) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Record" do - expect { - post :create, :record => valid_attributes - }.to change(Record, :count).by(1) - end - - it "assigns a newly created record as @record" do - post :create, :record => valid_attributes - assigns(:record).should be_a(Record) - assigns(:record).should be_persisted - end - - it "redirects to the created record" do - post :create, :record => valid_attributes - response.should redirect_to(Record.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved record as @record" do - # Trigger the behavior that occurs when invalid params are submitted - Record.any_instance.stub(:save).and_return(false) - post :create, :record => {} - assigns(:record).should be_a_new(Record) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Record.any_instance.stub(:save).and_return(false) - post :create, :record => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested record" do - record = Record.create! valid_attributes - # Assuming there are no other records in the database, this - # specifies that the Record created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Record.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => record.id, :record => {'these' => 'params'} - end - - it "assigns the requested record as @record" do - record = Record.create! valid_attributes - put :update, :id => record.id, :record => valid_attributes - assigns(:record).should eq(record) - end - - it "redirects to the record" do - record = Record.create! valid_attributes - put :update, :id => record.id, :record => valid_attributes - response.should redirect_to(record) - end - end - - describe "with invalid params" do - it "assigns the record as @record" do - record = Record.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Record.any_instance.stub(:save).and_return(false) - put :update, :id => record.id.to_s, :record => {} - assigns(:record).should eq(record) - end - - it "re-renders the 'edit' template" do - record = Record.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Record.any_instance.stub(:save).and_return(false) - put :update, :id => record.id.to_s, :record => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested record" do - record = Record.create! valid_attributes - expect { - delete :destroy, :id => record.id.to_s - }.to change(Record, :count).by(-1) - end - - it "redirects to the records list" do - record = Record.create! valid_attributes - delete :destroy, :id => record.id.to_s - response.should redirect_to(records_url) - end - end - -end \ No newline at end of file diff --git a/spec/controllers/soas_controller_spec.rb b/spec/controllers/soas_controller_spec.rb deleted file mode 100644 index 15c4135..0000000 --- a/spec/controllers/soas_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe SoasController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Soa. As you add validations to Soa, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all soas as @soas" do - soa = Soa.create! valid_attributes - get :index - assigns(:soas).should eq([soa]) - end - end - - describe "GET show" do - it "assigns the requested soa as @soa" do - soa = Soa.create! valid_attributes - get :show, :id => soa.id.to_s - assigns(:soa).should eq(soa) - end - end - - describe "GET new" do - it "assigns a new soa as @soa" do - get :new - assigns(:soa).should be_a_new(Soa) - end - end - - describe "GET edit" do - it "assigns the requested soa as @soa" do - soa = Soa.create! valid_attributes - get :edit, :id => soa.id.to_s - assigns(:soa).should eq(soa) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Soa" do - expect { - post :create, :soa => valid_attributes - }.to change(Soa, :count).by(1) - end - - it "assigns a newly created soa as @soa" do - post :create, :soa => valid_attributes - assigns(:soa).should be_a(Soa) - assigns(:soa).should be_persisted - end - - it "redirects to the created soa" do - post :create, :soa => valid_attributes - response.should redirect_to(Soa.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved soa as @soa" do - # Trigger the behavior that occurs when invalid params are submitted - Soa.any_instance.stub(:save).and_return(false) - post :create, :soa => {} - assigns(:soa).should be_a_new(Soa) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Soa.any_instance.stub(:save).and_return(false) - post :create, :soa => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested soa" do - soa = Soa.create! valid_attributes - # Assuming there are no other soas in the database, this - # specifies that the Soa created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Soa.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => soa.id, :soa => {'these' => 'params'} - end - - it "assigns the requested soa as @soa" do - soa = Soa.create! valid_attributes - put :update, :id => soa.id, :soa => valid_attributes - assigns(:soa).should eq(soa) - end - - it "redirects to the soa" do - soa = Soa.create! valid_attributes - put :update, :id => soa.id, :soa => valid_attributes - response.should redirect_to(soa) - end - end - - describe "with invalid params" do - it "assigns the soa as @soa" do - soa = Soa.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Soa.any_instance.stub(:save).and_return(false) - put :update, :id => soa.id.to_s, :soa => {} - assigns(:soa).should eq(soa) - end - - it "re-renders the 'edit' template" do - soa = Soa.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Soa.any_instance.stub(:save).and_return(false) - put :update, :id => soa.id.to_s, :soa => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested soa" do - soa = Soa.create! valid_attributes - expect { - delete :destroy, :id => soa.id.to_s - }.to change(Soa, :count).by(-1) - end - - it "redirects to the soas list" do - soa = Soa.create! valid_attributes - delete :destroy, :id => soa.id.to_s - response.should redirect_to(soas_url) - end - end - -end diff --git a/spec/controllers/srvs_controller_spec.rb b/spec/controllers/srvs_controller_spec.rb deleted file mode 100644 index dbccf04..0000000 --- a/spec/controllers/srvs_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe SrvsController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Srv. As you add validations to Srv, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all srvs as @srvs" do - srv = Srv.create! valid_attributes - get :index - assigns(:srvs).should eq([srv]) - end - end - - describe "GET show" do - it "assigns the requested srv as @srv" do - srv = Srv.create! valid_attributes - get :show, :id => srv.id.to_s - assigns(:srv).should eq(srv) - end - end - - describe "GET new" do - it "assigns a new srv as @srv" do - get :new - assigns(:srv).should be_a_new(Srv) - end - end - - describe "GET edit" do - it "assigns the requested srv as @srv" do - srv = Srv.create! valid_attributes - get :edit, :id => srv.id.to_s - assigns(:srv).should eq(srv) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Srv" do - expect { - post :create, :srv => valid_attributes - }.to change(Srv, :count).by(1) - end - - it "assigns a newly created srv as @srv" do - post :create, :srv => valid_attributes - assigns(:srv).should be_a(Srv) - assigns(:srv).should be_persisted - end - - it "redirects to the created srv" do - post :create, :srv => valid_attributes - response.should redirect_to(Srv.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved srv as @srv" do - # Trigger the behavior that occurs when invalid params are submitted - Srv.any_instance.stub(:save).and_return(false) - post :create, :srv => {} - assigns(:srv).should be_a_new(Srv) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Srv.any_instance.stub(:save).and_return(false) - post :create, :srv => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested srv" do - srv = Srv.create! valid_attributes - # Assuming there are no other srvs in the database, this - # specifies that the Srv created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Srv.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => srv.id, :srv => {'these' => 'params'} - end - - it "assigns the requested srv as @srv" do - srv = Srv.create! valid_attributes - put :update, :id => srv.id, :srv => valid_attributes - assigns(:srv).should eq(srv) - end - - it "redirects to the srv" do - srv = Srv.create! valid_attributes - put :update, :id => srv.id, :srv => valid_attributes - response.should redirect_to(srv) - end - end - - describe "with invalid params" do - it "assigns the srv as @srv" do - srv = Srv.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Srv.any_instance.stub(:save).and_return(false) - put :update, :id => srv.id.to_s, :srv => {} - assigns(:srv).should eq(srv) - end - - it "re-renders the 'edit' template" do - srv = Srv.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Srv.any_instance.stub(:save).and_return(false) - put :update, :id => srv.id.to_s, :srv => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested srv" do - srv = Srv.create! valid_attributes - expect { - delete :destroy, :id => srv.id.to_s - }.to change(Srv, :count).by(-1) - end - - it "redirects to the srvs list" do - srv = Srv.create! valid_attributes - delete :destroy, :id => srv.id.to_s - response.should redirect_to(srvs_url) - end - end - -end diff --git a/spec/controllers/txts_controller_spec.rb b/spec/controllers/txts_controller_spec.rb deleted file mode 100644 index c397034..0000000 --- a/spec/controllers/txts_controller_spec.rb +++ /dev/null @@ -1,144 +0,0 @@ -require 'spec_helper' - -describe TxtsController do - it_should_behave_like "wiring controller" -end - -# TODO implement me -__END__ - - # This should return the minimal set of attributes required to create a valid - # Txt. As you add validations to Txt, be sure to - # update the return value of this method accordingly. - def valid_attributes - {} - end - - describe "GET index" do - it "assigns all txts as @txts" do - txt = Txt.create! valid_attributes - get :index - assigns(:txts).should eq([txt]) - end - end - - describe "GET show" do - it "assigns the requested txt as @txt" do - txt = Txt.create! valid_attributes - get :show, :id => txt.id.to_s - assigns(:txt).should eq(txt) - end - end - - describe "GET new" do - it "assigns a new txt as @txt" do - get :new - assigns(:txt).should be_a_new(Txt) - end - end - - describe "GET edit" do - it "assigns the requested txt as @txt" do - txt = Txt.create! valid_attributes - get :edit, :id => txt.id.to_s - assigns(:txt).should eq(txt) - end - end - - describe "POST create" do - describe "with valid params" do - it "creates a new Txt" do - expect { - post :create, :txt => valid_attributes - }.to change(Txt, :count).by(1) - end - - it "assigns a newly created txt as @txt" do - post :create, :txt => valid_attributes - assigns(:txt).should be_a(Txt) - assigns(:txt).should be_persisted - end - - it "redirects to the created txt" do - post :create, :txt => valid_attributes - response.should redirect_to(Txt.last) - end - end - - describe "with invalid params" do - it "assigns a newly created but unsaved txt as @txt" do - # Trigger the behavior that occurs when invalid params are submitted - Txt.any_instance.stub(:save).and_return(false) - post :create, :txt => {} - assigns(:txt).should be_a_new(Txt) - end - - it "re-renders the 'new' template" do - # Trigger the behavior that occurs when invalid params are submitted - Txt.any_instance.stub(:save).and_return(false) - post :create, :txt => {} - response.should render_template("new") - end - end - end - - describe "PUT update" do - describe "with valid params" do - it "updates the requested txt" do - txt = Txt.create! valid_attributes - # Assuming there are no other txts in the database, this - # specifies that the Txt created on the previous line - # receives the :update_attributes message with whatever params are - # submitted in the request. - Txt.any_instance.should_receive(:update_attributes).with({'these' => 'params'}) - put :update, :id => txt.id, :txt => {'these' => 'params'} - end - - it "assigns the requested txt as @txt" do - txt = Txt.create! valid_attributes - put :update, :id => txt.id, :txt => valid_attributes - assigns(:txt).should eq(txt) - end - - it "redirects to the txt" do - txt = Txt.create! valid_attributes - put :update, :id => txt.id, :txt => valid_attributes - response.should redirect_to(txt) - end - end - - describe "with invalid params" do - it "assigns the txt as @txt" do - txt = Txt.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Txt.any_instance.stub(:save).and_return(false) - put :update, :id => txt.id.to_s, :txt => {} - assigns(:txt).should eq(txt) - end - - it "re-renders the 'edit' template" do - txt = Txt.create! valid_attributes - # Trigger the behavior that occurs when invalid params are submitted - Txt.any_instance.stub(:save).and_return(false) - put :update, :id => txt.id.to_s, :txt => {} - response.should render_template("edit") - end - end - end - - describe "DELETE destroy" do - it "destroys the requested txt" do - txt = Txt.create! valid_attributes - expect { - delete :destroy, :id => txt.id.to_s - }.to change(Txt, :count).by(-1) - end - - it "redirects to the txts list" do - txt = Txt.create! valid_attributes - delete :destroy, :id => txt.id.to_s - response.should redirect_to(txts_url) - end - end - -end diff --git a/spec/controllers/users/aaaas_controller_spec.rb b/spec/controllers/users/aaaas_controller_spec.rb new file mode 100644 index 0000000..2cb3129 --- /dev/null +++ b/spec/controllers/users/aaaas_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::AaaasController do + it_should_behave_like "wiring controller" +end diff --git a/spec/controllers/users/as_controller_spec.rb b/spec/controllers/users/as_controller_spec.rb new file mode 100644 index 0000000..7b1354d --- /dev/null +++ b/spec/controllers/users/as_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::AsController do + it_should_behave_like "wiring controller" +end diff --git a/spec/controllers/users/cnames_controller_spec.rb b/spec/controllers/users/cnames_controller_spec.rb new file mode 100644 index 0000000..e59ab50 --- /dev/null +++ b/spec/controllers/users/cnames_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::CnamesController do + it_should_behave_like "wiring controller" +end diff --git a/spec/controllers/users/domains_controller_spec.rb b/spec/controllers/users/domains_controller_spec.rb new file mode 100644 index 0000000..d25a23b --- /dev/null +++ b/spec/controllers/users/domains_controller_spec.rb @@ -0,0 +1,39 @@ +require 'spec_helper' + +describe Users::DomainsController do + + context "wiring" do + include_context "data" + + # a domain who's parent domain is not in our system + context "domain" do + before do + sign_in user + end + + it "is wired with the current user by #new_model" do + @controller.send(:new_model).user.should == user + end + + it "is wired with the current user by #before_create_save" do + domain = build(:domain) + @controller.send(:before_create_save, domain) + domain.user.should == user + end + end + + # a domain who's parent domain is in our system + context "subdomain" do + before do + sign_in user2 + end + + it "is wired with the user of the parent domain by #before_create_save" do + subdomain = build(:domain, :user => user2, :name => "x.#{domain.name}") + @controller.send(:before_create_save, subdomain) + subdomain.user.should == user + end + end + + end +end diff --git a/spec/controllers/users/hosts_controller_spec.rb b/spec/controllers/users/hosts_controller_spec.rb new file mode 100644 index 0000000..bb50e45 --- /dev/null +++ b/spec/controllers/users/hosts_controller_spec.rb @@ -0,0 +1,19 @@ +require 'spec_helper' + +describe Users::HostsController do + include_context "data" + + before do + sign_in user + @controller.stub(:nested_parent_record => host_domain) + end + + it "#new_model is wired" do + @controller.send(:new_model).user.should == user + end + + it "#before_create_save wires" do + @controller.send(:before_create_save, host_a_record) + host_a_record.user.should == user + end +end diff --git a/spec/controllers/users/mxes_controller_spec.rb b/spec/controllers/users/mxes_controller_spec.rb new file mode 100644 index 0000000..2673f65 --- /dev/null +++ b/spec/controllers/users/mxes_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::MxesController do + it_should_behave_like "wiring controller" +end diff --git a/spec/controllers/users/ns_controller_spec.rb b/spec/controllers/users/ns_controller_spec.rb new file mode 100644 index 0000000..2775292 --- /dev/null +++ b/spec/controllers/users/ns_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::NsController do + it_should_behave_like "wiring controller" +end diff --git a/spec/controllers/users/records_controller_spec.rb b/spec/controllers/users/records_controller_spec.rb new file mode 100644 index 0000000..ed62ef1 --- /dev/null +++ b/spec/controllers/users/records_controller_spec.rb @@ -0,0 +1,42 @@ +require 'spec_helper' + +describe Users::RecordsController do + it_should_behave_like "wiring controller" + + describe "GET modify" do + include_context "data" + + before do + sign_in user + end + + it "modifies @record when IP given" do + ip = '127.0.0.2' + get :modify, :authentication_token => a_record.authentication_token, :ip => ip + response.should be_success + response.body.should == Users::RecordsController::MODIFY_OK + assigns(:record).should == a_record + assigns(:record).content.should == ip + end + + it "modifies @record with remote IP" do + ip = '127.0.0.3' + request.env["HTTP_X_FORWARDED_FOR"] = ip + get :modify, :authentication_token => a_record.authentication_token + response.should be_success + response.body.should == Users::RecordsController::MODIFY_OK + assigns(:record).should == a_record + assigns(:record).content.should == ip + end + + it "errors when not A type @record with" do + ip = '127.0.0.3' + request.env["HTTP_X_FORWARDED_FOR"] = ip + get :modify, :authentication_token => soa_record.authentication_token + response.should be_success + response.body.should == Users::RecordsController::MODIFY_ERROR + end + + end + +end diff --git a/spec/controllers/users/soas_controller_spec.rb b/spec/controllers/users/soas_controller_spec.rb new file mode 100644 index 0000000..066b023 --- /dev/null +++ b/spec/controllers/users/soas_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::SoasController do + it_should_behave_like "wiring controller" +end diff --git a/spec/controllers/users/srvs_controller_spec.rb b/spec/controllers/users/srvs_controller_spec.rb new file mode 100644 index 0000000..4c08fff --- /dev/null +++ b/spec/controllers/users/srvs_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::SrvsController do + it_should_behave_like "wiring controller" +end diff --git a/spec/controllers/users/txts_controller_spec.rb b/spec/controllers/users/txts_controller_spec.rb new file mode 100644 index 0000000..cf47450 --- /dev/null +++ b/spec/controllers/users/txts_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Users::TxtsController do + it_should_behave_like "wiring controller" +end diff --git a/spec/factories/admins.rb b/spec/factories/admins.rb new file mode 100644 index 0000000..e531067 --- /dev/null +++ b/spec/factories/admins.rb @@ -0,0 +1,6 @@ +# Read about factories at http://github.com/thoughtbot/factory_girl + +FactoryGirl.define do + factory :admin do + end +end diff --git a/spec/mailers/permission_mailer_spec.rb b/spec/mailers/users/permission_mailer_spec.rb similarity index 70% rename from spec/mailers/permission_mailer_spec.rb rename to spec/mailers/users/permission_mailer_spec.rb index 085e145..775e677 100644 --- a/spec/mailers/permission_mailer_spec.rb +++ b/spec/mailers/users/permission_mailer_spec.rb @@ -1,5 +1,5 @@ require "spec_helper" -describe PermissionMailer do +describe Users::PermissionMailer do pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/models/admin_spec.rb b/spec/models/admin_spec.rb new file mode 100644 index 0000000..ccc4624 --- /dev/null +++ b/spec/models/admin_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Admin do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/ability_spec.rb b/spec/models/user_ability_spec.rb similarity index 97% rename from spec/models/ability_spec.rb rename to spec/models/user_ability_spec.rb index 70dcff3..0f4b3e0 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/user_ability_spec.rb @@ -2,9 +2,9 @@ require 'spec_helper' # needs "rake db:test:clone" for the "hosts" part -describe Ability do +describe UserAbility do include_context "data" - let(:crud){Ability::CRUD} + let(:crud){UserAbility::CRUD} context "basic" do it "allows me to manage my domains and their records, and my hosts" do diff --git a/spec/routing/aaaas_routing_spec.rb b/spec/routing/aaaas_routing_spec.rb deleted file mode 100644 index 6abee4a..0000000 --- a/spec/routing/aaaas_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe AaaasController do - describe "routing" do - - it "routes to #index" do - get("/aaaas").should route_to("aaaas#index") - end - - it "routes to #new" do - get("/aaaas/new").should route_to("aaaas#new") - end - - it "routes to #show" do - get("/aaaas/1").should route_to("aaaas#show", :id => "1") - end - - it "routes to #edit" do - get("/aaaas/1/edit").should route_to("aaaas#edit", :id => "1") - end - - it "routes to #create" do - post("/aaaas").should route_to("aaaas#create") - end - - it "routes to #update" do - put("/aaaas/1").should route_to("aaaas#update", :id => "1") - end - - it "routes to #destroy" do - delete("/aaaas/1").should route_to("aaaas#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/as_routing_spec.rb b/spec/routing/as_routing_spec.rb deleted file mode 100644 index a787b2e..0000000 --- a/spec/routing/as_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe AsController do - describe "routing" do - - it "routes to #index" do - get("/as").should route_to("as#index") - end - - it "routes to #new" do - get("/as/new").should route_to("as#new") - end - - it "routes to #show" do - get("/as/1").should route_to("as#show", :id => "1") - end - - it "routes to #edit" do - get("/as/1/edit").should route_to("as#edit", :id => "1") - end - - it "routes to #create" do - post("/as").should route_to("as#create") - end - - it "routes to #update" do - put("/as/1").should route_to("as#update", :id => "1") - end - - it "routes to #destroy" do - delete("/as/1").should route_to("as#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/cnames_routing_spec.rb b/spec/routing/cnames_routing_spec.rb deleted file mode 100644 index 9fb9fbc..0000000 --- a/spec/routing/cnames_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe CnamesController do - describe "routing" do - - it "routes to #index" do - get("/cnames").should route_to("cnames#index") - end - - it "routes to #new" do - get("/cnames/new").should route_to("cnames#new") - end - - it "routes to #show" do - get("/cnames/1").should route_to("cnames#show", :id => "1") - end - - it "routes to #edit" do - get("/cnames/1/edit").should route_to("cnames#edit", :id => "1") - end - - it "routes to #create" do - post("/cnames").should route_to("cnames#create") - end - - it "routes to #update" do - put("/cnames/1").should route_to("cnames#update", :id => "1") - end - - it "routes to #destroy" do - delete("/cnames/1").should route_to("cnames#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/domains_routing_spec.rb b/spec/routing/domains_routing_spec.rb deleted file mode 100644 index ceb8f63..0000000 --- a/spec/routing/domains_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe DomainsController do - describe "routing" do - - it "routes to #index" do - get("/domains").should route_to("domains#index") - end - - it "routes to #new" do - get("/domains/new").should route_to("domains#new") - end - - it "routes to #show" do - get("/domains/1").should route_to("domains#show", :id => "1") - end - - it "routes to #edit" do - get("/domains/1/edit").should route_to("domains#edit", :id => "1") - end - - it "routes to #create" do - post("/domains").should route_to("domains#create") - end - - it "routes to #update" do - put("/domains/1").should route_to("domains#update", :id => "1") - end - - it "routes to #destroy" do - delete("/domains/1").should route_to("domains#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/hosts_routing_spec.rb b/spec/routing/hosts_routing_spec.rb deleted file mode 100644 index 2f94d0e..0000000 --- a/spec/routing/hosts_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe HostsController do - describe "routing" do - - it "routes to #index" do - get("/hosts").should route_to("hosts#index") - end - - it "routes to #new" do - get("/hosts/new").should route_to("hosts#new") - end - - it "routes to #show" do - get("/hosts/1").should route_to("hosts#show", :id => "1") - end - - it "routes to #edit" do - get("/hosts/1/edit").should route_to("hosts#edit", :id => "1") - end - - it "routes to #create" do - post("/hosts").should route_to("hosts#create") - end - - it "routes to #update" do - put("/hosts/1").should route_to("hosts#update", :id => "1") - end - - it "routes to #destroy" do - delete("/hosts/1").should route_to("hosts#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/mxes_routing_spec.rb b/spec/routing/mxes_routing_spec.rb deleted file mode 100644 index 76204c3..0000000 --- a/spec/routing/mxes_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe MxesController do - describe "routing" do - - it "routes to #index" do - get("/mxes").should route_to("mxes#index") - end - - it "routes to #new" do - get("/mxes/new").should route_to("mxes#new") - end - - it "routes to #show" do - get("/mxes/1").should route_to("mxes#show", :id => "1") - end - - it "routes to #edit" do - get("/mxes/1/edit").should route_to("mxes#edit", :id => "1") - end - - it "routes to #create" do - post("/mxes").should route_to("mxes#create") - end - - it "routes to #update" do - put("/mxes/1").should route_to("mxes#update", :id => "1") - end - - it "routes to #destroy" do - delete("/mxes/1").should route_to("mxes#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/ns_routing_spec.rb b/spec/routing/ns_routing_spec.rb deleted file mode 100644 index 8be3aff..0000000 --- a/spec/routing/ns_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe NsController do - describe "routing" do - - it "routes to #index" do - get("/ns").should route_to("ns#index") - end - - it "routes to #new" do - get("/ns/new").should route_to("ns#new") - end - - it "routes to #show" do - get("/ns/1").should route_to("ns#show", :id => "1") - end - - it "routes to #edit" do - get("/ns/1/edit").should route_to("ns#edit", :id => "1") - end - - it "routes to #create" do - post("/ns").should route_to("ns#create") - end - - it "routes to #update" do - put("/ns/1").should route_to("ns#update", :id => "1") - end - - it "routes to #destroy" do - delete("/ns/1").should route_to("ns#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/permissions_routing_spec.rb b/spec/routing/permissions_routing_spec.rb deleted file mode 100644 index 287f501..0000000 --- a/spec/routing/permissions_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe PermissionsController do - describe "routing" do - - it "routes to #index" do - get("/permissions").should route_to("permissions#index") - end - - it "routes to #new" do - get("/permissions/new").should route_to("permissions#new") - end - - it "routes to #show" do - get("/permissions/1").should route_to("permissions#show", :id => "1") - end - - it "routes to #edit" do - get("/permissions/1/edit").should route_to("permissions#edit", :id => "1") - end - - it "routes to #create" do - post("/permissions").should route_to("permissions#create") - end - - it "routes to #update" do - put("/permissions/1").should route_to("permissions#update", :id => "1") - end - - it "routes to #destroy" do - delete("/permissions/1").should route_to("permissions#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/records_routing_spec.rb b/spec/routing/records_routing_spec.rb deleted file mode 100644 index 43b1e6a..0000000 --- a/spec/routing/records_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe RecordsController do - describe "routing" do - - it "routes to #index" do - get("/records").should route_to("records#index") - end - - it "routes to #new" do - get("/records/new").should route_to("records#new") - end - - it "routes to #show" do - get("/records/1").should route_to("records#show", :id => "1") - end - - it "routes to #edit" do - get("/records/1/edit").should route_to("records#edit", :id => "1") - end - - it "routes to #create" do - post("/records").should route_to("records#create") - end - - it "routes to #update" do - put("/records/1").should route_to("records#update", :id => "1") - end - - it "routes to #destroy" do - delete("/records/1").should route_to("records#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/soas_routing_spec.rb b/spec/routing/soas_routing_spec.rb deleted file mode 100644 index 9366361..0000000 --- a/spec/routing/soas_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe SoasController do - describe "routing" do - - it "routes to #index" do - get("/soas").should route_to("soas#index") - end - - it "routes to #new" do - get("/soas/new").should route_to("soas#new") - end - - it "routes to #show" do - get("/soas/1").should route_to("soas#show", :id => "1") - end - - it "routes to #edit" do - get("/soas/1/edit").should route_to("soas#edit", :id => "1") - end - - it "routes to #create" do - post("/soas").should route_to("soas#create") - end - - it "routes to #update" do - put("/soas/1").should route_to("soas#update", :id => "1") - end - - it "routes to #destroy" do - delete("/soas/1").should route_to("soas#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/srvs_routing_spec.rb b/spec/routing/srvs_routing_spec.rb deleted file mode 100644 index e7b796a..0000000 --- a/spec/routing/srvs_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe SrvsController do - describe "routing" do - - it "routes to #index" do - get("/srvs").should route_to("srvs#index") - end - - it "routes to #new" do - get("/srvs/new").should route_to("srvs#new") - end - - it "routes to #show" do - get("/srvs/1").should route_to("srvs#show", :id => "1") - end - - it "routes to #edit" do - get("/srvs/1/edit").should route_to("srvs#edit", :id => "1") - end - - it "routes to #create" do - post("/srvs").should route_to("srvs#create") - end - - it "routes to #update" do - put("/srvs/1").should route_to("srvs#update", :id => "1") - end - - it "routes to #destroy" do - delete("/srvs/1").should route_to("srvs#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/txts_routing_spec.rb b/spec/routing/txts_routing_spec.rb deleted file mode 100644 index 7093445..0000000 --- a/spec/routing/txts_routing_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "spec_helper" - -describe TxtsController do - describe "routing" do - - it "routes to #index" do - get("/txts").should route_to("txts#index") - end - - it "routes to #new" do - get("/txts/new").should route_to("txts#new") - end - - it "routes to #show" do - get("/txts/1").should route_to("txts#show", :id => "1") - end - - it "routes to #edit" do - get("/txts/1/edit").should route_to("txts#edit", :id => "1") - end - - it "routes to #create" do - post("/txts").should route_to("txts#create") - end - - it "routes to #update" do - put("/txts/1").should route_to("txts#update", :id => "1") - end - - it "routes to #destroy" do - delete("/txts/1").should route_to("txts#destroy", :id => "1") - end - - end -end diff --git a/spec/routing/users/aaaas_routing_spec.rb b/spec/routing/users/aaaas_routing_spec.rb new file mode 100644 index 0000000..f6b6310 --- /dev/null +++ b/spec/routing/users/aaaas_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::AaaasController do + describe "routing" do + + it "routes to #index" do + get("/aaaas").should route_to("users/aaaas#index") + end + + it "routes to #new" do + get("/aaaas/new").should route_to("users/aaaas#new") + end + + it "routes to #show" do + get("/aaaas/1").should route_to("users/aaaas#show", :id => "1") + end + + it "routes to #edit" do + get("/aaaas/1/edit").should route_to("users/aaaas#edit", :id => "1") + end + + it "routes to #create" do + post("/aaaas").should route_to("users/aaaas#create") + end + + it "routes to #update" do + put("/aaaas/1").should route_to("users/aaaas#update", :id => "1") + end + + it "routes to #destroy" do + delete("/aaaas/1").should route_to("users/aaaas#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/as_routing_spec.rb b/spec/routing/users/as_routing_spec.rb new file mode 100644 index 0000000..70b9b3e --- /dev/null +++ b/spec/routing/users/as_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::AsController do + describe "routing" do + + it "routes to #index" do + get("/as").should route_to("users/as#index") + end + + it "routes to #new" do + get("/as/new").should route_to("users/as#new") + end + + it "routes to #show" do + get("/as/1").should route_to("users/as#show", :id => "1") + end + + it "routes to #edit" do + get("/as/1/edit").should route_to("users/as#edit", :id => "1") + end + + it "routes to #create" do + post("/as").should route_to("users/as#create") + end + + it "routes to #update" do + put("/as/1").should route_to("users/as#update", :id => "1") + end + + it "routes to #destroy" do + delete("/as/1").should route_to("users/as#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/cnames_routing_spec.rb b/spec/routing/users/cnames_routing_spec.rb new file mode 100644 index 0000000..3ff7cfe --- /dev/null +++ b/spec/routing/users/cnames_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::CnamesController do + describe "routing" do + + it "routes to #index" do + get("/cnames").should route_to("users/cnames#index") + end + + it "routes to #new" do + get("/cnames/new").should route_to("users/cnames#new") + end + + it "routes to #show" do + get("/cnames/1").should route_to("users/cnames#show", :id => "1") + end + + it "routes to #edit" do + get("/cnames/1/edit").should route_to("users/cnames#edit", :id => "1") + end + + it "routes to #create" do + post("/cnames").should route_to("users/cnames#create") + end + + it "routes to #update" do + put("/cnames/1").should route_to("users/cnames#update", :id => "1") + end + + it "routes to #destroy" do + delete("/cnames/1").should route_to("users/cnames#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/domains_routing_spec.rb b/spec/routing/users/domains_routing_spec.rb new file mode 100644 index 0000000..74d6652 --- /dev/null +++ b/spec/routing/users/domains_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::DomainsController do + describe "routing" do + + it "routes to #index" do + get("/domains").should route_to("users/domains#index") + end + + it "routes to #new" do + get("/domains/new").should route_to("users/domains#new") + end + + it "routes to #show" do + get("/domains/1").should route_to("users/domains#show", :id => "1") + end + + it "routes to #edit" do + get("/domains/1/edit").should route_to("users/domains#edit", :id => "1") + end + + it "routes to #create" do + post("/domains").should route_to("users/domains#create") + end + + it "routes to #update" do + put("/domains/1").should route_to("users/domains#update", :id => "1") + end + + it "routes to #destroy" do + delete("/domains/1").should route_to("users/domains#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/hosts_routing_spec.rb b/spec/routing/users/hosts_routing_spec.rb new file mode 100644 index 0000000..0494da5 --- /dev/null +++ b/spec/routing/users/hosts_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::HostsController do + describe "routing" do + + it "routes to #index" do + get("/hosts").should route_to("users/hosts#index") + end + + it "routes to #new" do + get("/hosts/new").should route_to("users/hosts#new") + end + + it "routes to #show" do + get("/hosts/1").should route_to("users/hosts#show", :id => "1") + end + + it "routes to #edit" do + get("/hosts/1/edit").should route_to("users/hosts#edit", :id => "1") + end + + it "routes to #create" do + post("/hosts").should route_to("users/hosts#create") + end + + it "routes to #update" do + put("/hosts/1").should route_to("users/hosts#update", :id => "1") + end + + it "routes to #destroy" do + delete("/hosts/1").should route_to("users/hosts#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/mxes_routing_spec.rb b/spec/routing/users/mxes_routing_spec.rb new file mode 100644 index 0000000..dd8e3e9 --- /dev/null +++ b/spec/routing/users/mxes_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::MxesController do + describe "routing" do + + it "routes to #index" do + get("/mxes").should route_to("users/mxes#index") + end + + it "routes to #new" do + get("/mxes/new").should route_to("users/mxes#new") + end + + it "routes to #show" do + get("/mxes/1").should route_to("users/mxes#show", :id => "1") + end + + it "routes to #edit" do + get("/mxes/1/edit").should route_to("users/mxes#edit", :id => "1") + end + + it "routes to #create" do + post("/mxes").should route_to("users/mxes#create") + end + + it "routes to #update" do + put("/mxes/1").should route_to("users/mxes#update", :id => "1") + end + + it "routes to #destroy" do + delete("/mxes/1").should route_to("users/mxes#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/ns_routing_spec.rb b/spec/routing/users/ns_routing_spec.rb new file mode 100644 index 0000000..f5782f3 --- /dev/null +++ b/spec/routing/users/ns_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::NsController do + describe "routing" do + + it "routes to #index" do + get("/ns").should route_to("users/ns#index") + end + + it "routes to #new" do + get("/ns/new").should route_to("users/ns#new") + end + + it "routes to #show" do + get("/ns/1").should route_to("users/ns#show", :id => "1") + end + + it "routes to #edit" do + get("/ns/1/edit").should route_to("users/ns#edit", :id => "1") + end + + it "routes to #create" do + post("/ns").should route_to("users/ns#create") + end + + it "routes to #update" do + put("/ns/1").should route_to("users/ns#update", :id => "1") + end + + it "routes to #destroy" do + delete("/ns/1").should route_to("users/ns#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/permissions_routing_spec.rb b/spec/routing/users/permissions_routing_spec.rb new file mode 100644 index 0000000..beec226 --- /dev/null +++ b/spec/routing/users/permissions_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::PermissionsController do + describe "routing" do + + it "routes to #index" do + get("/permissions").should route_to("users/permissions#index") + end + + it "routes to #new" do + get("/permissions/new").should route_to("users/permissions#new") + end + + it "routes to #show" do + get("/permissions/1").should route_to("users/permissions#show", :id => "1") + end + + it "routes to #edit" do + get("/permissions/1/edit").should route_to("users/permissions#edit", :id => "1") + end + + it "routes to #create" do + post("/permissions").should route_to("users/permissions#create") + end + + it "routes to #update" do + put("/permissions/1").should route_to("users/permissions#update", :id => "1") + end + + it "routes to #destroy" do + delete("/permissions/1").should route_to("users/permissions#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/records_routing_spec.rb b/spec/routing/users/records_routing_spec.rb new file mode 100644 index 0000000..1ee184a --- /dev/null +++ b/spec/routing/users/records_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::RecordsController do + describe "routing" do + + it "routes to #index" do + get("/records").should route_to("users/records#index") + end + + it "routes to #new" do + get("/records/new").should route_to("users/records#new") + end + + it "routes to #show" do + get("/records/1").should route_to("users/records#show", :id => "1") + end + + it "routes to #edit" do + get("/records/1/edit").should route_to("users/records#edit", :id => "1") + end + + it "routes to #create" do + post("/records").should route_to("users/records#create") + end + + it "routes to #update" do + put("/records/1").should route_to("users/records#update", :id => "1") + end + + it "routes to #destroy" do + delete("/records/1").should route_to("users/records#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/soas_routing_spec.rb b/spec/routing/users/soas_routing_spec.rb new file mode 100644 index 0000000..0019e6f --- /dev/null +++ b/spec/routing/users/soas_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::SoasController do + describe "routing" do + + it "routes to #index" do + get("/soas").should route_to("users/soas#index") + end + + it "routes to #new" do + get("/soas/new").should route_to("users/soas#new") + end + + it "routes to #show" do + get("/soas/1").should route_to("users/soas#show", :id => "1") + end + + it "routes to #edit" do + get("/soas/1/edit").should route_to("users/soas#edit", :id => "1") + end + + it "routes to #create" do + post("/soas").should route_to("users/soas#create") + end + + it "routes to #update" do + put("/soas/1").should route_to("users/soas#update", :id => "1") + end + + it "routes to #destroy" do + delete("/soas/1").should route_to("users/soas#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/srvs_routing_spec.rb b/spec/routing/users/srvs_routing_spec.rb new file mode 100644 index 0000000..b722cfa --- /dev/null +++ b/spec/routing/users/srvs_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::SrvsController do + describe "routing" do + + it "routes to #index" do + get("/srvs").should route_to("users/srvs#index") + end + + it "routes to #new" do + get("/srvs/new").should route_to("users/srvs#new") + end + + it "routes to #show" do + get("/srvs/1").should route_to("users/srvs#show", :id => "1") + end + + it "routes to #edit" do + get("/srvs/1/edit").should route_to("users/srvs#edit", :id => "1") + end + + it "routes to #create" do + post("/srvs").should route_to("users/srvs#create") + end + + it "routes to #update" do + put("/srvs/1").should route_to("users/srvs#update", :id => "1") + end + + it "routes to #destroy" do + delete("/srvs/1").should route_to("users/srvs#destroy", :id => "1") + end + + end +end diff --git a/spec/routing/users/txts_routing_spec.rb b/spec/routing/users/txts_routing_spec.rb new file mode 100644 index 0000000..3e0d1fc --- /dev/null +++ b/spec/routing/users/txts_routing_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Users::TxtsController do + describe "routing" do + + it "routes to #index" do + get("/txts").should route_to("users/txts#index") + end + + it "routes to #new" do + get("/txts/new").should route_to("users/txts#new") + end + + it "routes to #show" do + get("/txts/1").should route_to("users/txts#show", :id => "1") + end + + it "routes to #edit" do + get("/txts/1/edit").should route_to("users/txts#edit", :id => "1") + end + + it "routes to #create" do + post("/txts").should route_to("users/txts#create") + end + + it "routes to #update" do + put("/txts/1").should route_to("users/txts#update", :id => "1") + end + + it "routes to #destroy" do + delete("/txts/1").should route_to("users/txts#destroy", :id => "1") + end + + end +end diff --git a/vendor/assets/javascripts/slides.css.erb b/vendor/assets/stylesheets/slides.css.erb similarity index 90% rename from vendor/assets/javascripts/slides.css.erb rename to vendor/assets/stylesheets/slides.css.erb index 6d5cfeb..35dcd6c 100644 --- a/vendor/assets/javascripts/slides.css.erb +++ b/vendor/assets/stylesheets/slides.css.erb @@ -73,12 +73,3 @@ font:bold 10px/1.33 sans-serif; float:left; margin-top:12px; } - -.controls { -display:block; -margin-top:12px; -float:left; -color:#333; -font:bold 10px/1.33 sans-serif; -margin-right:10px; -}