rails_best_practices 0.3.0 → 0.4.0

data/lib/rails_best_practices/checks/overuse_route_customizations_check.rb

@@ -8,7 +8,7 @@ module RailsBestPractices
     class OveruseRouteCustomizationsCheck < Check
       
       def interesting_nodes
-        [:call]
+        [:call, :iter]
       end
       
       def interesting_files
@@ -21,19 +21,32 @@ module RailsBestPractices
       end
       
       def evaluate_start(node)
-        if s(:lvar, :map) == node.subject and :resources == node.message
-          add_error "overuse route customizations (customize_count > #{@customize_count})" if member_and_collection_count(node) > @customize_count
-        end
+        add_error "overuse route customizations (customize_count > #{@customize_count})", node.file, node.subject.line if member_and_collection_count(node) > @customize_count
       end
 
       private
+        def member_and_collection_count(node)
+          if :resources == node.message
+            member_and_collection_count_for_rails2(node)
+          elsif :iter == node.node_type and :resources == node.subject.message
+            member_and_collection_count_for_rails3(node)
+          end
+        end
 
-      def member_and_collection_count(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)
-      end
+        # this is the checker for rails3 style routes
+        def member_and_collection_count_for_rails3(node)
+          get_nodes = node.grep_nodes(:node_type => :call, :message => :get)
+          post_nodes = node.grep_nodes(:node_type => :call, :message => :post)
+          get_nodes.size + post_nodes.size
+        end
+        
+        # this is the checker for rails2 style routes
+        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)
+        end
     end
   end
 end

data/lib/rails_best_practices/checks/replace_instance_variable_with_local_variable_check.rb

@@ -20,4 +20,4 @@ module RailsBestPractices
       end
     end
   end
-end
+end

data/lib/rails_best_practices/checks/{use_filter_check.rb → use_before_filter_check.rb}

@@ -2,10 +2,10 @@ require 'rails_best_practices/checks/check'
 
 module RailsBestPractices
   module Checks
-    # Check a controller file to make sure to use filter to remove duplicate call in different action.
+    # Check a controller file to make sure to use before_filter to remove duplicate call in different action.
     #
-    # Implementation: Check all methods' first call, if they are duplicate, then should use filter.
-    class UseFilterCheck < Check
+    # Implementation: Check all methods' first call, if they are duplicate, then should use before_filter.
+    class UseBeforeFilterCheck < Check
 
       def interesting_nodes
         [:class]
@@ -18,19 +18,21 @@ module RailsBestPractices
       def evaluate_start(node)
         @methods = {}
         node.grep_nodes({:node_type => :defn}).each { |method_node| remember_method(method_node) }
-        @methods.each do |first_call, method_names|
-          add_error "use filter for #{first_call.to_ruby} in #{method_names.join(',')}" if method_names.size > 1
+        @methods.each do |first_call, method_nodes|
+          if method_nodes.size > 1
+            add_error "use before_filter for #{method_nodes.collect{|method_node| method_node.message_name}.join(',')}", 
+              node.file, method_nodes.collect{|method_node| method_node.line}.join(',')
+          end
         end
       end
 
       private
 
       def remember_method(method_node)
-        method_name = method_node.message_name
         first_call = method_node.body[1]
         unless first_call == s(:nil)
           @methods[first_call] ||= []
-          @methods[first_call] << method_name
+          @methods[first_call] << method_node
         end
       end
     end

data/lib/rails_best_practices/checks/use_scope_access_check.rb

@@ -30,7 +30,7 @@ module RailsBestPractices
       end
       
       def current_user?(call_node)
-        call_node.message == :current_user or (call_node.subject.message == :current_user and call_node.message == :id)
+        call_node.node_type == :call and (call_node.message == :current_user or (call_node.subject.message == :current_user and call_node.message == :id))
       end
       
     end

data/lib/rails_best_practices/checks.rb

@@ -2,11 +2,8 @@ require 'rails_best_practices/checks/move_finder_to_named_scope_check'
 require 'rails_best_practices/checks/use_model_association_check'
 require 'rails_best_practices/checks/use_scope_access_check'
 require 'rails_best_practices/checks/add_model_virtual_attribute_check'
-require 'rails_best_practices/checks/use_model_callback_check'
 require 'rails_best_practices/checks/replace_complex_creation_with_factory_method_check'
 require 'rails_best_practices/checks/move_model_logic_into_model_check'
-require 'rails_best_practices/checks/many_to_many_collection_check'
-require 'rails_best_practices/checks/nested_model_forms_check'
 require 'rails_best_practices/checks/overuse_route_customizations_check'
 require 'rails_best_practices/checks/needless_deep_nesting_check'
 require 'rails_best_practices/checks/not_use_default_route_check'
@@ -15,7 +12,8 @@ require 'rails_best_practices/checks/law_of_demeter_check'
 require 'rails_best_practices/checks/use_observer_check'
 require 'rails_best_practices/checks/isolate_seed_data_check'
 require 'rails_best_practices/checks/always_add_db_index_check'
-require 'rails_best_practices/checks/use_filter_check'
+require 'rails_best_practices/checks/use_before_filter_check'
 require 'rails_best_practices/checks/move_code_into_controller_check'
+require 'rails_best_practices/checks/move_code_into_model_check'
 require 'rails_best_practices/checks/move_code_into_helper_check'
 require 'rails_best_practices/checks/replace_instance_variable_with_local_variable_check'

data/lib/rails_best_practices/command.rb

@@ -1,39 +1,5 @@
 require 'optparse'
 
-def expand_dirs_to_files *dirs
-  extensions = ['rb', 'erb', 'builder']
-
-  dirs.flatten.map { |p|
-    if File.directory? p
-      Dir[File.join(p, '**', "*.{#{extensions.join(',')}}")]
-    else
-      p
-    end
-  }.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/
-      1
-    else
-      a <=> b
-    end
-  }
-end
-
-# for always_add_db_index_check
-def add_duplicate_migrations files
-  migration_files = files.select { |file| file.index("db/migrate") }
-  (files << migration_files).flatten
-end
-
-def ignore_files files, pattern
-  files.reject { |file| file.index(pattern) }
-end
 
 options = {}
 OptionParser.new do |opts|
@@ -48,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
@@ -60,17 +31,12 @@ end
 runner = RailsBestPractices::Core::Runner.new
 runner.set_debug if options['debug']
 
-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 = RailsBestPractices::analyze_files(ARGV, options)
 files.each { |file| runner.check_file(file) }
 
 runner.errors.each {|error| puts error}
+puts "\nPlease go to http://rails-bestpractices.com to see more useful Rails Best Practices."
 if runner.errors.size > 0
-  puts "\ngo to http://wiki.github.com/flyerhzm/rails_best_practices to see how to solve these errors."
   puts "\nFound #{runner.errors.size} errors."
 end
 

data/lib/rails_best_practices/core/checking_visitor.rb

@@ -1,9 +1,9 @@
 module RailsBestPractices
   module Core
     class CheckingVisitor
-      def initialize(*checks)
+      def initialize(checks)
         @checks ||= {}
-        checks.first.each do |check|
+        checks.each do |check|
           nodes = check.interesting_nodes
           nodes.each do |node|
             @checks[node] ||= []

data/lib/rails_best_practices/core/runner.rb

@@ -10,11 +10,7 @@ module RailsBestPractices
       CUSTOM_CONFIG = File.join('config', 'rails_best_practices.yml')
       
       def initialize(*checks)
-        if File.exists?(CUSTOM_CONFIG)
-          @config = CUSTOM_CONFIG
-        else
-          @config = DEFAULT_CONFIG
-        end
+        @config = File.exists?(CUSTOM_CONFIG) ? CUSTOM_CONFIG : DEFAULT_CONFIG
         @checks = checks unless checks.empty?
         @checks ||= load_checks
         @checker ||= CheckingVisitor.new(@checks)
@@ -26,9 +22,15 @@ module RailsBestPractices
       end
 
       def check(filename, content)
-        if filename =~ /.*erb/
+        if filename =~ /.*\.erb/
           content = ERB.new(content).src
         end
+        if filename =~ /.*\.haml/
+          require 'haml'
+          content = Haml::Engine.new(content).precompiled
+          # remove \xxx characters
+          content.gsub!(/\\\d{3}/, '')
+        end
         node = parse(filename, content)
         node.accept(@checker) if node
       end

data/lib/rails_best_practices/core/visitable_sexp.rb

@@ -47,13 +47,13 @@ class Sexp
   end
   
   def subject
-    if [:attrasgn, :call, :iasgn, :lasgn, :class].include? node_type
+    if [:attrasgn, :call, :iasgn, :lasgn, :class, :iter].include? node_type
       self[1]
     end
   end
   
   def message
-    if [:attrasgn, :call, :defs].include? node_type
+    if [:attrasgn, :call, :defs, :iter].include? node_type
       self[2]
     end
   end
@@ -70,6 +70,12 @@ class Sexp
     end
   end
   
+  def conditional_statement
+    if node_type == :if
+      self[1]
+    end
+  end
+  
   def true_node
     if :if == node_type
       self[2]

data/lib/rails_best_practices.rb

@@ -2,4 +2,44 @@ require 'rails_best_practices/checks'
 require 'rails_best_practices/core'
 
 module RailsBestPractices
-end
+  
+  class <<self
+    def analyze_files(dir = '.', options = {})
+      files = expand_dirs_to_files(dir)
+      files = model_first_sort(files)
+      ['vendor', 'spec', 'test', 'stories', 'features'].each do |pattern|
+        files = ignore_files(files, "#{pattern}/") unless options[pattern]
+      end
+      files
+    end
+  
+    def expand_dirs_to_files *dirs
+      extensions = ['rb', 'erb', 'haml', 'builder']
+
+      dirs.flatten.map { |p|
+        if File.directory? p
+          Dir[File.join(p, '**', "*.{#{extensions.join(',')}}")]
+        else
+          p
+        end
+      }.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/
+          1
+        else
+          a <=> b
+        end
+      }
+    end
+
+    def ignore_files files, pattern
+      files.reject { |file| file.index(pattern) }
+    end
+  end
+end

data/rails_best_practices.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_best_practices}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-11-10}
+  s.date = %q{2010-08-15}
   s.default_executable = %q{rails_best_practices}
