attr-gather 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bd71ae41d26e56b126cd094b0baa82755c246c059c3149330730e80ff075836
-  data.tar.gz: 1ca6c61fa9e9daddcacb558387e2fac8d471108c223a390404ce77b11b2051b7
+  metadata.gz: d5a781371ace4374427a2510da9860b10014caf039fcfd4aa620886f252d57a9
+  data.tar.gz: a0d1d564f206b30246e67d017e8a814c43529b120c6ff8499ef0198d5847ad7a
 SHA512:
-  metadata.gz: 96607adf22289a8fc5226ec952e9e80d6694f79cc97bee2100d842c7dd5068b3bc4799d57026876888a432075f6c35d1dfba155069594f945ea002856e5ab7cc
-  data.tar.gz: 6ca46ed75fb879de04127ff80c3018a2b086a206ddac8c1e3d311fd71f292642709a09ea0b6dc4285ec19b3ddb1f9493a279894b870052c0c497ca7d9fc974ff
+  metadata.gz: 52823ab8e9b562de9b23b8bdbe6bc08354bb85f71bd51580ab746fd4adce30cade4d27d55c3bf67a294bbb101f61eae485bc006537c89aefcba57ca28f3e8e39
+  data.tar.gz: '0998be6201c8b8292297390064233d0ad04c17b5b8d84ceebf76f0766e5d84fdfafb7edc0d2a4621825f2efafd66b192f89a3fbd38d6462b16ecbecbea7abc01'

data/.github/workflows/ruby.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.4.x", "2.5.x", "2.6.x", "2.7.x"]
+        ruby: ["2.5.x", "2.6.x", "2.7.x"]
     steps:
       - uses: actions/checkout@v1
       - name: Set up Ruby 2.6

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
 AllCops:
   UseCache: true
   CacheRootDirectory: './tmp/cache'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   NewCops: enable
 
 Metrics/BlockLength:
@@ -15,7 +15,7 @@ Metrics/ModuleLength:
   Exclude:
     - spec/**/*.rb
 
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
     - ./attr-gather.gemspec
     - ./bin/**/*

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.6.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attr-gather (1.4.0)
+    attr-gather (1.5.1)
       dry-container (~> 0.7)
 
 GEM
@@ -9,46 +9,42 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     backport (1.1.2)
-    benchmark (0.1.0)
+    benchmark (0.1.1)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
     dry-initializer (3.0.4)
-    dry-logic (1.0.8)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-schema (1.5.5)
+      dry-core (~> 0.5, >= 0.5)
+    dry-schema (1.6.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
-      dry-types (~> 1.4)
-    dry-types (1.4.0)
+      dry-types (~> 1.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.5.6)
+    dry-validation (1.6.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)
@@ -56,87 +52,94 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5, >= 1.5.2)
     e2mmap (0.1.0)
-    ffi (1.13.1)
+    ffi (1.15.1)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    http (4.4.1)
+    http (5.0.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
+      llhttp-ffi (~> 0.0.1)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
     jaro_winkler (1.5.4)
-    maruku (0.7.3)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    llhttp-ffi (0.0.1)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    mini_portile2 (2.5.3)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (2.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
     reverse_markdown (2.0.0)
       nokogiri
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (0.93.1)
+    rspec-support (3.10.2)
+    rubocop (1.16.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.6.1)
-      rubocop (>= 0.71.0)
-    ruby-progressbar (1.10.1)
-    solargraph (0.39.17)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    solargraph (0.41.1)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
       e2mmap
       jaro_winkler (~> 1.5)
-      maruku (~> 0.7, >= 0.7.3)
-      nokogiri (~> 1.9, >= 1.9.1)
-      parser (~> 2.3)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
       reverse_markdown (>= 1.0.5, < 3)
-      rubocop (~> 0.52)
+      rubocop (>= 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
-    yard (0.9.25)
+    unicode-display_width (2.0.0)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
@@ -155,4 +158,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.11

data/Rakefile

@@ -23,7 +23,7 @@ rescue LoadError
   warn 'Could not load yarddoc rake task'
 end
 
-task default: %i[spec lint]
+task default: %i[spec lint doc]
 
 namespace :examples do
   desc 'Run all examples'

data/attr-gather.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/ianks/attr-gather'
   spec.license = 'MIT'
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.5'
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 

data/lib/attr/gather/aggregators.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'attr/gather/aggregators/base'
 require 'attr/gather/concerns/registrable'
 
 module Attr

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

@@ -13,7 +13,7 @@ module Attr
       class Base
         attr_accessor :filter
 
-        NOOP_FILTER ||= Filters::Noop.new
+        NOOP_FILTER = Filters::Noop.new
 
         def initialize(**opts)
           @filter = opts.delete(:filter) || NOOP_FILTER

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

@@ -13,11 +13,18 @@ module Attr
         #
         # @param reverse [Boolean] deep merge results in reverse order
         # @param merge_input [Boolean] merge the result with the initial input
+        # @param array_strategy [Symbol] strategy for handling arrays, one of (:concat, :overwrite)
         #
         # @api private
-        def initialize(reverse: false, merge_input: true, **)
+        def initialize(reverse: false, merge_input: true, array_strategy: :concat, **)
+          unless ARRAY_STRATEGY.include?(array_strategy)
+            raise ArgumentError, 'array_strategy must be one of: :concat, :overwrite'
+          end
+
           @reverse = reverse
           @merge_input = merge_input
+          @array_strategy = array_strategy
+
           super
         end
 
@@ -31,19 +38,38 @@ module Attr
 
         private
 
-        def reverse?
-          @reverse
-        end
+        ARRAY_STRATEGY = %i[concat overwrite].freeze
+
+        private_constant :ARRAY_STRATEGY
 
         def deep_merge(hash, other)
-          Hash[hash].merge(other) do |_, orig, new|
+          hash.to_h.merge(other) do |_, orig, new|
             if orig.respond_to?(:to_hash) && new.respond_to?(:to_hash)
-              deep_merge(Hash[orig], Hash[new])
+              deep_merge(orig.to_h, new.to_h)
+            elsif concattable?(orig, new)
+              orig + new
             else
               new
             end
           end
         end
+
+        def concattable?(orig, new)
+          return false unless @array_strategy == :concat
+
+          concattable_class?(orig) && concattable_class?(new)
+        end
+
+        def concattable_class?(obj)
+          return true if obj.is_a?(Array)
+          return true if obj.is_a?(Set)
+
+          false
+        end
+
+        def reverse?
+          @reverse
+        end
       end
     end
   end

data/lib/attr/gather/filters/noop.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'attr/gather/filters/base'
+
 module Attr
   module Gather
     module Filters

data/lib/attr/gather/version.rb

@@ -2,6 +2,6 @@
 
 module Attr
   module Gather
-    VERSION = '1.4.0'
+    VERSION = '1.5.1'
   end
 end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'concurrent/promise'
+
 module Attr
   module Gather
     module Workflow
@@ -63,7 +65,7 @@ module Attr
           return @aggregator if defined?(@aggregator) && !@aggregator.nil?
 
           @aggregator = self.class.aggregator
-          @aggregator.filter ||= filter
+          @aggregator.filter ||= filter if @aggregator.respond_to?(:filter=)
 
           @aggregator
         end

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

@@ -38,7 +38,7 @@ module Attr
         def task(task_name, opts = EMPTY_HASH)
           conf = OpenStruct.new
           yield conf
-          tasks << Hash[name: task_name, **opts, **conf.to_h]
+          tasks << ({ name: task_name, **opts, **conf.to_h })
           self
         end
 
@@ -134,12 +134,21 @@ module Attr
         #     aggregator :deep_merge
         #   end
         #
+        # @example
+        #   class EnhanceUserProfile
+        #     include Attr::Gather::Workflow
+        #
+        #     aggregator MyCustomAggregator
+        #   end
+        #
         # @param agg [#call] the aggregator to use
         #
         # @api public
         def aggregator(agg = nil, opts = EMPTY_HASH)
           @aggregator = if agg.nil? && !defined?(@aggregator)
                           Aggregators.default
+                        elsif agg.respond_to?(:new)
+                          agg.new(filter: filter, **opts)
                         elsif agg
                           Aggregators.resolve(agg, filter: filter, **opts)
                         else
@@ -222,7 +231,7 @@ module Attr
         #
         # @api public
         def filter_with_contract(arg = nil, &blk)
-          contract = block_given? ? build_inline_contract_filter(&blk) : arg
+          contract = blk ? build_inline_contract_filter(&blk) : arg
           filter(:contract, contract)
         end
 

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

@@ -9,6 +9,7 @@ module Attr
       # @api private
       class TaskGraph
         class UnfinishableError < StandardError; end
+
         class InvalidTaskDepedencyError < StandardError; end
 
         include TSort

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr-gather
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="