rails_best_practices 0.3.7 → 0.3.8

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/rails_best_practices/checks/always_add_db_index_check.rb

@@ -46,29 +46,31 @@ module RailsBestPractices
 
       private
 
-      def check_references(node)
-        create_table_node = node.grep_nodes({:node_type => :call, :message => :create_table}).first
-        if create_table_node
-          table_name = create_table_node.arguments[1].to_ruby_string
-          node.grep_nodes({:node_type => :call, :message => :integer}).each do |integer_node|
-            column_name = integer_node.arguments[1].to_ruby_string
-            if column_name =~ /_id$/ and !@@indexes[table_name].include? column_name
-              add_error "always add db index (#{table_name} => #{column_name})"
-            end
-          end
-          node.grep_nodes({:node_type => :call, :message => :references}).each do |references_node|
-            column_name = references_node.arguments[1].to_ruby_string + "_id"
-            if !@@indexes[table_name].include? column_name
-              add_error "always add db index (#{table_name} => #{column_name})"
-            end
-          end
-          node.grep_nodes({:node_type => :call, :message => :column}).each do |column_node|
-            if 'integer' == column_node.arguments[2].to_ruby_string
-              column_name = column_node.arguments[1].to_ruby_string
+      def check_references(nodes)
+        nodes[1..-1].each do |node|
+          create_table_node = node.grep_nodes({:node_type => :call, :message => :create_table}).first
+          if create_table_node
+            table_name = create_table_node.arguments[1].to_ruby_string
+            node.grep_nodes({:node_type => :call, :message => :integer}).each do |integer_node|
+              column_name = integer_node.arguments[1].to_ruby_string
               if column_name =~ /_id$/ and !@@indexes[table_name].include? column_name
                 add_error "always add db index (#{table_name} => #{column_name})"
               end
             end
+            node.grep_nodes({:node_type => :call, :message => :references}).each do |references_node|
+              column_name = references_node.arguments[1].to_ruby_string + "_id"
+              if !@@indexes[table_name].include? column_name
+                add_error "always add db index (#{table_name} => #{column_name})"
+              end
+            end
+            node.grep_nodes({:node_type => :call, :message => :column}).each do |column_node|
+              if 'integer' == column_node.arguments[2].to_ruby_string
+                column_name = column_node.arguments[1].to_ruby_string
+                if column_name =~ /_id$/ and !@@indexes[table_name].include? column_name
+                  add_error "always add db index (#{table_name} => #{column_name})"
+                end
+              end
+            end
           end
         end
       end
@@ -79,7 +81,7 @@ module RailsBestPractices
       #   add_index *args
       # end
       def remember_indexes(nodes)
-        nodes.each do |node|
+        nodes[1..-1].each do |node|
           begin
             eval(node.to_ruby)
           rescue Exception

data/rails_best_practices.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_best_practices}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-11-25}
+  s.date = %q{2009-11-26}
   s.default_executable = %q{rails_best_practices}
   s.description = %q{check rails files according to ihower's presentation 'rails best practices'}
   s.email = %q{flyerhzm@gmail.com}

data/spec/rails_best_practices/checks/always_add_db_index_check_spec.rb

@@ -193,4 +193,29 @@ describe RailsBestPractices::Checks::AlwaysAddDbIndexCheck do
     @runner.check('db/migrate/20090706091635_move_categories_to_profile_area.rb', content)
     errors = @runner.errors
   end
+  
+  it "should always add db index without duplicate error outputs" do
+    content = <<-EOF
+    class AllTables < ActiveRecord::Migration
+      def self.up
+        create_table "ducks" do |t|
+          t.column "registration", :string, :limit => 32
+          t.column "description",  :string
+        end
+
+        create_table "lab_data" do |t|
+          t.integer "input_biologist_id", :null => true
+          t.integer "owner_biologist_id", :null => false
+          t.column "remark",             :string,   :limit => 250
+        end
+      end
+    end
+    EOF
+    @runner.check('db/migrate/20090204160203_all_tables.rb', content)
+    @runner.check('db/migrate/20090204160203_all_tables.rb', content)
+    errors = @runner.errors
+    errors.should_not be_empty
+    errors[0].to_s.should == "db/migrate/20090204160203_all_tables.rb:2 - always add db index (lab_data => input_biologist_id)"
+    errors[1].to_s.should == "db/migrate/20090204160203_all_tables.rb:2 - always add db index (lab_data => owner_biologist_id)"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_best_practices
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 +08:00
+date: 2009-11-26 00:00:00 +08:00
 default_executable: rails_best_practices
 dependencies: 
 - !ruby/object:Gem::Dependency