em-midori 0.0.9 → 0.0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fbd92141350243b9a3e3d1419d3cc7364270d8
-  data.tar.gz: 6cb7c2807690751d6d0796511aa00d974ec51148
+  metadata.gz: 3c9b1b11b8b12fdf155197d7c635e7be5da31fe6
+  data.tar.gz: b6278a14ac7fbdb502d6585cad1f00735379de12
 SHA512:
-  metadata.gz: 014ae17886c6a64490fa0b9ace13c98cd6873e2aa11bfe649f799e150e64477dabd734440bdd9553129fa1db49454dadd088d5957cbcf738f1e8332040e40821
-  data.tar.gz: 1178bfea1e5d3da5b34aa3b1a0b1c22c4fcfd1b844c0466166d33994202ddf022048c62530e3ded73074de980459a09e6f84d9e81fa4ab427efd113b4b5aa439
+  metadata.gz: 774886075e8cf1c3d12ca43f28589fcaa0cd1bc11d645d5c12c1604400388a8bfb8fcd2580efcd0d678a16c2975a4f43725fd64eda186e0490431e669fa1cae9
+  data.tar.gz: 7c5f25c5051c387e3b86cee19d4dcea157fc797164b36a01ba9e0752195b324cbe5432e5824e4982c143526af53abaf96b228ea03a0dd9391ff302a79ef1a346

data/.gitignore

@@ -50,4 +50,5 @@ build-iPhoneSimulator/
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
-/.vscode/
+/.vscode/
+benchmark/express/node_modules

data/lib/em-midori/api.rb

@@ -167,7 +167,7 @@ class Midori::API
         # Convert String to Regexp to provide performance boost (Precompiled Regexp)
         path = convert_route path
       end
-      @route = [] if @route.nil?
+      @route = @route || []
       @route << Midori::Route.new(method, path, block)
       nil
     end
@@ -182,11 +182,12 @@ class Midori::API
         matched = match(route.method, route.path, request.method, request.path)
         next unless matched
         if @middleware.nil?
-          @middleware = []
-          @body_accept = [String]
+          middlewares, body_accept = [], [String]
+        else
+          middlewares, body_accept = @middleware.clone, @body_accept.clone
         end
-        @middleware.each { |middleware| request = middleware.before(request) }
-        clean_room = Midori::CleanRoom.new(request)
+        middlewares.each { |middleware| request = middleware.before(request) }
+        clean_room = Midori::CleanRoom.new(request, middlewares, body_accept)
         if request.websocket?
           # Send 101 Switching Protocol
           connection.send_data Midori::Response.new(101, websocket_header(request.header['Sec-WebSocket-Key']), '')
@@ -198,9 +199,9 @@ class Midori::API
           return Midori::Response.new
         else
           result = -> { clean_room.instance_exec(*matched, &route.function) }.call
-          clean_room.body = result if @body_accept.include?(result.class)
+          clean_room.body = result if body_accept.include?(result.class)
           response = clean_room.response
-          @middleware.reverse.each { |middleware| response = middleware.after(request, response) }
+          middlewares.reverse.each { |middleware| response = middleware.after(request, response) }
           return response
         end
       end
@@ -243,11 +244,11 @@ class Midori::API
       Regexp.new path
     end
 
-    def use(middleware)
-      raise Midori::Error::MiddlewareError unless middleware.new.is_a?Midori::Middleware
+    def use(middleware, *args)
+      middleware = middleware.new(*args)
       @middleware = [] if @middleware.nil?
       @middleware << middleware
-      @body_accept = middleware.accept
+      @body_accept = middleware.body_accept
     end
 
     def websocket_header(key)

data/lib/em-midori/clean_room.rb

@@ -1,13 +1,23 @@
 class Midori::CleanRoom
   attr_accessor :code, :header, :body, :request
-  def initialize(request)
+  def initialize(request, middleware = [], body_accept = [String])
     @status = 200
     @header = Midori::Const::DEFAULT_HEADER.clone
     @body = ''
     @request = request
+    @middleware = middleware
+    @body_accept = body_accept
   end
 
   def response
     Midori::Response.new(@status, @header, @body)
   end
+
+  def use(middleware, *args)
+    middleware = middleware.new(*args)
+    @middleware = [] if @middleware.nil?
+    @middleware << middleware
+    @body_accept.replace middleware.body_accept
+    @request = middleware.before(request)
+  end
 end

data/lib/em-midori/middleware.rb

@@ -1,13 +1,16 @@
 class Midori::Middleware
-  def self.before(request)
+  def initialize
+  end
+
+  def before(request)
     request
   end
 
-  def self.after(_request, response)
+  def after(_request, response)
     response
   end
-
-  def self.accept
+  
+  def body_accept
     [String]
   end
 end

data/lib/em-midori/version.rb

@@ -1,3 +1,3 @@
 module Midori
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.0.9.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.9.1
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine