trailblazer-option 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5d6eb7b91e88296224c9a75b28fae91a4c91d58b36f1193ed8c13068e77261
-  data.tar.gz: 4fb0d17ce2fbb30a2ac25c358c4a7b082e056aa406d646ac026991ba43ffe263
+  metadata.gz: b6002d9d525ee513b07f18ba89480e2a69be11892664186e8020c085e0286bf2
+  data.tar.gz: af25382707b80a01760a204861da7860ce4f60cd9a534b3015278de344cc8236
 SHA512:
-  metadata.gz: 709e99594cbfb5810f6861a20294552ace31a364025e83a14709dee74e0339d8ed5e1e7ce9ac35bb18018864994a1ee81b1c8eea6115edf25f3d3d2b9febe22a
-  data.tar.gz: 8ac22945f47ead2bc30d143f608dbaf257605fe95bad012c7328bde2aff2acf278bd3410854fe7787c0d0d3450f8cd8a28d4edc1f0d01c7f0bcc455f12b4ff17
+  metadata.gz: 1b3cfd6578fd2faf2a4d5e8f0df117ce387c01868e95056c3e6c0c4217129495ffd80f50a7ba05a166fcdefeab58931cccb5fbea845750b13c8b2e283044bc3d
+  data.tar.gz: fe6c2ce74b8ed5aac51ab0bc4fa773f2b8408f993667cb01299310806ed2d867c5d9724375dabc326d515107f79e59f6690522b02ee56fc68941364a87a08265

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.1
+
+* Don't pass empty `keyword_arguments` for ruby <= 2.6.
+
 # 0.1.0
 
 * Separated from `trailblazer-context`, beginning its own world.

data/lib/trailblazer/option.rb

@@ -3,10 +3,17 @@ module Trailblazer
     # A call implementation invoking `value.(*args, **keyword_arguments)` and plainly forwarding all arguments.
     # Override this for your own step strategy.
     # @private
-    def self.call!(value, *args, signal: :call, keyword_arguments: {}, **, &block)
-      # {**keyword_arguments} gets removed automatically if it's an empty hash.
-      # DISCUSS: is this a good practice?
-      value.public_send(signal, *args, **keyword_arguments, &block)
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
+      def self.call!(value, *args, signal: :call, keyword_arguments: {}, **, &block)
+        # NOTE: {**keyword_arguments} gets removed automatically if it's an empty hash.
+        value.public_send(signal, *args, **keyword_arguments, &block)
+      end
+    else
+      # Don't pass empty `keyword_arguments` because Ruby <= 2.6 passes an empty hash for `**{}`
+      def self.call!(value, *args, signal: :call, keyword_arguments: nil, **, &block)
+        return value.public_send(signal, *args, &block) unless keyword_arguments
+        value.public_send(signal, *args, **keyword_arguments, &block)
+      end
     end
 
     # Note that #evaluate_callable, #evaluate_proc and #evaluate_method drop most of the args.

data/lib/trailblazer/option/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Option
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/test/option_test.rb

@@ -1,14 +1,14 @@
 require "test_helper"
 
 class OptionTest < Minitest::Spec
-  def assert_result(result, block = nil)
-    _(result).must_equal([{a: 1}, 2, {b: 3}, block])
+  describe "positional and kws" do
+    def assert_result(result, block = nil)
+      _(result).must_equal([{a: 1}, 2, {b: 3}, block])
 
-    _(positional.inspect).must_equal %({:a=>1})
-    _(keywords.inspect).must_equal %({:a=>2, :b=>3})
-  end
+      _(positional.inspect).must_equal %({:a=>1})
+      _(keywords.inspect).must_equal %({:a=>2, :b=>3})
+    end
 
-  describe "positional and kws" do
     class Step
       def with_positional_and_keywords(options, a: nil, **more_options, &block)
         [options, a, more_options, block]
@@ -73,13 +73,8 @@ class OptionTest < Minitest::Spec
 
   describe "positionals" do
     def assert_result_pos(result)
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
-        _(result).must_equal([1, 2, [3, 4]])
-        _(positionals).must_equal [1, 2, 3, 4]
-      else
-        _(result).must_equal([1, 2, [3, 4, {}]])
-        _(positionals).must_equal [1, 2, 3, 4]
-      end
+      _(result).must_equal([1, 2, [3, 4]])
+      _(positionals).must_equal [1, 2, 3, 4]
     end
 
     # In Ruby < 3.0, {*args} will grab both positionals and keyword arguments.
@@ -167,4 +162,44 @@ class OptionTest < Minitest::Spec
       assert_result_kws option.(keyword_arguments: keywords, exec_context: "something")
     end
   end
+
+  describe "no arguments" do
+    def assert_result_no_args(result)
+      _(result).must_equal([])
+    end
+
+    class Step
+      def with_no_args
+        []
+      end
+    end
+
+    class WithNoArgs
+      def self.call
+        []
+      end
+    end
+
+    WITH_NO_ARGS = -> { [] }
+
+    it ":method" do
+      step = Step.new
+
+      option = Trailblazer::Option(:with_no_args)
+
+      assert_result_no_args option.(exec_context: step)
+    end
+
+    it "-> {} lambda" do
+      option = Trailblazer::Option(WITH_NO_ARGS)
+
+      assert_result_no_args option.(exec_context: "something")
+    end
+
+    it "callable" do
+      option = Trailblazer::Option(WithNoArgs)
+
+      assert_result_no_args option.(exec_context: "something")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-option
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest