polymorphic_integer_type 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a821ba758df6177c1f89d6f147bedd24e5a96874b65e9bff7c348b04f5a60013
-  data.tar.gz: 23f8a6196d1523ef46d58af66612646a910744e511f959ff783af977e8ea56a6
+  metadata.gz: a0ad89af7c6b5e5602d7a55d61d3ba112b5db2afbeb5e43226972eaaff50761b
+  data.tar.gz: 5838309b72defdf55b950c155c3d5d87ebe7a663aaad9dc5e8453bb246dd28f7
 SHA512:
-  metadata.gz: 0a4e980b7f71e2fd78f030fcd8053cb12923775075e1f9425ee999c24e65d017b30e248bfa484e5a1df7ee300afdf71c1ea03c8260663b475fc477431f81536e
-  data.tar.gz: 5e7be692212675c3f346d10b18328d9b35a0fc5bfc68fbfe19dfea1e0be112ad8d9410b6429b2986b212d64cf94e8825d2aa27d1aed29197625cdf8d45b5e81b
+  metadata.gz: 07a499153097713ec3f90b5a42b796205ea773a04a1b77aedc4e9d8e1f0ac8f2d84238a2a6350e3cce7fba1b8f5fcf59e3b28642e39a0f55c532cf5d94f22a18
+  data.tar.gz: bf81c398c18cdc8d2f7edaf81f8a669237b4aff73152c0bd180bb264bd4b5216bc6cc358a7fdd48aa8631cc1f31758ba9ddacf23e49e16c1b1cf2a1553199c62

data/lib/polymorphic_integer_type.rb

@@ -1,6 +1,10 @@
 require "polymorphic_integer_type/version"
 require "polymorphic_integer_type/extensions"
 require "polymorphic_integer_type/mapping"
-require "polymorphic_integer_type/polymorphic_array_value_extension"
+if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5")
+  require "polymorphic_integer_type/predicate_builder_extension"
+else
+  require "polymorphic_integer_type/polymorphic_array_value_extension"
+end
 
 module PolymorphicIntegerType; end

data/lib/polymorphic_integer_type/predicate_builder_extension.rb

@@ -0,0 +1,65 @@
+module PolymorphicIntegerType
+  module PredicateBuilderExtension
+
+    # Original Code:
+    # def self.expand(klass, table, column, value)
+    #   queries = []
+
+    #   # Find the foreign key when using queries such as:
+    #   # Post.where(author: author)
+    #   #
+    #   # For polymorphic relationships, find the foreign key and type:
+    #   # PriceEstimate.where(estimate_of: treasure)
+    #   if klass && reflection = klass._reflect_on_association(column)
+    #     base_class = polymorphic_base_class_from_value(value)
+
+    #     if reflection.polymorphic? && base_class
+    #       queries << build(table[reflection.foreign_type], base_class)
+    #     end
+
+    #     column = reflection.foreign_key
+
+    #     if base_class
+    #       primary_key = reflection.association_primary_key(base_class)
+    #       value = convert_value_to_association_ids(value, primary_key)
+    #     end
+    #   end
+
+    #   queries << build(table[column], value)
+    #   queries
+    # end
+
+    def expand(klass, table, column, value)
+      queries = []
+
+      # Find the foreign key when using queries such as:
+      # Post.where(author: author)
+      #
+      # For polymorphic relationships, find the foreign key and type:
+      # PriceEstimate.where(estimate_of: treasure)
+      if klass && reflection = klass._reflect_on_association(column)
+        base_class = polymorphic_base_class_from_value(value)
+
+        if reflection.polymorphic? && base_class
+          if klass.respond_to?("#{column}_type_mapping")
+            queries << build(table[reflection.foreign_type], klass.send("#{column}_type_mapping").key(base_class.to_s))
+          else
+            queries << build(table[reflection.foreign_type], base_class)
+          end
+        end
+
+        column = reflection.foreign_key
+
+        if base_class
+          primary_key = reflection.association_primary_key(base_class)
+          value = convert_value_to_association_ids(value, primary_key)
+        end
+      end
+
+      queries << build(table[column], value)
+      queries
+    end
+  end
+end
+
+ActiveRecord::PredicateBuilder.singleton_class.prepend(PolymorphicIntegerType::PredicateBuilderExtension)

data/lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicIntegerType
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/spec_helper.rb

@@ -13,7 +13,9 @@ RSpec.configure do |config|
   config.before(:suite) do
     database_config = YAML.load(File.open("#{File.dirname(__FILE__)}/support/database.yml"))
     ActiveRecord::Base.establish_connection(database_config)
-    ActiveRecord::MigrationContext.new("#{File.dirname(__FILE__)}/support/migrations").migrate
+    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
+      ActiveRecord::MigrationContext.new("#{File.dirname(__FILE__)}/support/migrations").migrate
+    end
   end
 
   config.around do |example|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,6 +112,7 @@ files:
 - lib/polymorphic_integer_type/extensions.rb
 - lib/polymorphic_integer_type/mapping.rb
 - lib/polymorphic_integer_type/polymorphic_array_value_extension.rb
+- lib/polymorphic_integer_type/predicate_builder_extension.rb
 - lib/polymorphic_integer_type/version.rb
 - polymorphic_integer_type.gemspec
 - spec/polymorphic_integer_type_spec.rb