rails_best_practices 1.9.1 → 1.10.0

data/spec/rails_best_practices/reviews/remove_unused_methods_in_helpers_review_spec.rb

@@ -4,8 +4,8 @@ module RailsBestPractices
   module Reviews
     describe RemoveUnusedMethodsInHelpersReview do
       let(:runner) { Core::Runner.new(
-        :prepares => [Prepares::ControllerPrepare.new, Prepares::HelperPrepare.new],
-        :reviews => RemoveUnusedMethodsInHelpersReview.new(:except_methods => [])
+        prepares: [Prepares::ControllerPrepare.new, Prepares::HelperPrepare.new],
+        reviews: RemoveUnusedMethodsInHelpersReview.new(except_methods: [])
       ) }
 
       it "should remove unused methods" do

data/spec/rails_best_practices/reviews/remove_unused_methods_in_models_review_spec.rb

@@ -4,8 +4,8 @@ module RailsBestPractices
   module Reviews
     describe RemoveUnusedMethodsInModelsReview do
       let(:runner) { Core::Runner.new(
-        :prepares => Prepares::ModelPrepare.new,
-        :reviews => RemoveUnusedMethodsInModelsReview.new({'except_methods' => ["*#set_cache"]})
+        prepares: Prepares::ModelPrepare.new,
+        reviews: RemoveUnusedMethodsInModelsReview.new({'except_methods' => ["*#set_cache"]})
       ) }
 
       context "private" do
@@ -86,7 +86,7 @@ module RailsBestPractices
           content =<<-EOF
           class Post < ActiveRecord::Base
             def fetch
-              get(:position => 'first')
+              get(position: 'first')
             end
             private
             def get(options={}); end
@@ -159,7 +159,7 @@ module RailsBestPractices
         it "should not remove unused method with validation condition" do
           content =<<-EOF
           class Post < ActiveRecord::Base
-            validates_uniqueness_of :login, :if => :email_blank?
+            validates_uniqueness_of :login, if: :email_blank?
             private
             def email_blank?; end
           end
@@ -173,7 +173,7 @@ module RailsBestPractices
         it "should not remove unused method with aasm" do
           content =<<-EOF
           class Post < ActiveRecord::Base
-            aasm_state :accepted, :enter => [:update_datetime]
+            aasm_state :accepted, enter: [:update_datetime]
             private
             def update_datetime; end
           end
@@ -383,7 +383,7 @@ module RailsBestPractices
         it "should not remove unused named_scope" do
           content =<<-EOF
           class Post < ActiveRecord::Base
-            named_scope :active, :conditions => {:active => true}
+            named_scope :active, conditions: {active: true}
           end
           EOF
           runner.prepare("app/models/post.rb", content)
@@ -403,7 +403,7 @@ module RailsBestPractices
         it "should remove unused named_scope" do
           content =<<-EOF
           class Post < ActiveRecord::Base
-            named_scope :active, :conditions => {:active => true}
+            named_scope :active, conditions: {active: true}
           end
           EOF
           runner.prepare("app/models/post.rb", content)
@@ -418,7 +418,7 @@ module RailsBestPractices
         it "should not remove unused scope" do
           content =<<-EOF
           class Post < ActiveRecord::Base
-            scope :active, where(:active => true)
+            scope :active, where(active: true)
           end
           EOF
           runner.prepare("app/models/post.rb", content)
@@ -438,7 +438,7 @@ module RailsBestPractices
         it "should remove unused named_scope" do
           content =<<-EOF
           class Post < ActiveRecord::Base
-            scope :active, where(:active => true)
+            scope :active, where(active: true)
           end
           EOF
           runner.prepare("app/models/post.rb", content)
@@ -540,7 +540,7 @@ module RailsBestPractices
           content =<<-EOF
           class Post < ActiveRecord::Base
             def to_xml(options = {})
-              super options.merge(:exclude => :visible, :methods => [:is_discussion_conversation])
+              super options.merge(exclude: :visible, methods: [:is_discussion_conversation])
             end
 
             def is_discussion_conversation; end
@@ -669,6 +669,21 @@ module RailsBestPractices
           runner.should have(0).errors
         end
       end
+
+      it "should not skip :call as call message" do
+        content =<<-EOF
+        module DateRange
+          RANGES = lambda {
+            last_month = {
+              'range' => lambda { [date_from_time.(31.days.ago), date_from_time.(Time.now)] },
+              'value' => 'last_month',
+              'label' => 'Last month'}
+          }[]
+        end
+        EOF
+        runner.prepare("app/mixins/date_range.rb", content)
+        runner.review("app/mixins/date_range.rb", content)
+      end
     end
   end
 end

data/spec/rails_best_practices/reviews/replace_complex_creation_with_factory_method_review_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module RailsBestPractices
   module Reviews
     describe ReplaceComplexCreationWithFactoryMethodReview do
-      let(:runner) { Core::Runner.new(:reviews => ReplaceComplexCreationWithFactoryMethodReview.new) }
+      let(:runner) { Core::Runner.new(reviews: ReplaceComplexCreationWithFactoryMethodReview.new) }
 
       it "should replace complex creation with factory method" do
         content = <<-EOF
@@ -26,7 +26,7 @@ module RailsBestPractices
         EOF
         runner.review('app/controllers/invoices_controller.rb', content)
         runner.should have(1).errors
-        runner.errors[0].to_s.should == "app/controllers/invoices_controller.rb:3 - replace complex creation with factory method (@invoice attribute_assignment_count > 2)"
+        runner.errors[0].to_s.should == "app/controllers/invoices_controller.rb:2 - replace complex creation with factory method (@invoice attribute_assignment_count > 2)"
       end
 
       it "should not replace complex creation with factory method with simple creation" do
@@ -63,7 +63,7 @@ module RailsBestPractices
           end
         end
         EOF
-        runner = Core::Runner.new(:reviews => ReplaceComplexCreationWithFactoryMethodReview.new('attribute_assignment_count' => 5))
+        runner = Core::Runner.new(reviews: ReplaceComplexCreationWithFactoryMethodReview.new('attribute_assignment_count' => 5))
         runner.review('app/controllers/invoices_controller.rb', content)
         runner.should have(0).errors
       end

data/spec/rails_best_practices/reviews/replace_instance_variable_with_local_variable_review_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module RailsBestPractices
   module Reviews
     describe ReplaceInstanceVariableWithLocalVariableReview do
-      let(:runner) { Core::Runner.new(:reviews => ReplaceInstanceVariableWithLocalVariableReview.new) }
+      let(:runner) { Core::Runner.new(reviews: ReplaceInstanceVariableWithLocalVariableReview.new) }
 
       it "should replace instance variable with local varialbe" do
         content = <<-EOF

data/spec/rails_best_practices/reviews/restrict_auto_generated_routes_review_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module RailsBestPractices
   module Reviews
     describe RestrictAutoGeneratedRoutesReview do
-      let(:runner) { Core::Runner.new(:prepares => Prepares::ControllerPrepare.new, :reviews => RestrictAutoGeneratedRoutesReview.new) }
+      let(:runner) { Core::Runner.new(prepares: Prepares::ControllerPrepare.new, reviews: RestrictAutoGeneratedRoutesReview.new) }
 
       describe "resources" do
         before :each do
@@ -29,13 +29,13 @@ module RailsBestPractices
             EOF
             runner.review('config/routes.rb', content)
             runner.should have(1).errors
-            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes posts (only: [:show, :new, :create, :edit, :update, :destroy])"
           end
 
           it "should not restrict auto-generated routes with only" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy]
+              map.resources :posts, only: [:show, :new, :create, :edit, :update, :destroy]
             end
             EOF
             runner.review('config/routes.rb', content)
@@ -45,27 +45,27 @@ module RailsBestPractices
           it "should not restrict auto-generated routes with except" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resources :posts, :except => :index
+              map.resources :posts, except: :index
             end
             EOF
             runner.review('config/routes.rb', content)
             runner.should have(0).errors
           end
 
-          it "should not restrict auto-generated routes with :only => :none" do
+          it "should not restrict auto-generated routes with only: :none" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resources :posts, :only => :none
+              map.resources :posts, only: :none
             end
             EOF
             runner.review('config/routes.rb', content)
             runner.should have(0).errors
           end
 
-          it "should not restrict auto-generated routes with :except => :all" do
+          it "should not restrict auto-generated routes with except: :all" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resources :posts, :except => :all
+              map.resources :posts, except: :all
             end
             EOF
             runner.review('config/routes.rb', content)
@@ -76,12 +76,12 @@ module RailsBestPractices
             it "should restrict auto-generated routes" do
               content =<<-EOF
               ActionController::Routing::Routes.draw do |map|
-                map.resources :articles, :controller => "posts"
+                map.resources :articles, controller: "posts"
               end
               EOF
               runner.review('config/routes.rb', content)
               runner.should have(1).errors
