em-midori 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ed2aa28d8f33b3189c8580e3710ee0c9082f24
-  data.tar.gz: f72b5ff4d67f06b619776484da4f8581b56c27df
+  metadata.gz: 98fbd92141350243b9a3e3d1419d3cc7364270d8
+  data.tar.gz: 6cb7c2807690751d6d0796511aa00d974ec51148
 SHA512:
-  metadata.gz: 1de935f59439205ea7d3b909410979fe4feade4d3a38a25541ef9ae79b96d82f99598ff274a942dab10ba627168f81473319d7e0822eb350e1e29be7ae0d9ab9
-  data.tar.gz: 5663cf9ab2ebbe09dd9c0cde0a36becc8cdc9c9f4809a91bb8957283d0a2aa1676fac04be0f1255045b9320655e0c3c31dd2225036aa08d51cab65e4ea8a41d2
+  metadata.gz: 014ae17886c6a64490fa0b9ace13c98cd6873e2aa11bfe649f799e150e64477dabd734440bdd9553129fa1db49454dadd088d5957cbcf738f1e8332040e40821
+  data.tar.gz: 1178bfea1e5d3da5b34aa3b1a0b1c22c4fcfd1b844c0466166d33994202ddf022048c62530e3ded73074de980459a09e6f84d9e81fa4ab427efd113b4b5aa439

data/lib/em-midori.rb

@@ -18,3 +18,4 @@ require_relative 'em-midori/route'
 require_relative 'em-midori/server'
 require_relative 'em-midori/websocket'
 require_relative 'em-midori/eventsource'
+require_relative 'em-midori/middleware'

data/lib/em-midori/api.rb

@@ -163,47 +163,46 @@ class Midori::API
     # === Returns
     # nil
     def add_route(method, path, block)
-      @route = [] if @route.nil?
       if path.class == String
         # Convert String to Regexp to provide performance boost (Precompiled Regexp)
         path = convert_route path
       end
+      @route = [] if @route.nil?
       @route << Midori::Route.new(method, path, block)
       nil
     end
 
     # Process after receive data from client
     # === Attributes
-    # * +request+ [+StringIO+] - Http Raw Request
+    # * +request+ [+Midori::Request+] - Http Raw Request
     # === Returns
     # [+Midori::Response+] - Http response
     def receive(request, connection = nil)
       @route.each do |route|
         matched = match(route.method, route.path, request.method, request.path)
         next unless matched
+        if @middleware.nil?
+          @middleware = []
+          @body_accept = [String]
+        end
+        @middleware.each { |middleware| request = middleware.before(request) }
         clean_room = Midori::CleanRoom.new(request)
         if request.websocket?
           # Send 101 Switching Protocol
-          connection.send_data Midori::Response.new(101, {
-                                                      'Upgrade' => 'websocket',
-                                                      'Connection' => 'Upgrade',
-                                                      'Sec-WebSocket-Accept' => Digest::SHA1.base64digest(request.header['Sec-WebSocket-Key'] + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
-                                                    }, '')
-          result = -> { clean_room.instance_exec(connection.websocket, *matched, &route.function) }.call
+          connection.send_data Midori::Response.new(101, websocket_header(request.header['Sec-WebSocket-Key']), '')
+          -> { clean_room.instance_exec(connection.websocket, *matched, &route.function) }.call
           return Midori::Response.new
         elsif request.eventsource?
-          connection.send_data Midori::Response.new(200, {
-                                                      'Content-Type' => 'text-event-stream',
-                                                      'Cache-Control' => 'no-cache',
-                                                      'Connection' => 'keep-alive'
-          }, '')
-          result = -> { clean_room.instance_exec(connection.eventsource, *matched, &route.function) }.call
+          connection.send_data Midori::Response.new(200, Midori::Const::EVENTSOURCE_HEADER, '')
+          -> { clean_room.instance_exec(connection.eventsource, *matched, &route.function) }.call
           return Midori::Response.new
         else
           result = -> { clean_room.instance_exec(*matched, &route.function) }.call
+          clean_room.body = result if @body_accept.include?(result.class)
+          response = clean_room.response
+          @middleware.reverse.each { |middleware| response = middleware.after(request, response) }
+          return response
         end
-        clean_room.body = result if result.class == String
-        return clean_room.response
       end
       raise Midori::Error::NotFound
     end
@@ -243,6 +242,21 @@ class Midori::API
       path += '$' if path[-1] != '$'
       Regexp.new path
     end
+
+    def use(middleware)
+      raise Midori::Error::MiddlewareError unless middleware.new.is_a?Midori::Middleware
+      @middleware = [] if @middleware.nil?
+      @middleware << middleware
+      @body_accept = middleware.accept
+    end
+
+    def websocket_header(key)
+      {
+        'Upgrade' => 'websocket',
+        'Connection' => 'Upgrade',
+        'Sec-WebSocket-Accept' => Digest::SHA1.base64digest(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
+      }
+    end
   end
 
   private_class_method :add_route

data/lib/em-midori/const.rb

@@ -45,4 +45,10 @@ module Midori::Const
   DEFAULT_HEADER = {
     'Server' => "Midori/#{Midori::VERSION}"
   }
+
+  EVENTSOURCE_HEADER = {
+    'Content-Type' => 'text-event-stream',
+    'Cache-Control' => 'no-cache',
+    'Connection' => 'keep-alive'
+  }
 end

data/lib/em-midori/error.rb

@@ -6,4 +6,5 @@ module Midori::Error
   class FrameEnd < StandardError; end
   class PingPongSizeTooLarge < StandardError; end
   class EventSourceTypeError < StandardError; end
+  class MiddlewareError < StandardError; end
 end

data/lib/em-midori/middleware.rb

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

data/lib/em-midori/request.rb

@@ -1,7 +1,7 @@
 class Midori::Request
   attr_accessor :ip, :port,
                 :protocol, :method, :path, :query_string,
-                :header, :body
+                :header, :body, :parsed
 
   def initialize
     @parsed = false

data/lib/em-midori/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-16 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -52,6 +52,7 @@ files:
 - lib/em-midori/em_midori.rb
 - lib/em-midori/error.rb
 - lib/em-midori/eventsource.rb
+- lib/em-midori/middleware.rb
 - lib/em-midori/promise.rb
 - lib/em-midori/request.rb
 - lib/em-midori/response.rb