rails_best_practices 0.4.5 → 0.4.6

data/lib/rails_best_practices/checks/check.rb

@@ -7,10 +7,10 @@ module RailsBestPractices
       NODE_TYPES = [:call, :defn, :defs, :if, :unless, :class, :lasgn, :ivar, :block, :iter]
       
       CONTROLLER_FILES = /_controller\.rb$/
-      MIGRATION_FILES = /db\/migrate\/.*\.rb/
-      MODLE_FILES = /models\/.*\.rb/
-      VIEW_FILES = /views\/.*\.(erb|haml)/
-      PARTIAL_VIEW_FILES = /views\/.*\/_.*\.(erb|haml)/
+      MIGRATION_FILES = /db\/migrate\/.*\.rb$/
+      MODLE_FILES = /models\/.*\.rb$/
+      VIEW_FILES = /views\/.*\.(erb|haml)$/
+      PARTIAL_VIEW_FILES = /views\/.*\/_.*\.(erb|haml)$/
 
       attr_reader :errors
 

data/lib/rails_best_practices/checks/overuse_route_customizations_check.rb

@@ -45,8 +45,11 @@ module RailsBestPractices
         def member_and_collection_count_for_rails2(node)
           hash_nodes = node.grep_nodes(:node_type => :hash)
           return 0 if hash_nodes.empty?
-          customize_hash = eval(hash_nodes.first.to_ruby)
-          (customize_hash[:member].size || 0) + (customize_hash[:collection].size || 0)
+          hash_key_node = hash_nodes.first[1]
+          if :lit == hash_key_node.node_type and [:member, :collection].include? hash_key_node[1]
+            customize_hash = eval(hash_nodes.first.to_ruby)
+            (customize_hash[:member].size || 0) + (customize_hash[:collection].size || 0)
+          end
         end
     end
   end

data/lib/rails_best_practices/checks/use_say_with_time_in_migrations_check.rb

@@ -21,7 +21,7 @@ module RailsBestPractices
       def evaluate_start(node)
         block_body = node.grep_nodes(:node_type => :block).first.body
         block_body.each do |iter|
-          if :call == iter[1].node_type and !(DEFAULT_MIGRATION_MESSAGES << :say_with_time).include? iter[1].message
+          if :iter == iter.node_type and :call == iter[1].node_type and !(DEFAULT_MIGRATION_MESSAGES << :say_with_time).include? iter[1].message
             add_error("use say with time in migrations", iter[1].file, iter[1].line)
           end
         end

data/lib/rails_best_practices/command.rb

@@ -44,7 +44,10 @@ runner.set_debug if options['debug']
 
 files = RailsBestPractices::analyze_files(ARGV, options)
 bar = ProgressBar.new('Analyzing', files.size)
-files.each { |file| runner.check_file(file); bar.inc }
+files.each do |file|
+  runner.check_file(file)
+  bar.inc unless options['debug']
+end
 bar.finish
 
 runner.errors.each {|error| puts error.to_s.red}

data/lib/rails_best_practices/core/runner.rb

@@ -23,12 +23,13 @@ module RailsBestPractices
       end
 
       def check(filename, content)
-        if filename =~ /.*\.erb/
+        puts filename if @debug
+        if filename =~ /.*\.erb$/
           content = ERB.new(content).src
           # remove the coding line which exists in Ruby 1.9
           content.gsub!(/#coding:US-ASCII\n/, '')
         end
-        if filename =~ /.*\.haml/
+        if filename =~ /.*\.haml$/
           require 'haml'
           content = Haml::Engine.new(content).precompiled
           # remove \xxx characters
@@ -55,7 +56,6 @@ module RailsBestPractices
       private
 
       def parse(filename, content)
-        puts filename if @debug
         begin
           RubyParser.new.parse(content, filename)
         rescue Exception => e

data/lib/rails_best_practices/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module RailsBestPractices
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_best_practices
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Richard Huang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +08:00
+date: 2010-10-15 00:00:00 +08:00
 default_executable: rails_best_practices
 dependencies: 
 - !ruby/object:Gem::Dependency