attr-gather 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 070b59c7216cfb62efcfc5294b5c3adf0fba6ebc887541aa775bcacda23b7ef4
-  data.tar.gz: bbaa3df40d203b8558fda936c82ca60d984261aaecc143ddf46759e5895521e1
+  metadata.gz: 8f0cfb5dd834161d41a92270f036981babbc4c64a7a2a0be6c223b52e68f22ed
+  data.tar.gz: e865667f933a51c3931e5c04d09d27bb30effabaae7aa247197f5b23e36908c6
 SHA512:
-  metadata.gz: 174170a1e6e8770a18c8b3a20b18c8cadb0e1e33320902af8041d13463eb4850039750865cf2c2c063cfb206763a91c19ccc95b61b8d3a70e703bcf9590411e8
-  data.tar.gz: 1741c549681ee4e91a53c7c3385ed05bb43ebcd8db2164c14cd4b9c79a4175c272a7557309b267d23fbe7bd79d16f63641a385871ae1d3406d1d5ca9d36557d0
+  metadata.gz: 4feb0be067955ac28cc1da31cf278a717a9aa56f43e97409fb110f822acacbae0fda1fc5bc2529c19a0e1d453bd87ef5a140ecde1494da5e5708c8ef4c47b7d4
+  data.tar.gz: 343523a4a84ec2326f9487051898ac3bce17e504a7bda5b93e4e03092bbd5aff4ae3a49b8cde9d2dfa24760803a783ff04d1b4fcc22f28954a798ab35d4503eb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attr-gather (1.1.1)
+    attr-gather (1.1.2)
       dry-container (~> 0.7)
 
 GEM

data/lib/attr/gather/aggregators/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'attr/gather/filters/noop'
+
 module Attr
   module Gather
     module Aggregators
@@ -11,8 +13,10 @@ module Attr
       class Base
         attr_accessor :filter
 
+        NOOP_FILTER ||= Filters::Noop.new
+
         def initialize(**opts)
-          @filter = opts.delete(:filter)
+          @filter = opts.delete(:filter) || NOOP_FILTER
         end
 
         def call(_original_input, _results_array)

data/lib/attr/gather/aggregators/deep_merge.rb

@@ -23,7 +23,7 @@ module Attr
 
         def call(input, execution_results)
           execution_results = execution_results.reverse_each if reverse?
-          initial = merge_input? ? input.dup : {}
+          initial = unwrap_initial_input(input)
 
           result = execution_results.reduce(initial) do |memo, res|
             deep_merge(memo, unwrap_result(res))
@@ -34,6 +34,10 @@ module Attr
 
         private
 
+        def unwrap_initial_input(input)
+          merge_input? ? filter.call(input.dup).value : {}
+        end
+
         def reverse?
           @reverse
         end

data/lib/attr/gather/aggregators/shallow_merge.rb

@@ -23,7 +23,7 @@ module Attr
 
         def call(input, execution_results)
           execution_results = execution_results.reverse_each if reverse?
-          initial = merge_input? ? input.dup : {}
+          initial = unwrap_initial_input(input)
 
           result = execution_results.reduce(initial) do |memo, res|
             memo.merge(unwrap_result(res))
@@ -34,6 +34,10 @@ module Attr
 
         private
 
+        def unwrap_initial_input(input)
+          merge_input? ? filter.call(input.dup).value : {}
+        end
+
         def reverse?
           @reverse
         end

data/lib/attr/gather/version.rb

@@ -2,6 +2,6 @@
 
 module Attr
   module Gather
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

data/lib/attr/gather/workflow/dsl.rb

@@ -88,13 +88,13 @@ module Attr
         #
         # @api public
         def aggregator(agg = nil, opts = EMPTY_HASH)
-          if agg.nil? && !defined?(@aggregator)
-            @aggregator = Aggregators.default
-            return @aggregator
-          end
-
-          @aggregator = Aggregators.resolve(agg, filter: filter, **opts) if agg
-          @aggregator
+          @aggregator = if agg.nil? && !defined?(@aggregator)
+                          Aggregators.default
+                        elsif agg
+                          Aggregators.resolve(agg, filter: filter, **opts)
+                        else
+                          @aggregator
+                        end
         end
 
         # Defines a filter for filtering out invalid values
@@ -130,12 +130,16 @@ module Attr
         # @param args [Array<Object>] arguments for initializing the filter
         #
         # @api public
-        def filter(filt = Undefined, *args, **opts)
-          if filt == Undefined && !defined?(@filter)
-            @filter = Filters.default
-          elsif filt != Undefined
-            @filter = Filters.resolve(filt, *args, **opts)
-          end
+        def filter(filt = nil, *args, **opts)
+          @filter = if filt.nil? && !defined?(@filter)
+                      Filters.default
+                    elsif filt
+                      Filters.resolve(filt, *args, **opts)
+                    else
+                      @filter
+                    end
+
+          aggregator.filter = @filter
 
           @filter
         end
@@ -169,7 +173,7 @@ module Attr
         # @api public
         def filter_with_contract(arg = nil, &blk)
           contract = block_given? ? build_inline_contract_filter(&blk) : arg
-          @filter = Filters.resolve(:contract, contract)
+          filter(:contract, contract)
         end
 
         private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attr-gather
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ian Ker-Seymer