fix bugs against Rails 2.3.14

Author: alexch

lib/annotate/annotate_models.rb

@@ -317,7 +317,10 @@ def get_model_class(file)
     # Retrieve loaded model class by path to the file where it's supposed to be defined.
     def get_loaded_model(model_path)
       ObjectSpace.each_object.
-        select { |c| c.is_a?(Class) && c.ancestors.include?(ActiveRecord::Base) }.
+        select { |c|
+          Class === c and    # note: we use === to avoid a bug in activesupport 2.3.14 OptionMerger vs. is_a?
+          c.ancestors.include?(ActiveRecord::Base) 
+        }.
         detect { |c| ActiveSupport::Inflector.underscore(c) == model_path }
     end
 
@@ -357,6 +360,8 @@ def do_annotations(options={})
         rescue Exception => e
           # todo: check if all backtrace lines are in "gems" -- if so, it's an annotate bug, so print the whole stack trace.
           puts "Unable to annotate #{file}: #{e.message} (#{e.backtrace.first})"
+          # todo: save this backtrace somewhere nice
+          # puts "\t" + e.backtrace.join("\n\t")
         end
       end
       if annotated.empty?

spec/integration/rails-2.3.gems

@@ -1,4 +1,4 @@
 source :rubygems
 
-gem "rails", "~>2.3.14"
+gem "rails", "~>2.3"
 gem "sqlite3"

spec/integration/rails-2.3.gems.lock

@@ -26,5 +26,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (~> 2.3.14)
+  rails (~> 2.3)
   sqlite3

spec/integration/rails-3.2.gems

@@ -1,4 +1,4 @@
 source :rubygems
 
-gem 'rails', "~>3.2.2"
+gem 'rails', "~>3.2"
 gem "sqlite3"

spec/integration/rails-3.2.gems.lock

@@ -83,5 +83,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (~> 3.2.2)
+  rails (~> 3.2)
   sqlite3

spec/integration/rails_integration_spec.rb

@@ -35,30 +35,38 @@
       rails_version = rails_version.split(" ").last
       rails_version.should =~ /(\d+)(\.\d+)*/
       rails_version.should =~ /^#{base_version}/
+      puts "\nUsing Rails #{rails_version}"
 
       `#{new_cmd} todo`
       Dir.chdir("#{temp_dir}/todo") do
         `#{generate_cmd} scaffold Task content:string`.should =~ %r{db/migrate/.*_create_tasks.rb}
         `../rake db:migrate`.should =~ /CreateTasks: migrated/
         File.read("app/models/task.rb").should == "class Task < ActiveRecord::Base\nend\n"
         `#{annotate_bin}`.chomp.should == "Annotated (1): Task"
-        File.read("app/models/task.rb").should == <<-RUBY
+        expected_model = <<-RUBY
 # == Schema Information
 #
 # Table name: tasks
 #
+#  id         :integer          not null, primary key
 #  content    :string(255)
 #  created_at :datetime         not null
-#  id         :integer          not null, primary key
 #  updated_at :datetime         not null
 #
 
 class Task < ActiveRecord::Base
 end
         RUBY
+        
+        if base_version == "2.3"
+          # for some reason timestamps are not required in Rails 2.3.14
+          expected_model.gsub!("datetime         not null", "datetime")
+        end
+        File.read("app/models/task.rb").should == expected_model
+        
       end
     end
    end
   end
  end
-end
+end