rails_best_practices 1.9.0 → 1.9.1

data/spec/rails_best_practices/reviews/move_code_into_controller_review_spec.rb

@@ -1,41 +1,45 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::MoveCodeIntoControllerReview do
-  let(:runner) { RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::MoveCodeIntoControllerReview.new) }
+module RailsBestPractices
+  module Reviews
+    describe MoveCodeIntoControllerReview do
+      let(:runner) { Core::Runner.new(:reviews => MoveCodeIntoControllerReview.new) }
 
-  it "should move code into controller for method call" do
-    content = <<-EOF
-    <% Post.find(:all).each do |post| %>
-      <%=h post.title %>
-      <%=h post.content %>
-    <% end %>
-    EOF
-    runner.review('app/views/posts/index.html.erb', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/index.html.erb:1 - move code into controller"
-  end
+      it "should move code into controller for method call" do
+        content = <<-EOF
+        <% Post.find(:all).each do |post| %>
+          <%=h post.title %>
+          <%=h post.content %>
+        <% end %>
+        EOF
+        runner.review('app/views/posts/index.html.erb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/index.html.erb:1 - move code into controller"
+      end
 
-  it "should move code into controller for assign" do
-    content = <<-EOF
-    <% @posts = Post.all %>
-    <% @posts.each do |post| %>
-      <%=h post.title %>
-      <%=h post.content %>
-    <% end %>
-    EOF
-    runner.review('app/views/posts/index.html.erb', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/index.html.erb:1 - move code into controller"
-  end
+      it "should move code into controller for assign" do
+        content = <<-EOF
+        <% @posts = Post.all %>
+        <% @posts.each do |post| %>
+          <%=h post.title %>
+          <%=h post.content %>
+        <% end %>
+        EOF
+        runner.review('app/views/posts/index.html.erb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/index.html.erb:1 - move code into controller"
+      end
 
-  it "should not move code into controller" do
-    content = <<-EOF
-    <% @posts.each do |post| %>
-      <%=h post.title %>
-      <%=h post.content %>
-    <% end %>
-    EOF
-    runner.review('app/views/posts/index.html.erb', content)
-    runner.should have(0).errors
+      it "should not move code into controller" do
+        content = <<-EOF
+        <% @posts.each do |post| %>
+          <%=h post.title %>
+          <%=h post.content %>
+        <% end %>
+        EOF
+        runner.review('app/views/posts/index.html.erb', content)
+        runner.should have(0).errors
+      end
+    end
   end
 end

data/spec/rails_best_practices/reviews/move_code_into_helper_review_spec.rb

@@ -1,24 +1,28 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::MoveCodeIntoHelperReview do
-  let(:runner) { RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::MoveCodeIntoHelperReview.new('array_count' => 2)) }
+module RailsBestPractices
+  module Reviews
+    describe MoveCodeIntoHelperReview do
+      let(:runner) { Core::Runner.new(:reviews => MoveCodeIntoHelperReview.new('array_count' => 2)) }
 
-  it "should move code into helper" do
-    content = <<-EOF
-    <%= select_tag :state, options_for_select( [[t(:draft), "draft"],
-                                                [t(:published), "published"]],
-                                               params[:default_state] ) %>
-    EOF
-    runner.review('app/views/posts/show.html.erb', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/show.html.erb:1 - move code into helper (array_count >= 2)"
-  end
+      it "should move code into helper" do
+        content = <<-EOF
+        <%= select_tag :state, options_for_select( [[t(:draft), "draft"],
+                                                    [t(:published), "published"]],
+                                                   params[:default_state] ) %>
+        EOF
+        runner.review('app/views/posts/show.html.erb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/show.html.erb:1 - move code into helper (array_count >= 2)"
+      end
 
-  it "should not move code into helper with simple arguments" do
-    content = <<-EOF
-    <%= select_tag :state, options_for_select( Post.STATES ) %>
-    EOF
-    runner.review('app/views/posts/show.html.erb', content)
-    runner.should have(0).errors
+      it "should not move code into helper with simple arguments" do
+        content = <<-EOF
+        <%= select_tag :state, options_for_select( Post.STATES ) %>
+        EOF
+        runner.review('app/views/posts/show.html.erb', content)
+        runner.should have(0).errors
+      end
+    end
   end
 end

data/spec/rails_best_practices/reviews/move_code_into_model_review_spec.rb

@@ -1,68 +1,72 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::MoveCodeIntoModelReview do
-  let(:runner) { RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::MoveCodeIntoModelReview.new) }
+module RailsBestPractices
+  module Reviews
+    describe MoveCodeIntoModelReview do
+      let(:runner) { Core::Runner.new(:reviews => MoveCodeIntoModelReview.new) }
 
-  it "should move code into model" do
-    content =<<-EOF
-    <% if current_user && @post.user && (current_user == @post.user || @post.editors.include?(current_user)) %>
-      <%= link_to 'Edit this post', edit_post_url(@post) %>
-    <% end %>
-    EOF
-    runner.review('app/views/posts/show.html.erb', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/show.html.erb:1 - move code into model (@post use_count > 2)"
-  end
+      it "should move code into model" do
+        content =<<-EOF
+        <% if current_user && @post.user && (current_user == @post.user || @post.editors.include?(current_user)) %>
+          <%= link_to 'Edit this post', edit_post_url(@post) %>
+        <% end %>
+        EOF
+        runner.review('app/views/posts/show.html.erb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/show.html.erb:1 - move code into model (@post use_count > 2)"
+      end
 
-  it "should move code into model with haml" do
-    content =<<-EOF
+      it "should move code into model with haml" do
+        content =<<-EOF
 - if current_user && @post.user && (current_user == @post.user || @post.editors.include?(current_user))
   = link_to 'Edit this post', edit_post_url(@post)
-    EOF
-    runner.review('app/views/posts/show.html.haml', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/show.html.haml:1 - move code into model (@post use_count > 2)"
-  end
+        EOF
+        runner.review('app/views/posts/show.html.haml', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/show.html.haml:1 - move code into model (@post use_count > 2)"
+      end
 
-  it "should move code into model with slim" do
-    content =<<-EOF
+      it "should move code into model with slim" do
+        content =<<-EOF
 - if current_user && @post.user && (current_user == @post.user || @post.editors.include?(current_user))
   = link_to 'Edit this post', edit_post_url(@post)
-    EOF
-    runner.review('app/views/posts/show.html.slim', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/show.html.slim:1 - move code into model (@post use_count > 2)"
-  end
+        EOF
+        runner.review('app/views/posts/show.html.slim', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/show.html.slim:1 - move code into model (@post use_count > 2)"
+      end
 
-  it "should move code into model only review for current if conditional statement" do
-    content =<<-EOF
-    <% if @post.title %>
-      <% if @post.user %>
-        <% if @post.description %>
+      it "should move code into model only review for current if conditional statement" do
+        content =<<-EOF
+        <% if @post.title %>
+          <% if @post.user %>
+            <% if @post.description %>
+            <% end %>
+          <% end %>
         <% end %>
-      <% end %>
-    <% end %>
-    EOF
-    runner.review('app/views/posts/show.html.erb', content)
-    runner.should have(0).errors
-  end
+        EOF
+        runner.review('app/views/posts/show.html.erb', content)
+        runner.should have(0).errors
+      end
 
-  it "should not move code into model" do
-    content =<<-EOF
-    <% if @post.editable_by?(current_user) %>
-      <%= link_to 'Edit this post', edit_post_url(@post) %>
-    <% end %>
-    EOF
-    runner.review('app/views/posts/show.html.erb', content)
-    runner.should have(0).errors
-  end
+      it "should not move code into model" do
+        content =<<-EOF
+        <% if @post.editable_by?(current_user) %>
+          <%= link_to 'Edit this post', edit_post_url(@post) %>
+        <% end %>
+        EOF
+        runner.review('app/views/posts/show.html.erb', content)
+        runner.should have(0).errors
+      end
 
-  it "should not move code into model for multiple calls on same variable node" do
-    content =<<-EOF
-    <% if !job.company.blank? && job.company.title? %>
-    <% end %>
-    EOF
-    runner.review('app/views/jobs/show.html.erb', content)
-    runner.should have(0).errors
+      it "should not move code into model for multiple calls on same variable node" do
+        content =<<-EOF
+        <% if !job.company.blank? && job.company.title? %>
+        <% end %>
+        EOF
+        runner.review('app/views/jobs/show.html.erb', content)
+        runner.should have(0).errors
+      end
+    end
   end
 end

data/spec/rails_best_practices/reviews/move_finder_to_named_scope_review_spec.rb

@@ -1,78 +1,77 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::MoveFinderToNamedScopeReview do
-  let(:runner) { RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::MoveFinderToNamedScopeReview.new) }
+module RailsBestPractices
+  module Reviews
+    describe MoveFinderToNamedScopeReview do
+      let(:runner) { Core::Runner.new(:reviews => MoveFinderToNamedScopeReview.new) }
 
-  it "should move finder to named_scope" do
-    content = <<-EOF
-    class PostsController < ActionController::Base
+      it "should move finder to named_scope" do
+        content = <<-EOF
+        class PostsController < ActionController::Base
+          def index
+            @public_posts = Post.find(:all, :conditions => { :state => 'public' },
+                                            :limit => 10,
+                                            :order => 'created_at desc')
 
-      def index
-        @public_posts = Post.find(:all, :conditions => { :state => 'public' },
-                                        :limit => 10,
-                                        :order => 'created_at desc')
-
-        @draft_posts  = Post.find(:all, :conditions => { :state => 'draft' },
-                                        :limit => 10,
-                                        :order => 'created_at desc')
+            @draft_posts  = Post.find(:all, :conditions => { :state => 'draft' },
+                                            :limit => 10,
+                                            :order => 'created_at desc')
+          end
+        end
+        EOF
+        runner.review('app/controllers/posts_controller.rb', content)
+        runner.should have(2).errors
+        runner.errors[0].to_s.should == "app/controllers/posts_controller.rb:4 - move finder to named_scope"
+        runner.errors[1].to_s.should == "app/controllers/posts_controller.rb:8 - move finder to named_scope"
       end
-    end
-    EOF
-    runner.review('app/controllers/posts_controller.rb', content)
-    runner.should have(2).errors
-    runner.errors[0].to_s.should == "app/controllers/posts_controller.rb:4 - move finder to named_scope"
-    runner.errors[1].to_s.should == "app/controllers/posts_controller.rb:8 - move finder to named_scope"
-  end
 
-  it "should not move simple finder" do
-    content = <<-EOF
-    class PostsController < ActionController::Base
-
-      def index
-        @all_posts = Post.find(:all)
-        @another_all_posts = Post.all
-        @first_post = Post.find(:first)
-        @another_first_post = Post.first
-        @last_post = Post.find(:last)
-        @another_last_post = Post.last
+      it "should not move simple finder" do
+        content = <<-EOF
+        class PostsController < ActionController::Base
+          def index
+            @all_posts = Post.find(:all)
+            @another_all_posts = Post.all
+            @first_post = Post.find(:first)
+            @another_first_post = Post.first
+            @last_post = Post.find(:last)
+            @another_last_post = Post.last
+          end
+        end
+        EOF
+        runner.review('app/controllers/posts_controller.rb', content)
+        runner.should have(0).errors
       end
-    end
-    EOF
-    runner.review('app/controllers/posts_controller.rb', content)
-    runner.should have(0).errors
-  end
 
-  it "should not move namd_scope" do
-    content = <<-EOF
-    class PostsController < ActionController::Base
-
-      def index
-        @public_posts = Post.published
-        @draft_posts  = Post.draft
+      it "should not move namd_scope" do
+        content = <<-EOF
+        class PostsController < ActionController::Base
+          def index
+            @public_posts = Post.published
+            @draft_posts  = Post.draft
+          end
+        end
+        EOF
+        runner.review('app/controllers/posts_controller.rb', content)
+        runner.should have(0).errors
       end
-    end
-    EOF
-    runner.review('app/controllers/posts_controller.rb', content)
-    runner.should have(0).errors
-  end
 
-  it "should not review model file" do
-    content = <<-EOF
-    class Post < ActiveRecord::Base
+      it "should not review model file" do
+        content = <<-EOF
+        class Post < ActiveRecord::Base
+          def published
+            Post.find(:all, :conditions => { :state => 'public' },
+                            :limit => 10, :order => 'created_at desc')
+          end
 
-      def published
-        Post.find(:all, :conditions => { :state => 'public' },
-                        :limit => 10, :order => 'created_at desc')
+          def published
+            Post.find(:all, :conditions => { :state => 'draft' },
+                            :limit => 10, :order => 'created_at desc')
+          end
+        end
+        EOF
+        runner.review('app/model/post.rb', content)
+        runner.should have(0).errors
       end
-
-      def published
-        Post.find(:all, :conditions => { :state => 'draft' },
-                        :limit => 10, :order => 'created_at desc')
-      end
-
     end
-    EOF
-    runner.review('app/model/post.rb', content)
-    runner.should have(0).errors
   end
 end

data/spec/rails_best_practices/reviews/move_model_logic_into_model_review_spec.rb

@@ -1,62 +1,63 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::MoveModelLogicIntoModelReview do
-  let(:runner) { RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::MoveModelLogicIntoModelReview.new) }
-
-  it "should move model logic into model" do
-    content = <<-EOF
-    class PostsController < ApplicationController
-
-      def publish
-        @post = Post.find(params[:id])
-        @post.update_attributes(:is_published, true)
-        @post.approved_by = current_user
-        if @post.created_at > Time.now - 7.days
-          @post.popular = 100
-        else
-          @post.popular = 0
+module RailsBestPractices
+  module Reviews
+    describe MoveModelLogicIntoModelReview do
+      let(:runner) { Core::Runner.new(:reviews => MoveModelLogicIntoModelReview.new) }
+
+      it "should move model logic into model" do
+        content = <<-EOF
+        class PostsController < ApplicationController
+          def publish
+            @post = Post.find(params[:id])
+            @post.update_attributes(:is_published, true)
+            @post.approved_by = current_user
+            if @post.created_at > Time.now - 7.days
+              @post.popular = 100
+            else
+              @post.popular = 0
+            end
+
+            redirect_to post_url(@post)
+          end
         end
-
-        redirect_to post_url(@post)
+        EOF
+        runner.review('app/controllers/posts_controller.rb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/controllers/posts_controller.rb:3 - move model logic into model (@post use_count > 4)"
       end
-    end
-    EOF
-    runner.review('app/controllers/posts_controller.rb', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/controllers/posts_controller.rb:3 - move model logic into model (@post use_count > 4)"
-  end
-
-  it "should not move model logic into model with simple model calling" do
-    content = <<-EOF
-    class PostsController < ApplicationController
 
-      def publish
-        @post = Post.find(params[:id])
-        @post.update_attributes(:is_published, true)
-        @post.approved_by = current_user
+      it "should not move model logic into model with simple model calling" do
+        content = <<-EOF
+        class PostsController < ApplicationController
+          def publish
+            @post = Post.find(params[:id])
+            @post.update_attributes(:is_published, true)
+            @post.approved_by = current_user
 
-        redirect_to post_url(@post)
+            redirect_to post_url(@post)
+          end
+        end
+        EOF
+        runner.review('app/controllers/posts_controller.rb', content)
+        runner.should have(0).errors
       end
-    end
-    EOF
-    runner.review('app/controllers/posts_controller.rb', content)
-    runner.should have(0).errors
-  end
 
-  it "should not move model logic into model with self calling" do
-    content = <<-EOF
-    class PostsController < ApplicationController
-
-      def publish
-        self.step1
-        self.step2
-        self.step3
-        self.step4
-        self.step5
+      it "should not move model logic into model with self calling" do
+        content = <<-EOF
+        class PostsController < ApplicationController
+          def publish
+            self.step1
+            self.step2
+            self.step3
+            self.step4
+            self.step5
+          end
+        end
+        EOF
+        runner.review('app/controllers/posts_controller.rb', content)
+        runner.should have(0).errors
       end
     end
-    EOF
-    runner.review('app/controllers/posts_controller.rb', content)
-    runner.should have(0).errors
   end
 end