rails_best_practices 0.2.10 → 0.2.11

data/Rakefile

@@ -27,7 +27,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.email = "flyerhzm@gmail.com"
   gemspec.homepage = "http://github.com/flyerhzm/rails_best_practices"
   gemspec.authors = ["Richard Huang"]
-  gemspec.add_dependency 'ruby_parser'
-  gemspec.add_dependency 'ruby2ruby'
+  gemspec.add_dependency 'ruby_parser', '>= 2.0.4'
+  gemspec.add_dependency 'ruby2ruby', '>= 1.2.4'
 end
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/lib/rails_best_practices/checks/add_model_virtual_attribute_check.rb

@@ -34,23 +34,28 @@ module RailsBestPractices
       
       def attribute_assignment(node)
         variable = node.subject
-        return if variable.nil?
+        arguments_node = nil
+        node.arguments.recursive_children do |child|
+          if :[] == child.message
+            arguments_node = child
+            break
+          end
+        end
+        return if variable.nil? or arguments_node.nil?
         @variables[variable] ||= []
-        @variables[variable] << {:message => node.message, :arguments => node.arguments}
+        @variables[variable] << {:message => node.message, :arguments => arguments_node}
       end
       
       def call_assignment(node)
         if node.message == :save
           variable = node.subject
-          add_error "add model virtual attribute (for #{node.subject.to_ruby})" if params_dup?(@variables[variable].collect {|h| h[:arguments] })
+          add_error "add model virtual attribute (for #{node.subject.to_ruby})" if params_dup?(@variables[variable].collect {|h| h[:arguments]})
         end
       end
       
       def params_dup?(nodes)
         return false if nodes.nil?
-        params_nodes = nodes.collect {|node| node.grep_nodes({:subject => s(:call, nil, :params, s(:arglist)), :message => :[]}).first}.compact
-        params_arguments = params_nodes.collect{|node| node.arguments}
-        !params_arguments.dups.empty?
+        !nodes.dups.empty?
       end
     end
   end

data/lib/rails_best_practices/checks/check.rb

@@ -16,8 +16,8 @@ module RailsBestPractices
       NODE_TYPES.each do |node|
         start_node_method = "evaluate_start_#{node}"
         end_node_method = "evaluate_end_#{node}"
-        define_method(start_node_method) { } unless self.respond_to?(start_node_method)
-        define_method(end_node_method) { } unless self.respond_to?(end_node_method)
+        define_method(start_node_method) { |node| } unless self.respond_to?(start_node_method)
+        define_method(end_node_method) { |node| } unless self.respond_to?(end_node_method)
       end
 
       def position(offset = 0)

data/lib/rails_best_practices/command.rb

@@ -1,8 +1,7 @@
 require 'optparse'
 
 def expand_dirs_to_files *dirs
-  # extensions = ['rb', 'erb', 'builder']
-  extensions = ['rb', 'builder']
+  extensions = ['rb', 'erb', 'builder']
 
   dirs.flatten.map { |p|
     if File.directory? p
@@ -10,8 +9,12 @@ def expand_dirs_to_files *dirs
     else
       p
     end
-  }.flatten.sort { |a, b|
-    # for law_of_demeter_check
+  }.flatten
+end
+
+# for law_of_demeter_check
+def model_first_sort files
+  files.sort { |a, b|
     if a =~ /models\/.*rb/
       -1
     elsif b =~ /models\/.*rb/
@@ -23,13 +26,13 @@ def expand_dirs_to_files *dirs
 end
 
 # for always_add_db_index_check
-def add_duplicate_migration_files files
+def add_duplicate_migrations files
   migration_files = files.select { |file| file.index("db/migrate") }
   (files << migration_files).flatten
 end
 
-def ignore_vendor_directories files
-  files.reject { |file| file.index("vendor/") }
+def ignore_files files, pattern
+  files.reject { |file| file.index(pattern) }
 end
 
 options = {}
@@ -39,7 +42,13 @@ OptionParser.new do |opts|
   opts.on("-d", "--debug", "Debug mode") do
     options['debug'] = true
   end
-  
+
+  ['vendor', 'spec', 'test', 'stories'].each do |pattern|
+    opts.on("--#{pattern}", "include #{pattern} files") do
+      options[pattern] = true
+    end
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -50,7 +59,15 @@ end
 
 runner = RailsBestPractices::Core::Runner.new
 runner.set_debug if options['debug']
-ignore_vendor_directories(add_duplicate_migration_files(expand_dirs_to_files(ARGV))).each { |file| runner.check_file(file) }
+
+files = expand_dirs_to_files(ARGV)
+files = model_first_sort(files)
+files = add_duplicate_migrations(files)
+['vendor', 'spec', 'test', 'stories'].each do |pattern|
+  files = ignore_files(files, "#{pattern}/") unless options[pattern]
+end
+files.each { |file| runner.check_file(file) }
+
 runner.errors.each {|error| puts error}
 puts "\nFound #{runner.errors.size} errors."
 

data/lib/rails_best_practices/core/runner.rb

@@ -18,7 +18,6 @@ module RailsBestPractices
         @checks = checks unless checks.empty?
         @checks ||= load_checks
         @checker ||= CheckingVisitor.new(@checks)
-        @parser = RubyParser.new
         @debug = false
       end
       
@@ -53,7 +52,7 @@ module RailsBestPractices
       def parse(filename, content)
         puts filename if @debug
         begin
-          @parser.parse(content, filename)
+          RubyParser.new.parse(content, filename)
         rescue Exception => e
           puts "#{filename} looks like it's not a valid Ruby file.  Skipping..."
           nil

data/rails_best_practices.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_best_practices}
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
@@ -80,23 +80,23 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{check rails files according to ihower's presentation 'rails best practices'}
   s.test_files = [
-    "spec/rails_best_practices/checks/add_model_virtual_attribute_check_spec.rb",
-     "spec/rails_best_practices/checks/always_add_db_index_check_spec.rb",
-     "spec/rails_best_practices/checks/isolate_seed_data_check_spec.rb",
+    "spec/rails_best_practices/checks/use_scope_access_check_spec.rb",
+     "spec/rails_best_practices/checks/not_use_default_route_check_spec.rb",
+     "spec/rails_best_practices/checks/add_model_virtual_attribute_check_spec.rb",
      "spec/rails_best_practices/checks/keep_finders_on_their_own_model_check_spec.rb",
-     "spec/rails_best_practices/checks/law_of_demeter_check_spec.rb",
+     "spec/rails_best_practices/checks/use_model_callback_check_spec.rb",
+     "spec/rails_best_practices/checks/isolate_seed_data_check_spec.rb",
      "spec/rails_best_practices/checks/many_to_many_collection_check_spec.rb",
-     "spec/rails_best_practices/checks/move_finder_to_named_scope_check_spec.rb",
+     "spec/rails_best_practices/checks/use_model_association_check_spec.rb",
      "spec/rails_best_practices/checks/move_model_logic_into_model_check_spec.rb",
-     "spec/rails_best_practices/checks/needless_deep_nesting_check_spec.rb",
-     "spec/rails_best_practices/checks/nested_model_forms_check_spec.rb",
-     "spec/rails_best_practices/checks/not_use_default_route_check_spec.rb",
-     "spec/rails_best_practices/checks/overuse_route_customizations_check_spec.rb",
+     "spec/rails_best_practices/checks/law_of_demeter_check_spec.rb",
      "spec/rails_best_practices/checks/replace_complex_creation_with_factory_method_check_spec.rb",
-     "spec/rails_best_practices/checks/use_model_association_check_spec.rb",
-     "spec/rails_best_practices/checks/use_model_callback_check_spec.rb",
+     "spec/rails_best_practices/checks/nested_model_forms_check_spec.rb",
      "spec/rails_best_practices/checks/use_observer_check_spec.rb",
-     "spec/rails_best_practices/checks/use_scope_access_check_spec.rb",
+     "spec/rails_best_practices/checks/move_finder_to_named_scope_check_spec.rb",
+     "spec/rails_best_practices/checks/needless_deep_nesting_check_spec.rb",
+     "spec/rails_best_practices/checks/overuse_route_customizations_check_spec.rb",
+     "spec/rails_best_practices/checks/always_add_db_index_check_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -105,15 +105,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby_parser>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby2ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby_parser>, [">= 2.0.4"])
+      s.add_runtime_dependency(%q<ruby2ruby>, [">= 1.2.4"])
     else
-      s.add_dependency(%q<ruby_parser>, [">= 0"])
-      s.add_dependency(%q<ruby2ruby>, [">= 0"])
+      s.add_dependency(%q<ruby_parser>, [">= 2.0.4"])
+      s.add_dependency(%q<ruby2ruby>, [">= 1.2.4"])
     end
   else
-    s.add_dependency(%q<ruby_parser>, [">= 0"])
-    s.add_dependency(%q<ruby2ruby>, [">= 0"])
+    s.add_dependency(%q<ruby_parser>, [">= 2.0.4"])
+    s.add_dependency(%q<ruby2ruby>, [">= 1.2.4"])
   end
 end
 

data/spec/rails_best_practices/checks/add_model_virtual_attribute_check_spec.rb

@@ -75,4 +75,39 @@ describe RailsBestPractices::Checks::AddModelVirtualAttributeCheck do
     errors = @runner.errors
     errors.should be_empty
   end
+
+  it "should add model virtual attribute with two dimension params" do
+    content = <<-EOF
+    class UsersController < ApplicationController
+
+      def create
+        @user = User.new(params[:user])
+        @user.first_name = params[:user][:full_name].split(' ', 2).first
+        @user.last_name = params[:user][:full_name].split(' ', 2).last
+        @user.save
+      end
+    end
+    EOF
+    @runner.check('app/controllers/users_controller.rb', content)
+    errors = @runner.errors
+    errors.should_not be_empty
+    errors[0].to_s.should == "app/controllers/users_controller.rb:3 - add model virtual attribute (for @user)"
+  end
+
+  it "should no add model virtual attribute with two dimension params" do
+    content = <<-EOF
+    class UsersController < ApplicationController
+
+      def create
+        @user = User.new(params[:user])
+        @user.first_name = params[:user][:first_name]
+        @user.last_name = params[:user][:last_name]
+        @user.save
+      end
+    end
+    EOF
+    @runner.check('app/controllers/users_controller.rb', content)
+    errors = @runner.errors
+    errors.should be_empty
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_best_practices
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors: 
 - Richard Huang
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.4
     version: 
 description: check rails files according to ihower's presentation 'rails best practices'
 email: flyerhzm@gmail.com
@@ -125,21 +125,21 @@ signing_key:
 specification_version: 3
 summary: check rails files according to ihower's presentation 'rails best practices'
 test_files: 
+- spec/rails_best_practices/checks/use_scope_access_check_spec.rb
+- spec/rails_best_practices/checks/not_use_default_route_check_spec.rb
 - spec/rails_best_practices/checks/add_model_virtual_attribute_check_spec.rb
-- spec/rails_best_practices/checks/always_add_db_index_check_spec.rb
-- spec/rails_best_practices/checks/isolate_seed_data_check_spec.rb
 - spec/rails_best_practices/checks/keep_finders_on_their_own_model_check_spec.rb
-- spec/rails_best_practices/checks/law_of_demeter_check_spec.rb
+- spec/rails_best_practices/checks/use_model_callback_check_spec.rb
+- spec/rails_best_practices/checks/isolate_seed_data_check_spec.rb
 - spec/rails_best_practices/checks/many_to_many_collection_check_spec.rb
-- spec/rails_best_practices/checks/move_finder_to_named_scope_check_spec.rb
+- spec/rails_best_practices/checks/use_model_association_check_spec.rb
 - spec/rails_best_practices/checks/move_model_logic_into_model_check_spec.rb
-- spec/rails_best_practices/checks/needless_deep_nesting_check_spec.rb
-- spec/rails_best_practices/checks/nested_model_forms_check_spec.rb
-- spec/rails_best_practices/checks/not_use_default_route_check_spec.rb
-- spec/rails_best_practices/checks/overuse_route_customizations_check_spec.rb
+- spec/rails_best_practices/checks/law_of_demeter_check_spec.rb
 - spec/rails_best_practices/checks/replace_complex_creation_with_factory_method_check_spec.rb
-- spec/rails_best_practices/checks/use_model_association_check_spec.rb
-- spec/rails_best_practices/checks/use_model_callback_check_spec.rb
+- spec/rails_best_practices/checks/nested_model_forms_check_spec.rb
 - spec/rails_best_practices/checks/use_observer_check_spec.rb
-- spec/rails_best_practices/checks/use_scope_access_check_spec.rb
+- spec/rails_best_practices/checks/move_finder_to_named_scope_check_spec.rb
+- spec/rails_best_practices/checks/needless_deep_nesting_check_spec.rb
+- spec/rails_best_practices/checks/overuse_route_customizations_check_spec.rb
+- spec/rails_best_practices/checks/always_add_db_index_check_spec.rb
 - spec/spec_helper.rb