polymorphic_join 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9b703f8ff1b5289d2747b1459e5740c4b8d6a67065f1472cdf6d7a684ce2a142
-  data.tar.gz: 74fbc141a9bb1b3371e504260ef483848e9988cfb1fdd9e49073a2909f322e56
+SHA1:
+  metadata.gz: b2e3c19213a3b9fbe21bfa6d1ea920f31c9f5def
+  data.tar.gz: 5bf97916ff403fc3a719da1711efdce1bd2adc1d
 SHA512:
-  metadata.gz: 425c0fd60d0d5bfcdf7e478d55230be5891561efb8081d17d3ba480e1435617677ac063951583d5fe3a91fa090a2e9db38c4649ec8a39071c2bb3a70c7657e1c
-  data.tar.gz: 89a3ae135b7aacb3503ba41307509fe579a37b8b1d2e19d9591e1dedfba8101644d8c598296f9cf931e5750d008d059fd9c1607d19b26d0942b002efafd21df2
+  metadata.gz: dd699d99211940f5f9fc54e350b33b69bd98a60ea880a84034717dcd24b2634327d8c7f5c7113d20f995958f4c91633187f0c6ad2ede6d4531d7a0d721d931ce
+  data.tar.gz: 2be3693618f439c047a23f578c205d21becd4f2cc2bcc694a263a428cffb7ab0780bdae58a8d641df022fe01fc115187f6c4dcb49adf59d18e59fe2c3b232833

data/README.md

@@ -7,7 +7,7 @@ Rails does not include a polymorphic join by default but this gem would help you
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'polymorphic_join', '~> 0.2.0'
+gem 'polymorphic_join', '~> 0.2.1'
 ```
 
 And then execute:
@@ -57,6 +57,23 @@ Notification
   .order('notifiables.common_attribute ASC')
 ```
 
+Or if you want to map back certain column
+
+```rb
+Notification
+  .ref_polymorphic(
+    :notifiable,
+    [
+      :comments,
+      {
+        uploads: { title: 'content' }
+      }
+    ]
+  )
+  .where('notifiables.common_attribute' => 'test')
+  .order('notifiables.common_attribute ASC')
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/polymorphic_join/version.rb

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

data/lib/polymorphic_join.rb

@@ -1,4 +1,4 @@
-# rubocop:disable BlockLength, AbcSize, Style/Documentation, MethodLength
+# rubocop:disable MethodLength, AbcSize
 # frozen_string_literal: true
 
 require 'polymorphic_join/version'
@@ -10,8 +10,73 @@ module PolymorphicJoin
   end
 
   module ClassMethods
+    def query_ref_polymorphic(type, refs)
+      polymorphic = if refs.nil?
+                      {
+                        refs: retrieve_all_polymorphic_types(type),
+                        map_columns: {}
+                      }
+                    else
+                      process_input_refs(refs)
+                    end
 
-    private
+      columns =
+        polymorphic[:refs]
+        .first
+        .to_s
+        .classify
+        .constantize
+        .column_names
+
+      polymorphic[:refs].each do |p|
+        columns &= p.to_s.classify.constantize.column_names
+      end
+
+      polymorphic[:map_columns].values.each do |value|
+        columns += value.values
+      end
+
+      columns.uniq!
+
+      selectable_columns = {}
+      types = type.to_s.pluralize
+      polymorphic[:refs].each do |p|
+        map_columns = polymorphic[:map_columns][p] || {}
+        selectable_columns[p] = []
+
+        p.to_s.classify.constantize.column_names.each do |column_name|
+          if (alias_name = map_columns[column_name.to_sym]).present?
+            selectable_columns[p] <<
+              "#{types}.#{column_name} AS #{alias_name}"
+          elsif columns.index(column_name)
+            selectable_columns[p] <<
+              "#{types}.#{column_name}"
+          end
+        end
+      end
+
+      table = arel_table
+      joins_statements = polymorphic[:refs].map do |join_type|
+        join_table =
+          join_type.to_s.classify.constantize.arel_table.alias(types)
+        arel_table
+          .project(*(selectable_columns[join_type]))
+          .join(
+            join_table, Arel::Nodes::InnerJoin
+          )
+          .on(
+            table["#{type}_type".to_sym]
+            .eq(join_type.to_s.classify)
+            .and(
+              table["#{type}_id".to_sym].eq(join_table[:id])
+            )
+          )
+      end
+
+      polymorphic_union_scope(types, *joins_statements)
+    end
+
+    protected
 
     def polymorphic_union_scope(types, *scopes)
       union = scopes[0]
@@ -28,52 +93,35 @@ module PolymorphicJoin
     end
 
     def retrieve_all_polymorphic_types(type)
-      distinct.pluck("#{type}_type").collect do |x| 
+      distinct.pluck("#{type}_type").collect do |x|
         x.underscore.tableize.to_sym
       end
     end
 
-    def add_ref_polymorphic_scope
-      scope :ref_polymorphic, lambda { |type, refs = nil|
-        polymorphic = if refs.nil?
-                        retrieve_all_polymorphic_types(type)
-                      else
-                        refs
-                      end
-        columns = polymorphic.first.to_s.classify.constantize.column_names
-        polymorphic.each do |p|
-          columns &= p.to_s.classify.constantize.column_names
-        end
-
-        types = type.to_s.pluralize
-
-        columns -= column_names
-        selectable_columns = []
-        columns.each do |column|
-          selectable_columns << "#{types}.#{column}"
-        end
+    def process_input_refs(refs)
+      poly_refs = []
+      refs.each do |ref|
+        poly_refs << (ref.is_a?(Symbol) ? ref : ref.keys.first)
+      end
 
-        table = arel_table
-        joins_statements = polymorphic.map do |join_type|
-          join_table =
-            join_type.to_s.classify.constantize.arel_table.alias(types)
-          arel_table
-            .project(table[Arel.star], *selectable_columns)
-            .join(
-              join_table, Arel::Nodes::InnerJoin
-            )
-            .on(
-              table["#{type}_type".to_sym]
-              .eq(join_type.to_s.classify)
-              .and(
-                table["#{type}_id".to_sym].eq(join_table[:id])
-              )
-            )
+      puts refs.inspect
+      {
+        refs: poly_refs,
+        map_columns: refs.each_with_object({}) do |el, hash|
+          if el.is_a?(Symbol)
+            hash[el] = {}
+          else
+            hash[el.keys.first] = el[el.keys.first]
+          end
         end
+      }
+    end
 
-        polymorphic_union_scope(types, *joins_statements)
+    def add_ref_polymorphic_scope
+      scope :ref_polymorphic, lambda { |type, refs = nil|
+        query_ref_polymorphic(type, refs)
       }
     end
   end
 end
-# rubocop:enable all
+# rubocop:disable all

metadata

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