ibsciss-middleware 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 86fc76bf275b9613ba8eaf6234356f6e897e8fa2
-  data.tar.gz: 40a061815db18be1438ce941abd3d8df47d80c96
+SHA256:
+  metadata.gz: c89cc2b115c1a80b0832be442efcae80215ae469f4c1afadd05e471d3eabc4ca
+  data.tar.gz: 3234dc5748481f4e47ce2720818a32e4ef7226e1b052b8caa6c4e8427a0a2da5
 SHA512:
-  metadata.gz: 20bdeb80623bfad270d6a44d5d7d7c95dc00af9ce262728649ea88b90ae0bb6a1dae6c2cecef187363631fecc8718300e8b5ee6c54d445ffe2b603f0b7d30e57
-  data.tar.gz: 7cfefa01cc28a9765bb715af5f1513acc8c839c47d241204ebcee26d4be57372b07c3fa74ba8ac4100e0a17218c4d507ab52070af24710ddde7f81c15d98abe2
+  metadata.gz: df9e7568674925a87a0ce50d335d99d6bc351a6536a21d8f044651b74e3c6670190b995a7ad0a5b5b85576eddbb11665186ed445c1cf77769b7d574694959047
+  data.tar.gz: a5f4d6137d5a20ede4def20a64c1016560d9dc6964ab0a875343d9e0eb3b948f5c3c4ce839cec9284b26e0fc8f7b658a489a60ac312e4928279398703be5bd8b

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.4.3
+  - Fix Ruby 3 error when keyword argument is passed
+- 
+## 0.4.2
+  - Update documentation
+  - Fix bug https://github.com/Ibsciss/ruby-middleware/issues/8
+
+## 0.4.1
+  - Simplify the inspect method
+
 ## 0.4.0
   - Add a name displayed in the logger & inspect methods
   - Add a logger middleware

data/README.md

@@ -28,7 +28,7 @@ $ gem install ibsciss-middleware
 Or, in your Gemfile:
 
 ```
-gem 'ibsciss-middleware', '~> 0.3'
+gem 'ibsciss-middleware', '~> 0.4.2'
 ```
 
 Then, you can add it to your project:
@@ -169,8 +169,8 @@ lambdas:
 
 ```ruby
 Middleware::Builder.new { |b|
-  b.use lambda { |env| env + 3 }
-  b.use lambda { |env| env * 2 }
+  b.use -> (env) { env + 3 }
+  b.use -> (env) { env * 2 }
 }.call(1) #return 8
 ```
 
@@ -188,7 +188,7 @@ for building a stack of middlewares:
 ```ruby
 stack = Middleware::Builder.new do |d|
   d.use Trace
-  d.use lambda { |env| puts "LAMBDA!" }
+  d.use ->(env) { puts "LAMBDA!" }
 end
 ```
 
@@ -241,7 +241,7 @@ stack.insert_after(0, SomeOtherMiddleware)
 #### Insert after each
 
 ```ruby
-logger = lambda { |env| p env }
+logger = -> (env) { p env }
 
 # Insert the middleware (can be also a middleware object) after each existing middleware
 stack.insert_after_each logger
@@ -250,7 +250,7 @@ stack.insert_after_each logger
 #### Insert before each
 
 ```ruby
-logger = lambda { |env| p env }
+logger = -> (env) { p env }
 
 # Insert the middleware (can be also a middleware object) before each existing middleware
 stack.insert_before_each logger

data/lib/middleware/builder.rb

@@ -73,19 +73,18 @@ module Middleware
     # of the middleware.
     #
     # @param [Class] middleware The middleware class
-    def use(middleware, *args, &block)
+    def use(middleware, *args, **kwargs, &block)
       if middleware.is_a?(Builder)
         # Merge in the other builder's stack into our own
         stack.concat(middleware.stack)
       else
-        stack << [middleware, args, block]
+        stack << [middleware, args, kwargs, block]
       end
 
       self
     end
 
-    # Inserts a middleware at the given index or directly before the
-    # given middleware object.
+    # Inserts a middleware at the given index or directly before the given middleware object.
     def insert(index, middleware, *args, &block)
       index = self.index(index) unless index.is_a?(Integer)
       fail "no such middleware to insert before: #{index.inspect}" unless index
@@ -115,16 +114,12 @@ module Middleware
       end
     end
 
-    # Replaces the given middleware object or index with the new
-    # middleware.
+    # Replaces the given middleware object or index with the new middleware.
     def replace(index, middleware, *args, &block)
