immigrant 0.1.4 → 0.1.5

data/README.rdoc

@@ -38,4 +38,4 @@ migration.
 
 == License
 
-Copyright (c) 2012 Jon Jensen, released under the MIT license
+Copyright (c) 2013 Jon Jensen, released under the MIT license

data/lib/immigrant.rb

@@ -40,7 +40,7 @@ module Immigrant
 
       def model_classes
         classes = []
-        ActiveRecord::Base.send(:subclasses).each do |model|
+        ActiveRecord::Base.descendants.each do |model|
           classes << model.name.constantize
         end
         classes
@@ -101,18 +101,19 @@ module Immigrant
                   reflection.klass.table_name, klass.table_name,
                   :column => reflection.send(fk_method).to_s,
                   :primary_key => klass.primary_key.to_s,
-                  :dependent => [:delete, :delete_all].include?(reflection.options[:dependent]) && reflection.options[:conditions].nil? ? :delete : nil
+                  :dependent => [:delete, :delete_all].include?(reflection.options[:dependent]) && !qualified_reflection?(reflection, klass) ? :delete : nil
                 )
               when :has_and_belongs_to_many
+                join_table = (reflection.respond_to?(:join_table) ? reflection.join_table : reflection.options[:join_table]).to_s
                 [
                   Foreigner::ConnectionAdapters::ForeignKeyDefinition.new(
-                    reflection.options[:join_table].to_s, klass.table_name,
+                    join_table, klass.table_name,
                     :column => reflection.send(fk_method).to_s,
                     :primary_key => klass.primary_key.to_s,
                     :dependent => nil
                   ),
                   Foreigner::ConnectionAdapters::ForeignKeyDefinition.new(
-                    reflection.options[:join_table].to_s, reflection.klass.table_name,
+                    join_table, reflection.klass.table_name,
                     :column => reflection.association_foreign_key.to_s,
                     :primary_key => reflection.klass.primary_key.to_s,
                     :dependent => nil
@@ -125,6 +126,25 @@ module Immigrant
         }.flatten
       end
 
+      def qualified_reflection?(reflection, klass)
+        if ActiveRecord::VERSION::STRING < '4.'
+          reflection.options[:conditions].present?
+        else
+          scope = reflection.scope
+          if scope.nil?
+            false
+          elsif scope.respond_to?(:options)
+            scope.options[:where].present?
+          else
+            klass.instance_exec(*([nil]*scope.arity), &scope).where_values.present?
+          end
+        end
+      rescue
+        # if there's an error evaluating the scope block or whatever, just
+        # err on the side of caution and assume there are conditions
+        true
+      end
+
   end
 end
 

data/test/helper.rb

@@ -8,6 +8,7 @@ require 'active_record'
 require 'foreigner'
 class Foreigner::Adapter
   def self.configured_name; "dummy_adapter"; end
+  def self.load!; end
 end
 Foreigner.load
 

data/test/immigrant_test.rb

@@ -13,14 +13,31 @@ class ImmigrantTest < ActiveSupport::TestCase
         @connection ||= MockConnection.new
       end
     end
+
+    if ActiveRecord::VERSION::STRING >= '4.'
+      # support old 3.x syntax for the sake of concise tests
+      [:belongs_to, :has_one, :has_many, :has_and_belongs_to_many].each do |method|
+        instance_eval <<-CODE
+          def self.#{method}(assoc, options = {})
+            args = [assoc]
+            scope = options.extract!(:conditions, :order)
+            if scope
+              args.push lambda{ where(scope[:conditions]).order(scope[:order]) }
+            end
+            args.push options
+            super *args
+          end
+        CODE
+      end
+    end
   end
-  
+
   class MockConnection
     def supports_primary_key? # AR <3.2
       true
     end
     def primary_key(table)
-      table !~ /s_.*s\z/ ? 'id' : nil
+      table.to_s !~ /s_.*s\z/ ? 'id' : nil
     end
   end
 
@@ -32,16 +49,15 @@ class ImmigrantTest < ActiveSupport::TestCase
     subclasses.replace([])
   end
 
-
   # basic scenarios
-  
+
   test 'belongs_to should generate a foreign key' do
     class Author < MockModel; end
     class Book < MockModel
       belongs_to :guy, :class_name => 'Author', :foreign_key => 'author_id'
     end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -58,7 +74,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     end
     class Book < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -75,7 +91,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     end
     class Book < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -92,7 +108,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     end
     class Book < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -109,7 +125,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     end
     class Book < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -126,7 +142,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     end
     class Fan < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Fan]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -143,19 +159,19 @@ class ImmigrantTest < ActiveSupport::TestCase
 
   test 'has_and_belongs_to_many should respect the join_table' do
     class Author < MockModel
-      has_and_belongs_to_many :fans, :join_table => :lol_wuts
+      has_and_belongs_to_many :fans, :join_table => :lols_wuts
     end
     class Fan < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Fan]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
-         'lol_wuts', 'authors',
+         'lols_wuts', 'authors',
          :column => 'author_id', :primary_key => 'id', :dependent => nil
        ),
        foreign_key_definition(
-         'lol_wuts', 'fans',
+         'lols_wuts', 'fans',
          :column => 'fan_id', :primary_key => 'id', :dependent => nil
        )],
       keys
@@ -171,7 +187,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     class Book < MockModel; end
     class Article < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Article, Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -188,7 +204,7 @@ class ImmigrantTest < ActiveSupport::TestCase
 
 
   # (no) duplication
-  
+
   test 'STI should not generate duplicate foreign keys' do
     class Company < MockModel; end
     class Employee < MockModel
@@ -197,7 +213,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     class Manager < Employee; end
 
     assert(Manager.reflections.present?)
-    keys = Immigrant.infer_keys([], [Company, Employee, Manager]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -216,7 +232,7 @@ class ImmigrantTest < ActiveSupport::TestCase
       belongs_to :author
     end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -235,7 +251,7 @@ class ImmigrantTest < ActiveSupport::TestCase
     end
     class Book < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -270,23 +286,25 @@ class ImmigrantTest < ActiveSupport::TestCase
     class Book < MockModel; end
     class Article < MockModel; end
 
-    keys = Immigrant.infer_keys(database_keys, [Article, Author, Book]).first
+    keys = Immigrant.infer_keys(database_keys).first
     assert_equal([], keys)
   end
 
-  test 'finder_sql associations should not generate foreign keys' do
-    class Author < MockModel
-      has_many :books, :finder_sql => <<-SQL
-        SELECT *
-        FROM books
-        WHERE author_id = \#{id}
-        ORDER BY RANDOM() LIMIT 5'
-      SQL
-    end
-    class Book < MockModel; end
+  if ActiveRecord::VERSION::STRING < '4.'
+    test 'finder_sql associations should not generate foreign keys' do
+      class Author < MockModel
+        has_many :books, :finder_sql => <<-SQL
+          SELECT *
+          FROM books
+          WHERE author_id = \#{id}
+          ORDER BY RANDOM() LIMIT 5'
+        SQL
+      end
+      class Book < MockModel; end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
-    assert_equal([], keys)
+      keys = Immigrant.infer_keys([]).first
+      assert_equal([], keys)
+    end
   end
 
   test 'polymorphic associations should not generate foreign keys' do
@@ -300,7 +318,7 @@ class ImmigrantTest < ActiveSupport::TestCase
       has_many :properties, :as => :owner
     end
 
-    keys = Immigrant.infer_keys([], [Corporation, Person, Property]).first
+    keys = Immigrant.infer_keys([]).first
     assert_equal([], keys)
   end
 
@@ -318,7 +336,7 @@ class ImmigrantTest < ActiveSupport::TestCase
       has_many :authors, :through => :authors_fans
     end
 
-    keys = Immigrant.infer_keys([], [Author, AuthorsFan, Fan]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(
@@ -340,7 +358,7 @@ class ImmigrantTest < ActiveSupport::TestCase
       belongs_to :invalid
     end
 
-    keys = Immigrant.infer_keys([], [Author, Book]).first
+    keys = Immigrant.infer_keys([]).first
     assert_nothing_raised { keys.map { |key| key.to_ruby(:add) } }
     assert_equal(
       [foreign_key_definition(

metadata

@@ -1,63 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: immigrant
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.1.5
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-13 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: foreigner
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: foreigner
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id002
-description: Adds a generator for creating a foreign key migration based on your current model associations
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+description: Adds a generator for creating a foreign key migration based on your current
+  model associations
 email: jenseng@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - LICENSE.txt
 - Rakefile
 - README.rdoc
@@ -71,43 +64,29 @@ files:
 - lib/immigrant.rb
 - test/helper.rb
 - test/immigrant_test.rb
-has_rdoc: true
 homepage: http://github.com/jenseng/immigrant
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Migration generator for Foreigner
 test_files: []
-
+has_rdoc: