zoo-generators 0.1.0 → 0.1.1

data/README.rdoc

@@ -9,7 +9,7 @@ A collection of useful Rails generator scripts for scaffolding, layout files, au
 
 Add the gem to your Gemfile.
 
-  gem "zoo-generators", :group => :development
+  gem "zoo-generators", group : :development
 
 Then you can run any of the included generators.
 
@@ -54,7 +54,7 @@ Add the attribute to the attr_accessible line in the model.
 
 Some generators default redirecting to the root_url. Set this in your routes.rb file like this (substituting your controller name).
 
-  root :to => "home#index"
+  root to: "home#index"
 
 
 <b>I get a missing database error.</b>

data/Rakefile

@@ -7,4 +7,4 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format progress"
 end
 
-task :default => :features
+task default : :features

data/features/zoo_authentication.feature

@@ -5,7 +5,7 @@ Feature: Zoo Authentication Generator
 
   Scenario: Generate default authentication
     Given a new Rails app
-    When I insert "root :to => 'users#new'" into "config/routes.rb" after line 1
+    When I insert "root to: 'users#new'" into "config/routes.rb" after line 1
     And I run "rails g zoo:authentication"
     Then I should see the following files
       | app/models/user.rb                          |
@@ -25,13 +25,13 @@ Feature: Zoo Authentication Generator
     And I should see the following in file "config/routes.rb"
       | resources :sessions                                          |
       | resources :users                                             |
-      | match 'login' => 'sessions#new', :as => :login               |
-      | match 'logout' => 'sessions#destroy', :as => :logout         |
-      | match 'signup' => 'users#new', :as => :signup                |
-      | match 'user/edit' => 'users#edit', :as => :edit_current_user |
+      | match 'login' => 'sessions#new', as : :login               |
+      | match 'logout' => 'sessions#destroy', as : :logout         |
+      | match 'signup' => 'users#new', as : :signup                |
+      | match 'user/edit' => 'users#edit', as : :edit_current_user |
     And I should see "include ControllerAuthentication" in file "app/controllers/application_controller.rb"
-    And I should see "gem "mocha", :group => :test" in file "Gemfile"
-    And I should see "gem "bcrypt-ruby", :require => "bcrypt"" in file "Gemfile"
+    And I should see "gem "mocha", group : :test" in file "Gemfile"
+    And I should see "gem "bcrypt-ruby", require: "bcrypt"" in file "Gemfile"
     When I run "rails g zoo:layout -f"
     And I run "rake db:migrate"   
     And I run "bundle install"
@@ -39,7 +39,7 @@ Feature: Zoo Authentication Generator
 
   Scenario: Generate named authentication
     Given a new Rails app
-    When I insert "root :to => 'accounts#new'" into "config/routes.rb" after line 1
+    When I insert "root to: 'accounts#new'" into "config/routes.rb" after line 1
     And I run "rails g zoo:authentication Account CurrentSession"
     Then I should see the following files
       | app/models/account.rb                               |
@@ -57,10 +57,10 @@ Feature: Zoo Authentication Generator
     And I should see the following in file "config/routes.rb"
       | resources :current_sessions                                   |
       | resources :accounts                                           |
-      | match 'login' => 'current_sessions#new', :as => :login        |
-      | match 'logout' => 'current_sessions#destroy', :as => :logout  |
-      | match 'signup' => 'accounts#new', :as => :signup              |
-      | match 'account/edit' => 'accounts#edit', :as => :edit_current_account |
+      | match 'login' => 'current_sessions#new', as : :login        |
+      | match 'logout' => 'current_sessions#destroy', as : :logout  |
+      | match 'signup' => 'accounts#new', as : :signup              |
+      | match 'account/edit' => 'accounts#edit', as : :edit_current_account |
     When I run "rails g zoo:layout -f"
     And I run "rake db:migrate"          
     And I run "bundle install"
@@ -68,7 +68,7 @@ Feature: Zoo Authentication Generator
 
   Scenario: Generate named authentication with rspec
     Given a new Rails app
-    When I insert "root :to => 'accounts#new'" into "config/routes.rb" after line 1
+    When I insert "root to: 'accounts#new'" into "config/routes.rb" after line 1
     And I run "rails g zoo:authentication Account CurrentSession --rspec"
     Then I should see the following files
       | spec/models/account_spec.rb                          |

data/lib/generators/zoo/authentication/USAGE

@@ -41,6 +41,6 @@ Methods:
     You can also restrict unregistered users from accessing a controller using
     a before filter. For example.
 
-      before_filter :login_required, :except => [:index, :show]
+      before_filter :login_required, except: [:index, :show]
 
     See the generated file lib/authentication.rb for details.

data/lib/generators/zoo/authentication/authentication_generator.rb

@@ -6,17 +6,17 @@ module Zoo
     class AuthenticationGenerator < Base
       include Rails::Generators::Migration
 
-      argument :user_name, :type => :string, :default => 'user', :banner => 'user_name'
-      argument :session_name, :type => :string, :default => 'session', :banner => 'sessions_controller_name'
+      argument :user_name, type: :string, default: 'user', banner: 'user_name'
+      argument :session_name, type: :string, default: 'session', banner: 'sessions_controller_name'
 
-      class_option :testunit, :desc => 'Use test/unit for test files.', :group => 'Test framework', :type => :boolean
-      class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
-      class_option :shoulda, :desc => 'Use shoulda for test files.', :group => 'Test framework', :type => :boolean
+      class_option :testunit, desc: 'Use test/unit for test files.', group: 'Test framework', type: :boolean
+      class_option :rspec, desc: 'Use RSpec for test files.', group: 'Test framework', type: :boolean
+      class_option :shoulda, desc: 'Use shoulda for test files.', group: 'Test framework', type: :boolean
  
       def add_gems                        
          add_gem "haml-rails"
-         add_gem "bcrypt-ruby", :require => "bcrypt"
-         add_gem "mocha", :group => :test  
+         add_gem "bcrypt-ruby", require: "bcrypt"
+         add_gem "mocha", group: :test  
        end   
 
       def create_model_files
@@ -47,10 +47,10 @@ module Zoo
       def create_routes
         route "resources #{user_plural_name.to_sym.inspect}"
         route "resources #{session_plural_name.to_sym.inspect}"
-        route "match 'login' => '#{session_plural_name}#new', :as => :login"
-        route "match 'logout' => '#{session_plural_name}#destroy', :as => :logout"
-        route "match 'signup' => '#{user_plural_name}#new', :as => :signup"
-        route "match '#{user_singular_name}/edit' => '#{user_plural_name}#edit', :as => :edit_current_#{user_singular_name}"
+        route "match 'login' => '#{session_plural_name}#new', as : :login"
+        route "match 'logout' => '#{session_plural_name}#destroy', as : :logout"
+        route "match 'signup' => '#{user_plural_name}#new', as : :signup"
+        route "match '#{user_singular_name}/edit' => '#{user_plural_name}#edit', as : :edit_current_#{user_singular_name}"
       end
 
       def create_migration
@@ -129,7 +129,7 @@ module Zoo
         elsif options.shoulda?
           return @test_framework = :shoulda
         else
-          return @test_framework = File.exist?(destination_path('spec')) ? :rspec : :testunit
+          return @test_framework = File.exist?(destination_path('spec')) ? rspec: :testunit
         end
       end
 

data/lib/generators/zoo/authentication/templates/controller_authentication.rb

@@ -14,7 +14,7 @@
 # You can also restrict unregistered users from accessing a controller using
 # a before filter. For example.
 #
-#   before_filter :login_required, :except => [:index, :show]
+#   before_filter :login_required, except: [:index, :show]
 module ControllerAuthentication
   def self.included(controller)
     controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in?, :redirect_to_target_or_default
@@ -31,7 +31,7 @@ module ControllerAuthentication
   def login_required
     unless logged_in?
       store_target_location
-      redirect_to login_url, :alert => "You must first log in or sign up before accessing this page."
+      redirect_to login_url, alert: "You must first log in or sign up before accessing this page."
     end
   end
 

data/lib/generators/zoo/authentication/templates/sessions_controller.rb

@@ -6,7 +6,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
     <%= user_singular_name %> = <%= user_class_name %>.authenticate(params[:login], params[:password])
     if <%= user_singular_name %>
       session[:<%= user_singular_name %>_id] = <%= user_singular_name %>.id
-      redirect_to_target_or_default root_url, :notice => "Logged in successfully."
+      redirect_to_target_or_default root_url, notice: "Logged in successfully."
     else
       flash.now[:alert] = "Invalid login or password."
       render :new
@@ -15,6 +15,6 @@ class <%= session_plural_class_name %>Controller < ApplicationController
 
   def destroy
     session[:<%= user_singular_name %>_id] = nil
-    redirect_to root_url, :notice => "You have been logged out."
+    redirect_to root_url, notice: "You have been logged out."
   end
 end

data/lib/generators/zoo/authentication/templates/tests/rspec/user.rb

@@ -18,33 +18,33 @@ describe <%= user_class_name %> do
   end
 
   it "should require username" do
-    new_<%= user_singular_name %>(:username => '').should have(1).error_on(:username)
+    new_<%= user_singular_name %>(username: '').should have(1).error_on(:username)
   end
 
   it "should require password" do
-    new_<%= user_singular_name %>(:password => '').should have(1).error_on(:password)
+    new_<%= user_singular_name %>(password: '').should have(1).error_on(:password)
   end
 
   it "should require well formed email" do
-    new_<%= user_singular_name %>(:email => 'foo@bar@example.com').should have(1).error_on(:email)
+    new_<%= user_singular_name %>(email: 'foo@bar@example.com').should have(1).error_on(:email)
   end
 
   it "should validate uniqueness of email" do
-    new_<%= user_singular_name %>(:email => 'bar@example.com').save!
-    new_<%= user_singular_name %>(:email => 'bar@example.com').should have(1).error_on(:email)
+    new_<%= user_singular_name %>(email: 'bar@example.com').save!
+    new_<%= user_singular_name %>(email: 'bar@example.com').should have(1).error_on(:email)
   end
 
   it "should validate uniqueness of username" do
-    new_<%= user_singular_name %>(:username => 'uniquename').save!
-    new_<%= user_singular_name %>(:username => 'uniquename').should have(1).error_on(:username)
+    new_<%= user_singular_name %>(username: 'uniquename').save!
+    new_<%= user_singular_name %>(username: 'uniquename').should have(1).error_on(:username)
   end
 
   it "should not allow odd characters in username" do
-    new_<%= user_singular_name %>(:username => 'odd ^&(@)').should have(1).error_on(:username)
+    new_<%= user_singular_name %>(username: 'odd ^&(@)').should have(1).error_on(:username)
   end
 
   it "should validate password is longer than 3 characters" do
-    new_<%= user_singular_name %>(:password => 'bad').should have(1).error_on(:password)
+    new_<%= user_singular_name %>(password: 'bad').should have(1).error_on(:password)
   end
 
   it "should require matching password confirmation" do
@@ -59,13 +59,13 @@ describe <%= user_class_name %> do
   end
 
   it "should authenticate by username" do
-    <%= user_singular_name %> = new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret')
+    <%= user_singular_name %> = new_<%= user_singular_name %>(username: 'foobar', password: 'secret')
     <%= user_singular_name %>.save!
     <%= user_class_name %>.authenticate('foobar', 'secret').should == <%= user_singular_name %>
   end
 
   it "should authenticate by email" do
-    <%= user_singular_name %> = new_<%= user_singular_name %>(:email => 'foo@bar.com', :password => 'secret')
+    <%= user_singular_name %> = new_<%= user_singular_name %>(email: 'foo@bar.com', password: 'secret')
     <%= user_singular_name %>.save!
     <%= user_class_name %>.authenticate('foo@bar.com', 'secret').should == <%= user_singular_name %>
   end
@@ -75,7 +75,7 @@ describe <%= user_class_name %> do
   end
 
   it "should not authenticate bad password" do
-    new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
+    new_<%= user_singular_name %>(username: 'foobar', password: 'secret').save!
     <%= user_class_name %>.authenticate('foobar', 'badpassword').should be_nil
   end
 end

data/lib/generators/zoo/authentication/templates/tests/rspec/users_controller.rb

@@ -23,32 +23,32 @@ describe <%= user_plural_class_name %>Controller do
   end
 
   it "edit action should redirect when not logged in" do
-    get :edit, :id => "ignored"
+    get :edit, id: "ignored"
     response.should redirect_to(login_url)
   end
 
   it "edit action should render edit template" do
     @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
-    get :edit, :id => "ignored"
+    get :edit, id: "ignored"
     response.should render_template(:edit)
   end
 
   it "update action should redirect when not logged in" do
-    put :update, :id => "ignored"
+    put :update, id: "ignored"
     response.should redirect_to(login_url)
   end
 
   it "update action should render edit template when <%= user_singular_name %> is invalid" do
     @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
-    put :update, :id => "ignored"
+    put :update, id: "ignored"
     response.should render_template(:edit)
   end
 
   it "update action should redirect when <%= user_singular_name %> is valid" do
     @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
-    put :update, :id => "ignored"
+    put :update, id: "ignored"
     response.should redirect_to(root_url)
   end
 end

data/lib/generators/zoo/authentication/templates/tests/shoulda/user.rb

@@ -20,33 +20,33 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
 
   should "require username" do
-    assert_equal ["can't be blank"], new_<%= user_singular_name %>(:username => '').errors[:username]
+    assert_equal ["can't be blank"], new_<%= user_singular_name %>(username: '').errors[:username]
   end
 
   should "require password" do
-    assert_equal ["can't be blank"], new_<%= user_singular_name %>(:password => '').errors[:password]
+    assert_equal ["can't be blank"], new_<%= user_singular_name %>(password: '').errors[:password]
   end
 
   should "require well formed email" do
-    assert_equal ["is invalid"], new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors[:email]
+    assert_equal ["is invalid"], new_<%= user_singular_name %>(email: 'foo@bar@example.com').errors[:email]
   end
 
   should "validate uniqueness of email" do
-    new_<%= user_singular_name %>(:email => 'bar@example.com').save!
-    assert_equal ["has already been taken"], new_<%= user_singular_name %>(:email => 'bar@example.com').errors[:email]
+    new_<%= user_singular_name %>(email: 'bar@example.com').save!
+    assert_equal ["has already been taken"], new_<%= user_singular_name %>(email: 'bar@example.com').errors[:email]
   end
 
   should "validate uniqueness of username" do
