modware 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3954be9354da6c601d61ef054899259b7fc749c9
-  data.tar.gz: 6840f5fa4aad0fbd2f4a97200133e12a5362bb25
+  metadata.gz: 69f274970332a9e8b996853befecaee2a5d386c4
+  data.tar.gz: 6f4274479fb7fbe02d085e9e468960bb078f65b7
 SHA512:
-  metadata.gz: 997889d2b9aed15eabab7ebc41f85f52ba1be4213d2cdcd44ab562ce5245c75c6a3b0d9e87515b02b4387eea34e2305c8c841ee93324c8b76319953f4ab2f803
-  data.tar.gz: 0cfe6a6036f066df4794e96944ac42750f4249d1d4a13da5482412fd63cc9bd051de7e7a7f419cc9c67805cec360ee8eb53bfa104f29c18935c2828599e9887f
+  metadata.gz: 29a50dfea8185c607d62cc677516eb4109b762dc190cb41c070a0a30a8919691148e93b4b3c68e508b94623754a9b26a127553f7a0cca88547340dc9146f9636
+  data.tar.gz: 2296664bee1116d4b0a201a93f0b88d4c37b811da374c540588cfb309a297838bef4a91ca2c7c9a9b9740ba5c29fdf35469bffa530a5e311c2a36759e4eb3e6d

data/README.md

@@ -132,6 +132,7 @@ The [middleware](https://rubygems.org/gems/middleware) gem works well, following
 
 ## Change Log
 
+* 0.1.2 - More thread safety in Stack#start
 * 0.1.1 - Thread safety in Stack#start
 * 0.1.0 - Initial release
 

data/lib/modware/stack.rb

@@ -8,70 +8,81 @@ module Modware
                    when Class then env
                    else KeyStruct[*env]
                    end
-      @middlewares = []
+      @middleware_mods = []
     end
 
     def add(mod)
-      middleware = Middleware.new(self, mod)
-      @middlewares.last._next = middleware if @middlewares.any?
-      @middlewares << middleware
+      @middleware_mods << mod
     end
 
-    def start(*args, &implementation)
+    def start(*args, &base_implementation)
       env = @env_klass.new(*args)
-      execute_stack(env, implementation)
+      Executor.new(@middleware_mods).execute(env, base_implementation)
       env
     end
 
     private
 
-    def execute_stack(env, base_implementation)
-      return call_implementation(env, base_implementation) unless @middlewares.any?
-
-      @middlewares.each do |middleware|
-        middleware.before env if middleware.respond_to? :before
+    class Executor
+      def initialize(middleware_mods)
+        prev = nil
+        @middlewares = middleware_mods.map { |mod|
+          Middleware.new(self, mod).tap { |middleware|
+            prev._modware_next = middleware if prev
+            prev = middleware
+          }
+        }
       end
 
-      @middlewares.first._call(env, base_implementation)
+      def execute(env, base_implementation)
+        return call_implementation(env, base_implementation) if @middlewares.empty?
+
+        @middlewares.each do |middleware|
+          middleware.before env if middleware.respond_to? :before
+        end
+
+        @middlewares.first._modware_call(env, base_implementation)
 
-      @middlewares.each do |middleware|
-        middleware.after env if middleware.respond_to? :after
+        @middlewares.each do |middleware|
+          middleware.after env if middleware.respond_to? :after
+        end
       end
-    end
 
-    def call_implementation(env, base_implementation)
-      if middleware = @middlewares.select(&it.respond_to?(:implement)).last
-        middleware.implement(env)
-      elsif base_implementation
-        base_implementation.call env
-      else
-        raise StackError, "No base implementation nor middleware implementation in stack"
+      def call_implementation(env, base_implementation)
+        if middleware = @middlewares.select(&it.respond_to?(:implement)).last
+          middleware.implement(env)
+        elsif base_implementation
+          base_implementation.call env
+        else
+          raise StackError, "No base implementation nor middleware implementation in stack"
+        end
       end
     end
 
+
     class Middleware
-      attr_accessor :_next
+      attr_accessor :_modware_next
 
-      def initialize(stack, mod)
-        @stack = stack
+      def initialize(executor, mod)
+        @executor = executor
         singleton_class.send :include, mod
       end
 
-      def _call(env, base_implementation)
+      def _modware_call(env, base_implementation)
         if respond_to? :around
           around(env) { |env|
-            _continue env, base_implementation
+            _modware_continue env, base_implementation
           }
         else
-          _continue env, base_implementation
+          _modware_continue env, base_implementation
         end
       end
 
-      def _continue(env, base_implementation)
-        if self._next
-          self._next._call(env, base_implementation)
+      def _modware_continue(env, base_implementation)
+        if self._modware_next
+          self._modware_next._modware_call(env, base_implementation)
         else
-          @stack.send :call_implementation, env, base_implementation
+          @executor.call_implementation env, base_implementation
         end
       end
     end

data/lib/modware/version.rb

@@ -1,3 +1,3 @@
 module Modware
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/execution_spec.rb

@@ -28,6 +28,13 @@ describe "Execution" do
         Given { stack.add Factory.middleware(2, implement: nil) }
 
         Then { expect(env.result).to eq [:before1, :before2, :around_pre2, :implement1, :around_post2, :after1, :after2 ] }
+
+        context "if add middleware3" do
+
+          Given { stack.add Factory.middleware(3, around: nil, implement: nil) }
+
+          Then { expect(env.result).to eq [:before1, :before2, :before3, :around_pre2, :implement1, :around_post2, :after1, :after2, :after3 ] }
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modware
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: key_struct
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A middleware library, featuring a simple interface and "callback" style semantics