chickadeex 7.3.0 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85540edc5bc2f6ac410e1309b996747f1156c13ab59f9bde6cf96c1ce28945e0
-  data.tar.gz: bca0dc8e4ef9abf0760d307352d2262534b7da9a3ddfd21876807899935ea6f5
+  metadata.gz: 45de8f33ec18e303a1da7ccda573b4122df935c1c4e611187bdf858e212115af
+  data.tar.gz: b8b5466fddcc93fdbeeb205c682eb727ccf232b96a4ce9f7a486e31256db086f
 SHA512:
-  metadata.gz: 1c3eadb2109105e51f72839e837f6eaf011653a15232c35a9262b19c5877bbe4745f87daa4e436a2d931194cac50c134026b643851326c40c9c01f0066d61320
-  data.tar.gz: 3d1a3b0b7b6844ec1e112acbe2fdb1a97530b0f9100aa7e22d04c15d8f63017989d31bf231af5c2731a7128595d401591d4cdd826b48ebe59e908fb87ba88f40
+  metadata.gz: 1be36c777fd3f4b0f631f4726f5b2dd1ce29f43786632874fe73552025fe5df3022b6d03a631e3bee7cc584394c0dee20403531ebc52a0dcb235840a1c2d0a62
+  data.tar.gz: 663a0d07bae750ab944530b61fdaafdce8136a217c6ab24523d47fcc9d939a8bf9314138e89d4f0f39990fab08d896d48bac85ecf81681fcb3a61c17b4c7f17b

data/.ruby-version

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

data/chickadee.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "iocx", "~> 6.6.0"
   spec.add_dependency "rack", "~> 2.2", ">= 2.2.6.3"
-  spec.add_dependency "hanami-router", "~> 2.0", ">= 2.0.2"
 
   spec.add_development_dependency "bundler", "~> 2.4", ">= 2.4.7"
   spec.add_development_dependency "rake", "~> 13.0", ">= 13.0.6"

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.5.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.5.0
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iocx
@@ -44,26 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.6.3
-- !ruby/object:Gem::Dependency
-  name: hanami-router
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +115,6 @@ files:
 - lib/chickadee.rb
 - lib/chickadee/application.rb
 - lib/chickadee/container.rb
-- lib/chickadee/router.rb
 - lib/chickadee/version.rb
 - lib/chickadee/vos/numeric_id.rb
 - lib/chickadee/vos/uuid.rb

data/lib/chickadee/router.rb

@@ -1,5 +0,0 @@
-require "hanami/router"
-
-module Chickadee
-  class Router < ::Hanami::Router; end
-end