polymorphic_integer_type 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f818991a7fa6b0835e39fd4133d6bc7c163e6d4e
-  data.tar.gz: 2e2715bfdb1d56e36d142b9c5b9bebf785795ab3
+SHA256:
+  metadata.gz: 71d86331b1421461b63d205d371f2194139604604850c2fca777fa03d779d5b6
+  data.tar.gz: 051307d6d4844ff3657acca8b2e5b75ce45afd774553da5801d7fad1a991dd6d
 SHA512:
-  metadata.gz: d9616ed1ea9e3bd402b4632b0c3b9aa4355a282424941f1538a86498420f84f91e06e9471cf7d0e243afad70f9dc74f3348b5252a4c2aea455a6b0bdc7f40c04
-  data.tar.gz: e6b3723b6b3de1b558797c2334252369896674c451f40760ff0a1f8ccde01c14a55058c30f4fc1a7d117c70406a1e67880ecaf5cf597270358033d3e88c96d01
+  metadata.gz: a495033bdbe6a71f90268ed764521d8b1be527dbc614244dbfad48a49ec9a71f680906457e7f0fb69196dc79122906783c62ac909f8770d55107ad23fd78b825
+  data.tar.gz: 1ab16457dfae29bebf25e180053e3061f5b14a69187d0fa540bab78f74dfa5953fcf1fdf25aa0ea2d1136cc3336cb2db79be1dacaf0af8e7c619ab50e28ecbb8

data/lib/polymorphic_integer_type.rb

@@ -1,10 +1,21 @@
+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
+
+if ACTIVE_RECORD_VERSION < Gem::Version.new("5.2.0")
+  require "polymorphic_integer_type/activerecord_4/belongs_to_polymorphic_association_extension"
 end
 
 module PolymorphicIntegerType; end

data/lib/polymorphic_integer_type/activerecord_4/belongs_to_polymorphic_association_extension.rb

@@ -0,0 +1,10 @@
+module ActiveRecord
+  module Associations
+    class BelongsToPolymorphicAssociation < BelongsToAssociation
+      private def replace_keys(record)
+        super
+        owner[reflection.foreign_type] = record.class.base_class
+      end
+    end
+  end
+end

data/lib/polymorphic_integer_type/activerecord_5_0_0/association_query_handler_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)

data/lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicIntegerType
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/spec/polymorphic_integer_type_spec.rb

@@ -24,19 +24,33 @@ describe PolymorphicIntegerType do
     end
   end
 
-  context "when the source is a class that modifies the sti_name" do
+  context "when the source is a class that modifies the sti_name or polymorphic_name" do
     it "properly sets the source_type to the modified class name" do
       link = Link.new(source: Namespaced::Animal.new)
       expect(link.source_type).to eql "Animal"
     end
+
+    it "can read dirty attributes from an associated object" do
+      animal = Namespaced::Animal.create!(name: "Oldie")
+      animal.name = "Newton"
+      link = Link.create!(source: animal)
+
+      expect(link.source.name).to eq("Newton")
+    end
   end
 
   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
@@ -103,7 +117,7 @@ describe PolymorphicIntegerType do
 
   end
 
-  context "When using a relation to the links with eagar loading" do
+  context "When using a relation to the links with eager loading" do
     let!(:links){
       [Link.create(source: source, target: kibble),
         Link.create(source: source, target: water)]
@@ -118,7 +132,7 @@ describe PolymorphicIntegerType do
 
   end
 
-  context "When using a through relation to the links with eagar loading" do
+  context "When using a through relation to the links with eager loading" do
     let!(:links){
       [Link.create(source: source, target: kibble),
         Link.create(source: source, target: water)]
@@ -133,7 +147,7 @@ describe PolymorphicIntegerType do
 
   end
 
-  context "When eagar loading the polymorphic association" do
+  context "When eager loading the polymorphic association" do
     let(:link) { Link.create(source_id: source.id, source_type: source.class.to_s) }
     let(:source) { cat }
 
@@ -154,6 +168,7 @@ describe PolymorphicIntegerType do
     end
 
 
+
   end
 
   context "when the association is an STI table" do

data/spec/spec_helper.rb

@@ -9,12 +9,13 @@ require 'support/dog'
 require 'support/person'
 require 'support/food'
 require 'support/drink'
+require 'byebug'
 
 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)
-    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
+    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5.2.0")
       ActiveRecord::MigrationContext.new("#{File.dirname(__FILE__)}/support/migrations").migrate
     end
   end

data/spec/support/namespaced_animal.rb

@@ -3,5 +3,9 @@ module Namespaced
 
     self.store_full_sti_class = false
     self.table_name = "animals"
+
+    def self.polymorphic_name
+      "Animal"
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,10 +109,12 @@ files:
 - Rakefile
 - bin/setup
 - lib/polymorphic_integer_type.rb
+- lib/polymorphic_integer_type/activerecord_4/belongs_to_polymorphic_association_extension.rb
+- lib/polymorphic_integer_type/activerecord_4/predicate_builder_extension.rb
+- lib/polymorphic_integer_type/activerecord_5_0_0/association_query_handler_extension.rb
+- lib/polymorphic_integer_type/activerecord_5_0_0/polymorphic_array_value_extension.rb
 - 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
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Use integers rather than strings for the _type field