activerecord_nested_scope 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 873946315cf0ac4297ef8a4b16db871e009886c757f380006a4b980d67fbf59b
-  data.tar.gz: a05ed25fd35de7eb5b3418899f781105da5e8624b200da1689588f50cb00007b
+  metadata.gz: 6e06209d1f222b99ba36ec6619390cec6465e41000e4dc9100a0de23e47e962b
+  data.tar.gz: 7ed179db041bff9e317e0eb4e51b7e6e8877c0a2ef782cbd1e464c5fe640dec3
 SHA512:
-  metadata.gz: fe922e968ee53fce622f4fe149582167b6b16336c09d49befb57476ab5d79ee5a8acf2811390ee06d87dff2b676180a220a7579ffb672e47e1d509a0b44bf65a
-  data.tar.gz: c3954c2d58bdd3ef006556c0fb84ce613b3249784cad10a829e3eb1ce46cd5cad594ff7ef85070ba33bf025cae5c3457151680bf03ff9ced9fe0e1fb38765c91
+  metadata.gz: 2a2b55f78f24d9e1e1cf50f3d2260dff3e62dc70ce2ba6594835192e0189eee3b222d17a2b55e6f0ff5351a2927befcd35f0f3e660c45ec6679d5a186a3fb18a
+  data.tar.gz: 73a819a21306bb1ed00645063af41eea0851687c944942a8aa7a9f8b2f209980ca9bb99b007e778f197c1c40126d0585f199f9a9d5742a57937cd3fb6fd1220b

data/.travis.yml

@@ -30,4 +30,4 @@ before_script:
   - bundle exec rake db:create db:migrate db:seed RAILS_ENV=test
   - cd ../..
 script:
-  - bundle exec rspec
+  - DEBUG=1 bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.2.0
+
+* Add source_map option to resolve polymorphic type.
+
 ## 1.1.1
 
 * Fix query for associations with primary key option.

data/lib/activerecord_nested_scope/builder.rb

@@ -48,7 +48,7 @@ module ActiveRecordNestedScope
       rels = node.children.map do |child|
         relation = child_relation(child, select: child.klass.primary_key)
         node.klass.where(
-          node.reflection.foreign_type => child.klass.to_s,
+          node.reflection.foreign_type => child.source_type,
           node.reflection.foreign_key => relation
         )
       end

data/lib/activerecord_nested_scope/node.rb

@@ -1,11 +1,12 @@
 module ActiveRecordNestedScope
   class Node
-    attr_accessor :klass, :name, :parent
+    attr_accessor :klass, :name, :parent, :source_type
 
-    def initialize(klass, name, parent = nil)
+    def initialize(klass, name, parent = nil, source_type = nil)
       @klass = klass
       @name = name
       @parent = parent
+      @source_type = source_type
     end
 
     def has_options?
@@ -46,7 +47,8 @@ module ActiveRecordNestedScope
       if leaf?
         []
       elsif polymorphic_belongs_to?
-        polymorphic_klasses.map { |klass| Node.new(klass, @name, self) }
+        types = PolymorphicType.new(self, reflection).resolve
+        types.map { |klass, source_type| Node.new(klass, @name, self, source_type) }
       else
         [Node.new(reflection.klass, @name, self)]
       end
@@ -71,11 +73,39 @@ module ActiveRecordNestedScope
       @klass.all.instance_eval(&@parent.reflection.scope) if has_scope?
     end
 
-    private
+    class PolymorphicType
+      def initialize(node, reflection)
+        @node = node
+        @reflection = reflection
+      end
+
+      def resolve
+        types = @node.klass.unscoped.group(@reflection.foreign_type).pluck(@reflection.foreign_type).compact
+        types.map do |type|
+          klass = resolve_source_type(type)&.safe_constantize
+          [klass, type] if klass
+        end.compact
+      end
+
+      private
 
-    def polymorphic_klasses
-      types = @klass.unscoped.group(reflection.foreign_type).pluck(reflection.foreign_type).compact
-      types.map { |type| type.safe_constantize }.compact
+      def resolve_source_type(type)
+        if (map = @node.options(:source_map))
+          resolve_from_map(type, map)
+        else
+          type
+        end
+      end
+
+      def resolve_from_map(type, map)
+        if map.is_a?(Proc)
+          map.call(type)
+        elsif map.is_a?(Hash)
+          map[type]
+        else
+          raise ArgumentError.new("unsupported argument type for source_map option: #{map.class}.")
+        end
+      end
     end
   end
 end

data/lib/activerecord_nested_scope/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordNestedScope
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_nested_scope
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord extension to build nested scopes