ibsciss-middleware 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a7f568a5dd19fa3ed4060972af8eab369d6cc7
-  data.tar.gz: 9324a50e02d47da8f6a4232db2d0f373dda717f5
+  metadata.gz: 86fc76bf275b9613ba8eaf6234356f6e897e8fa2
+  data.tar.gz: 40a061815db18be1438ce941abd3d8df47d80c96
 SHA512:
-  metadata.gz: cc1c0601887f79ce0580705cf7031124315cc25109703765f1b92e66147c8c2ef79b2ee9ffca951ff7bb4ef739bebdf8d21f3ec226fab2630852fa073be45204
-  data.tar.gz: ad2c8c9a03d3da09664e879322906b405423e0fdb8cd801da3fab30c0cfba90ea0529aeeea330a5c1bb4ff28d4922b20f0b61249ab1c7ab57d6d5c161a9dcd94
+  metadata.gz: 20bdeb80623bfad270d6a44d5d7d7c95dc00af9ce262728649ea88b90ae0bb6a1dae6c2cecef187363631fecc8718300e8b5ee6c54d445ffe2b603f0b7d30e57
+  data.tar.gz: 7cfefa01cc28a9765bb715af5f1513acc8c839c47d241204ebcee26d4be57372b07c3fa74ba8ac4100e0a17218c4d507ab52070af24710ddde7f81c15d98abe2

data/README.md

@@ -204,7 +204,7 @@ end.call()
 The call method takes an optional parameter which is the state to pass into the
 initial middleware.
 
-You can optionally set a name, that will be displayed in inspect and for logging purpose, for the current middleware:
+You can optionally set a name, that will be displayed in inspect and for logging purpose:
 
 ```ruby
 Middleware::Builder.new(name: 'MyPersonalMiddleware')

data/lib/middleware/builder.rb

@@ -1,3 +1,5 @@
+require_relative 'logger'
+
 module Middleware
   # This provides a DSL for building up a stack of middlewares.
   #
@@ -40,8 +42,8 @@ module Middleware
     #   like {#use} and such.
     def initialize(opts = nil, &block)
       opts ||= {}
-      @runner_class = opts[:runner_class] || Runner
-      @middleware_name = opts[:name] || 'Middleware'
+      @runner_class = opts.fetch(:runner_class, Runner)
+      @middleware_name = opts.fetch(:name, 'Middleware')
 
       if block_given?
         if block.arity == 1
@@ -137,10 +139,9 @@ module Middleware
     end
 
     def inspect
-      name+'[' + stack.reduce([]) do |carry, middleware|
+      name+'[' + stack.map do |middleware|
         name = middleware[0].is_a?(Proc) ? 'Proc' : middleware[0].name
-
-        carry << "#{name}(#{middleware[1].join(', ')})"
+        "#{name}(#{middleware[1].join(', ')})"
       end.join(', ') + ']'
     end
 
@@ -173,7 +174,7 @@ module Middleware
     end
 
     # you shouldn't use this method
-    #
+    # used for insert_before|after_each
     # @return [Array]
     attr_writer :stack
 

data/middleware.gemspec

@@ -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.0'
+  gem.version       = '0.4.1'
 end

data/spec/middleware/builder_spec.rb

@@ -37,36 +37,36 @@ describe Middleware::Builder do
 
         app.call(data)
 
-        expect(data[:data]).to be_truthy
+        expect(data[:data]).to eq true
       end
     end
   end
 
   context 'basic `use`' do
-    it 'should add items to the stack and make them callable' do
+    it 'adds items to the stack and make them callable' do
       data = {}
       proc = proc { |env| env[:data] = true }
 
       instance.use proc
       instance.call(data)
 
-      expect(data[:data]).to be_truthy
+      expect(data[:data]).to eq true
     end
 
-    it 'should be able to add multiple items' do
+    it 'is able to add multiple items' do
       data = {}
-      proc1 = proc { |env| env.tap { |obj| obj[:one] = true } }
-      proc2 = proc { |env| env.tap { |obj| obj[:two] = true } }
+      proc1 = ->(env) { env.tap { |obj| obj[:one] = :value_1 } }
+      proc2 = ->(env) { env.tap { |obj| obj[:two] = :value_2 } }
 
       instance.use proc1
       instance.use proc2
       instance.call(data)
 
-      expect(data[:one]).to be_truthy
-      expect(data[:two]).to be_truthy
+      expect(data[:one]).to eq :value_1
+      expect(data[:two]).to eq :value_2
     end
 
-    it 'should be able to add another builder' do
+    it 'can be compose with another builder' do
       data  = {}
       proc1 = proc { |env| env[:one] = true }
 
@@ -80,17 +80,17 @@ describe Middleware::Builder do
 
       # Call the 2nd and verify results
       two.call(data)
-      expect(data[:one]).to be_truthy
+      expect(data[:one]).to eq true
     end
 
-    it 'should default the env to `nil` if not given' do
+    it 'has the env to `nil` if not given' do
       result = false
       proc = proc { |env| result = env.nil? }
 
       instance.use proc
       instance.call
 
-      expect(result).to be_truthy
+      expect(result).to eq true
     end
   end
 
@@ -103,7 +103,7 @@ describe Middleware::Builder do
       expect(data[:data]).to eq [2, 1]
     end
 
-    it 'can insert next to a previous object' do
+    it 'can insert after a previous object' do
       proc2 = appender_proc(2)
       instance.use appender_proc(1)
       instance.use proc2
@@ -113,7 +113,7 @@ describe Middleware::Builder do
       expect(data[:data]).to eq [1, 3, 2]
     end
 
-    it 'can insert before' do
+    it 'can insert before a previous object' do
       instance.use appender_proc(1)
       instance.insert_before 0, appender_proc(2)
       instance.call(data)
@@ -121,7 +121,7 @@ describe Middleware::Builder do
       expect(data[:data]).to eq [2, 1]
     end
 
-    it 'raises an exception if attempting to insert before an invalid object' do
+    it 'raises an exception if attempting to insert before an invalid index' do
       expect { instance.insert 'object', appender_proc(1) }
         .to raise_error(RuntimeError)
     end
@@ -216,18 +216,18 @@ describe Middleware::Builder do
       expect(instance.inspect).to eq 'Middleware[Proc(), Proc(2), Echo(Hi, how are you?)]'
     end
 
-    it 'displays his name in the inspect' do
+    it 'can have a name' do
+      expect(described_class.new(name: 'Name').name).to eq 'Name'
+    end
+
+    it 'displays the name in the inspect' do
       middleware = described_class.new(name: 'Dumb') { |b|
         b.use appender_proc(1)
       }
       expect(middleware.inspect).to eq 'Dumb[Proc()]'
     end
 
-    it "can have a name" do
-      expect(described_class.new(name: 'Name').name).to eq 'Name'
-    end
-
-    it "can have a Logger" do
+    it 'makes use of a Logger' do
       mocked_logger = instance_double(Logger)
       expect(mocked_logger).to receive(:add).exactly(4).times
 

data/spec/middleware/runner_spec.rb

@@ -1,12 +1,12 @@
 require 'middleware'
 
 describe Middleware::Runner do
-  it 'should work with an empty stack' do
+  it 'works with an empty stack' do
     instance = described_class.new([])
     expect { instance.call({}) }.to_not raise_error
   end
 
-  it 'should call classes in the proper order' do
+  it 'calls classes in the same order as given' do
     a = Class.new do
       def initialize(app)
         @app = app
@@ -37,7 +37,7 @@ describe Middleware::Runner do
     expect(env[:result]).to eq %w(A B B A)
   end
 
-  it 'should call lambdas in the proper order' do
+  it 'calls lambdas in the proper order' do
     data = []
     a = ->(_env) { data << 'A' }
     b = ->(_env) { data << 'B' }
@@ -48,7 +48,7 @@ describe Middleware::Runner do
     expect(data).to eq %w(A B)
   end
 
-  it 'should let lambdas to change the given argument' do
+  it 'lets lambdas to change the given argument' do
     a = ->(env) { env + 1 }
     b = ->(env) { env + 2 }
 
@@ -104,11 +104,11 @@ describe Middleware::Runner do
     expect(env[:result]).to eq 42
   end
 
-  it 'should raise an error if an invalid middleware is given' do
+  it 'raises an error if an invalid middleware is given' do
     expect { described_class.new([27]) }.to raise_error(/Invalid middleware/)
   end
 
-  it "should not call middlewares which aren't called" do
+  it "not calls middlewares which aren't called" do
     # A does not call B, so B should never execute
     data = []
     a = Class.new do
@@ -131,7 +131,7 @@ describe Middleware::Runner do
   end
 
   describe 'exceptions' do
-    it 'should propagate the exception up the middleware chain' do
+    it 'propagates the exception up the middleware chain' do
       # This tests a few important properties:
       # * Exceptions propagate multiple middlewares
       #   - C raises an exception, which raises through B to A.
@@ -174,7 +174,7 @@ describe Middleware::Runner do
       expect(data).to eq %w(a b e)
     end
 
-    it 'should stop propagation if rescued' do
+    it 'stops propagation if rescued' do
       # This test mainly tests that if there is a sequence A, B, C, and
       # an exception is raised in C, that if B rescues this, then the chain
       # continues fine backwards.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ibsciss-middleware
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake