chickadeex 7.2.0 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b765fbd021f64ea854d8aa710dd22cd65337e1fc42349f13dea11e61206c2f76
-  data.tar.gz: dff4a1a92c878324882e8aba695c0a8d57100d8c276f0242df077221fdcb0f09
+  metadata.gz: d51040ae985e4fb4c8a74844cb752b3d866d770d51514aa9c10e6e1526359c8d
+  data.tar.gz: 81322d83fa1757cd2c2912349b437c152b54172937da5fb49cc62df9fc6d5f2b
 SHA512:
-  metadata.gz: 46ddd4acbdc43085ebac8200f4d7fa75acef20eede41df27f07d6a7e6979df69c7b3502d9f352c7aaf1e299c5addd1762733fe2d20be13d2cb5b330614c1a4f8
-  data.tar.gz: b4f8a31928aa1d5c765867a19a6c3a374ee910f336798af182c31ba594ba08cebc3ac215fa990fda962dff4d43e2caf7024b6e9d9350ff15ac301cbc4acc1aba
+  metadata.gz: a04e02682f6eb8ff7f26d86749f6155f8ebf3d3e6fd0bb9c768cfa04adb669944126201240c83597607f5018a470956b97bcd044fa338d589c7c0bba46e454df
+  data.tar.gz: 24cf37ed42b2ef97d11cdc720ac7cefe12140afa8c7d923011d107fbc4a3cca5b78c61d1c7b525195b760ed4b644ac6e1779caaedc920f8fe334ccee44c40ec3

data/.ruby-version

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

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "spec"
+  t.test_files = FileList["spec/**/*_spec.rb"]
+  t.verbose = true
+end
+
+task :default => :test

data/chickadee.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "iocx", "~> 6.5.1"
-  spec.add_dependency "rack", "~> 2.2.3"
-  spec.add_dependency "hanami-router", "~> 1.3.2"
+  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.1.4"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5.14.1"
+  spec.add_development_dependency "bundler", "~> 2.4", ">= 2.4.7"
+  spec.add_development_dependency "rake", "~> 13.0", ">= 13.0.6"
+  spec.add_development_dependency "minitest", "~> 5.18"
 end

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.2.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.2.0
+  version: 7.4.0
 platform: ruby
 authors:
 - Erik Lott
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iocx
@@ -16,84 +16,108 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.1
+        version: 6.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.1
+        version: 6.6.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '2.2'
+    - - ">="
+      - !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: 1.3.2
+        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: 1.3.2
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.1
+        version: '5.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.1
+        version: '5.18'
 description: Minimal domain driven design library
 email:
 - erik.lott@evrium.com
@@ -121,7 +145,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Minimal domain driven design library
 test_files: