rails_best_practices 1.19.2 → 1.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41de74a9e0a16b8a3b3feb2fb709f21aec80098
-  data.tar.gz: 98f10516376d7de5d3144b767196aa952b274748
+  metadata.gz: 4a366fcb2bd3097eb1afcc7fa940b233a4177c6d
+  data.tar.gz: 45c9b324f42e0974e7314c1db9e634c782665e93
 SHA512:
-  metadata.gz: 21e177d13d0f2137aebe7d683e87af1b97d53046e53b6bbd4722ae943a1061c5c6f740dee8efe9bc713c0be4550b70016849e17033faa6fd17e33a1204645963
-  data.tar.gz: 81473ba0611d37c8a4a005710983330d0aa6a8c4537ba976e71d93bc670f8ef4fda1d492a44fe1966d2dc0bd91452460ade65f250f252238c187bbe9064e5935
+  metadata.gz: fa6aed2c8549d66e9650e456787a57cc32fb052011506e10cdc94ee43803d2016d644ec4e0aae1d9b08d583abb5d2eab7c4dd26eb8754e60bac46a02f8ad4459
+  data.tar.gz: 5558cb09e7a4a4f38af75078762d3dba880bd29a97ea2ba743df3e20edf8ca51a0fd3f440808f29043b8d00d99503257de3e18849ea3d6d355930728dd9187f6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Next Release
 
+## 1.19.3
+
+* Fix false positive remove unused method for around_action in
+  controller
+* Fix current_class_name in end_class callback
+
 ## 1.19.2
 
 * Integrate with awesomecode.io

data/README.md

@@ -89,13 +89,9 @@ To see the full list of command-line options, run:
 
 Homepage: <http://rails-bestpractices.com>
 
-Online Service: <http://railsbp.com>
-
 GitHub: <http://github.com/railsbp/rails_best_practices>
 
-RDoc: <http://rdoc.rails-bestpractices.com>
-
-Team Blog <http://rails-bestpractices.com/blog/posts>
+Team Blog <http://rails-bestpractices.com>
 
 Google Group: <https://groups.google.com/group/rails_best_practices>
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake'
 require 'rspec'
 require 'rspec/core/rake_task'
 
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'rails_best_practices/version'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/lib/rails_best_practices/core/check.rb

@@ -139,7 +139,7 @@ module RailsBestPractices
             # end of the class
             add_callback :end_class do |_node|
               klasses.pop
-              # @klass = nil
+              @klass = nil
             end
           end
         end
@@ -296,12 +296,12 @@ module RailsBestPractices
               end
 
               def call_method(method_name, class_name = nil)
-                name ||= respond_to?(:current_class_name) ? current_class_name : current_module_name
-                if methods.has_method?(name, method_name)
-                  methods.get_method(name, method_name).mark_used
+                class_name ||= respond_to?(:current_class_name) ? current_class_name : current_module_name
+                if methods.has_method?(class_name, method_name)
+                  methods.get_method(class_name, method_name).mark_used
                 end
-                methods.mark_parent_class_method_used(name, method_name)
-                methods.mark_subclasses_method_used(name, method_name)
+                methods.mark_parent_class_method_used(class_name, method_name)
+                methods.mark_subclasses_method_used(class_name, method_name)
                 methods.possible_public_used(method_name)
               end
           end

data/lib/rails_best_practices/core/runner.rb

@@ -157,7 +157,6 @@ module RailsBestPractices
 
         # load all plugin reviews.
         def load_plugin_reviews
-          
             plugins = File.join(Runner.base_path, 'lib', 'rails_best_practices', 'plugins', 'reviews')
             if File.directory?(plugins)
               Dir[File.expand_path(File.join(plugins, '*.rb'))].each do |review|
@@ -169,7 +168,6 @@ module RailsBestPractices
                 end
               end
             end
-          
         end
     end
   end

data/lib/rails_best_practices/prepares/controller_prepare.rb

@@ -24,6 +24,7 @@ module RailsBestPractices
       # also check if the controller is inherit from InheritedResources::Base.
       add_callback :start_class do |_node|
         @controllers << @klass
+        @current_controller_name = @klass.to_s
         if @inherited_resources
           @actions = DEFAULT_ACTIONS
         end
@@ -31,9 +32,9 @@ module RailsBestPractices
 
       # remember the action names at the end of class node if the controller is a InheritedResources.
       add_callback :end_class do |node|
-        if @inherited_resources && 'ApplicationController' != current_class_name
+        if @inherited_resources && 'ApplicationController' != @current_controller_name
           @actions.each do |action|
-            @methods.add_method(current_class_name, action, 'file' => node.file, 'line_number' => node.line_number)
+            @methods.add_method(@current_controller_name, action, 'file' => node.file, 'line_number' => node.line_number)
           end
         end
       end

data/lib/rails_best_practices/reviews/always_add_db_index_review.rb

@@ -168,11 +168,10 @@ module RailsBestPractices
             foreign_id_keys = foreign_keys.select { |key| key.size == 1 && key.first =~ /_id/ }
             foreign_type_keys = foreign_keys.select { |key| key.size == 1 && key.first =~ /_type/ }
             foreign_id_keys.each do |id_key|
-              if type_key = foreign_type_keys.detect { |type_key| type_key.first == id_key.first.sub(/_id/, '') + '_type' }
-                foreign_keys.delete(id_key)
-                foreign_keys.delete(type_key)
-                foreign_keys << id_key + type_key
-              end
+              next unless type_key = foreign_type_keys.detect { |type_key| type_key.first == id_key.first.sub(/_id/, '') + '_type' }
+              foreign_keys.delete(id_key)
+              foreign_keys.delete(type_key)
+              foreign_keys << id_key + type_key
             end
           }
         end

data/lib/rails_best_practices/reviews/remove_unused_methods_in_controllers_review.rb

@@ -30,11 +30,15 @@ module RailsBestPractices
         @inherited_resources = false
       end
 
+      add_callback :start_class do |_node|
+        @current_controller_name = @klass.to_s
+      end
+
       # mark custom inherited_resources methods as used.
       add_callback :end_class do |_node|
         if @inherited_resources
           INHERITED_RESOURCES_METHODS.each do |method|
-            call_method(method)
+            call_method(method, @current_controller_name)
           end
         end
       end
@@ -56,7 +60,7 @@ module RailsBestPractices
             action_name = first_argument.hash_value('state').to_s
             call_method(action_name, current_class_name)
           end
-        when 'around_filter'
+        when 'around_filter', 'around_action'
           node.arguments.all.each { |argument| mark_used(argument) }
         when 'layout'
           first_argument = node.arguments.all.first

data/lib/rails_best_practices/reviews/use_before_filter_review.rb

@@ -37,11 +37,10 @@ module RailsBestPractices
           remember_first_sentence(statement_node) if :def == statement_node.sexp_type
         end
         @first_sentences.each do |_first_sentence, def_nodes|
-          if def_nodes.size > @customize_count
-            add_error "use before_filter for #{def_nodes.map { |node| node.method_name.to_s }.join(',')}",
-                      node.file,
-                      def_nodes.map(&:line_number).join(',')
-          end
+          next unless def_nodes.size > @customize_count
+          add_error "use before_filter for #{def_nodes.map { |node| node.method_name.to_s }.join(',')}",
+                    node.file,
+                    def_nodes.map(&:line_number).join(',')
         end
       end
 

data/lib/rails_best_practices/reviews/use_query_attribute_review.rb

@@ -40,12 +40,11 @@ module RailsBestPractices
           node.conditional_statement.all_conditions
         end
         all_conditions.each do |condition_node|
-          if query_attribute_node = query_attribute_node(condition_node)
-            receiver_node = query_attribute_node.receiver
-            add_error "use query attribute (#{receiver_node.receiver}.#{receiver_node.message}?)",
-                      node.file,
-                      query_attribute_node.line_number
-          end
+          next unless query_attribute_node = query_attribute_node(condition_node)
+          receiver_node = query_attribute_node.receiver
+          add_error "use query attribute (#{receiver_node.receiver}.#{receiver_node.message}?)",
+                    node.file,
+                    query_attribute_node.line_number
         end
       end
 

data/lib/rails_best_practices/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsBestPractices
-  VERSION = '1.19.2'.freeze
+  VERSION = '1.19.3'.freeze
 end

data/rails_best_practices.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../lib/rails_best_practices/version', __FILE__)
+require File.expand_path('lib/rails_best_practices/version', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'rails_best_practices'
@@ -46,10 +46,6 @@ Gem::Specification.new do |s|
 
       http://rails-bestpractices.com
 
-  Please also try our online service
-
-      http://railsbp.com
-
   Enjoy!
 
       Richard Huang (flyerhzm@gmail.com)

data/spec/rails_best_practices/reviews/remove_unused_methods_in_controllers_review_spec.rb

@@ -89,6 +89,24 @@ module RailsBestPractices
           expect(runner.errors.size).to eq(0)
         end
 
+        it 'should not remove unused methods for around_action (new syntax)' do
+          content = <<-EOF
+          class PostsController < ActiveRecord::Base
+            around_action :use_time_zone
+
+            protected
+
+            def use_time_zone(&block)
+              Time.use_zone(current_user.time_zone, &block)
+            end
+          end
+          EOF
+          runner.prepare('app/controllers/posts_controller.rb', content)
+          runner.review('app/controllers/posts_controller.rb', content)
+          runner.after_review
+          expect(runner.errors.size).to eq(0)
+        end
+
         it 'should not remove unused methods for layout' do
           content = <<-EOF
           RailsBestPracticesCom::Application.routes.draw do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_best_practices
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.19.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -376,10 +376,6 @@ post_install_message: |
 
         http://rails-bestpractices.com
 
-    Please also try our online service
-
-        http://railsbp.com
-
     Enjoy!
 
         Richard Huang (flyerhzm@gmail.com)