RubyGems - rails_best_practices - Versions diffs - 1.2.0 → 1.3.0 - Mend

rails_best_practices 1.2.0 → 1.3.0

Files changed (29) hide show

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_best_practices (1.2.0)
+    rails_best_practices (1.3.0)
       activesupport
       colored
       erubis
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
+    activesupport (3.0.10)
     colored (1.2)
     diff-lcs (1.1.2)
     erubis (2.7.0)

data/README.md CHANGED Viewed

@@ -23,6 +23,7 @@ By default rails_best_practices will do parse codes in vendor, spec, test and fe
             --without-color              only output plain text without color
             --with-textmate              open file by textmate in html format
             --with-mvim                  open file by mvim in html format
+            --with-git                   display git commit and git username in html format
             --vendor                     include vendor files
             --spec                       include spec files
             --test                       include test files

data/assets/result.html.erb CHANGED Viewed

@@ -12,11 +12,14 @@
       h1 {
         color: ##4E4E4E;
       }
+      p {
+        margin: 5px 0;
+      }
       table {
         background: white;
         border: 1px solid #666;
         border-collapse: collapse;
-        margin: 20px 0;
+        margin: 10px 0;
         font-size: 14px;
       }
       table th, table td {
@@ -33,26 +36,33 @@
       table tr:hover {
         background-color: #FFFFC0;
       }
+      ul {
+        clear: both;
+        display: inline-block;
+        padding: 0;
+        margin: 0;
+      }
       ul li {
        list-style: none;
        display: none;
+       float: left;
       }
     </style>
   </head>
   <body>
     <h1>rails_best_practices output</h1>
-    <h2>
+    <p>
       Please go to
       <a href='http://rails-bestpractices.com' target='_blank'>http://rails-bestpractices.com</a>
       to see more useful Rails Best Practices.
-    </h2>
-    <h2>
+    </p>
+    <p>
       <% if @errors.empty? %>
         No error found. Cool!
       <% else %>
-        Found <%= @errors.size %> errors.
+        Found <%= @errors.size %> warnings.
       <% end %>
-    </h2>
+    </p>
     <ul>
       <% @error_types.each do |error_type| %>
         <li><input type="checkbox" value="<%= error_type.split(':').last %>" /><%= error_type.split(':').last %></li>
@@ -63,6 +73,10 @@
         <th>Filename</th>
         <th>Line Number</th>
         <th>Warning Message</th>
+        <% if @git %>
+          <th>Git Commit</th>
+          <th>Git Username</th>
+        <% end %>
       </tr>
       <% @errors.each do |error| %>
         <tr class="<%= error.type.split(':').last %>">
@@ -79,6 +93,10 @@
           <td class='message'>
             <a href='<%= error.url %>' target='_blank'><%= error.message %></a>
           </td>
+          <% if @git %>
+            <td class='git_commit'><%= error.git_commit %></td>
+            <td class='git_usename'><%= error.git_username %></td>
+          <% end %>
         </tr>
       <% end %>
     </table>

data/lib/rails_best_practices.rb CHANGED Viewed

@@ -81,12 +81,13 @@ module RailsBestPractices
         plain_output("AlwaysAddDbIndexReview is disabled as there is no db/schema.rb file in your rails project.", 'blue')
       end
-      @bar = ProgressBar.new('Analyzing', lexical_files.size + prepare_files.size + review_files.size)
+      @bar = ProgressBar.new('Source Codes', lexical_files.size + prepare_files.size + review_files.size)
       ["lexical", "prepare", "review"].each { |process| send(:process, process) }
       @runner.on_complete
       @bar.finish
       if @options['format'] == 'html'
+        load_git_info if @options["with-git"]
         output_html_errors
       else
         output_terminal_errors
@@ -148,7 +149,7 @@ module RailsBestPractices
     # @param [Array] dirs what directories to expand
     # @return [Array] all files expanded
     def expand_dirs_to_files *dirs
-      extensions = ['rb', 'erb', 'rhtml', 'haml', 'builder']
+      extensions = ['rb', 'erb', 'rake', 'rhtml', 'haml', 'builder']
       dirs.flatten.map { |entry|
         next unless File.exist? entry
@@ -214,6 +215,21 @@ module RailsBestPractices
       end
     end
+    # load git commit and git username info.
+    def load_git_info
+      git_progressbar = ProgressBar.new('Git Info', @runner.errors.size)
+      @runner.errors.each do |error|
+        git_info = `cd #{@runner.class.base_path}; git blame #{error.filename[@runner.class.base_path.size..-1]} | sed -n #{error.line_number.split(',').first}p`
+        unless git_info == ""
+          git_commit, git_username = git_info.split(/\d{4}-\d{2}-\d{2}/).first.split("(")
+          error.git_commit = git_commit.split(" ").first.strip
+          error.git_username = git_username.strip
+        end
+        git_progressbar.inc unless @options['debug']
+      end
+      git_progressbar.finish
+    end
     # output errors with html format.
     def output_html_errors
       require 'erubis'
@@ -221,7 +237,7 @@ module RailsBestPractices
       File.open("rails_best_practices_output.html", "w+") do |file|
         eruby = Erubis::Eruby.new(template)
-        file.puts eruby.evaluate(:errors => @runner.errors, :error_types => error_types, :textmate => @options["with-textmate"], :mvim => @options["with-mvim"])
+        file.puts eruby.evaluate(:errors => @runner.errors, :error_types => error_types, :textmate => @options["with-textmate"], :mvim => @options["with-mvim"], :git => @options["with-git"])
       end
     end

data/lib/rails_best_practices/command.rb CHANGED Viewed

@@ -40,6 +40,10 @@ OptionParser.new do |opts|
     options["with-mvim"] = true
   end
+  opts.on("--with-git", "display git commit and username, only support html format") do
+    options["with-git"] = true
+  end
   ['vendor', 'spec', 'test', 'features'].each do |pattern|
     opts.on("--#{pattern}", "include #{pattern} files") do
       options[pattern] = true

data/lib/rails_best_practices/core/error.rb CHANGED Viewed

@@ -6,6 +6,7 @@ module RailsBestPractices
     # it indicates the filenname, line number and error message for the violation.
     class Error
       attr_reader :filename, :line_number, :message, :type, :url
+      attr_accessor :git_commit, :git_username
       def initialize(filename, line_number, message, type, url = nil)
         @filename = filename

data/lib/rails_best_practices/core/methods.rb CHANGED Viewed

@@ -53,15 +53,27 @@ module RailsBestPractices
       #
       # @param [String] class name
       # @param [String] method name
-      def mark_extend_class_method_used(class_name, method_name)
+      def mark_parent_class_method_used(class_name, method_name)
         klass = Prepares.klasses.find { |klass| klass.to_s == class_name }
         if klass && klass.extend_class_name
-          mark_extend_class_method_used(klass.extend_class_name, method_name)
+          mark_parent_class_method_used(klass.extend_class_name, method_name)
           method = get_method(klass.extend_class_name, method_name)
           method.mark_used if method
         end
       end
+      # Mark sub classes' method as used.
+      #
+      # @param [String] class name
+      # @param [String] method name
+      def mark_subclasses_method_used(class_name, method_name)
+        Prepares.klasses.select { |klass| klass.extend_class_name == class_name }.each do |klass|
+          mark_subclasses_method_used(klass.to_s, method_name)
+          method = get_method(klass.to_s, method_name)
+          method.mark_used if method
+        end
+      end
       # remomber the method name, the method is probably be used for the class' public method.
       #
       # @param [String] method name

data/lib/rails_best_practices/core/runner.rb CHANGED Viewed

@@ -159,7 +159,7 @@ module RailsBestPractices
               content.gsub!(/\\\d{3}/, '')
             rescue LoadError
               raise "In order to parse #{filename}, please install the haml gem"
-            rescue Haml::Error
+            rescue Haml::Error, SyntaxError
               # do nothing, just ignore the wrong haml files.
             end
           end
@@ -202,7 +202,7 @@ module RailsBestPractices
         # load all plugin reviews.
         def load_plugin_reviews
           begin
-            plugins = "#{Runner.base_path}lib/rails_best_practices/plugins/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|
                 require review

data/lib/rails_best_practices/core_ext/sexp.rb CHANGED Viewed

@@ -22,8 +22,11 @@ class Sexp
   #       => 2
   def line
     if [:def, :command, :command_call, :call, :fcall, :method_add_arg, :method_add_block,
-      :var_ref, :const_ref, :const_path_ref, :class, :module, :if, :unless, :elsif, :binary].include? sexp_type
+      :var_ref, :const_ref, :const_path_ref, :class, :module, :if, :unless, :elsif, :binary,
+      :alias, :symbol_literal, :symbol, :aref].include? sexp_type
       self[1].line
+    elsif :array == sexp_type
+      array_values[0].line
     else
       self.last.first if self.last.is_a? Array
     end
@@ -294,7 +297,7 @@ class Sexp
     when :args_add_block, :array
       node = self[1]
       while true
-        if :args_add == node.sexp_type
+        if [:args_add, :args_add_star].include? node.sexp_type
           nodes.unshift node[2]
           node = node[1]
         elsif :args_new == node.sexp_type
@@ -675,12 +678,48 @@ class Sexp
     if :array == sexp_type
       if nil == self[1]
         []
+      elsif :qwords_add == self[1].sexp_type
+        self[1].array_values
       else
         arguments.all
       end
+    elsif :qwords_add
+      values = []
+      node = self
+      while true
+        if :qwords_add == node.sexp_type
+          values.unshift node[2]
+          node = node[1]
+        elsif :qwords_new == node.sexp_type
+          break
+        end
+      end
+      values
     end
   end
+  # old method for alias node.
+  #
+  #     s(:alias,
+  #       s(:symbol_literal, s(:@ident, "new", s(1, 6))),
+  #       s(:symbol_literal, s(:@ident, "old", s(1, 10)))
+  #     )
+  #         => s(:symbol_literal, s(:@ident, "old", s(1, 10))),
+  def old_method
+    self[2]
+  end
+  # new method for alias node.
+  #
+  #     s(:alias,
+  #       s(:symbol_literal, s(:@ident, "new", s(1, 6))),
+  #       s(:symbol_literal, s(:@ident, "old", s(1, 10)))
+  #     )
+  #         => s(:symbol_literal, s(:@ident, "new", s(1, 6))),
+  def new_method
+    self[1]
+  end
   # To object.
   #
   #     s(:array,
@@ -726,6 +765,12 @@ class Sexp
       else
         self[1].to_s
       end
+    when :qwords_add
+      if s(:qwords_new) == self[1]
+        self[2].to_s
+      else
+        self[1].to_s
+      end
     when :const_path_ref
       "#{self[1]}::#{self[2]}"
     when :@label

data/lib/rails_best_practices/prepares/controller_prepare.rb CHANGED Viewed

@@ -54,7 +54,15 @@ module RailsBestPractices
       # restrict actions for inherited_resources
       def start_command(node)
         if @inherited_resources && "actions" ==  node.message.to_s
-          @actions = node.arguments.all.map(&:to_s)
+          if "all" == node.arguments.all[0].to_s
+            @actions = DEFAULT_ACTIONS
+            option_argument = node.arguments.all[1]
+            if :bare_assoc_hash == option_argument.sexp_type && option_argument.hash_value("except")
+              @actions -= option_argument.hash_value("except").to_object
+            end
+          else
+            @actions = node.arguments.all.map(&:to_s)
+          end
         end
       end

data/lib/rails_best_practices/prepares/model_prepare.rb CHANGED Viewed

@@ -11,7 +11,7 @@ module RailsBestPractices
       ASSOCIATION_METHODS = %w(belongs_to has_one has_many has_and_belongs_to_many)
       def interesting_nodes
-        [:module, :class, :def, :command, :var_ref]
+        [:module, :class, :def, :command, :var_ref, :alias]
       end
       def interesting_files
@@ -62,14 +62,26 @@ module RailsBestPractices
       #       }
       #     }
       def start_command(node)
-        if %w(named_scope scope).include? node.message.to_s
+        case node.message.to_s
+        when *%w(named_scope scope alias_method)
           method_name = node.arguments.all[0].to_s
           @methods.add_method(current_class_name, method_name, {"file" => node.file, "line" => node.line}, current_access_control)
-        elsif ASSOCIATION_METHODS.include? node.message.to_s
+        when "alias_method_chain"
+          method, feature = *node.arguments.all.map(&:to_s)
+          @methods.add_method(current_class_name, "#{method}_with_#{feature}", {"file" => node.file, "line" => node.line}, current_access_control)
+          @methods.add_method(current_class_name, "#{method}", {"file" => node.file, "line" => node.line}, current_access_control)
+        when *ASSOCIATION_METHODS
           remember_association(node)
+        else
         end
       end
+      # check alias node to remembr the alias methods.
+      def start_alias(node)
+        method_name = node.new_method.to_s
+        @methods.add_method(current_class_name, method_name, {"file" => node.file, "line" => node.line}, current_access_control)
+      end
       private
         # remember associations, with class to association names.
         def remember_association(node)

data/lib/rails_best_practices/reviews/remove_unused_methods_in_models_review.rb CHANGED Viewed

@@ -3,14 +3,22 @@ require 'rails_best_practices/reviews/review'
 module RailsBestPractices
   module Reviews
+    # Find out unused methods in models.
+    #
+    # Implemenation:
+    #
+    # Review process:
+    #   remember all method calls,
+    #   at end, check if all defined methods are called,
+    #   if not, non called methods are unused.
     class RemoveUnusedMethodsInModelsReview < Review
       include Klassable
       include Completeable
-      EXCEPT_METHODS = %w(initialize validate to_xml to_json)
+      EXCEPT_METHODS = %w(initialize validate to_xml to_json assign_attributes after_find after_initialize)
       def interesting_nodes
-        [:module, :class, :call, :fcall, :command, :method_add_arg, :var_ref]
+        [:module, :class, :call, :fcall, :command, :command_call, :method_add_arg, :var_ref, :alias, :bare_assoc_hash]
       end
       def initialize(options={})
@@ -19,32 +27,76 @@ module RailsBestPractices
         @except_methods = EXCEPT_METHODS + options['except_methods']
       end
+      # remember the message of call node.
       def start_call(node)
         mark_used(node.message)
       end
+      # remember the message of fcall node.
       def start_fcall(node)
         mark_used(node.message)
       end
+      # remember name of var_ref node.
       def start_var_ref(node)
         mark_used(node)
       end
+      # remember the message of command call node.
+      def start_command_call(node)
+        mark_used(node.message)
+      end
+      # remember the message of command node.
+      # remember the argument of alias_method and alias_method_chain as well.
       def start_command(node)
-        unless %w(named_scope scope).include? node.message.to_s
+        case node.message.to_s
+        when "named_scope", "scope"
+          # nothing
+        when "alias_method"
+          mark_used(node.arguments.all[1])
+        when "alias_method_chain"
+          method, feature = *node.arguments.all.map(&:to_s)
+          call_method("#{method}_with_#{feature}")
+        else
           mark_used(node.message)
           node.arguments.all.each { |argument| mark_used(argument) }
         end
       end
+      # remember the old method of alias node.
+      def start_alias(node)
+        mark_used(node.old_method)
+      end
+      # remember hash values for hash key "methods".
+      #
+      #     def to_xml(options = {})
+      #       super options.merge(:exclude => :visible, :methods => [:is_discussion_conversation])
+      #     end
+      def start_bare_assoc_hash(node)
+        if node.hash_keys.include? "methods"
+          mark_used(node.hash_value("methods"))
+        end
+      end
+      # remember the first argument for try and send method.
       def start_method_add_arg(node)
-        if "try" == node.message.to_s
+        case node.message.to_s
+        when "try"
           method_name = node.arguments.all[0].to_s
           call_method(method_name)
+        when "send"
+          if [:symbol_literal, :string_literal].include?(node.arguments.all[0].sexp_type)
+            method_name = node.arguments.all[0].to_s
+            call_method(method_name)
+          end
+        else
+          # nothing
         end
       end
+      # get all unused methods at the end of review process.
       def on_complete
         @model_methods.get_all_unused_methods.each do |method|
           if !@except_methods.include?(method.method_name) && method.method_name !~ /=$/
@@ -69,7 +121,8 @@ module RailsBestPractices
           if @model_methods.has_method?(current_class_name, method_name)
             @model_methods.get_method(current_class_name, method_name).mark_used
           end
-          @model_methods.mark_extend_class_method_used(current_class_name, method_name)
+          @model_methods.mark_parent_class_method_used(current_class_name, method_name)
+          @model_methods.mark_subclasses_method_used(current_class_name, method_name)
           @model_methods.possible_public_used(method_name)
         end
     end

data/lib/rails_best_practices/reviews/restrict_auto_generated_routes_review.rb CHANGED Viewed

@@ -86,10 +86,10 @@ module RailsBestPractices
         # get the controller name.
         def controller_name(node)
-          if node.arguments.all.size > 1
-            options = node.arguments.all[1]
-            if options.hash_keys.include?("controller")
-              name = options.hash_value("controller").to_s
+          if option_with_hash(node)
+            option_node = node.arguments.all[1]
+            if hash_key_exist?(option_node,"controller")
+              name = option_node.hash_value("controller").to_s
             else
               name = node.arguments.all[0].to_s.tableize
             end
@@ -111,39 +111,47 @@ module RailsBestPractices
         # get the route actions that should be generated by resources call.
         def resources_methods(node)
-          resources_methods = RESOURCES_METHODS
-          if node.arguments.all.size > 1
-            options = node.arguments.all[1]
-            if options.hash_keys.include?("only")
-              Array(options.hash_value("only").to_object)
-            elsif options.hash_keys.include?("except")
-              resources_methods - Array(options.hash_value("except").to_object)
+          methods = RESOURCES_METHODS
+          if option_with_hash(node)
+            option_node = node.arguments.all[1]
+            if hash_key_exist?(option_node, "only")
+              option_node.hash_value("only").to_s == "none" ? [] : Array(option_node.hash_value("only").to_object)
+            elsif hash_key_exist?(option_node, "except")
+              option_node.hash_value("except").to_s == "all" ? [] : (methods - Array(option_node.hash_value("except").to_object))
             else
-              resources_methods
+              methods
             end
           else
-            resources_methods
+            methods
           end
         end
         # get the route actions that should be generated by resource call.
         def resource_methods(node)
-          resource_methods = RESOURCE_METHODS
-          if node.arguments.all.size > 1
-            options = node.arguments.all[1]
-            if options.hash_keys.include?("only")
-              Array(options.hash_value("only").to_object)
-            elsif options.hash_keys.include?("except")
-              resource_methods - Array(options.hash_value("except").to_object)
+          methods = RESOURCE_METHODS
+          if option_with_hash(node)
+            option_node = node.arguments.all[1]
+            if hash_key_exist?(option_node, "only")
+              option_node.hash_value("only").to_s == "none" ? [] : Array(option_node.hash_value("only").to_object)
+            elsif hash_key_exist?(option_node, "except")
+              option_node.hash_value("except").to_s == "all" ? [] : (methods - Array(option_node.hash_value("except").to_object))
             else
-              resource_methods
+              methods
             end
           else
-            resource_methods
+            methods
           end
         end
+        def option_with_hash(node)
+          node.arguments.all.size > 1 && :bare_assoc_hash == node.arguments.all[1].sexp_type
+        end
+        def hash_key_exist?(node, key)
+          node.hash_keys && node.hash_keys.include?(key)
+        end
     end
   end
 end

data/lib/rails_best_practices/reviews/review.rb CHANGED Viewed

@@ -16,7 +16,8 @@ module RailsBestPractices
       # then save it to as key in @variable_use_count hash, and add the call count (hash value).
       def remember_variable_use_count(node)
         variable_node = variable(node)
-        if variable_node && "self" != variable_node.to_s
+        if variable_node && "self" != variable_node.to_s && @last_variable_node != variable_node
+          @last_variable_node = variable_node
           variable_use_count[variable_node.to_s] ||= 0
           variable_use_count[variable_node.to_s] += 1
         end

data/lib/rails_best_practices/reviews/simplify_render_in_views_review.rb CHANGED Viewed

@@ -31,7 +31,9 @@ module RailsBestPractices
       def start_command(node)
         if "render" == node.message.to_s
           hash_node =  node.arguments.all[0]
-          if hash_node && hash_node.hash_keys && hash_node.hash_keys.include?("partial")
+          if hash_node && :bare_assoc_hash == hash_node.sexp_type &&
+            hash_node.hash_keys.include?("partial") &&
+            !hash_node.hash_value("partial").to_s.include?('/')
             add_error 'simplify render in views'
           end
         end

data/lib/rails_best_practices/reviews/use_before_filter_review.rb CHANGED Viewed

@@ -27,7 +27,7 @@ module RailsBestPractices
       def initialize(options = {})
         super()
-        @customize_count = options['customize_count'] || 1
+        @customize_count = options['customize_count'] || 2
       end
       # check class define node to see if there are method define nodes whose first code line are duplicated.

data/lib/rails_best_practices/version.rb CHANGED Viewed

@@ -1,5 +1,4 @@
 # encoding: utf-8
 module RailsBestPractices
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/rails_best_practices.yml CHANGED Viewed

@@ -12,7 +12,7 @@ LawOfDemeterCheck: { }
 UseObserverCheck: { }
 IsolateSeedDataCheck: { }
 AlwaysAddDbIndexCheck: { }
-UseBeforeFilterCheck: { customize_count: 1 }
+UseBeforeFilterCheck: { customize_count: 2 }
 MoveCodeIntoControllerCheck: { }
 MoveCodeIntoModelCheck: { use_count: 2 }
 MoveCodeIntoHelperCheck: { array_count: 3 }
@@ -27,4 +27,4 @@ SimplifyRenderInControllersCheck: { }
 RemoveEmptyHelpersCheck: { }
 RemoveTabCheck: { }
 RestrictAutoGeneratedRoutesCheck: { }
-# RemoveUnusedMethodsInModelsCheck: { except_methods: [] }
+RemoveUnusedMethodsInModelsCheck: { except_methods: [] }

data/rake_rubies.sh CHANGED Viewed

@@ -1,10 +1,9 @@
 #!/bin/bash
-rubies=( 1.8.7 1.9.2 ree )
+rubies=( 1.9.2-p180 1.9.2-p290 1.9.3-p0 )
 gemset="rails_best_practices"
 for x in ${rubies[*]}
 do
-  rvm use --create $x@$gemset
-  bundle install
-  rake spec:progress
+  echo $x@$gemset
+  rvm $x@$gemset do bundle exec rake spec:progress
 done

data/spec/rails_best_practices/core/runner_spec.rb CHANGED Viewed

@@ -1,13 +1,22 @@
 require 'spec_helper'
 describe RailsBestPractices::Core::Runner do
+  describe "load_plugin_reviews" do
+    shared_examples_for 'load_plugin_reviews' do
+      it "should load plugins in lib/rails_best_practices/plugins/reviews" do
+        runner = RailsBestPractices::Core::Runner.new
+        runner.instance_variable_get('@reviews').map(&:class).should include(RailsBestPractices::Plugins::Reviews::NotUseRailsRootReview)
+      end
+    end
-  before { RailsBestPractices::Core::Runner.base_path = 'spec/fixtures/' }
+    context "given a path that ends with a slash" do
+      before { RailsBestPractices::Core::Runner.base_path = 'spec/fixtures/' }
+      it_should_behave_like 'load_plugin_reviews'
+    end
-  describe "load_plugin_reviews" do
-    it "should load plugins in lib/rails_best_practices/plugins/reviews" do
-      runner = RailsBestPractices::Core::Runner.new
-      runner.instance_variable_get('@reviews').map(&:class).should include(RailsBestPractices::Plugins::Reviews::NotUseRailsRootReview)
+    context "given a path that does not end with a slash" do
+      before { RailsBestPractices::Core::Runner.base_path = 'spec/fixtures' }
+      it_should_behave_like 'load_plugin_reviews'
     end
   end
 end

data/spec/rails_best_practices/core_ext/sexp_spec.rb CHANGED Viewed

@@ -8,6 +8,7 @@ describe Sexp do
         def test
           ActiveRecord::Base.connection
         end
+        alias :test_new :test
       end
       EOF
       @node = parse_content(content)
@@ -28,6 +29,10 @@ describe Sexp do
     it "should return const path line" do
       @node.grep_node(:sexp_type => :const_path_ref).line.should == 3
     end
+    it "should return alias line" do
+      @node.grep_node(:sexp_type => :alias).line.should == 5
+    end
   end
   describe "grep_nodes" do
@@ -239,6 +244,11 @@ describe Sexp do
       node = parse_content("puts 'hello', 'world'").grep_node(:sexp_type => :args_add_block)
       node.all.map(&:to_s).should == ["hello", "world"]
     end
+    it "no error for args_add_star" do
+      node = parse_content("send(:\"\#{route}_url\", *args)").grep_node(:sexp_type => :args_add_block)
+      lambda { node.all }.should_not raise_error
+    end
   end
   describe "conditional_statement" do
@@ -410,6 +420,41 @@ describe Sexp do
       node = parse_content("[]").grep_node(:sexp_type => :array)
       node.array_values.should == []
     end
+    it "should get array value with qwords" do
+      node = parse_content("%w(first_name last_name)").grep_node(:sexp_type => :qwords_add)
+      node.array_values.map(&:to_s).should == ["first_name", "last_name"]
+    end
+  end
+  describe "alias" do
+    context "method" do
+      before do
+        @node = parse_content("alias new old").grep_node(:sexp_type => :alias)
+      end
+      it "should get old_method" do
+        @node.old_method.to_s.should == "old"
+      end
+      it "should get new_method" do
+        @node.new_method.to_s.should == "new"
+      end
+    end
+    context "symbol" do
+      before do
+        @node = parse_content("alias :new :old").grep_node(:sexp_type => :alias)
+      end
+      it "should get old_method" do
+        @node.old_method.to_s.should == "old"
+      end
+      it "should get new_method" do
+        @node.new_method.to_s.should == "new"
+      end
+    end
   end
   describe "to_object" do

data/spec/rails_best_practices/prepares/controller_prepare_spec.rb CHANGED Viewed

@@ -89,6 +89,17 @@ describe RailsBestPractices::Prepares::ControllerPrepare do
         methods.get_methods("PostsController").map(&:method_name).should == ["index", "show"]
       end
+      it "extend inherited_resources with all actions" do
+        content =<<-EOF
+        class PostsController < InheritedResources::Base
+          actions :all, except: [:show]
+        end
+        EOF
+        runner.prepare('app/controllers/posts_controller.rb', content)
+        methods = RailsBestPractices::Prepares.controller_methods
+        methods.get_methods("PostsController").map(&:method_name).should == ["index", "new", "create", "edit", "update", "destroy"]
+      end
       it "DSL inherit_resources" do
         content =<<-EOF
         class PostsController

data/spec/rails_best_practices/prepares/model_prepare_spec.rb CHANGED Viewed

@@ -181,6 +181,41 @@ describe RailsBestPractices::Prepares::ModelPrepare do
     end
   end
+  context "alias" do
+    it "should treat alias as method" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        alias :new :old
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      methods = RailsBestPractices::Prepares.model_methods
+      methods.get_methods("Post").map(&:method_name).should == ["new"]
+    end
+    it "should treat alias_method as method" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        alias_method :new, :old
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      methods = RailsBestPractices::Prepares.model_methods
+      methods.get_methods("Post").map(&:method_name).should == ["new"]
+    end
+    it "should treat alias_method_chain as method" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        alias_method_chain :method, :feature
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      methods = RailsBestPractices::Prepares.model_methods
+      methods.get_methods("Post").map(&:method_name).should == ["method_with_feature", "method"]
+    end
+  end
   context "no error" do
     it "should raised for finder_sql option" do
       content =<<-EOF

data/spec/rails_best_practices/reviews/move_code_into_model_review_spec.rb CHANGED Viewed

@@ -5,7 +5,7 @@ describe RailsBestPractices::Reviews::MoveCodeIntoModelReview do
   it "should move code into model" do
     content =<<-EOF
-    <% if current_user && (current_user == @post.user || @post.editors.include?(current_user)) %>
+    <% 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
@@ -16,7 +16,7 @@ describe RailsBestPractices::Reviews::MoveCodeIntoModelReview do
   it "should move code into model with haml" do
     content =<<-EOF
-- if current_user && (current_user == @post.user || @post.editors.include?(current_user))
+- 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)
@@ -46,4 +46,13 @@ describe RailsBestPractices::Reviews::MoveCodeIntoModelReview do
     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
+  end
 end

data/spec/rails_best_practices/reviews/remove_unused_methods_in_models_review_spec.rb CHANGED Viewed

@@ -259,6 +259,68 @@ describe RailsBestPractices::Reviews::RemoveUnusedMethodsInModelsReview do
       runner.on_complete
       runner.should have(0).errors
     end
+    it "should not remove unused methods for send" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def find(user_id); end
+      end
+      EOF
+      runner.prepare('app/models/post.rb', content)
+      runner.review('app/models/post.rb', content)
+      content =<<-EOF
+      class PostsController < ApplicationController
+        def find
+          Post.new.send(:find, current_user.id)
+        end
+      end
+      EOF
+      runner.review('app/controllers/posts_controller.rb', content)
+      runner.on_complete
+      runner.should have(0).errors
+    end
+    it "should remove unused methods for send string_embexpre" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def find_first; end
+      end
+      EOF
+      runner.prepare('app/models/post.rb', content)
+      runner.review('app/models/post.rb', content)
+      content =<<-EOF
+      class PostsController < ApplicationController
+        def find
+          type = "first"
+          Post.new.send("find_\#{type}")
+        end
+      end
+      EOF
+      runner.review('app/controllers/posts_controller.rb', content)
+      runner.on_complete
+      runner.should have(1).errors
+    end
+    it "should remove unused methods for send variable" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def first; end
+      end
+      EOF
+      runner.prepare('app/models/post.rb', content)
+      runner.review('app/models/post.rb', content)
+      content =<<-EOF
+      class PostsController < ApplicationController
+        def find
+          type = "first"
+          Post.new.send(type)
+        end
+      end
+      EOF
+      runner.review('app/controllers/posts_controller.rb', content)
+      runner.on_complete
+      runner.should have(1).errors
+    end
   end
   context "protected" do
@@ -384,4 +446,108 @@ describe RailsBestPractices::Reviews::RemoveUnusedMethodsInModelsReview do
       runner.errors[0].to_s.should == "app/models/post.rb:2 - remove unused methods (Post#active)"
     end
   end
+  context "alias" do
+    it "should not remove unused method with alias" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def old; end
+        alias new old
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      runner.review("app/models/post.rb", content)
+      content =<<-EOF
+      class PostsController < ApplicationController
+        def show
+          @post.new
+        end
+      end
+      EOF
+      runner.review("app/controllers/posts_controller.rb", content)
+      runner.on_complete
+      runner.should have(0).errors
+    end
+     it "should not remove unused method with symbol alias" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def old; end
+        alias :new :old
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      runner.review("app/models/post.rb", content)
+      content =<<-EOF
+      class PostsController < ApplicationController
+        def show
+          @post.new
+        end
+      end
+      EOF
+      runner.review("app/controllers/posts_controller.rb", content)
+      runner.on_complete
+      runner.should have(0).errors
+    end
+    it "should not remove unused method with alias_method" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def old; end
+        alias_method :new, :old
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      runner.review("app/models/post.rb", content)
+      content =<<-EOF
+      class PostsController < ApplicationController
+        def show
+          @post.new
+        end
+      end
+      EOF
+      runner.review("app/controllers/posts_controller.rb", content)
+      runner.on_complete
+      runner.should have(0).errors
+    end
+    it "should not remove unused method with alias_method_chain" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def method_with_feature; end
+        alias_method_chain :method, :feature
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      runner.review("app/models/post.rb", content)
+      content =<<-EOF
+      class PostsController < ApplicationController
+        def show
+          @post.method
+        end
+      end
+      EOF
+      runner.review("app/controllers/posts_controller.rb", content)
+      runner.on_complete
+      runner.should have(0).errors
+    end
+  end
+  context "methods hash" do
+    it "should not remove unused method with methods hash" do
+      content =<<-EOF
+      class Post < ActiveRecord::Base
+        def to_xml(options = {})
+          super options.merge(:exclude => :visible, :methods => [:is_discussion_conversation])
+        end
+        def is_discussion_conversation; end
+      end
+      EOF
+      runner.prepare("app/models/post.rb", content)
+      runner.review("app/models/post.rb", content)
+      runner.on_complete
+      runner.should have(0).errors
+    end
+  end
 end

