chickadeex 7.3.0 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85540edc5bc2f6ac410e1309b996747f1156c13ab59f9bde6cf96c1ce28945e0
-  data.tar.gz: bca0dc8e4ef9abf0760d307352d2262534b7da9a3ddfd21876807899935ea6f5
+  metadata.gz: d51040ae985e4fb4c8a74844cb752b3d866d770d51514aa9c10e6e1526359c8d
+  data.tar.gz: 81322d83fa1757cd2c2912349b437c152b54172937da5fb49cc62df9fc6d5f2b
 SHA512:
-  metadata.gz: 1c3eadb2109105e51f72839e837f6eaf011653a15232c35a9262b19c5877bbe4745f87daa4e436a2d931194cac50c134026b643851326c40c9c01f0066d61320
-  data.tar.gz: 3d1a3b0b7b6844ec1e112acbe2fdb1a97530b0f9100aa7e22d04c15d8f63017989d31bf231af5c2731a7128595d401591d4cdd826b48ebe59e908fb87ba88f40
+  metadata.gz: a04e02682f6eb8ff7f26d86749f6155f8ebf3d3e6fd0bb9c768cfa04adb669944126201240c83597607f5018a470956b97bcd044fa338d589c7c0bba46e454df
+  data.tar.gz: 24cf37ed42b2ef97d11cdc720ac7cefe12140afa8c7d923011d107fbc4a3cca5b78c61d1c7b525195b760ed4b644ac6e1779caaedc920f8fe334ccee44c40ec3

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.6
+ruby-3.1.3p185

data/lib/chickadee/application.rb

@@ -4,6 +4,7 @@ require "rack/request"
 require "rack/response"
 require "rack/builder"
 
+
 module Chickadee
   class Application
     def initialize(request: Rack::Request, response: Rack::Response, builder: Rack::Builder, container: Container)
@@ -15,17 +16,17 @@ module Chickadee
       @register_cache = []
     end
 
-    def register(*args, &block)
-      @register_cache << [args, block]
+    def register(*args, **kwargs, &block)
+      @register_cache << [args, kwargs, block]
     end
 
-    def use(*args, &block)
-      @use_cache << [args, block]
+    def use(*args, **kwargs, &block)
+      @use_cache << [args, kwargs, block]
     end
 
     def service(name)
       builder = @builder_class.new
-      @use_cache.each { |use| builder.use(*use[0], &use[1]) }
+      @use_cache.each { |use| builder.use(*use[0], **use[1], &use[2]) }
       builder.run(service_app(name))
       builder
     end
@@ -37,7 +38,7 @@ module Chickadee
         request = @request_class.new(env)
         response = @response_class.new
         container = @container_class.new
-        @register_cache.each{ |r| container.register(*r[0], &r[1]) }
+        @register_cache.each{ |r| container.register(*r[0], **r[1], &r[2]) }
         container.resolve(name).call(request, response)
       end
     end

data/lib/chickadee/version.rb

@@ -1,3 +1,3 @@
 module Chickadee
-  VERSION = "7.3.0"
+  VERSION = "7.4.0"
 end

data/spec/application_spec.rb

@@ -2,6 +2,18 @@ require "minitest"
 require "minitest/autorun"
 require "chickadee/application"
 
+class TestMiddleware
+  def initialize(app, strategies: {}, message: "hello")
+    @app = app
+    @strategies = strategies
+    @message = message
+  end
+
+  def call(env)
+    @app.call(env)
+  end
+end
+
 describe Chickadee::Application do
   describe "service" do
     it "returns callable object" do
@@ -15,4 +27,18 @@ describe Chickadee::Application do
       _(res).must_be_instance_of(Rack::Response)
     end
   end
+
+  describe "use" do
+    it "correctly delegates middleware arguments using ruby 3 args and kwargs" do
+      env = {}
+      service = Proc.new{ |req, res| [req, res] }
+      application = Chickadee::Application.new
+      application.use(TestMiddleware, :strategies => {:a => "a"})      
+      application.register(:my_service){ service }
+      obj = application.service(:my_service)
+      req, res = obj.call(env)
+      _(req).must_be_instance_of(Rack::Request)
+      _(res).must_be_instance_of(Rack::Response)      
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chickadeex
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.4.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iocx