rails_best_practices 1.13.1 → 1.13.2

data/lib/rails_best_practices/reviews/check_save_return_value_review.rb

@@ -15,11 +15,11 @@ module RailsBestPractices
     #   Check all "save" calls to check the return value is used by a node we have visited.
     class CheckSaveReturnValueReview < Review
       include Classable
-      interesting_nodes :call, :command_call, :method_add_arg, :if, :ifop, :elsif, :unless, :assign, :binary
+      interesting_nodes :call, :command_call, :method_add_arg, :if, :ifop, :elsif, :unless, :if_mod, :unless_mod, :assign, :binary
       interesting_files ALL_FILES
       url "http://rails-bestpractices.com/posts/703-check-the-return-value-of-save-otherwise-use-save"
 
-      add_callback :start_if, :start_ifop, :start_elsif, :start_unless do |node|
+      add_callback :start_if, :start_ifop, :start_elsif, :start_unless, :start_if_mod, :start_unless_mod do |node|
         @used_return_value_of = node.conditional_statement.all_conditions
       end
 
@@ -74,5 +74,3 @@ module RailsBestPractices
     end
   end
 end
-
-

data/lib/rails_best_practices/reviews/move_code_into_model_review.rb

@@ -13,7 +13,7 @@ module RailsBestPractices
     #   check if, unless, elsif there are multiple method calls or attribute assignments apply to one receiver,
     #   and the receiver is a variable, then they should be moved into model.
     class MoveCodeIntoModelReview < Review
-      interesting_nodes :if, :unless, :elsif
+      interesting_nodes :if, :unless, :elsif, :ifop, :if_mod, :unless_mod
       interesting_files VIEW_FILES
       url "http://rails-bestpractices.com/posts/25-move-code-into-model"
 
@@ -28,7 +28,7 @@ module RailsBestPractices
       #
       # if there are multiple call and assignment nodes who have the same receiver,
       # and the receiver is a variable, then the conditional statement nodes should be moved into model.
-      add_callback :start_if, :start_unless, :start_elsif do |node|
+      add_callback :start_if, :start_unless, :start_elsif, :start_ifop, :start_if_mod, :start_unless_mod do |node|
         node.conditional_statement.grep_nodes(sexp_type: :call) { |child_node| remember_variable_use_count(child_node) }
 
         variable_use_count.each do |variable_node, count|

data/lib/rails_best_practices/reviews/use_query_attribute_review.rb

@@ -16,7 +16,7 @@ module RailsBestPractices
     #   and their messages of second call are one of nil?, blank?, present?, or they are == ""
     #   then you can use query attribute instead.
     class UseQueryAttributeReview < Review
-      interesting_nodes :if, :unless, :elsif
+      interesting_nodes :if, :unless, :elsif, :ifop, :if_mod, :unless_mod
       interesting_files ALL_FILES
       url "http://rails-bestpractices.com/posts/56-use-query-attribute"
 
@@ -34,7 +34,7 @@ module RailsBestPractices
       #    the message is == and the argument is ""
       #
       # then the call node can use query attribute instead.
-      add_callback :start_if, :start_unless, :start_elsif do |node|
+      add_callback :start_if, :start_unless, :start_elsif, :start_ifop, :start_if_mod, :start_unless_mod do |node|
         all_conditions = if node.conditional_statement == node.conditional_statement.all_conditions
           [node.conditional_statement]
         else

data/lib/rails_best_practices/reviews/use_scope_access_review.rb

@@ -16,7 +16,7 @@ module RailsBestPractices
     #   and there is redirect_to method call in if block body,
     #   then it should be replaced by using scope access.
     class UseScopeAccessReview < Review
-      interesting_nodes :if, :unless, :elsif
+      interesting_nodes :if, :unless, :elsif, :ifop, :if_mod, :unless_mod
       interesting_files CONTROLLER_FILES
       url "http://rails-bestpractices.com/posts/3-use-scope-access"
 
@@ -25,7 +25,7 @@ module RailsBestPractices
       # if it is a method call compared with current_user or current_user.id,
       # and there is a redirect_to method call in the block body,
       # then it should be replaced by using scope access.
-      add_callback :start_if, :start_unless, :start_elsif do |node|
+      add_callback :start_if, :start_unless, :start_elsif, :start_ifop, :start_if_mod, :start_unless_mod do |node|
         add_error "use scope access" if current_user_redirect?(node)
       end
 

data/lib/rails_best_practices/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module RailsBestPractices
-  VERSION = "1.13.1"
+  VERSION = "1.13.2"
 end

data/spec/rails_best_practices/reviews/check_save_return_value_spec.rb

@@ -81,6 +81,32 @@ module RailsBestPractices
           runner.should have(0).errors
         end
 
+        it "should allow save return value used in if_mod" do
+          content =<<-EOF
+          def my_method
+            post = Posts.new do |p|
+              p.title = "foo"
+            end
+            "OK" if post.save
+          end
+          EOF
+          runner.review('app/helpers/posts_helper.rb', content)
+          expect(runner).to have(0).errors
+        end
+
+        it "should allow save return value used in unless_mod" do
+          content =<<-EOF
+          def my_method
+            post = Posts.new do |p|
+              p.title = "foo"
+            end
+            "NO" unless post.save
+          end
+          EOF
+          runner.review('app/helpers/posts_helper.rb', content)
+          expect(runner).to have(0).errors
+        end
+
         it "should allow save return value used in unless with &&" do
           content =<<-EOF
           def my_method

data/spec/rails_best_practices/reviews/move_code_into_model_review_spec.rb

@@ -36,6 +36,24 @@ module RailsBestPractices
         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 with if in one line" do
+        content =<<-EOF
+        <%= link_to 'Edit this post', edit_post_url(@post) if current_user && @post.user && (current_user == @post.user || @post.editors.include?(current_user)) %>
+        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 '? :'" do
+        content =<<-EOF
+        <%= 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.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 only review for current if conditional statement" do
         content =<<-EOF
         <% if @post.title %>

data/spec/rails_best_practices/reviews/use_query_attribute_review_spec.rb

@@ -39,6 +39,24 @@ module RailsBestPractices
         runner.errors[0].to_s.should == "app/views/users/show.html.erb:1 - use query attribute (@user.login?)"
       end
 
+      it "should use query attribute by blank call with if in one line" do
+        content = <<-EOF
+        <%= link_to 'login', new_session_path if @user.login.blank? %>
+        EOF
+        runner.review('app/views/users/show.html.erb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/users/show.html.erb:1 - use query attribute (@user.login?)"
+      end
+
+      it "should use query attribute by blank call with '? :'" do
+        content = <<-EOF
+        <%= @user.login.blank? ? link_to('login', new_session_path) : '' %>
+        EOF
+        runner.review('app/views/users/show.html.erb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/users/show.html.erb:1 - use query attribute (@user.login?)"
+      end
+
       it "should use query attribute by comparing empty string" do
         content = <<-EOF
         <% if @user.login == "" %>

data/spec/rails_best_practices/reviews/use_scope_access_review_spec.rb

@@ -24,6 +24,36 @@ module RailsBestPractices
           runner.errors[0].to_s.should == "app/controllers/posts_controller.rb:5 - use scope access"
         end
 
+        it "shoud use scope access with if in one line" do
+          content = <<-EOF
+          class PostsController < ApplicationController
+            def edit
+              @post = Post.find(params[:id])
+
+              redirect_to posts_url if @post.user != current_user
+            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:5 - use scope access"
+        end
+
+        it "shoud use scope access with '? :'" do
+          content = <<-EOF
+          class PostsController < ApplicationController
+            def edit
+              @post = Post.find(params[:id])
+
+              @post.user != current_user ? redirect_to(posts_url) : render
+            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:5 - use scope access"
+        end
+
         it "shoud use scope access by comparing with id" do
           content = <<-EOF
           class PostsController < ApplicationController

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_best_practices
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_analyzer
@@ -386,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4362184298328338159
+      hash: -3343139253340945050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: