shifty 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e40c676c0313d5e9d68d6f086d288cbe8ff2ab62daec547512ff2a6d88f7137
-  data.tar.gz: 4510bcada58be0042ecef3acefb11b8805ca58d309ba5633a0c86ad2d99d8f35
+  metadata.gz: b2d09c087eca2d3c2790efab38c0e12230edd9738daf7e43c6788a8671c64356
+  data.tar.gz: 98fe18da84e2889e1b0c1bb90ea41ffcb6928e50868033fa33627bce58482052
 SHA512:
-  metadata.gz: 243e0b8aac6babbd44913ece9b7fae08b38aff704f6c5949ad48eb393558cf012c6f49b68dad301bd468f17247c76c0e3e2943ef894f1090806d8e2cfbd53879
-  data.tar.gz: 3adca13be889a7b036f6cc670832603f9015b2c6a5f00af54da0398e6c04585b0ce99a651d2867e3c81e36007999de20f9ae1479d41ac70ef97bc05ea5a27e00
+  metadata.gz: 0fb0046526de78394da2a742f9c9d41d07d58717592f0ce40f13d32e6cdf8e2c0c42d30fffe2bc53e164398422639c5f42943c0e7edb064eb0ec8c21960fe833
+  data.tar.gz: 45792b0187073a88781217d1559afc185471bbdbd849c233af81055a9dc5d71ebf8bbd018a3224baa4d0a32795109802eadfcfe9dba754f964907154dabc0e4c

data/lib/shifty/dsl.rb

@@ -19,18 +19,23 @@ module Shifty
       end
     end
 
-    def relay_worker(&block)
+    def relay_worker(options = {}, &block)
+      options[:tags] ||= []
+      options[:tags] << :relay
       ensure_regular_arity(block)
 
-      Worker.new(tags: [:relay]) do |value|
+      Worker.new(options) do |value|
         value && block.call(value)
       end
     end
 
-    def side_worker(mode = :normal, &block)
+    def side_worker(options = {}, &block)
+      options[:tags] ||= []
+      options[:tags] << :side_effect
+      mode = options[:mode] || :normal
       ensure_regular_arity(block)
 
-      Worker.new(tags: [:side_effect]) do |value|
+      Worker.new(options) do |value|
         value.tap do |v|
           used_value = (mode == :hardened) ?
             Marshal.load(Marshal.dump(v)) : v
@@ -40,15 +45,13 @@ module Shifty
       end
     end
 
-    def filter_worker(argument = nil, &block)
-      if block && argument.respond_to?(:call)
-        throw_with "You cannot supply two callables"
-      end
-      callable = argument.respond_to?(:call) ? argument : block
-      ensure_callable(callable)
+    def filter_worker(options = {}, &block)
+      options[:tags] ||= []
+      options[:tags] << :filter
+      ensure_callable!(block)
 
-      Worker.new(tags: [:filter]) do |value, supply|
-        while value && !callable.call(value)
+      Worker.new(options) do |value, supply|
+        while value && !block.call(value)
           value = supply.shift
         end
         value
@@ -62,14 +65,18 @@ module Shifty
       end
     end
 
-    def batch_worker(options = {gathering: 1}, &block)
+    def batch_worker(options = {}, &block)
+      options[:tags] ||= []
+      options[:tags] << :batch
+      options[:gathering] ||= 1
+
       ensure_regular_arity(block) if block
       batch_full = block ||
         proc { |_, batch| batch.size >= options[:gathering] }
 
-      batch_context = BatchContext.new({batch_full: batch_full})
+      options[:context] = BatchContext.new({batch_full: batch_full})
 
-      Worker.new(tags: [:batch], context: batch_context) do |value, supply, context|
+      Worker.new(options) do |value, supply, context|
         if value
           context.collection = [value]
           until context.batch_complete?(
@@ -83,10 +90,12 @@ module Shifty
       end
     end
 
-    def splitter_worker(&block)
+    def splitter_worker(options = {}, &block)
+      options[:tags] ||= []
+      options[:tags] << :splitter
       ensure_regular_arity(block)
 
-      Worker.new(tags: [:splitter]) do |value|
+      Worker.new(options) do |value|
         if value.nil?
           value
         else
@@ -99,9 +108,11 @@ module Shifty
       end
     end
 
+    # don't like that this is a second exception to accepting options..
     def trailing_worker(trail_length = 2)
+      options = {tags: [:trailing]}
       trail = []
-      Worker.new(tags: [:trailing]) do |value, supply|
+      Worker.new(options) do |value, supply|
         if value
           trail.unshift value
           if trail.size >= trail_length
@@ -113,7 +124,7 @@ module Shifty
 
           trail
         else
-          value
+          value # hint: it's nil!
         end
       end
     end
@@ -128,7 +139,7 @@ module Shifty
       raise WorkerInitializationError.new([msg].flatten.join(" "))
     end
 
-    def ensure_callable(callable)
+    def ensure_callable!(callable)
       unless callable&.respond_to?(:call)
         throw_with "You must supply a callable"
       end

data/lib/shifty/taggable.rb

@@ -1,7 +1,7 @@
 module Shifty
   module Taggable
     def tags=(tag_arg)
-      @tags = [tag_arg].flatten.compact
+      @tags = [tag_arg].flatten.compact.uniq
     end
 
     def criteria=(criteria_arg)

data/lib/shifty/version.rb

@@ -1,3 +1,3 @@
 module Shifty
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shifty
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Joel Helbling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake