geert 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/geert.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geert}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Iain Hecker"]

data/lib/geert/association.rb

@@ -2,11 +2,6 @@ module Geert
 
   class Association
 
-    attr_reader :reflection, :model
-
-    def exclude?
-      polymorphic? or uses_polymorphic?
-    end
 
     def migration
       "add_foreign_key :#{source}, :#{target}, #{options_string}" unless exclude?
@@ -16,14 +11,26 @@ module Geert
       reflection.options[:polymorphic]
     end
 
-    def uses_polymorphic?
-      model.associations.select(&:polymorphic?).map(&:column).include?(column)
-    end
-
     def column
       reflection.primary_key_name
     end
 
+    private
+
+    def exclude?
+      existing? or polymorphic? or uses_polymorphic?
+    end
+
+    def existing?
+      ActiveRecord::Base.connection.foreign_keys(source).any? do |fk|
+        fk.options[:column].to_s == column.to_s
+      end
+    end
+
+    def uses_polymorphic?
+      model.associations.select(&:polymorphic?).map(&:column).include?(column)
+    end
+
     def source
       model.table_name
     end
@@ -33,13 +40,36 @@ module Geert
     end
 
     def options
-      {:column => column}
+      {:column => column}.merge(dependency || {})
+    end
+
+    def dependency
+      { :dependent => dependency_type } if dependency_type
+    end
+
+    def dependency_type
+      [ :nullify, :delete ].find { |type| send("#{type}?") }
     end
 
+    def nullify?
+      dependency_option == :nullify
+    end
+
+    def delete?
+      dependency_option == :delete_all
+    end
+
+    def dependency_option
+      reflection.options[:dependent]
+    end
+
+    # Just to make it pretty, remove the curly braces
     def options_string
       options.inspect.gsub(/\A\{(.*)\}\z/, '\\1')
     end
 
+    attr_reader :reflection, :model
+
     def initialize(reflection, model)
       @reflection, @model = reflection, model
     end

data/lib/geert.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/geert/project'
 require File.dirname(__FILE__) + '/geert/model'
 require File.dirname(__FILE__) + '/geert/association'
+require "foreigner"
 
 module Geert
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geert
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Iain Hecker