-              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes articles (only: [:show, :new, :create, :edit, :update, :destroy])"
             end
           end
 
@@ -111,13 +111,13 @@ module RailsBestPractices
               EOF
               runner.review('config/routes.rb', content)
               runner.should have(1).errors
-              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes posts (only: [:show, :new, :create, :edit, :update, :destroy])"
             end
 
             it "should not restrict auto-generated routes with only" do
               content =<<-EOF
               ActionController::Routing::Routes.draw do |map|
-                map.resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy] do |post|
+                map.resources :posts, only: [:show, :new, :create, :edit, :update, :destroy] do |post|
                   post.resources :comments
                 end
               end
@@ -129,7 +129,7 @@ module RailsBestPractices
             it "should not restrict auto-generated routes with except" do
               content =<<-EOF
               ActionController::Routing::Routes.draw do |map|
-                map.resources :posts, :except => :index do |post|
+                map.resources :posts, except: :index do |post|
                   post.resources :comments
                 end
               end
@@ -149,13 +149,13 @@ module RailsBestPractices
             EOF
             runner.review('config/routes.rb', content)
             runner.should have(1).errors
-            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes posts (only: [:show, :new, :create, :edit, :update, :destroy])"
           end
 
           it "should not restrict auto-generated routes with only" do
             content =<<-EOF
             RailsBestPracticesCom::Application.routes.draw do
-              resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy]
+              resources :posts, only: %w(show new create edit update destroy)
             end
             EOF
             runner.review('config/routes.rb', content)
@@ -165,7 +165,7 @@ module RailsBestPractices
           it "should not restrict auto-generated routes with except" do
             content =<<-EOF
             RailsBestPracticesCom::Application.routes.draw do
-              resources :posts, :except => :index
+              resources :posts, except: :index
             end
             EOF
             runner.review('config/routes.rb', content)
@@ -176,12 +176,12 @@ module RailsBestPractices
             it "should restrict auto-generated routes" do
               content =<<-EOF
               RailsBestPracticesCom::Application.routes.draw do
-                resources :articles, :controller => "posts"
+                resources :articles, controller: "posts"
               end
               EOF
               runner.review('config/routes.rb', content)
               runner.should have(1).errors
-              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes articles (only: [:show, :new, :create, :edit, :update, :destroy])"
             end
           end
 
@@ -208,7 +208,7 @@ module RailsBestPractices
               EOF
               runner.review('config/routes.rb', content)
               runner.should have(1).errors
-              runner.errors[0].to_s.should == "config/routes.rb:3 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+              runner.errors[0].to_s.should == "config/routes.rb:3 - restrict auto-generated routes admin/comments (only: [:show, :new, :create, :edit, :update, :destroy])"
             end
           end
 
@@ -238,13 +238,13 @@ module RailsBestPractices
               EOF
               runner.review('config/routes.rb', content)
               runner.should have(1).errors
-              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes posts (only: [:show, :new, :create, :edit, :update, :destroy])"
             end
 
             it "should not restrict auto-generated routes with only" do
               content =<<-EOF
               RailsBestPracticesCom::Application.routes.draw do
-                resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy] do
+                resources :posts, only: %w(show new create edit update destroy) do
                   resources :comments
                 end
               end
@@ -256,7 +256,7 @@ module RailsBestPractices
             it "should not restrict auto-generated routes with except" do
               content =<<-EOF
               RailsBestPracticesCom::Application.routes.draw do
-                resources :posts, :except => :index do
+                resources :posts, except: :index do
                   resources :comments
                 end
               end
@@ -291,13 +291,13 @@ module RailsBestPractices
             EOF
             runner.review('config/routes.rb', content)
             runner.should have(1).errors
-            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update])"
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes account (only: [:show, :new, :create, :edit, :update])"
           end
 
           it "should not restrict auto-generated routes with only" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resource :account, :only => [:show, :new, :create, :edit, :update]
+              map.resource :account, only: %w(show new create edit update)
             end
             EOF
             runner.review('config/routes.rb', content)
@@ -307,7 +307,7 @@ module RailsBestPractices
           it "should not restrict auto-generated routes with except" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resource :account, :except => :destroy
+              map.resource :account, except: :destroy
             end
             EOF
             runner.review('config/routes.rb', content)
@@ -324,13 +324,13 @@ module RailsBestPractices
             EOF
             runner.review('config/routes.rb', content)
             runner.should have(1).errors
-            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update])"
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes account (only: [:show, :new, :create, :edit, :update])"
           end
 
           it "should not restrict auto-generated routes with only" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resource :account, :only => [:show, :new, :create, :edit, :update]
+              map.resource :account, only: %w(show new create edit update)
             end
             EOF
             runner.review('config/routes.rb', content)
@@ -340,7 +340,7 @@ module RailsBestPractices
           it "should not restrict auto-generated routes with except" do
             content =<<-EOF
             ActionController::Routing::Routes.draw do |map|
-              map.resource :account, :except => :destroy
+              map.resource :account, except: :destroy
             end
             EOF
             runner.review('config/routes.rb', content)

data/spec/rails_best_practices/reviews/simplify_render_in_controllers_review_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 module RailsBestPractices
   module Reviews
     describe SimplifyRenderInControllersReview do
-      let(:runner) { Core::Runner.new(:reviews => SimplifyRenderInControllersReview.new) }
+      let(:runner) { Core::Runner.new(reviews: SimplifyRenderInControllersReview.new) }
 
       it "should simplify render action view" do
         content =<<-EOF
         def edit
-          render :action => :edit
+          render action: :edit
         end
         EOF
         runner.review("app/controllers/posts_controller.rb", content)
@@ -19,7 +19,7 @@ module RailsBestPractices
       it "should simplify render actions's template" do
         content =<<-EOF
         def edit
-          render :template => 'books/edit'
+          render template: 'books/edit'
         end
         EOF
         runner.review("app/controllers/posts_controller.rb", content)
@@ -30,7 +30,7 @@ module RailsBestPractices
       it "should simplify render an arbitrary file" do
         content =<<-EOF
         def edit
-          render :file => '/path/to/rails/app/views/books/edit'
+          render file: '/path/to/rails/app/views/books/edit'
         end
         EOF
         runner.review("app/controllers/posts_controller.rb", content)

data/spec/rails_best_practices/reviews/simplify_render_in_views_review_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 module RailsBestPractices
   module Reviews
     describe SimplifyRenderInViewsReview do
-      let(:runner) { Core::Runner.new(:reviews => SimplifyRenderInViewsReview.new) }
+      let(:runner) { Core::Runner.new(reviews: SimplifyRenderInViewsReview.new) }
 
       it "should simplify render simple partial" do
         content =<<-EOF
-        <%= render :partial => 'sidebar' %>
+        <%= render partial: 'sidebar' %>
         EOF
         runner.review('app/views/posts/index.html.erb', content)
         runner.should have(1).errors
@@ -16,7 +16,7 @@ module RailsBestPractices
 
       it "should simplify render partial with object" do
         content =<<-EOF
-        <%= render :partial => 'post', :object => @post %>
+        <%= render partial: 'post', object: @post %>
         EOF
         runner.review('app/views/posts/index.html.erb', content)
         runner.should have(1).errors
@@ -25,7 +25,7 @@ module RailsBestPractices
 
       it "should simplify render partial with collection" do
         content =<<-EOF
-        <%= render :partial => 'posts', :collection => @posts %>
+        <%= render partial: 'posts', collection: @posts %>
         EOF
         runner.review('app/views/posts/index.html.erb', content)
         runner.should have(1).errors
@@ -34,7 +34,7 @@ module RailsBestPractices
 
       it "should simplify render partial with local variables" do
         content =<<-EOF
-        <%= render :partial => 'comment', :locals => { :parent => post } %>
+        <%= render partial: 'comment', locals: { parent: post } %>
         EOF
         runner.review('app/views/posts/index.html.erb', content)
         runner.should have(1).errors
@@ -68,7 +68,7 @@ module RailsBestPractices
 
       it "should not simplify render partial with local variables" do
         content =<<-EOF
-        <%= render 'comment', :parent => post %>
+        <%= render 'comment', parent: post %>
         EOF
         runner.review('app/views/posts/index.html.erb', content)
         runner.should have(0).errors
@@ -76,7 +76,15 @@ module RailsBestPractices
 
       it "should not simplify render partial with complex partial" do
         content =<<-EOF
-        <%= render :partial => 'shared/post', :object => @post %>
+        <%= render partial: 'shared/post', object: @post %>
+        EOF
+        runner.review('app/views/posts/index.html.erb', content)
+        runner.should have(0).errors
+      end
+
+      it "should not simplify render partial with layout option" do
+        content =<<-EOF
+        <%= render partial: 'post', layout: 'post' %>
         EOF
         runner.review('app/views/posts/index.html.erb', content)
         runner.should have(0).errors