-      if index.is_a?(Integer)
-        delete(index)
-        insert(index, middleware, *args, &block)
-      else
-        insert_before(index, middleware, *args, &block)
-        delete(index)
-      end
+      index = self.index index unless index.is_a? Integer
+
+      delete(index)
+      insert(index, middleware, *args, &block)
     end
 
     # Deletes the given middleware object or index

data/lib/middleware/runner.rb

@@ -42,17 +42,18 @@ module Middleware
       # is always the empty middleware, which does nothing but return.
       stack.reverse.inject(EMPTY_MIDDLEWARE) do |next_middleware, current_middleware|
         # Unpack the actual item
-        klass, args, block = current_middleware
+        klass, args, kwargs, block = current_middleware
 
         # Default the arguments to an empty array. Otherwise in Ruby 1.8
         # a `nil` args will actually pass `nil` into the class. Not what
         # we want!
         args ||= []
+        kwargs ||= {}
 
         if klass.is_a?(Class)
           # If the klass actually is a class, then instantiate it with
           # the app and any other arguments given.
-          klass.new(next_middleware, *args, &block)
+          klass.new(next_middleware, *args, **kwargs, &block)
         elsif klass.respond_to?(:call)
           # Make it a lambda which calls the item then forwards up
           # the chain.

data/middleware.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/ibsciss/ruby-middleware'
   gem.license       = 'MIT'
 
-  gem.add_development_dependency 'rake', '~> 10.4.2'
+  gem.add_development_dependency 'rake', '>= 12.3.3'
   gem.add_development_dependency 'rspec-core', '~> 3.2'
   gem.add_development_dependency 'rspec-expectations', '~> 3.2'
   gem.add_development_dependency 'rspec-mocks', '~> 3.2'
@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = 'ibsciss-middleware'
   gem.require_paths = ['lib']
-  gem.version       = '0.4.1'
+  gem.version       = '0.4.3'
 end

data/spec/middleware/builder_spec.rb

@@ -4,6 +4,20 @@ describe Middleware::Builder do
   let(:data) { { data: [] } }
   let(:instance) { described_class.new }
 
+  class Foo
+    def initialize app, pos, key:
+      @app = app
+      @pos = pos
+      @key = key
+    end
+
+    def call env
+      env[:pos] = @pos
+      env[:key] = @key
+      @app.call(env)
+    end
+  end
+
   # This returns a proc that can be used with the builder
   # that simply appends data to an array in the env.
   def appender_proc(data)
@@ -53,6 +67,16 @@ describe Middleware::Builder do
       expect(data[:data]).to eq true
     end
 
+    it 'handles positional and keyword arguments' do
+      data = {}
+
+      instance.use Foo, 1, key: 2
+      instance.call(data)
+
+      expect(data[:pos]).to eq 1
+      expect(data[:key]).to eq 2
+    end
+
     it 'is able to add multiple items' do
       data = {}
       proc1 = ->(env) { env.tap { |obj| obj[:one] = :value_1 } }
@@ -239,4 +263,4 @@ describe Middleware::Builder do
     end
   end
 
-end
+end

data/spec/middleware/runner_spec.rb

@@ -85,6 +85,27 @@ describe Middleware::Runner do
     expect(env[:result]).to eq 42
   end
 
+  it 'passes in keyword arguments if given' do
+    a = Class.new do
+      def initialize(_app, foo = nil, bar: nil)
+        @foo = foo
+        @bar = bar
+      end
+
+      def call(env)
+        env[:foo] = @foo
+        env[:bar] = @bar
+      end
+    end
+
+    env = {}
+    instance = described_class.new([[a, [42], { bar: 1764 }, nil]])
+    instance.call(env)
+
+    expect(env[:foo]).to eq 42
+    expect(env[:bar]).to eq 1764
+  end
+
   it 'passes in a block if given' do
     a = Class.new do
       def initialize(_app, &block)
@@ -98,7 +119,7 @@ describe Middleware::Runner do
 
     block = proc { 42 }
     env = {}
-    instance = described_class.new([[a, nil, block]])
+    instance = described_class.new([[a, [], {}, block]])
     instance.call(env)
 
     expect(env[:result]).to eq 42

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: ibsciss-middleware
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Mitchell Hashimoto
 - Arnaud Lemaire
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ homepage: https://github.com/ibsciss/ruby-middleware
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.5.5
+signing_key:
 specification_version: 4
 summary: Generalized implementation of the rack middleware abstraction for Ruby (chain
   of responsibility design pattern).