-    new_<%= user_singular_name %>(:username => 'uniquename').save!
-    assert_equal ["has already been taken"], new_<%= user_singular_name %>(:username => 'uniquename').errors[:username]
+    new_<%= user_singular_name %>(username: 'uniquename').save!
+    assert_equal ["has already been taken"], new_<%= user_singular_name %>(username: 'uniquename').errors[:username]
   end
 
   should "not allow odd characters in username" do
-    assert_equal ["should only contain letters, numbers, or .-_@"], new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors[:username]
+    assert_equal ["should only contain letters, numbers, or .-_@"], new_<%= user_singular_name %>(username: 'odd ^&(@)').errors[:username]
   end
 
   should "validate password is longer than 3 characters" do
-    assert_equal ["is too short (minimum is 4 characters)"], new_<%= user_singular_name %>(:password => 'bad').errors[:password]
+    assert_equal ["is too short (minimum is 4 characters)"], new_<%= user_singular_name %>(password: 'bad').errors[:password]
   end
 
   should "require matching password confirmation" do
@@ -61,13 +61,13 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
 
   should "authenticate by username" do
-    <%= user_singular_name %> = new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret')
+    <%= user_singular_name %> = new_<%= user_singular_name %>(username: 'foobar', password: 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foobar', 'secret')
   end
 
   should "authenticate by email" do
-    <%= user_singular_name %> = new_<%= user_singular_name %>(:email => 'foo@bar.com', :password => 'secret')
+    <%= user_singular_name %> = new_<%= user_singular_name %>(email: 'foo@bar.com', password: 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foo@bar.com', 'secret')
   end
@@ -77,7 +77,7 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
 
   should "not authenticate bad password" do
-    new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
+    new_<%= user_singular_name %>(username: 'foobar', password: 'secret').save!
     assert_nil <%= user_class_name %>.authenticate('foobar', 'badpassword')
   end
 end

data/lib/generators/zoo/authentication/templates/tests/shoulda/users_controller.rb

@@ -25,34 +25,34 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
 
   context "edit action" do
     should "redirect when not logged in" do
-      get :edit, :id => "ignored"
+      get :edit, id: "ignored"
       assert_redirected_to login_url
     end
 
     should "render edit template" do
       @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
-      get :edit, :id => "ignored"
+      get :edit, id: "ignored"
       assert_template 'edit'
     end
   end
 
   context "update action" do
     should "redirect when not logged in" do
-      put :update, :id => "ignored"
+      put :update, id: "ignored"
       assert_redirected_to login_url
     end
 
     should "render edit template when <%= user_singular_name %> is invalid" do
       @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
       <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
-      put :update, :id => "ignored"
+      put :update, id: "ignored"
       assert_template 'edit'
     end
 
     should "redirect when <%= user_singular_name %> is valid" do
       @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
       <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
-      put :update, :id => "ignored"
+      put :update, id: "ignored"
       assert_redirected_to root_url
     end
   end

data/lib/generators/zoo/authentication/templates/tests/testunit/user.rb

@@ -21,33 +21,33 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
 
   def test_require_username
-    assert_equal ["can't be blank"], new_<%= user_singular_name %>(:username => '').errors[:username]
+    assert_equal ["can't be blank"], new_<%= user_singular_name %>(username: '').errors[:username]
   end
 
   def test_require_password
-    assert_equal ["can't be blank"], new_<%= user_singular_name %>(:password => '').errors[:password]
+    assert_equal ["can't be blank"], new_<%= user_singular_name %>(password: '').errors[:password]
   end
 
   def test_require_well_formed_email
-    assert_equal ["is invalid"], new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors[:email]
+    assert_equal ["is invalid"], new_<%= user_singular_name %>(email: 'foo@bar@example.com').errors[:email]
   end
 
   def test_validate_uniqueness_of_email
-    new_<%= user_singular_name %>(:email => 'bar@example.com').save!
-    assert_equal ["has already been taken"], new_<%= user_singular_name %>(:email => 'bar@example.com').errors[:email]
+    new_<%= user_singular_name %>(email: 'bar@example.com').save!
+    assert_equal ["has already been taken"], new_<%= user_singular_name %>(email: 'bar@example.com').errors[:email]
   end
 
   def test_validate_uniqueness_of_username
-    new_<%= user_singular_name %>(:username => 'uniquename').save!
-    assert_equal ["has already been taken"], new_<%= user_singular_name %>(:username => 'uniquename').errors[:username]
+    new_<%= user_singular_name %>(username: 'uniquename').save!
+    assert_equal ["has already been taken"], new_<%= user_singular_name %>(username: 'uniquename').errors[:username]
   end
 
   def test_validate_odd_characters_in_username
-    assert_equal ["should only contain letters, numbers, or .-_@"], new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors[:username]
+    assert_equal ["should only contain letters, numbers, or .-_@"], new_<%= user_singular_name %>(username: 'odd ^&(@)').errors[:username]
   end
 
   def test_validate_password_length
-    assert_equal ["is too short (minimum is 4 characters)"], new_<%= user_singular_name %>(:password => 'bad').errors[:password]
+    assert_equal ["is too short (minimum is 4 characters)"], new_<%= user_singular_name %>(password: 'bad').errors[:password]
   end
 
   def test_require_matching_password_confirmation
@@ -63,14 +63,14 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
 
   def test_authenticate_by_username
     <%= user_class_name %>.delete_all
-    <%= user_singular_name %> = new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret')
+    <%= user_singular_name %> = new_<%= user_singular_name %>(username: 'foobar', password: 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foobar', 'secret')
   end
 
   def test_authenticate_by_email
     <%= user_class_name %>.delete_all
-    <%= user_singular_name %> = new_<%= user_singular_name %>(:email => 'foo@bar.com', :password => 'secret')
+    <%= user_singular_name %> = new_<%= user_singular_name %>(email: 'foo@bar.com', password: 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foo@bar.com', 'secret')
   end
@@ -81,7 +81,7 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
 
   def test_authenticate_bad_password
     <%= user_class_name %>.delete_all
-    new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
+    new_<%= user_singular_name %>(username: 'foobar', password: 'secret').save!
     assert_nil <%= user_class_name %>.authenticate('foobar', 'badpassword')
   end
 end

data/lib/generators/zoo/authentication/templates/tests/testunit/users_controller.rb

@@ -20,32 +20,32 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
   end
 
   def test_edit_without_user
-    get :edit, :id => "ignored"
+    get :edit, id: "ignored"
     assert_redirected_to login_url
   end
 
   def test_edit
     @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
-    get :edit, :id => "ignored"
+    get :edit, id: "ignored"
     assert_template 'edit'
   end
 
   def test_update_without_user
-    put :update, :id => "ignored"
+    put :update, id: "ignored"
     assert_redirected_to login_url
   end
 
   def test_update_invalid
     @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
-    put :update, :id => "ignored"
+    put :update, id: "ignored"
     assert_template 'edit'
   end
 
   def test_update_valid
     @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
-    put :update, :id => "ignored"
+    put :update, id: "ignored"
     assert_redirected_to root_url
   end
 end

data/lib/generators/zoo/authentication/templates/user.rb

@@ -8,11 +8,11 @@ class <%= user_class_name %> < ActiveRecord::Base
 
   validates_presence_of :username
   validates_uniqueness_of :username, :email, :allow_blank => true
-  validates_format_of :username, :with => /^[-\w\._@]+$/i, :allow_blank => true, :message => "should only contain letters, numbers, or .-_@"
-  validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
-  validates_presence_of :password, :on => :create
+  validates_format_of :username, with: /^[-\w\._@]+$/i, :allow_blank => true, message: "should only contain letters, numbers, or .-_@"
+  validates_format_of :email, with: /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
+  validates_presence_of password, on: :create
   validates_confirmation_of :password
-  validates_length_of :password, :minimum => 4, :allow_blank => true
+  validates_length_of :password, minimum: 4, :allow_blank => true
 
   # login can be either username or email address
   def self.authenticate(login, pass)

data/lib/generators/zoo/authentication/templates/users_controller.rb

@@ -1,5 +1,5 @@
 class <%= user_plural_class_name %>Controller < ApplicationController
-  before_filter :login_required, :except => [:new, :create]
+  before_filter :login_required, except: [:new, :create]
 
   def new
     @<%= user_singular_name %> = <%= user_class_name %>.new
@@ -9,7 +9,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
     @<%= user_singular_name %> = <%= user_class_name %>.new(params[:<%= user_singular_name %>])
     if @<%= user_singular_name %>.save
       session[:<%= user_singular_name %>_id] = @<%= user_singular_name %>.id
-      redirect_to root_url, :notice => "Thank you for signing up! You are now logged in."
+      redirect_to root_url, notice: "Thank you for signing up! You are now logged in."
     else
       render :new
     end
@@ -22,7 +22,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
   def update
     @<%= user_singular_name %> = current_<%= user_singular_name %>
     if @<%= user_singular_name %>.update_attributes(params[:<%= user_singular_name %>])
-      redirect_to root_url, :notice => "Your profile has been updated."
+      redirect_to root_url, notice: "Your profile has been updated."
     else
       render :edit
     end

data/lib/generators/zoo/config/config_generator.rb

@@ -3,7 +3,7 @@ require 'generators/zoo'
 module Zoo
   module Generators
     class ConfigGenerator < Base
-      argument :config_name, :type => :string, :default => 'app', :banner => 'config_name'
+      argument config_name, type: :string, default: 'app', banner: 'config_name'
 
       def create_config
         template "load_config.rb", "config/initializers/load_#{file_name}_config.rb"

data/lib/generators/zoo/layout/layout_generator.rb

@@ -3,7 +3,7 @@ require 'generators/zoo'
 module Zoo
   module Generators
     class LayoutGenerator < Base
-      argument :layout_name, :type => :string, :default => 'application', :banner => 'layout_name'
+      argument :layout_name, type: :string, default: 'application', banner: 'layout_name'
 
       # def add_gems
       #   add_gem "haml-rails"

data/lib/generators/zoo/layout/templates/error_messages_helper.rb

@@ -2,11 +2,11 @@ module ErrorMessagesHelper
   # Render error messages for the given objects. The :message and :header_message options are allowed.
   def error_messages_for(*objects)
     options = objects.extract_options!
-    options[:header_message] ||= I18n.t(:"activerecord.errors.header", :default => "Invalid Fields")
-    options[:message] ||= I18n.t(:"activerecord.errors.message", :default => "Correct the following errors and try again.")
+    options[:header_message] ||= I18n.t(:"activerecord.errors.header", default: "Invalid Fields")
+    options[:message] ||= I18n.t(:"activerecord.errors.message", default: "Correct the following errors and try again.")
     messages = objects.compact.map { |o| o.errors.full_messages }.flatten
     unless messages.empty?
-      content_tag(:div, :class => "error_messages") do
+      content_tag(:div, class: "error_messages") do
         list_items = messages.map { |msg| content_tag(:li, msg.html_safe) }
         content_tag(:h2, options[:header_message].html_safe) + content_tag(:p, options[:message].html_safe) + content_tag(:ul, list_items.join.html_safe)
       end

data/lib/generators/zoo/layout/templates/layout.html.haml

@@ -4,7 +4,7 @@
   %head
     %title
       = yield(:title) || "Untitled"
-    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
+    %meta{"http-equiv"=>"Content-Type", content: "text/html; charset=utf-8"}/
     = stylesheet_link_tag "<%= file_name %>"
     = javascript_include_tag :defaults
     = csrf_meta_tag
@@ -13,7 +13,7 @@
   %body
     #container
       - flash.each do |name, msg|
-        = content_tag :div, msg, :id => "flash_#{name}"
+        = content_tag :div, msg, id: "flash_#{name}"
 
       - if show_title?
         %h1= yield(:title)

data/lib/generators/zoo/scaffold/scaffold_generator.rb

@@ -8,18 +8,18 @@ module Zoo
       include Rails::Generators::Migration
       no_tasks { attr_accessor :scaffold_name, :model_attributes, :controller_actions }
 
-      argument :scaffold_name, :type => :string, :required => true, :banner => 'ModelName'
-      argument :args_for_c_m, :type => :array, :default => [], :banner => 'controller_actions and model:attributes'
-
-      class_option :skip_model, :desc => 'Don\'t generate a model or migration file.', :type => :boolean
-      class_option :skip_migration, :desc => 'Dont generate migration file for model.', :type => :boolean
-      class_option :skip_timestamps, :desc => 'Don\'t add timestamps to migration file.', :type => :boolean
-      class_option :skip_controller, :desc => 'Don\'t generate controller, helper, or views.', :type => :boolean
-      class_option :invert, :desc => 'Generate all controller actions except these mentioned.', :type => :boolean
-      class_option :namespace_model, :desc => 'If the resource is namespaced, include the model in the namespace.', :type => :boolean
-      class_option :testunit, :desc => 'Use test/unit for test files.', :group => 'Test framework', :type => :boolean
-      class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
-      class_option :shoulda, :desc => 'Use shoulda for test files.', :group => 'Test framework', :type => :boolean
+      argument :scaffold_name, type: :string, required: true, banner: 'ModelName'
+      argument :args_for_c_m, type: :array, default: [], banner: 'controller_actions and model:attributes'
+
+      class_option :skip_model, desc: 'Don\'t generate a model or migration file.', type: :boolean
+      class_option :skip_migration, desc: 'Dont generate migration file for model.', type: :boolean
+      class_option :skip_timestamps, desc: 'Don\'t add timestamps to migration file.', type: :boolean
+      class_option :skip_controller, desc: 'Don\'t generate controller, helper, or views.', type: :boolean
+      class_option :invert, desc: 'Generate all controller actions except these mentioned.', type: :boolean
+      class_option :namespace_model, desc: 'If the resource is namespaced, include the model in the namespace.', type: :boolean
+      class_option :testunit, desc: 'Use test/unit for test files.', group: 'Test framework', type: :boolean
+      class_option :rspec, desc: 'Use RSpec for test files.', group: 'Test framework', type: :boolean
+      class_option :shoulda, desc: 'Use shoulda for test files.', group: 'Test framework', type: :boolean
 
       def initialize(*args, &block)
         super
@@ -66,7 +66,7 @@ module Zoo
       def add_gems
         add_gem "haml-rails"  
         add_gem "formtastic"
-        add_gem "mocha", :group => :test
+        add_gem "mocha", group: :test
       end
 
       def create_model

data/lib/generators/zoo/scaffold/templates/actions/create.rb

@@ -1,7 +1,7 @@
   def create
     @<%= instance_name %> = <%= class_name %>.new(params[:<%= instance_name %>])
     if @<%= instance_name %>.save
-      redirect_to <%= item_url %>, :notice => "Successfully created <%= class_name.underscore.humanize.downcase %>."
+      redirect_to <%= item_url %>, notice: "Successfully created <%= class_name.underscore.humanize.downcase %>."
     else
       render :new
     end

data/lib/generators/zoo/scaffold/templates/actions/destroy.rb

@@ -1,5 +1,5 @@
   def destroy
     @<%= instance_name %> = <%= class_name %>.find(params[:id])
     @<%= instance_name %>.destroy
-    redirect_to <%= items_url %>, :notice => "Successfully destroyed <%= class_name.underscore.humanize.downcase %>."
+    redirect_to <%= items_url %>, notice: "Successfully destroyed <%= class_name.underscore.humanize.downcase %>."
   end

data/lib/generators/zoo/scaffold/templates/tests/rspec/actions/destroy.rb

@@ -1,6 +1,6 @@
   it "destroy action should destroy model and redirect to index action" do
     <%= instance_name %> = <%= class_name %>.first
-    delete :destroy, :id => <%= instance_name %>
+    delete :destroy, id: <%= instance_name %>
     response.should redirect_to(<%= items_url %>)
     <%= class_name %>.exists?(<%= instance_name %>.id).should be_false
   end

data/lib/generators/zoo/scaffold/templates/tests/rspec/actions/edit.rb

@@ -1,4 +1,4 @@
   it "edit action should render edit template" do
-    get :edit, :id => <%= class_name %>.first
+    get :edit, id: <%= class_name %>.first
     response.should render_template(:edit)
   end

data/lib/generators/zoo/scaffold/templates/tests/rspec/actions/show.rb

@@ -1,4 +1,4 @@
   it "show action should render show template" do
-    get :show, :id => <%= class_name %>.first
+    get :show, id: <%= class_name %>.first
     response.should render_template(:show)
   end

data/lib/generators/zoo/scaffold/templates/tests/rspec/actions/update.rb

@@ -1,11 +1,11 @@
   it "update action should render edit template when model is invalid" do
     <%= class_name %>.any_instance.stubs(:valid?).returns(false)
-    put :update, :id => <%= class_name %>.first
+    put :update, id: <%= class_name %>.first
     response.should render_template(:edit)
   end
 
   it "update action should redirect when model is valid" do
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
-    put :update, :id => <%= class_name %>.first
+    put :update, id: <%= class_name %>.first
     response.should redirect_to(<%= item_path_for_spec('url') %>)
   end

data/lib/generators/zoo/scaffold/templates/tests/shoulda/actions/destroy.rb

@@ -1,7 +1,7 @@
   context "destroy action" do
     should "destroy model and redirect to index action" do
       <%= instance_name %> = <%= class_name %>.first
-      delete :destroy, :id => <%= instance_name %>
+      delete :destroy, id: <%= instance_name %>
       assert_redirected_to <%= items_url %>
       assert !<%= class_name %>.exists?(<%= instance_name %>.id)
     end

data/lib/generators/zoo/scaffold/templates/tests/shoulda/actions/edit.rb

@@ -1,6 +1,6 @@
   context "edit action" do
     should "render edit template" do
-      get :edit, :id => <%= class_name %>.first
+      get :edit, id: <%= class_name %>.first
       assert_template 'edit'
     end
   end

data/lib/generators/zoo/scaffold/templates/tests/shoulda/actions/show.rb

@@ -1,6 +1,6 @@
   context "show action" do
     should "render show template" do
-      get :show, :id => <%= class_name %>.first
+      get :show, id: <%= class_name %>.first
       assert_template 'show'
     end
   end

data/lib/generators/zoo/scaffold/templates/tests/shoulda/actions/update.rb

@@ -1,13 +1,13 @@
   context "update action" do
     should "render edit template when model is invalid" do
       <%= class_name %>.any_instance.stubs(:valid?).returns(false)
-      put :update, :id => <%= class_name %>.first
+      put :update, id: <%= class_name %>.first
       assert_template 'edit'
     end
 
     should "redirect when model is valid" do
       <%= class_name %>.any_instance.stubs(:valid?).returns(true)
-      put :update, :id => <%= class_name %>.first
+      put :update, id: <%= class_name %>.first
       assert_redirected_to <%= item_path_for_test('url') %>
     end
   end

data/lib/generators/zoo/scaffold/templates/tests/testunit/actions/destroy.rb

@@ -1,6 +1,6 @@
   def test_destroy
     <%= instance_name %> = <%= class_name %>.first
-    delete :destroy, :id => <%= instance_name %>
+    delete :destroy, id: <%= instance_name %>
     assert_redirected_to <%= items_url %>
     assert !<%= class_name %>.exists?(<%= instance_name %>.id)
   end

data/lib/generators/zoo/scaffold/templates/tests/testunit/actions/edit.rb

@@ -1,4 +1,4 @@
   def test_edit
-    get :edit, :id => <%= class_name %>.first
+    get :edit, id: <%= class_name %>.first
     assert_template 'edit'
   end

data/lib/generators/zoo/scaffold/templates/tests/testunit/actions/show.rb

@@ -1,4 +1,4 @@
   def test_show
-    get :show, :id => <%= class_name %>.first
+    get :show, id: <%= class_name %>.first
     assert_template 'show'
   end

data/lib/generators/zoo/scaffold/templates/tests/testunit/actions/update.rb

@@ -1,11 +1,11 @@
   def test_update_invalid
     <%= class_name %>.any_instance.stubs(:valid?).returns(false)
-    put :update, :id => <%= class_name %>.first
+    put :update, id: <%= class_name %>.first
     assert_template 'edit'
   end
 
   def test_update_valid
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
-    put :update, :id => <%= class_name %>.first
+    put :update, id: <%= class_name %>.first
     assert_redirected_to <%= item_path_for_test('url') %>
   end

data/lib/generators/zoo/scaffold/templates/views/haml/_form.html.haml

@@ -1,4 +1,4 @@
-= semantic_form_for <%= item_path :instance_variable => true %> do |f|
+= semantic_form_for <%= item_path instance_variable: true %> do |f|
   = f.error_messages
   <%- for attribute in model_attributes -%>
   .field

data/lib/generators/zoo/scaffold/templates/views/haml/edit.html.haml

@@ -5,7 +5,7 @@
 <%- if actions? :show, :index -%>
 %p
   <%- if action? :show -%>
-  = link_to "Show", <%= item_path :instance_variable => true %>
+  = link_to "Show", <%= item_path instance_variable: true %>
   |
   <%- end -%>
   <%- if action? :index -%>

data/lib/generators/zoo/scaffold/templates/views/haml/index.html.haml

@@ -14,12 +14,12 @@
       %td= link_to 'Show', <%= item_path %>
       <%- end -%>
       <%- if action? :edit -%>
-      %td= link_to 'Edit', <%= item_path :action => :edit %>
+      %td= link_to 'Edit', <%= item_path action: :edit %>
       <%- end -%>
       <%- if action? :destroy -%>
-      %td= link_to 'Destroy', <%= item_path %>, :confirm => 'Are you sure?', :method => :delete
+      %td= link_to 'Destroy', <%= item_path %>, confirm: 'Are you sure?', method: :delete
       <%- end -%>
 
-<%- if actions? :new -%>
-%p= link_to "New <%= singular_name.titleize %>", <%= item_path :action => :new %>
+<%- if action? :new -%>
+%p= link_to "New <%= singular_name.titleize %>", <%= item_path action: :new %>
 <%- end -%>

data/lib/generators/zoo/scaffold/templates/views/haml/show.html.haml

@@ -2,17 +2,17 @@
 
 <%- for attribute in model_attributes -%>
 %p
-  %strong <%= attribute.human_name.titleize %>:
+  %strong <%= attribute.human_name.titleize %>
   = @<%= instance_name %>.<%= attribute.name %>
 <%- end -%>
 
 %p
   <%- if action? :edit -%>
-  = link_to "Edit", <%= item_path :action => :edit, :instance_variable => true %>
+  = link_to "Edit", <%= item_path action: :edit, instance_variable: true %>
   |
   <%- end -%>
   <%- if action? :destroy -%>
-  = link_to "Destroy", <%= item_path :instance_variable => true %>, :confirm => 'Are you sure?', :method => :delete
+  = link_to "Destroy", <%= item_path instance_variable: true %>, confirm: 'Are you sure?', method: :delete
   |
   <%- end -%>
   <%- if action? :index -%>

metadata

@@ -2,7 +2,7 @@
 name: zoo-generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mikael Henriksson
@@ -144,7 +144,6 @@ files:
 - lib/generators/zoo/config/USAGE
 - lib/generators/zoo/layout/layout_generator.rb
 - lib/generators/zoo/layout/templates/error_messages_helper.rb
-- lib/generators/zoo/layout/templates/layout.html.erb
 - lib/generators/zoo/layout/templates/layout.html.haml
 - lib/generators/zoo/layout/templates/layout_helper.rb
 - lib/generators/zoo/layout/templates/stylesheet.css

data/lib/generators/zoo/layout/templates/layout.html.erb

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
-    <%%= stylesheet_link_tag "<%= file_name %>" %>
-    <%%= javascript_include_tag :defaults %>
-    <%%= csrf_meta_tag %>
-    <%%= yield(:head) %>
-  </head>
-  <body>
-    <div id="container">
-      <%% flash.each do |name, msg| %>
-        <%%= content_tag :div, msg, :id => "flash_#{name}" %>
-      <%% end %>
-      <%%= content_tag :h1, yield(:title) if show_title? %>
-      <%%= yield %>
-    </div>
-  </body>
-</html>