data/spec/rails_best_practices/reviews/restrict_auto_generated_routes_review_spec.rb CHANGED Viewed

@@ -55,6 +55,26 @@ describe RailsBestPractices::Reviews::RestrictAutoGeneratedRoutesReview do
         runner.should have(0).errors
       end
+      it "should not restrict auto-generated routes with :only => :none" do
+        content =<<-EOF
+        ActionController::Routing::Routes.draw do |map|
+          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
+        content =<<-EOF
+        ActionController::Routing::Routes.draw do |map|
+          map.resources :posts, :except => :all
+        end
+        EOF
+        runner.review('config/routes.rb', content)
+        runner.should have(0).errors
+      end
       describe "specify a controller" do
         it "should restrict auto-generated routes" do
           content =<<-EOF

data/spec/rails_best_practices/reviews/simplify_render_in_views_review_spec.rb CHANGED Viewed

@@ -14,7 +14,7 @@ describe RailsBestPractices::Reviews::SimplifyRenderInViewsReview do
   it "should simplify render partial with object" do
     content =<<-EOF
-    <%= render :partial => 'posts/post', :object => @post %>
+    <%= render :partial => 'post', :object => @post %>
     EOF
     runner.review('app/views/posts/index.html.erb', content)
     runner.should have(1).errors
