shifty 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df1f9b8ed700b93a733b07ef8316d40f4c0651f993e7ebdc81534ce2816f35da
-  data.tar.gz: 18ef18bf4bfa01d84f13ee3cf3151a1bf0475dd25b5c5cdbfd6555fa6a777de9
+  metadata.gz: b2d09c087eca2d3c2790efab38c0e12230edd9738daf7e43c6788a8671c64356
+  data.tar.gz: 98fe18da84e2889e1b0c1bb90ea41ffcb6928e50868033fa33627bce58482052
 SHA512:
-  metadata.gz: 13217cff868f2d1fb1d8dd7d0f0d149abeac5130db3740765dfaab4d178c0d95821e02406e270a6159e181591827fda9c5b9e903cf1313df07244cfefcc81329
-  data.tar.gz: 5a010dbc027c6c0c7295e2c63fd90a2a58deba458664c351410ad075e5ba9ca15f088ad44ca420dd31d6e3e6d26e1bda64f4750ba061f4c15737da456354acee
+  metadata.gz: 0fb0046526de78394da2a742f9c9d41d07d58717592f0ce40f13d32e6cdf8e2c0c42d30fffe2bc53e164398422639c5f42943c0e7edb064eb0ec8c21960fe833
+  data.tar.gz: 45792b0187073a88781217d1559afc185471bbdbd849c233af81055a9dc5d71ebf8bbd018a3224baa4d0a32795109802eadfcfe9dba754f964907154dabc0e4c

data/.gitignore

@@ -14,3 +14,5 @@
 .rubocop.yml
 
 Gemfile.lock
+
+shifty-*.gem

data/lib/shifty/dsl.rb

@@ -10,7 +10,7 @@ module Shifty
 
       return Worker.new(&callable) if series.nil?
 
-      Worker.new do
+      Worker.new(tags: [:source]) do
         series.each(&callable)
 
         loop do
@@ -19,20 +19,25 @@ module Shifty
       end
     end
 
-    def relay_worker(&block)
+    def relay_worker(options = {}, &block)
+      options[:tags] ||= []
+      options[:tags] << :relay
       ensure_regular_arity(block)
 
-      Worker.new 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 ?
+          used_value = (mode == :hardened) ?
             Marshal.load(Marshal.dump(v)) : v
 
           v && block.call(used_value)
@@ -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 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(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 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 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.1"
+  VERSION = "0.5.0"
 end

data/shifty.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rspec-given", "~> 3.8"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "standard", "~> 1.1"
+  spec.add_development_dependency "standard", ">= 1.28.2"
   spec.add_development_dependency "codeclimate-test-reporter"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shifty
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Joel Helbling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,16 +70,16 @@ dependencies:
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement