rails_best_practices 0.3.26 → 0.3.27

data/VERSION

@@ -1 +1 @@
-0.3.26
+0.3.27

data/lib/rails_best_practices/checks/always_add_db_index_check.rb

@@ -40,13 +40,15 @@ module RailsBestPractices
         def find_index_columns(node)
           node.grep_nodes({:node_type => :call, :message => :add_index}).each do |index_node|
             table_name = index_node.arguments[1].to_ruby_string
-            reference_column_name = index_node.arguments[2].to_ruby_string
-            @index_columns << [table_name, reference_column_name]
+            reference_column = eval(index_node.arguments[2].to_ruby)
+            @index_columns << [table_name, reference_column]
           end
         end
         
         def indexed?(table_name, column_name)
-          !!@index_columns.find { |reference| reference[0] == table_name and reference[1] == column_name }
+          !!@index_columns.find do |reference|
+            reference[0] == table_name and reference[1].class == String ? reference[1] == column_name : reference[1].include?(column_name)
+          end
         end
     end
   end

data/lib/rails_best_practices/command.rb

@@ -14,6 +14,11 @@ OptionParser.new do |opts|
       options[pattern] = true
     end
   end
+  
+  opts.on_tail('-v', '--version', 'Show this version') do
+    puts File.read(File.dirname(__FILE__) + '/../../VERSION')
+    exit
+  end
 
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts

data/rails_best_practices.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_best_practices}
-  s.version = "0.3.26"
+  s.version = "0.3.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-07-25}
+  s.date = %q{2010-08-13}
   s.default_executable = %q{rails_best_practices}
   s.description = %q{a code metric tool for rails codes.}
   s.email = %q{flyerhzm@gmail.com}
@@ -91,28 +91,28 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{a code metric tool for rails codes.}
   s.test_files = [
-    "spec/rails_best_practices/checks/isolate_seed_data_check_spec.rb",
-     "spec/rails_best_practices/checks/move_model_logic_into_model_check_spec.rb",
-     "spec/rails_best_practices/checks/move_code_into_helper_check_spec.rb",
-     "spec/rails_best_practices/checks/move_code_into_controller_check_spec.rb",
-     "spec/rails_best_practices/checks/use_observer_check_spec.rb",
-     "spec/rails_best_practices/checks/overuse_route_customizations_check_spec.rb",
-     "spec/rails_best_practices/checks/nested_model_forms_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/many_to_many_collection_check_spec.rb",
-     "spec/rails_best_practices/checks/use_before_filter_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_scope_access_check_spec.rb",
-     "spec/rails_best_practices/checks/replace_complex_creation_with_factory_method_check_spec.rb",
-     "spec/rails_best_practices/checks/not_use_default_route_check_spec.rb",
+     "spec/rails_best_practices/checks/many_to_many_collection_check_spec.rb",
+     "spec/rails_best_practices/checks/move_code_into_controller_check_spec.rb",
+     "spec/rails_best_practices/checks/move_code_into_helper_check_spec.rb",
+     "spec/rails_best_practices/checks/move_code_into_model_check_spec.rb",
      "spec/rails_best_practices/checks/move_finder_to_named_scope_check_spec.rb",
-     "spec/rails_best_practices/checks/use_model_callback_check_spec.rb",
-     "spec/rails_best_practices/checks/add_model_virtual_attribute_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/replace_complex_creation_with_factory_method_check_spec.rb",
      "spec/rails_best_practices/checks/replace_instance_variable_with_local_variable_check_spec.rb",
+     "spec/rails_best_practices/checks/use_before_filter_check_spec.rb",
      "spec/rails_best_practices/checks/use_model_association_check_spec.rb",
-     "spec/rails_best_practices/checks/move_code_into_model_check_spec.rb",
-     "spec/rails_best_practices/checks/needless_deep_nesting_check_spec.rb",
-     "spec/rails_best_practices/checks/keep_finders_on_their_own_model_check_spec.rb",
+     "spec/rails_best_practices/checks/use_model_callback_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/spec_helper.rb"
   ]
 

data/spec/rails_best_practices/checks/always_add_db_index_check_spec.rb

@@ -53,4 +53,21 @@ describe RailsBestPractices::Checks::AlwaysAddDbIndexCheck do
     errors = @runner.errors
     errors.should be_empty
   end
+
+  it "should not always add db index with multi-column index" do
+    content = <<-EOF
+    ActiveRecord::Schema.define(:version => 20100603080629) do
+      create_table "versions", :force => true do |t|
+        t.integer  "versioned_id"
+        t.string   "versioned_type"
+        t.string   "tag"
+      end
+
+      add_index "versions", ["versioned_id", "versioned_type"], :name => "index_versions_on_versioned_id_and_versioned_type"
+    end
+    EOF
+    @runner.check('db/schema.rb', content)
+    errors = @runner.errors
+    errors.should be_empty
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 26
-  version: 0.3.26
+  - 27
+  version: 0.3.27
 platform: ruby
 authors: 
 - Richard Huang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 +08:00
+date: 2010-08-13 00:00:00 +08:00
 default_executable: rails_best_practices
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,26 +151,26 @@ signing_key:
 specification_version: 3
 summary: a code metric tool for rails codes.
 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/move_model_logic_into_model_check_spec.rb
-- spec/rails_best_practices/checks/move_code_into_helper_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/many_to_many_collection_check_spec.rb
 - spec/rails_best_practices/checks/move_code_into_controller_check_spec.rb
-- spec/rails_best_practices/checks/use_observer_check_spec.rb
-- spec/rails_best_practices/checks/overuse_route_customizations_check_spec.rb
+- spec/rails_best_practices/checks/move_code_into_helper_check_spec.rb
+- spec/rails_best_practices/checks/move_code_into_model_check_spec.rb
+- spec/rails_best_practices/checks/move_finder_to_named_scope_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/always_add_db_index_check_spec.rb
-- spec/rails_best_practices/checks/many_to_many_collection_check_spec.rb
-- spec/rails_best_practices/checks/use_before_filter_check_spec.rb
-- spec/rails_best_practices/checks/law_of_demeter_check_spec.rb
-- spec/rails_best_practices/checks/use_scope_access_check_spec.rb
-- spec/rails_best_practices/checks/replace_complex_creation_with_factory_method_check_spec.rb
 - spec/rails_best_practices/checks/not_use_default_route_check_spec.rb
-- spec/rails_best_practices/checks/move_finder_to_named_scope_check_spec.rb
-- spec/rails_best_practices/checks/use_model_callback_check_spec.rb
-- spec/rails_best_practices/checks/add_model_virtual_attribute_check_spec.rb
+- spec/rails_best_practices/checks/overuse_route_customizations_check_spec.rb
+- spec/rails_best_practices/checks/replace_complex_creation_with_factory_method_check_spec.rb
 - spec/rails_best_practices/checks/replace_instance_variable_with_local_variable_check_spec.rb
+- spec/rails_best_practices/checks/use_before_filter_check_spec.rb
 - spec/rails_best_practices/checks/use_model_association_check_spec.rb
-- spec/rails_best_practices/checks/move_code_into_model_check_spec.rb
-- spec/rails_best_practices/checks/needless_deep_nesting_check_spec.rb
-- spec/rails_best_practices/checks/keep_finders_on_their_own_model_check_spec.rb
+- spec/rails_best_practices/checks/use_model_callback_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/spec_helper.rb