rare_map 1.1.0 → 1.1.1

data/lib/rare_map/model_builder.rb

@@ -47,16 +47,18 @@ module RareMap
       end
       
       models.each do |model|
-        group_models = models.select { |m| m.group == model.group && m.default_id == model.default_id }
-        
         model.relations.each do |rel_from|
           model.relations.each do |rel_to|
             if rel_from != rel_to &&
                rel_from.type == :belongs_to &&
                rel_to.type == :belongs_to &&
                rel_from.table != rel_to.table
-              model_from = models.find { |m| m.table.name == rel_from.table }
-              model_to = models.find { |m| m.table.name == rel_to.table }
+              model_from = models.find { |m| m.table.name == rel_from.table &&
+                                             m.group      == model.group &&
+                                             m.default_id == model.default_id }
+              model_to = models.find { |m| m.table.name == rel_to.table &&
+                                           m.group      == model.group &&
+                                           m.default_id == model.default_id }
               model_from.relations << Relation.new(:has_many_through, rel_to.foreign_key, model_to.table.name, model.table.name)
               model_to.relations << Relation.new(:has_many_through, rel_from.foreign_key, model_from.table.name, model.table.name)
             end

data/lib/rare_map/model_generator.rb

@@ -19,28 +19,28 @@ module RareMap
         belongs_to = model.relations.select { |rel| rel.type == :belongs_to }
         unless belongs_to.empty?
           output << belongs_to.
-            map { |rel| "  belongs_to :#{rel.table.pluralize.singularize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, models)}'" }.
+            map { |rel| "  belongs_to :#{rel.table.pluralize.singularize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, model, models)}'" }.
             join("\n") << "\n"
         end
         
         has_one = model.relations.select { |rel| rel.type == :has_one }
         unless has_one.empty?
           output << has_one.
-            map { |rel| "  has_one :#{rel.table.pluralize.singularize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, models)}'" }.
+            map { |rel| "  has_one :#{rel.table.pluralize.singularize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, model, models)}'" }.
             join("\n") << "\n"
         end
         
         has_many = model.relations.select { |rel| rel.type == :has_many }
         unless has_many.empty?
           output << has_many.
-            map { |rel| "  has_many :#{rel.table.pluralize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, models)}'" }.
+            map { |rel| "  has_many :#{rel.table.pluralize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, model, models)}'" }.
             join("\n") << "\n"
         end
         
         has_many_through = model.relations.select { |rel| rel.type == :has_many_through }
         unless has_many_through.empty?
           output << has_many_through.
-            map { |rel| "  has_many :#{rel.table.pluralize}#{"_by_#{rel.through}, :source => :#{rel.table.pluralize.singularize}" if has_many_through.count { |hmt| hmt.table == rel.table } > 1}, :through => :#{rel.through.pluralize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, models)}'" }.
+            map { |rel| "  has_many :#{rel.table.pluralize}#{"_by_#{rel.through}, :source => :#{rel.table.pluralize.singularize}" if has_many_through.count { |hmt| hmt.table == rel.table } > 1}, :through => :#{rel.through.pluralize}, :foreign_key => '#{rel.foreign_key}', :class_name => '#{classify_by_table(rel.table, model, models)}'" }.
             join("\n") << "\n"
         end
         
@@ -58,8 +58,10 @@ module RareMap
     end
     
     private
-    def classify_by_table(table, models)
-      model = models.find { |m| m.table.name == table }
+    def classify_by_table(table, model, models)
+      model = models.find { |m| m.table.name == table &&
+                                m.group      == model.group &&
+                                m.default_id == model.default_id }
       model.classify
     end
   end

data/lib/rare_map/version.rb

@@ -2,7 +2,7 @@ class RareMap
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rare_map
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4278626048823483051
+      hash: -750417326408919851
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: