polymorphic_integer_type 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 11fbd6f9c602a576f371e3229014f93c51c656d2
-  data.tar.gz: 7de5bd1c342aaf386ef9cd3defe7cb2791e1bda4
+SHA256:
+  metadata.gz: a821ba758df6177c1f89d6f147bedd24e5a96874b65e9bff7c348b04f5a60013
+  data.tar.gz: 23f8a6196d1523ef46d58af66612646a910744e511f959ff783af977e8ea56a6
 SHA512:
-  metadata.gz: f266a00a2d64233c9362f344c2d9077ffbf0fd4df12bb3dd99734b239b9c0d2867dbe7b741e36c0348adc19f9e181204e534e70c307fa711e3323c6e2958f835
-  data.tar.gz: 31355ff1e141213dd72935588ae45cb64ff4787407ce80ee0b242d76c7e04a41a665b432675a45b3f3d25259c44ed5c87f0fe6e3ddac13797950f703b9d689a0
+  metadata.gz: 0a4e980b7f71e2fd78f030fcd8053cb12923775075e1f9425ee999c24e65d017b30e248bfa484e5a1df7ee300afdf71c1ea03c8260663b475fc477431f81536e
+  data.tar.gz: 5e7be692212675c3f346d10b18328d9b35a0fc5bfc68fbfe19dfea1e0be112ad8d9410b6429b2986b212d64cf94e8825d2aa27d1aed29197625cdf8d45b5e81b

data/.gitignore

@@ -17,3 +17,5 @@ spec/support/active_record.rb
 test/tmp
 test/version_tmp
 tmp
+.byebug_history
+polymorphic_integer_type_test

data/lib/polymorphic_integer_type/polymorphic_array_value_extension.rb

@@ -0,0 +1,20 @@
+module PolymorphicIntegerType
+  module PolymorphicArrayValueExtension
+    def type_to_ids_mapping
+      super.tap do |result|
+        association = @associated_table.send(:association)
+        klass = association.active_record
+        name = association.name
+
+        if klass.respond_to?("#{name}_type_mapping")
+          result.transform_keys! do |key|
+            klass.send("#{name}_type_mapping").key(key)
+          end
+        end
+        result
+      end
+    end
+  end
+end
+
+ActiveRecord::PredicateBuilder::PolymorphicArrayValue.prepend(PolymorphicIntegerType::PolymorphicArrayValueExtension)

data/lib/polymorphic_integer_type/version.rb

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

data/lib/polymorphic_integer_type.rb

@@ -1,5 +1,6 @@
 require "polymorphic_integer_type/version"
 require "polymorphic_integer_type/extensions"
 require "polymorphic_integer_type/mapping"
+require "polymorphic_integer_type/polymorphic_array_value_extension"
 
 module PolymorphicIntegerType; end

data/polymorphic_integer_type.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.2"
+  spec.add_dependency "activerecord"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "activerecord", "4.2.0"
-  spec.add_development_dependency "mysql2", "0.3.16"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "byebug"
 end

data/spec/polymorphic_integer_type_spec.rb

@@ -24,6 +24,17 @@ describe PolymorphicIntegerType do
     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 with a find_by" do
+      expect(Link.find_by(source: source, id: link.id)).to eql link
+    end
+  end
+
   shared_examples "proper source" do
     it "should have the proper id, type and object for the source" do
       expect(link.source_id).to eql source.id
@@ -47,12 +58,12 @@ describe PolymorphicIntegerType do
 
     context "and the link is accessed through the associations" do
       before { link }
-      
+
       it "should have the proper source" do
         expect(source.source_links[0].source).to eql source
       end
     end
-    
+
   end
   context "When a link is given polymorphic record" do
     let(:link) { Link.create(source: source) }
@@ -137,7 +148,7 @@ describe PolymorphicIntegerType do
 
 
   end
-  
+
   context "when the association is an STI table" do
     let(:link) { Link.create(source: source, target: whiskey) }
     let(:source) { Dog.create(name: "Bela", kind: "Dog", owner: owner) }
@@ -147,7 +158,7 @@ describe PolymorphicIntegerType do
       expect(link.source).to eql source
     end
   end
-  
+
   context "when mapping is given inline in the belongs_to model" do
     class InlineLink < ActiveRecord::Base
       include PolymorphicIntegerType::Extensions
@@ -187,7 +198,7 @@ describe PolymorphicIntegerType do
     include_examples "proper target"
 
     it "creates foreign_type mapping method" do
-      expect(Link.source_type_mapping).to eq({0 => "Person", 1 => "Animal"})
+      expect(Link.source_type_mapping).to eq({1 => "Person", 2 => "Animal"})
       expect(InlineLink.source_type_mapping).to eq({10 => "Person", 11 => "InlineAnimal"})
     end
 

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ 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
   end
 
   config.around do |example|

data/spec/support/configuration.rb

@@ -1,4 +1,4 @@
 PolymorphicIntegerType::Mapping.configuration do |config|
-  config.add :source, {0 => "Person", 1 => "Animal"}
-  config.add :target, {0 => "Food", 1 => "Drink"}
+  config.add :source, {1 => "Person", 2 => "Animal"}
+  config.add :target, {1 => "Food", 2 => "Drink"}
 end

data/spec/support/database.yml

@@ -1,5 +1,5 @@
 ---
-:adapter: mysql2
+:adapter: sqlite3
 :host: localhost
 :database: polymorphic_integer_type_test
 :username: root

data/spec/support/migrations/1_create_link_table.rb

@@ -1,4 +1,4 @@
-class CreateLinkTable < ActiveRecord::Migration
+class CreateLinkTable < ActiveRecord::Migration[5.2]
 
   def up
     create_table :links do |t|

data/spec/support/migrations/2_create_animal_table.rb

@@ -1,4 +1,4 @@
-class CreateAnimalTable < ActiveRecord::Migration
+class CreateAnimalTable < ActiveRecord::Migration[5.2]
 
   def up
     create_table :animals do |t|

data/spec/support/migrations/3_create_person_table.rb

@@ -1,4 +1,4 @@
-class CreatePersonTable < ActiveRecord::Migration
+class CreatePersonTable < ActiveRecord::Migration[5.2]
 
   def up
     create_table :people do |t|

data/spec/support/migrations/4_create_food_table.rb

@@ -1,4 +1,4 @@
-class CreateFoodTable < ActiveRecord::Migration
+class CreateFoodTable < ActiveRecord::Migration[5.2]
 
   def up
     create_table :foods do |t|

data/spec/support/migrations/5_create_drink_table.rb

@@ -1,4 +1,4 @@
-class CreateDrinkTable < ActiveRecord::Migration
+class CreateDrinkTable < ActiveRecord::Migration[5.2]
 
   def up
     create_table :drinks do |t|

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +111,7 @@ files:
 - lib/polymorphic_integer_type.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/version.rb
 - polymorphic_integer_type.gemspec
 - spec/polymorphic_integer_type_spec.rb
@@ -147,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Use integers rather than strings for the _type field