@@ -32,7 +32,7 @@ describe RailsBestPractices::Reviews::SimplifyRenderInViewsReview do
   it "should simplify render partial with local variables" do
     content =<<-EOF
-    <%= render :partial => 'comments/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
@@ -66,7 +66,15 @@ describe RailsBestPractices::Reviews::SimplifyRenderInViewsReview do
   it "should not simplify render partial with local variables" do
     content =<<-EOF
-    <%= render 'comments/comment', :parent => post %>
+    <%= render 'comment', :parent => post %>
+    EOF
+    runner.review('app/views/posts/index.html.erb', content)
+    runner.should have(0).errors
+  end
+  it "should not simplify render partial with complex partial" do
+    content =<<-EOF
+    <%= render :partial => 'shared/post', :object => @post %>
     EOF
     runner.review('app/views/posts/index.html.erb', content)
     runner.should have(0).errors

data/spec/spec_helper.rb CHANGED Viewed

@@ -8,6 +8,8 @@ RSpec.configure do |config|
   config.after do
     RailsBestPractices::Prepares.clear
   end
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 def parse_content(content)

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: rails_best_practices
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Richard Huang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00 +08:00
+date: 2011-11-13 00:00:00 +08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -298,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 1140723947848304714
+      hash: 3527788243321139328
       segments:
       - 0
       version: "0"