polymorphic_join 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b2e3c19213a3b9fbe21bfa6d1ea920f31c9f5def
-  data.tar.gz: 5bf97916ff403fc3a719da1711efdce1bd2adc1d
+SHA256:
+  metadata.gz: c613dd44e44c5926f53a7563876aa768be0a1c4ed93d7a5b6d466f288d225c14
+  data.tar.gz: b11dca1df7bbe4e17d8017ba7cb929151bd1373e95ab6f11fcb109a33bd48938
 SHA512:
-  metadata.gz: dd699d99211940f5f9fc54e350b33b69bd98a60ea880a84034717dcd24b2634327d8c7f5c7113d20f995958f4c91633187f0c6ad2ede6d4531d7a0d721d931ce
-  data.tar.gz: 2be3693618f439c047a23f578c205d21becd4f2cc2bcc694a263a428cffb7ab0780bdae58a8d641df022fe01fc115187f6c4dcb49adf59d18e59fe2c3b232833
+  metadata.gz: 572ccc4a2074c1a8ec8a46cfe9f286516e4ae412f31f1ed0376ad746dc051d87f0cfbb3d5a9303ca962cada9129da83fd84aa79870c948c7190cd27a7e4aade8
+  data.tar.gz: bd8efc9ef21a1d92919069ed39fa39f3b476258d46b49bdf57bb3b98bd623b10e6c2baed676bb2d1306b033c984a7d48f1733be584b06551d6fe97a9711aa63d

data/lib/polymorphic_join/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicJoin
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/polymorphic_join.rb

@@ -1,4 +1,4 @@
-# rubocop:disable MethodLength, AbcSize
+# rubocop:disable MethodLength, AbcSize, ModuleLength
 # frozen_string_literal: true
 
 require 'polymorphic_join/version'
@@ -73,12 +73,14 @@ module PolymorphicJoin
           )
       end
 
-      polymorphic_union_scope(types, *joins_statements)
+      polymorphic_union_scope(
+        type, polymorphic[:refs], *joins_statements
+      )
     end
 
     protected
 
-    def polymorphic_union_scope(types, *scopes)
+    def polymorphic_union_scope(type, refs, *scopes)
       union = scopes[0]
       t2 = arel_table
 
@@ -88,8 +90,20 @@ module PolymorphicJoin
         end
       end
 
+      types = type.to_s.pluralize
       t1 = arel_table.create_table_alias(union, types)
-      from(t2.create_join(t1, t2.create_on(t1[:id].eq(t2[:id]))))
+      from(
+        t2.create_join(
+          t1,
+          t2.create_on(
+            t1[:id].eq(t2["#{type}_id".to_sym]).and(
+              t2["#{type}_type"].in(
+                refs.collect { |x| x.to_s.singularize.classify }
+              )
+            )
+          )
+        )
+      ).distinct
     end
 
     def retrieve_all_polymorphic_types(type)
@@ -104,7 +118,6 @@ module PolymorphicJoin
         poly_refs << (ref.is_a?(Symbol) ? ref : ref.keys.first)
       end
 
-      puts refs.inspect
       {
         refs: poly_refs,
         map_columns: refs.each_with_object({}) do |el, hash|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_join
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Huynh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This gem is used to do polymorphic join