Merge pull request #26 from mctaylorpants/fix-polymorphic-integer-lookup-rails-5-0

Fix polymorphic integer lookup rails 5.0

Author: Kyle d'Oliveira

lib/polymorphic_integer_type.rb

@@ -1,10 +1,17 @@
+ACTIVE_RECORD_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
+
 require "polymorphic_integer_type/version"
 require "polymorphic_integer_type/extensions"
 require "polymorphic_integer_type/mapping"
-if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5")
-  require "polymorphic_integer_type/predicate_builder_extension"
+
+if ACTIVE_RECORD_VERSION < Gem::Version.new("5")
+  require "polymorphic_integer_type/activerecord_4/predicate_builder_extension"
 else
-  require "polymorphic_integer_type/polymorphic_array_value_extension"
+  require "polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension"
+end
+
+if ACTIVE_RECORD_VERSION >= Gem::Version.new("5.0") && ACTIVE_RECORD_VERSION < Gem::Version.new("5.2.0")
+  require "polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension"
 end
 
 module PolymorphicIntegerType; end

…eger_type/predicate_builder_extension.rb …erecord_4/predicate_builder_extension.rblib/polymorphic_integer_type/predicate_builder_extension.rb renamed to lib/polymorphic_integer_type/activerecord_4/predicate_builder_extension.rb lib/polymorphic_integer_type/predicate_builder_extension.rb renamed to lib/polymorphic_integer_type/activerecord_4/predicate_builder_extension.rb

@@ -0,0 +1,38 @@
+module PolymorphicIntegerType
+  module AssociationQueryHandlerExtension
+    def call(attribute, value)
+      queries = {}
+      table = value.associated_table
+
+      if value.base_class
+        queries[table.association_foreign_type.to_s] = polymorphic_value_for(value)
+      end
+
+      queries[table.association_foreign_key.to_s] = value.ids
+      predicate_builder.build_from_hash(queries)
+    end
+
+    protected
+
+    def polymorphic_value_for(query_value)
+      table = query_value.associated_table
+      association = table.send(:association)
+      klass = association.active_record
+      name = association.name
+
+      if klass.respond_to?("#{name}_type_mapping")
+        type_mapping = klass.send("#{name}_type_mapping")
+
+        type_mapping.key(query_value.value.class.sti_name) ||
+          type_mapping.key(query_value.base_class.to_s) ||
+          type_mapping.key(query_value.base_class.sti_name)
+      else
+        query_value.base_class.name
+      end
+    end
+
+
+  end
+end
+
+ActiveRecord::PredicateBuilder::AssociationQueryHandler.prepend(PolymorphicIntegerType::AssociationQueryHandlerExtension)

lib/polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension.rb

@@ -34,9 +34,15 @@
   context "when querying the associations" do
     let(:source) { cat }
     let(:target) { nil }
+
     it "properly finds the object with a where" do
       expect(Link.where(source: source, id: link.id).first).to eql link
     end
+
+    it "properly finds the object when passing an array of sources" do
+      expect(Link.where(source: [source])).to eq [link]
+    end
+
     it "properly finds the object with a find_by" do
       expect(Link.find_by(source: source, id: link.id)).to eql link
     end