-  s.description = %q{check rails files according to ihower's presentation 'rails best practices'}
+  s.description = %q{a code metric tool for rails codes.}
   s.email = %q{flyerhzm@gmail.com}
   s.executables = ["rails_best_practices"]
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/rails_best_practices",
+     "identifier",
      "lib/rails_best_practices.rb",
      "lib/rails_best_practices/checks.rb",
      "lib/rails_best_practices/checks/add_model_virtual_attribute_check.rb",
@@ -33,20 +34,18 @@ Gem::Specification.new do |s|
      "lib/rails_best_practices/checks/isolate_seed_data_check.rb",
      "lib/rails_best_practices/checks/keep_finders_on_their_own_model_check.rb",
      "lib/rails_best_practices/checks/law_of_demeter_check.rb",
-     "lib/rails_best_practices/checks/many_to_many_collection_check.rb",
      "lib/rails_best_practices/checks/move_code_into_controller_check.rb",
      "lib/rails_best_practices/checks/move_code_into_helper_check.rb",
+     "lib/rails_best_practices/checks/move_code_into_model_check.rb",
      "lib/rails_best_practices/checks/move_finder_to_named_scope_check.rb",
      "lib/rails_best_practices/checks/move_model_logic_into_model_check.rb",
      "lib/rails_best_practices/checks/needless_deep_nesting_check.rb",
-     "lib/rails_best_practices/checks/nested_model_forms_check.rb",
      "lib/rails_best_practices/checks/not_use_default_route_check.rb",
      "lib/rails_best_practices/checks/overuse_route_customizations_check.rb",
      "lib/rails_best_practices/checks/replace_complex_creation_with_factory_method_check.rb",
      "lib/rails_best_practices/checks/replace_instance_variable_with_local_variable_check.rb",
-     "lib/rails_best_practices/checks/use_filter_check.rb",
+     "lib/rails_best_practices/checks/use_before_filter_check.rb",
      "lib/rails_best_practices/checks/use_model_association_check.rb",
-     "lib/rails_best_practices/checks/use_model_callback_check.rb",
      "lib/rails_best_practices/checks/use_observer_check.rb",
      "lib/rails_best_practices/checks/use_scope_access_check.rb",
      "lib/rails_best_practices/command.rb",
@@ -63,52 +62,48 @@ Gem::Specification.new do |s|
      "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/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/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_filter_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/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.opts",
      "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/flyerhzm/rails_best_practices}
+  s.homepage = %q{http://rails-bestpractices.com}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{check rails files according to ihower's presentation 'rails best practices'}
+  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/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/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_finder_to_named_scope_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/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/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/always_add_db_index_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/add_model_virtual_attribute_check_spec.rb",
      "spec/rails_best_practices/checks/replace_instance_variable_with_local_variable_check_spec.rb",
-     "spec/rails_best_practices/checks/use_filter_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/use_observer_check_spec.rb",
-     "spec/rails_best_practices/checks/use_scope_access_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/spec_helper.rb"
   ]
 

data/rails_best_practices.yml

@@ -2,11 +2,8 @@ MoveFinderToNamedScopeCheck: { }
 UseModelAssociationCheck: { }
 UseScopeAccessCheck: { }
 AddModelVirtualAttributeCheck: { }
-# UseModelCallbackCheck: { }
 ReplaceComplexCreationWithFactoryMethodCheck: { attribute_assignment_count: 2 }
 MoveModelLogicIntoModelCheck: { called_count: 4 }
-# ManyToManyCollectionCheck: { }
-# NestedModelFormsCheck: { }
 OveruseRouteCustomizationsCheck: { customize_count: 3 }
 NeedlessDeepNestingCheck: { nested_count: 2 }
 NotUseDefaultRouteCheck: {  }
@@ -15,7 +12,8 @@ LawOfDemeterCheck: { }
 UseObserverCheck: { }
 IsolateSeedDataCheck: { }
 AlwaysAddDbIndexCheck: { }
-UseFilterCheck: { }
+UseBeforeFilterCheck: { }
 MoveCodeIntoControllerCheck: { }
-MoveCodeIntoHelperCheck: { }
+MoveCodeIntoModelCheck: { }
+MoveCodeIntoHelperCheck: { array_count: 3 }
 ReplaceInstanceVariableWithLocalVariableCheck: { }

data/spec/rails_best_practices/checks/always_add_db_index_check_spec.rb

@@ -7,147 +7,67 @@ describe RailsBestPractices::Checks::AlwaysAddDbIndexCheck do
 
   it "should always add db index" do
     content = <<-EOF
-    class CreateComments < ActiveRecord::Migration
-      def self.up
-        create_table "comments", :force => true do |t|
-          t.string :content
-          t.integer :post_id
-          t.integer :user_id
-        end
-      end
-
-      def self.down
-        drop_table "comments"
+    ActiveRecord::Schema.define(:version => 20100603080629) do
+      create_table "comments", :force => true do |t|
+        t.string "content"
+        t.integer "post_id"
+        t.integer "user_id"
       end
     end
     EOF
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
+    @runner.check('db/schema.rb', content)
     errors = @runner.errors
     errors.should_not be_empty
-    errors[0].to_s.should == "db/migrate/20090918130258_create_comments.rb:2 - always add db index (comments => post_id, comments => user_id)"
+    errors[0].to_s.should == "db/schema.rb:4 - always add db index (comments => post_id)"
+    errors[1].to_s.should == "db/schema.rb:5 - always add db index (comments => user_id)"
   end
-
+  
   it "should always add db index with column has no id" do
     content = <<-EOF
-    class CreateComments < ActiveRecord::Migration
-      def self.up
-        create_table "comments", :force => true do |t|
-          t.string :content
-          t.integer :position
-        end
-      end
-
-      def self.down
-        drop_table "comments"
+    ActiveRecord::Schema.define(:version => 20100603080629) do
+      create_table "comments", :force => true do |t|
+        t.string "content"
+        t.integer "position"
       end
     end
     EOF
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
+    @runner.check('db/schema.rb', content)
     errors = @runner.errors
     errors.should be_empty
   end
-
-  it "should always add db index with references" do
-    content = <<-EOF
-    class CreateComments < ActiveRecord::Migration
-      def self.up
-        create_table "comments", :force => true do |t|
-          t.string :content
-          t.references :post
-          t.references :user
-        end
-      end
-
-      def self.down
-        drop_table "comments"
-      end
-    end
-    EOF
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    errors = @runner.errors
-    errors.should_not be_empty
-    errors[0].to_s.should == "db/migrate/20090918130258_create_comments.rb:2 - always add db index (comments => post_id, comments => user_id)"
-  end
-
-  it "should always add db index with column" do
-    content = <<-EOF
-    class CreateComments < ActiveRecord::Migration
-      def self.up
-        create_table "comments", :force => true do |t|
-          t.string :content
-          t.column :post_id, :integer
-          t.column :user_id, :integer
-        end
-      end
-
-      def self.down
-        drop_table "comments"
-      end
-    end
-    EOF
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    errors = @runner.errors
-    errors.should_not be_empty
-    errors[0].to_s.should == "db/migrate/20090918130258_create_comments.rb:2 - always add db index (comments => post_id, comments => user_id)"
-  end
-
+  
   it "should not always add db index with add_index" do
     content = <<-EOF
-    class CreateComments < ActiveRecord::Migration
-      def self.up
-        create_table "comments", :force => true do |t|
-          t.string :content
-          t.integer :post_id
-          t.integer :user_id
-        end
-
-        add_index :comments, :post_id
-        add_index :comments, :user_id
+    ActiveRecord::Schema.define(:version => 20100603080629) do
+      create_table "comments", :force => true do |t|
+        t.string "content"
+        t.integer "post_id"
+        t.integer "user_id"
       end
 
-      def self.down
-        drop_table "comments"
-      end
+      add_index "comments", ["post_id"], :name => "index_comments_on_post_id"
+      add_index "comments", ["user_id"], :name => "index_comments_on_user_id"
     end
     EOF
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
+    @runner.check('db/schema.rb', content)
     errors = @runner.errors
     errors.should be_empty
   end
 
-  it "should not always add db index with add_index in another migration file" do
+  it "should not always add db index with multi-column index" do
     content = <<-EOF
-    class CreateComments < ActiveRecord::Migration
-      def self.up
-        create_table "comments", :force => true do |t|
-          t.string :content
-          t.integer :post_id
-          t.integer :user_id
-        end
+    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
 
-      def self.down
-        drop_table "comments"
-      end
+      add_index "versions", ["versioned_id", "versioned_type"], :name => "index_versions_on_versioned_id_and_versioned_type"
     end
     EOF
-    add_index_content = <<-EOF
-    class AddIndexesToComments < ActiveRecord::Migration
-      def self.up
-        add_index :comments, :post_id
-        add_index :comments, :user_id
-      end
-    end
-    EOF
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    @runner.check('db/migrate/20090919130258_add_indexes_to_comments.rb', content)
-    @runner.check('db/migrate/20090918130258_create_comments.rb', content)
-    @runner.check('db/migrate/20090919130258_add_indexes_to_comments.rb', content)
+    @runner.check('db/schema.rb', content)
     errors = @runner.errors
+    errors.should be_empty
   end
 end