foreigner-matcher 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 040a77aa46e11c55687026338766c6172f5124d3
-  data.tar.gz: 1c4e54f5a6109bb11b15d10c62616db3452b5d34
+  metadata.gz: 6a34b92119950726090515e7a0f22487189c750a
+  data.tar.gz: 2905df2a90aaca7702e7a298934d818742ad8a70
 SHA512:
-  metadata.gz: a9076d22605fbc18bd71cab26665b3d71e21e452938f6d460957b8be5ea1476781a43fa0ba0112e52ed4d9dd33eca5b29c1e3148602d503d5c950f7b36d8a555
-  data.tar.gz: 47d8ff0f6a0c7de9de8cc43f500c236ca96a4a7e7c27d24dc68d041d1ec3c26cd22771de3de65a2c66ffdbf5f30e1e2e8db9c8cd3c6a2c4cd8b5a266ebee4f2f
+  metadata.gz: ea9af498c35b1f54ac30fe6a9dae55d7849ce8ce95b368d130142d6fddafc4dc2d804330627106c9958a88e48ab668a3517516c8f581be7e9fbe14050203fbd5
+  data.tar.gz: be95eb3eb8e86baec258c9690b85a401f723bf9425becf42ed6ddf5be944c50de97f6e53e7c44f223392c1b31ce1ae71213a59502297d443f87cf60498a73953

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foreigner-matcher (0.2.2)
+    foreigner-matcher (0.2.3)
       foreigner (>= 1.0.0)
 
 GEM
@@ -39,7 +39,7 @@ GEM
     builder (3.0.4)
     diff-lcs (1.2.3)
     erubis (2.7.0)
-    foreigner (1.4.1)
+    foreigner (1.4.2)
       activerecord (>= 3.0.0)
     hike (1.2.2)
     i18n (0.6.1)
@@ -51,7 +51,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
+    multi_json (1.7.7)
     mysql2 (0.3.11)
     pg (0.15.1)
     rack (1.4.5)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Cameron Dykes
+Copyright (c) 2011-2013 Cameron Dykes
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -36,7 +36,7 @@ namespace :db do
       puts "Connected to #{db_config['database']} via a #{db_config['adapter']} connector"
 
       puts "\nDropping test tables, if they exist"
-      %w( default_options user_logins user_types comments searches special_user_records table_without_foreign_keys users ).each do |test_table|
+      %w( default_options user_logins comments searches special_user_records table_without_foreign_keys user_types users ).each do |test_table|
         print "\tDropping #{test_table}..."
         conn.execute("drop table if exists #{test_table}")
         print "done\n"
@@ -52,6 +52,7 @@ namespace :db do
       print_table_creation('special_user_records') do
         conn.create_table(:special_user_records) do |t|
           t.integer :special_user_id
+          t.integer :special_user_type_id
         end
       end
       [ :default_options, :user_logins, :user_types, :comments, :searches, :table_without_foreign_keys ].each do |user_table|
@@ -92,6 +93,7 @@ namespace :db do
       end
       print_foreign_key_creation('special_user_records') do
         conn.add_foreign_key(:special_user_records, :users, :column => "special_user_id", :dependent => :delete)
+        conn.add_foreign_key(:special_user_records, :user_types, :column => "special_user_type_id", :name => "special_user_type_fk")
       end
     end
   end

data/lib/foreigner-matcher.rb

@@ -28,13 +28,17 @@ module ForeignerMatcher # :nodoc:
     private
 
     def foreign_key_definition
-      defaults             = { :primary_key => "id", :column => "#{@parent.singularize}_id" }
+      defaults             = { :primary_key => "id", :column => foreign_key_definition_column_name }
       defaults[:name]      = "#{@child.class.table_name}_#{defaults[:column]}_fk"
       defaults[:dependent] = nil if postgresql_db?
       full_options         = defaults.merge(@options)
       Foreigner::ConnectionAdapters::ForeignKeyDefinition.new(@child.class.table_name, @parent.pluralize, full_options)
     end
 
+    def foreign_key_definition_column_name
+      @options[:column] || "#{@parent.singularize}_id"
+    end
+
     def child_foreign_keys
       @child.class.connection.foreign_keys(@child.class.table_name)
     end

data/lib/foreigner-matcher/version.rb

@@ -1,5 +1,5 @@
 module Foreigner
   module Matcher
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/spec/test_models/special_user_record_spec.rb

@@ -23,7 +23,9 @@ describe SpecialUserRecord do
   end
 
   describe 'matcher' do
-    it { should have_foreign_key_for(:user, :column => 'special_user_id', :name => 'special_user_records_special_user_id_fk', :dependent => :delete) }
-    it { should have_foreign_key_for(:users, :column => 'special_user_id', :name => 'special_user_records_special_user_id_fk', :dependent => :delete) }
+    it { should have_foreign_key_for(:user, :column => 'special_user_id', :dependent => :delete) }
+    it { should have_foreign_key_for(:users, :column => 'special_user_id', :dependent => :delete) }
+    it { should have_foreign_key_for(:user_type, :column => 'special_user_type_id', :name => 'special_user_type_fk') }
+    it { should have_foreign_key_for(:user_types, :column => 'special_user_type_id', :name => 'special_user_type_fk') }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreigner-matcher
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Cameron Dykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner