immigrant 0.1.1 → 0.1.2

data/lib/immigrant/foreign_key_definition.rb

@@ -1,7 +1,9 @@
 module Immigrant
   # add some useful stuff to foreigner's ForeignKeyDefinition
-  # TODO: get it in foreigner so we don't need to monkey patch
+  # TODO: get more of this into foreigner so we don't need to monkey patch
   module ForeignKeyDefinition
+    include Foreigner::SchemaDumper::ClassMethods
+
     def initialize(from_table, to_table, options, *args)
       options ||= {}
       options[:name] ||= "#{from_table}_#{options[:column]}_fk"
@@ -14,21 +16,7 @@ module Immigrant
 
     def to_ruby(action = :add)
       if action == :add
-        # not DRY ... guts of this are copied from Foreigner :(
-        parts = [ ('add_foreign_key ' + from_table.inspect) ]
-        parts << to_table.inspect
-        parts << (':name => ' + options[:name].inspect)
-  
-        if options[:column] != "#{to_table.singularize}_id"
-          parts << (':column => ' + options[:column].inspect)
-        end
-        if options[:primary_key] != 'id'
-          parts << (':primary_key => ' + options[:primary_key].inspect)
-        end
-        if options[:dependent].present?
-          parts << (':dependent => ' + options[:dependent].inspect)
-        end
-        parts.join(', ')
+        dump_foreign_key(self)
       else
         "remove_foreign_key #{from_table.inspect}, " \
         ":name => #{options[:name].inspect}"

data/lib/immigrant.rb

@@ -69,6 +69,7 @@ module Immigrant
           #    Foo.has_many :bazzes, :class_name => Bar
           # we need to make sure everything is legit and see if any of them
           # specify :dependent => :delete
+          next if foreign_key.nil?
           if current_key = foreign_keys[foreign_key.hash_key]
             if current_key.to_table != foreign_key.to_table || current_key.options[:primary_key] != foreign_key.options[:primary_key]
               warnings[foreign_key.hash_key] ||= "Skipping #{foreign_key.from_table}.#{foreign_key.options[:column]}: it has multiple associations referencing different keys/tables."
@@ -138,4 +139,4 @@ module Immigrant
 end
 
 require 'immigrant/loader'
-require 'immigrant/railtie' if defined?(Rails)
+require 'immigrant/railtie' if defined?(Rails)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: immigrant
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jon Jensen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-01 00:00:00 -06:00
+date: 2012-05-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
         - 1
         - 1
-        - 3
-        version: 1.1.3
+        - 6
+        version: 1.1.6
   type: :runtime
   version_requirements: *id002
 description: Adds a generator for creating a foreign key migration based on your current model associations