annotate 2.5.0.pre3 → 2.5.0

data/History.txt

@@ -3,7 +3,7 @@
 * Works better with Rails 3
 * Bugfix: schema kept prepending additional newlines
 * Updates to make annotate smarter about when to touch a model
-* Recognize column+type, and don't change a file unless the column+type combination of the new schema are different than that of the old (i.e., don't regenerate if columns happen to be in a different order. That's just how life is sometimes)
+* Recognize column+type, and don't change a file unless the column+type combination of the new schema are different than that of the old (i.e., don't regenerate if columns happen to be in a different order. That's just how life is sometimes.)
 * Grab old specification even if it has \r\n as line endings rather than pure \ns
 * Various warning and specification fixes
 * Fix "no such file to load -- annotate/annotate_models (MissingSourceFile)" error (require statements in tasks now use full path to lib files)
@@ -17,7 +17,6 @@
 * Leave magic encoding comment intact
 * Fix issue #14 - RuntimeError: Already memoized
 * Count a model as 'annotated' if any of its tests/fixtures are annotated
-* Support FactoryGirl
 * Support :change migrations (Rails 3.1)
 * Allow models with non-standard capitalization
 * Widen type column so we can handle longtexts with chopping things off.
@@ -39,13 +38,10 @@
   non-standard capitalization.
   Note that this still requires that the inflector be configured to understand
   the special case.
-* Shore up test cases a bit.
 * Merge against many of the older branches on Github whose functionality is
   already reflected to reduce confusion about what is and is not implemented
   here.
 * Accept String or Symbol for :position (et al) options.
-* Rename "annotate" bin to "annotate_models" to avoid conflicting with
-  ImageMagick.
 * Add RDoc output formatting as an option.
 * Add Markdown output formatting as an option.
 * Add option to force annotation regeneration.
@@ -58,10 +54,12 @@
 * Fix handling of files with no trailing newline when putting annotations at
   the end of the file.
 * Now works on tables with no primary key.
-* Add --format=markdown option
+* --format=markdown option
+* --trace option to help debug "Unable to annotate" errors
 * "Table name" annotation (if table name is different from model name)
 * "Human name" annotation (enabling translation to non-English locales)
-* --trace option to help debug "Unable to annotate" errors
+* Fix JRuby ObjectSpace compatibility bug (https://github.com/ctran/annotate_models/pull/85)
+* Fix FactoryGirl compatibility bug (https://github.com/ctran/annotate_models/pull/82)
 
 == 2.4.2 2009-11-21
 

data/README.rdoc

@@ -43,7 +43,7 @@ Also, if you pass the -r option, it'll annotate routes.rb with the output of "ra
 
 Into Gemfile from rubygems.org:
 
-    gem 'annotate', ">=2.5.0.pre3"
+    gem 'annotate', ">=2.5.0"
 
 Into Gemfile from Github:
 

data/lib/annotate/annotate_models.rb

@@ -316,11 +316,12 @@ module AnnotateModels
 
     # 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|
+      ObjectSpace.each_object(::Class).
+        select do |c|
           Class === c and    # note: we use === to avoid a bug in activesupport 2.3.14 OptionMerger vs. is_a?
+          c.ancestors.respond_to?(:include?) and  # to fix FactoryGirl bug, see https://github.com/ctran/annotate_models/pull/82
           c.ancestors.include?(ActiveRecord::Base) 
-        }.
+        end.
         detect { |c| ActiveSupport::Inflector.underscore(c) == model_path }
     end
 

data/lib/annotate/version.rb

@@ -1,5 +1,5 @@
 module Annotate
   def self.version
-    "2.5.0.pre3"
+    "2.5.0"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: annotate
 version: !ruby/object:Gem::Version
-  version: 2.5.0.pre3
-  prerelease: 6
+  version: 2.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Cuong Tran
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,13 +74,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4381666328163276586
+      hash: 3303794202298947958
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: annotate
 rubygems_version: 1.8.21