immigrant 0.1.2 → 0.1.3

data/lib/generators/immigration_generator.rb

@@ -2,6 +2,7 @@ require 'rails/generators/active_record'
 
 class ImmigrationGenerator < ActiveRecord::Generators::Base
   def create_immigration_file
+    Rails.application.eager_load!
     @keys, warnings = Immigrant.infer_keys
     warnings.values.each{ |warning| $stderr.puts "WARNING: #{warning}" }
     @keys.each do |key|
@@ -17,4 +18,4 @@ class ImmigrationGenerator < ActiveRecord::Generators::Base
   end
 
   source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-end
+end

data/lib/immigrant.rb

@@ -40,18 +40,8 @@ module Immigrant
 
       def model_classes
         classes = []
-        pattern = /^\s*(has_one|has_many|has_and_belongs_to_many|belongs_to)\s/
-        Dir['app/models/*.rb'].each do |model|
-          class_name = model.sub(/\A.*\/(.*?)\.rb\z/, '\1').camelize
-          begin
-            klass = class_name.constantize
-          rescue SyntaxError, LoadError
-            if File.read(model) =~ pattern
-              raise "unable to load #{class_name} and its associations"
-            end
-            next
-          end
-          classes << klass if klass < ActiveRecord::Base
+        ActiveRecord::Base.send(:subclasses).each do |model|
+          classes << model.name.constantize
         end
         classes
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: immigrant
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jon Jensen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 -06:00
+date: 2012-11-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency