rare_map 1.0.2 → 1.1.0

data/lib/rare_map/model_builder.rb

@@ -31,13 +31,18 @@ module RareMap
       models.each do |model|
         group_models = models.select { |m| m.group == model.group && m.default_id == model.default_id }
         
-        model.table.columns.each do |col|
-          group_models.each do |gm|
+        group_models.each do |gm|
+          model.table.columns.each do |col|
             if gm.table.match_foreign_key(col) && model != gm
               model.relations << Relation.new(:belongs_to, col.name, gm.table.name)
               gm.relations << Relation.new(col.unique? ? :has_one : :has_many, col.name, model.table.name)
             end
           end
+          
+          if gm.table.match_foreign_key_by_primary_key(model.table.primary_key) && model != gm
+            model.relations << Relation.new(:belongs_to, model.table.primary_key, gm.table.name)
+            gm.relations << Relation.new(:has_one, model.table.primary_key, model.table.name)
+          end
         end
       end
       

data/lib/rare_map/schema_parser.rb

@@ -63,15 +63,20 @@ module RareMap
     end
     
     def match_foreign_key(column)
-      if column.references == @name || ["#{@name}_#{fk_suffix}",
-                                        "#{@name}#{fk_suffix}",
-                                        "#{singularize}_#{fk_suffix}",
-                                        "#{singularize}#{fk_suffix}",
-                                        "#{pluralize}_#{fk_suffix}",
-                                        "#{pluralize}#{fk_suffix}"].include?(column.name)
+      if column.references == @name || foreign_keys.include?(column.name)
         @name if primary_key
       end
     end
+    
+    def match_foreign_key_by_primary_key(pk)
+      @name if foreign_keys.include?(pk) && primary_key
+    end
+    
+    private
+    def foreign_keys
+      ["#{@name}_#{fk_suffix}",      "#{@name}#{fk_suffix}",      "#{singularize}_#{fk_suffix}",
+       "#{singularize}#{fk_suffix}", "#{pluralize}_#{fk_suffix}", "#{pluralize}#{fk_suffix}"]
+    end
   end
   
   class Column

data/lib/rare_map/version.rb

@@ -1,8 +1,8 @@
 class RareMap
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 2
+    MINOR = 1
+    PATCH = 0
 
     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.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
+date: 2012-11-30 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: 1396508381234435921
+      hash: 4278626048823483051
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: