foreigner 1.1.5 → 1.1.6

data/README.rdoc

@@ -1,4 +1,5 @@
 = Foreigner
+{<img src="https://secure.travis-ci.org/matthuhiggins/foreigner.png?rvm=1.9.3" />}[http://travis-ci.org/matthuhiggins/foreigner]
 
 Foreigner introduces a few methods to your migrations for adding and removing foreign key constraints. It also dumps foreign keys to schema.rb.
 

data/lib/foreigner.rb

@@ -10,6 +10,7 @@ module Foreigner
     autoload :Sql2003
 
     autoload_under 'abstract' do
+      autoload :ForeignKeyDefinition
       autoload :SchemaDefinitions
       autoload :SchemaStatements
     end

data/lib/foreigner/connection_adapters/abstract/foreign_key_definition.rb

@@ -0,0 +1,6 @@
+module Foreigner
+  module ConnectionAdapters
+    class ForeignKeyDefinition < Struct.new(:from_table, :to_table, :options) #:nodoc:
+    end
+  end
+end

data/lib/foreigner/connection_adapters/abstract/schema_definitions.rb

@@ -1,8 +1,5 @@
 module Foreigner
-  module ConnectionAdapters
-    class ForeignKeyDefinition < Struct.new(:from_table, :to_table, :options) #:nodoc:
-    end
-    
+  module ConnectionAdapters    
     module SchemaDefinitions
       def self.included(base)
         base::Table.class_eval do

data/lib/foreigner/schema_dumper.rb

@@ -6,6 +6,26 @@ module Foreigner
       alias_method_chain :tables, :foreign_keys
     end
 
+    module ClassMethods
+      def dump_foreign_key(foreign_key)
+        statement_parts = [ ('add_foreign_key ' + foreign_key.from_table.inspect) ]
+        statement_parts << foreign_key.to_table.inspect
+        statement_parts << (':name => ' + foreign_key.options[:name].inspect)
+
+        if foreign_key.options[:column] != "#{foreign_key.to_table.singularize}_id"
+          statement_parts << (':column => ' + foreign_key.options[:column].inspect)
+        end
+        if foreign_key.options[:primary_key] != 'id'
+          statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
+        end
+        if foreign_key.options[:dependent].present?
+          statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
+        end
+
+        statement_parts.join(', ')
+      end
+    end
+
     def tables_with_foreign_keys(stream)
       tables_without_foreign_keys(stream)
       @connection.tables.sort.each do |table|
@@ -25,21 +45,7 @@ module Foreigner
       def foreign_keys(table_name, stream)
         if (foreign_keys = @connection.foreign_keys(table_name)).any?
           add_foreign_key_statements = foreign_keys.map do |foreign_key|
-            statement_parts = [ ('add_foreign_key ' + foreign_key.from_table.inspect) ]
-            statement_parts << foreign_key.to_table.inspect
-            statement_parts << (':name => ' + foreign_key.options[:name].inspect)
-
-            if foreign_key.options[:column] != "#{foreign_key.to_table.singularize}_id"
-              statement_parts << (':column => ' + foreign_key.options[:column].inspect)
-            end
-            if foreign_key.options[:primary_key] != 'id'
-              statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
-            end
-            if foreign_key.options[:dependent].present?
-              statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
-            end
-
-            '  ' + statement_parts.join(', ')
+            '  ' + self.class.dump_foreign_key(foreign_key)
           end
 
           stream.puts add_foreign_key_statements.sort.join("\n")

data/test/unit/schema_dumper_test.rb

@@ -9,38 +9,48 @@ class Foreigner::SchemaDumperTest < Foreigner::UnitTest
   end
 
   class MockSchemaDumper
-    cattr_accessor :ignore_tables, :processed_tables
-    @@ignore_table = []
-    @@processed_tables = []
+    cattr_accessor :ignore_tables
 
-    @connection = MockConnection.new
-
-    # need this here so ActiveRecord::Concern has something to redefine
-    def tables
+    attr_accessor :processed_tables
+    def initialize
+      @connection = MockConnection.new
+      @processed_tables = []
     end
 
-    include Foreigner::SchemaDumper
+    def tables(stream)
+    end
 
-    # override this method so we don't have to mock up
-    # all of the necessary scafolding for things to work
     def foreign_keys(table, stream)
       processed_tables << table
     end
 
-    def tables(ignore_list)
-      ignore_tables = ignore_list
-      processed_table = nil
-    end
+    include Foreigner::SchemaDumper
+  end
+
+  test 'dump_foreign_key' do
+    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :primary_key => \"uuid\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'uuid', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :dependent => :delete", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz', dependent: :delete)
+    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :column => \"mamma_id\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'mamma_id', primary_key: 'id', name: 'lulz')
   end
 
   test 'all tables' do
     MockSchemaDumper.ignore_tables = []
-    assert MockSchemaDumper.new.processed_tables.sort.to_s, "['bar', 'foo']"
+    dumper = MockSchemaDumper.new
+    dumper.tables(StringIO.new)
+    assert_equal ['bar', 'foo'].to_set, dumper.processed_tables.to_set
   end
 
   test 'ignores tables' do
     MockSchemaDumper.ignore_tables = ['foo']
-    assert MockSchemaDumper.new.processed_tables.to_s, "['bar']"
+    dumper = MockSchemaDumper.new
+    dumper.tables(StringIO.new)
+    assert_equal ['bar'].to_set, dumper.processed_tables.to_set
   end
+
+  private
+    def assert_dump(expected, definition)
+      assert_equal expected, MockSchemaDumper.dump_foreign_key(definition)
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreigner
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70271327577720 !ruby/object:Gem::Requirement
+  requirement: &70302659050020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70271327577720
+  version_requirements: *70302659050020
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70271319040260 !ruby/object:Gem::Requirement
+  requirement: &70302659074460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70271319040260
+  version_requirements: *70302659074460
 description: Adds helpers to migrations and dumps foreign keys to schema.rb
 email: developer@matthewhiggins.com
 executables: []
@@ -44,6 +44,7 @@ files:
 - Rakefile
 - README.rdoc
 - lib/foreigner/adapter.rb
+- lib/foreigner/connection_adapters/abstract/foreign_key_definition.rb
 - lib/foreigner/connection_adapters/abstract/schema_definitions.rb
 - lib/foreigner/connection_adapters/abstract/schema_statements.rb
 - lib/foreigner/connection_adapters/mysql2_adapter.rb