From 05934f713b699a627e05465c24464104626473d0 Mon Sep 17 00:00:00 2001
From: Pat Allan <pat@freelancing-gods.com>
Date: Wed, 10 Mar 2021 13:15:35 +1100
Subject: [PATCH] Handle keyword arguments in a Ruby 3.0 world.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that keyword arguments are no longer implicitly translated into hashes, we need to explicitly handle them as a separate argument type.

This commit may not cover all cases (either from a code or spec perspective), but hopefully it’s at least a useful start.
---
 lib/dry/transformer/function.rb | 20 ++++++++++++++------
 lib/dry/transformer/registry.rb |  4 ++--
 spec/unit/registry_spec.rb      | 14 ++++++++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/lib/dry/transformer/function.rb b/lib/dry/transformer/function.rb
index 4c5a346..2496ca1 100644
--- a/lib/dry/transformer/function.rb
+++ b/lib/dry/transformer/function.rb
@@ -25,6 +25,13 @@ class Function
       # @api private
       attr_reader :args
 
+      # Additional keyword arguments that will be passed to the wrapped proc
+      #
+      # @return [Hash]
+      #
+      # @api private
+      attr_reader :kwargs
+
       # @!attribute [r] name
       #
       # @return [<type] The name of the function
@@ -36,6 +43,7 @@ class Function
       def initialize(fn, options = {})
         @fn = fn
         @args = options.fetch(:args, [])
+        @kwargs = options.fetch(:kwargs, {})
         @name = options.fetch(:name, fn)
       end
 
@@ -46,8 +54,8 @@ def initialize(fn, options = {})
       # @alias []
       #
       # @api public
-      def call(*value)
-        fn.call(*value, *args)
+      def call(*value, **additional_kwargs)
+        fn.call(*value, *args, **(kwargs).merge(additional_kwargs))
       end
       alias_method :[], :call
 
@@ -71,15 +79,15 @@ def compose(other)
       # @return [Function]
       #
       # @api private
-      def with(*args)
-        self.class.new(fn, name: name, args: args)
+      def with(*args, **additional_kwargs)
+        self.class.new(fn, name: name, args: args, kwargs: kwargs.merge(additional_kwargs))
       end
 
       # @api public
       def ==(other)
         return false unless other.instance_of?(self.class)
 
-        [fn, name, args] == [other.fn, other.name, other.args]
+        [fn, name, args, kwargs] == [other.fn, other.name, other.args, other.kwargs]
       end
       alias_method :eql?, :==
 
@@ -99,7 +107,7 @@ def to_ast
       #
       def to_proc
         if !args.empty?
-          proc { |*value| fn.call(*value, *args) }
+          proc { |*value| fn.call(*value, *args, **kwargs) }
         else
           fn.to_proc
         end
diff --git a/lib/dry/transformer/registry.rb b/lib/dry/transformer/registry.rb
index c9710bb..5a89625 100644
--- a/lib/dry/transformer/registry.rb
+++ b/lib/dry/transformer/registry.rb
@@ -45,10 +45,10 @@ module Registry
       #
       # @alias :t
       #
-      def [](fn, *args)
+      def [](fn, *args, **kwargs)
         fetched = fetch(fn)
 
-        return Function.new(fetched, args: args, name: fn) unless already_wrapped?(fetched)
+        return Function.new(fetched, args: args, kwargs: kwargs, name: fn) unless already_wrapped?(fetched)
 
         args.empty? ? fetched : fetched.with(*args)
       end
diff --git a/spec/unit/registry_spec.rb b/spec/unit/registry_spec.rb
index 12df8e1..d1d5de6 100644
--- a/spec/unit/registry_spec.rb
+++ b/spec/unit/registry_spec.rb
@@ -8,6 +8,10 @@
       def self.prefix(value, prefix)
         "#{prefix}_#{value}"
       end
+
+      def self.trim(value, limit:)
+        value[0..(limit - 1)]
+      end
     end
   end
 
@@ -32,6 +36,16 @@ def self.prefix(value, prefix)
         expect(transproc["qux"]).to eql "baz_qux"
       end
     end
+
+    context "with keyword arguments" do
+      it "passes keywords through" do
+        expect(foo[:trim]["string", limit: 3]).to eql("str")
+      end
+
+      it "works with a transproc approach" do
+        expect(foo[:trim, limit: 2]["string"]).to eql("st")
+      end
+    end
   end
 
   describe ".t" do