scopiform 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd67fcd99f42ab665dd31c6fedebe66f490e28ccb03d5d9ad5bd68d6c074b04
-  data.tar.gz: eb6622a1ca3489a78156e290020c36153ddd6008e9a97af05804b94b8cf4a2e4
+  metadata.gz: 60fdf69684da8b4a16efc5b52b69bcae18d30824b844fb57fdc3219780ed2894
+  data.tar.gz: fbc86f9e966127b7c64546adc46b805e1c78caaa6d8aa9c49acceaeea7120639
 SHA512:
-  metadata.gz: ebbbc3f4ed13cddd576958a6b82f5bd2238cb8930ac242ed3dfaeca6bdd71f388c9eaa33912cf02acdfaf31f710737aab3bbcbf2a1654f25a199ad5443eb53d5
-  data.tar.gz: 6ea5675e9a5a6d68a2221b4affd5887cd3a0b8a57c407515b693bb65ab0a49b0fde09d7a3c8a39bb1a14d22e074907ce417f92216a82e8b8aa188d269c8c4187
+  metadata.gz: 6165fbab6073d4ec637aed25cfb58d2f13ef7ecd590724b17374f47e9718850c62740655768f11f1e1b7f14a119a30eba863897c6189b620844e03b0c54fa0ee
+  data.tar.gz: 5730438bea472073e31a9f37d45ce3de8e066615e9dea0b0fa99af5bb955d5b3192cd068898c6367515d959d84354a202c90d405f5a08f488f8f07f342439aa7

data/lib/scopiform/association_scopes.rb

@@ -23,9 +23,9 @@ module Scopiform
         applied = ctx.association.klass.send(method, value, ctx: ScopeContext.from(ctx).set(ctx.association_arel_table))
 
         if is_root
-          joins(ctx.joins).merge(applied)
+          ctx.scopes.reduce(joins(ctx.joins).merge(applied)) { |chain, scope| chain.merge(scope) }
         else
-          all.merge(applied)
+          ctx.scopes.reduce(all.merge(applied)) { |chain, scope| chain.merge(scope) }
         end
       end
 

data/lib/scopiform/core.rb

@@ -8,6 +8,8 @@ module Scopiform
     extend ActiveSupport::Concern
 
     module ClassMethods
+      attr_accessor :scopiform_ctx
+
       def auto_scopes
         @auto_scopes || []
       end

data/lib/scopiform/scope_context.rb

@@ -1,6 +1,6 @@
 module Scopiform
   class ScopeContext
-    attr_accessor :association, :arel_table, :association_arel_table, :joins, :ancestors
+    attr_accessor :association, :arel_table, :association_arel_table, :joins, :ancestors, :scopes
 
     def self.from(ctx)
       created = new
@@ -19,6 +19,7 @@ module Scopiform
     def initialize
       @joins = []
       @ancestors = []
+      @scopes = []
     end
 
     def set(arel_table)
@@ -34,18 +35,24 @@ module Scopiform
           self.association = association.through_reflection
         end
 
-        ancestors << association.name
+        ancestors << association.name.to_s.pluralize
         self.association_arel_table = association.klass.arel_table.alias(alias_name)
 
         joins << create_join
 
+        if association.scope.present? && association.scope.arity.zero?
+          association.klass.scopiform_ctx = ScopeContext.from(self).set(association_arel_table)
+          scopes << association.klass.instance_exec(&association.scope)
+          association.klass.scopiform_ctx = nil
+        end
+
         break if source_reflection_name.blank?
 
-        self.association = association.klass.association(source_reflection_name)
+        self.association = association.klass.reflect_on_association(source_reflection_name)
         self.arel_table = association_arel_table
       end
 
-      self
+      joins
     end
 
     def alias_name

data/lib/scopiform/version.rb

@@ -1,3 +1,3 @@
 module Scopiform
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopiform
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord