geert 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/geert.gemspec

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

data/lib/geert/association.rb

@@ -4,7 +4,7 @@ module Geert
 
 
     def migration
-      "add_foreign_key :#{source}, :#{target}, #{options_string}" unless exclude?
+      ":#{source}, :#{target}#{options_string}" unless exclude?
     end
 
     def polymorphic?
@@ -15,13 +15,18 @@ module Geert
       reflection.primary_key_name
     end
 
-    private
+    def target
+      reflection.table_name
+    end
 
     def exclude?
       existing? or polymorphic? or uses_polymorphic?
     end
 
+    private
+
     def existing?
+      require "foreigner"
       ActiveRecord::Base.connection.foreign_keys(source).any? do |fk|
         fk.options[:column].to_s == column.to_s
       end
@@ -35,16 +40,16 @@ module Geert
       model.table_name
     end
 
-    def target
-      reflection.table_name
+    def options
+      { :column => column_option, :dependent => dependency_type }.reject { |key, value| value.nil? }
     end
 
-    def options
-      {:column => column}.merge(dependency || {})
+    def column_option
+      column if column != "#{target.singularize}_id"
     end
 
     def dependency
-      { :dependent => dependency_type } if dependency_type
+      { :dependent => dependency_type }
     end
 
     def dependency_type
@@ -60,12 +65,38 @@ module Geert
     end
 
     def dependency_option
-      reflection.options[:dependent]
+      opposite_relation.options[:dependent] if opposite_relation
+    end
+
+    def opposite_relation
+      opposite_associations.find do |association|
+        association.table_name == source && association.primary_key_name == column
+      end
+    end
+
+    def opposite_associations
+      [:has_many, :has_one].map { |type| target_model.reflect_on_all_associations(type) }.flatten
+    end
+
+    def target_model
+      target.singularize.camelize.constantize
     end
 
-    # Just to make it pretty, remove the curly braces
     def options_string
-      options.inspect.gsub(/\A\{(.*)\}\z/, '\\1')
+      options.empty? ? "" : ", " + space + pretty_options
+    end
+
+    def space
+      " " * (longest_target_size - target.size)
+    end
+
+    def longest_target_size
+      @longest_target_size ||= model.associations.map { |association| association.target.size }.sort.last.to_i
+    end
+
+    # Just to make it pretty, remove the curly braces, and add some spaces
+    def pretty_options
+      options.inspect.gsub(/\A\{(.*)\}\z/, '\\1').gsub("=>", " => ")
     end
 
     attr_reader :reflection, :model

data/lib/geert/model.rb

@@ -13,7 +13,7 @@ module Geert
     end
 
     def migration
-      associations.map(&:migration).compact.join("\n") if usable?
+      associations.map(&:migration).compact.sort.join("\n") if usable?
     end
 
     def associations

data/lib/geert/project.rb

@@ -10,7 +10,33 @@ module Geert
     end
 
     def migration
-      models.map(&:migration).select(&:present?).join("\n\n")
+      <<-MIGRATION
+class AddMissingForeignKeys < ActiveRecord::Migration
+  def self.up
+#{migration_up}
+  end
+
+  def self.down
+#{migration_down}
+  end
+end
+      MIGRATION
+    end
+
+    def migration_up
+      migration_lines.map(&modify_line("add"))
+    end
+
+    def migration_down
+      migration_lines.split("\n").reverse.join("\n").map(&modify_line("remove"))
+    end
+
+    def migration_lines
+      @migration_lines ||= models.map(&:migration).select(&:present?).join("\n\n")
+    end
+
+    def modify_line(command)
+      lambda { |line| line.present? ? "    #{command}_foreign_key #{line}" : "\n" }
     end
 
     private

data/lib/geert.rb

@@ -1,7 +1,6 @@
 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.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Iain Hecker