em-midori 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6d10050423b7536832c5ef0b7d94ead6bb713a8
-  data.tar.gz: 949d87027c3feaece3ce05637b91569f37056978
+  metadata.gz: 2dcc440db5d1538e1e4530d9d6879c9a4115ee85
+  data.tar.gz: b6912e55681783ebcd555de7b13c5d8681a213a8
 SHA512:
-  metadata.gz: 69ee80d129f50421830b10c57dc3712211892d9cb5e047422e7b90e7b8bf2eb2bb01fb44b03c0d1d7b6424e1843a8861be7fa040d383b73dffa9cb22ca7bce5d
-  data.tar.gz: 1b97321457676354063864beb257e0b8ce43e5e873beb34b1dd9a08e6db0e00471ae3b99dc440071f3c561e984a608b215b0ad41f02fae2d6b4ea0d0c8dfeffb
+  metadata.gz: 6b004b9d39d894840e6c2652dda4162d25be4be82f5532c3bedf61a189103e64b9d874312a686ccaa60469977d4f070bc4a6e09959cbcc24db3f7448ca0af648
+  data.tar.gz: 9d4c89c1930ce59fe8590f2f26f2fda1972d768145c054803e8f0f2d8aecf840a44f52c50d026c5026cb0233ed8759ff6f443b11e9dd89043ee301a09a2fae88

data/CONTRIBUTOR_COVENANT_CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at dsh0416@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/lib/em-midori.rb

@@ -4,19 +4,22 @@ require 'eventmachine'
 require 'fiber'
 require 'logger'
 require 'http/parser'
+require 'mustermann'
 require 'socket'
 
-require_relative 'em-midori/version'
 require_relative 'em-midori/core_ext/configurable'
-require_relative 'em-midori/string'
-require_relative 'em-midori/promise'
+require_relative 'em-midori/core_ext/string'
+require_relative 'em-midori/core_ext/promise'
+require_relative 'em-midori/core_ext/define_class'
+
+require_relative 'em-midori/version'
 require_relative 'em-midori/const'
-require_relative 'em-midori/define_class'
 require_relative 'em-midori/error'
 require_relative 'em-midori/clean_room'
 require_relative 'em-midori/request'
 require_relative 'em-midori/response'
 require_relative 'em-midori/api'
+require_relative 'em-midori/api_engine'
 require_relative 'em-midori/route'
 require_relative 'em-midori/server'
 require_relative 'em-midori/websocket'

data/lib/em-midori/api.rb

@@ -2,138 +2,120 @@
 # This class provides methods to be inherited as route definition.
 class Midori::API
   class << self
+    attr_accessor :routes, :scope_middlewares
+    def class_initialize
+      @routes = {
+        GET: [],
+        POST: [],
+        PUT: [],
+        DELETE: [],
+        OPTIONS: [],
+        LINK: [],
+        UNLINK: [],
+        WEBSOCKET: [],
+        EVENTSOURCE: [],
+        MOUNT: []
+      }
+      @scope_middlewares = []
+      @temp_middlewares = []
+    end
+
     # Add GET method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @yield what to run when route matched
     # @return [ nil ] nil
     # @example String as router
     #   get '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   get /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def get(path, &block) end
 
     # Add POST method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @yield what to run when route matched
     # @return [ nil ] nil
     # @example String as router
     #   post '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   post /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def post(path, &block) end
 
     # Add PUT method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @yield what to run when route matched
     # @return [ nil ] nil
     # @example String as router
     #   put '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   put /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def put(path, &block) end
 
     # Add DELETE method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @yield what to run when route matched
     # @return [ nil ] nil
     # @example String as router
     #   delete '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   delete /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def delete(path, &block) end
 
     # Add OPTIONS method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @return [ nil ] nil
     # @example String as router
     #   options '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   options /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def options(path, &block) end
 
     # Add LINK method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @yield what to run when route matched
     # @return [ nil ] nil
     # @example String as router
     #   link '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   link /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def link(path, &block) end
 
     # Add UNLINK method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @yield what to run when route matched
     # @return [ nil ] nil
     # @example String as router
     #   unlink '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   unlink /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def unlink(path, &block) end
 
     # Add WEBSOCKET method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @yield what to run when route matched
     # @return [ nil ] nil
     # @example String as router
     #   websocket '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   websocket /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def websocket(path, &block) end
 
     # Add EVENTSOURCE method as a DSL for route definition
-    # @param [ String, Regexp ] path Accepts as part of path in route definition
+    # @param [ String ] path Accepts as part of path in route definition
     # @return [ nil ] nil
     # @example String as router
     #   eventsource '/' do
     #      puts 'Hello World'
     #   end
-    #
-    # @example Regex as router
-    #   eventsource /\/hello\/(.*?)/ do
-    #      puts 'Hello World'
-    #   end
     def eventsource(path, &block) end
+    
+    # Mount a route prefix with another API defined
+    # @param [String] prefix prefix of the route String
+    # @param [Class] api inherited from Midori::API
+    # @return [nil] nil
+    def mount(prefix, api)
+      raise ArgumentError if prefix == '/' # Cannot mount route API
+      @routes[:MOUNT] << [prefix, api]
+    end
 
     # Implementation of route DSL
     # @param [ String ] method HTTP method
@@ -141,82 +123,17 @@ class Midori::API
     # @param [ Proc ] block process to run when route matched
     # @return [ nil ] nil
     def add_route(method, path, block)
-      if path.class == String
-        # Convert String to Regexp to provide performance boost (Precompiled Regexp)
-        path = convert_route path
-      end
-      @route = @route || []
-      @route << Midori::Route.new(method, path, block)
-      nil
-    end
+      # Argument check
+      raise ArgumentError unless path.is_a?String
 
-    # Process after receive data from client
-    # @param request [ Midori::Request ] Http Raw Request
-    # @param connection [ EM::Connection ] A connection created by EventMachine
-    # @yield what to run when route matched
-    # @return [ Midori::Response ] Http Response
-    # @raise [ Midori::Error::NotFound ] If no route matched
-    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?
-          middlewares, body_accept = [], [String]
-        else
-          middlewares, body_accept = @middleware.clone, @body_accept.clone
-        end
-        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']), '')
-          -> { clean_room.instance_exec(connection.websocket, *matched, &route.function) }.call
-          return Midori::Response.new
-        elsif request.eventsource?
-          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.raw_response
-          middlewares.reverse_each { |middleware| response = middleware.after(request, response) }
-          return response
-        end
-      end
-      raise Midori::Error::NotFound
-    end
+      # Insert route to routes
+      route = Midori::Route.new(method, path, block)
+      route.middlewares = @scope_middlewares + @temp_middlewares
+      @routes[method] << route
 
-    # Match route with given definition
-    # @param [ String ] method Accepts an HTTP/1.1 method like GET POST PUT ...
-    # @param [ Regexp ] path Precompiled route definition.
-    # @param [ String ] request_method HTTP Request Method
-    # @param [ String ] request_path HTTP Request Path
-    # @return [ Array ] matched parameters
-    # @return [ Boolean ] false if not matched
-    # @example match a route
-    #   match('GET', /^\/user\/(.*?)\/order\/(.*?)$/, '/user/foo/order/bar') # => ['foo', 'bar']
-    def match(method, path, request_method, request_path)
-      if request_method == method
-        result = request_path.match(path)
-        return result.to_a[1..-1] if result
-        false
-      else
-        false
-      end
-    end
-
-    # Convert String path to its Regexp equivalent
-    # @param [ String ] path String route definition
-    # @return [ Regexp ] Regexp equivalent
-    # @example
-    #   convert_route('/user/:id/order/:order_id') # => Regexp
-    def convert_route(path)
-      path = '^' + path
-             .gsub(/\/(:[_a-z][_a-z0-9]+?)\//, '/([^/]+?)/')
-             .gsub(/\/(:[_a-z][_a-z0-9]+?)$/, '/([^/]+?)$')
-      path += '$' if path[-1] != '$'
-      Regexp.new path
+      # Clean up temp middleware
+      @temp_middlewares = []
+      nil
     end
 
     # Use a middleware in the all routes
@@ -224,20 +141,16 @@ class Midori::API
     # @return [nil] nil
     def use(middleware, *args)
       middleware = middleware.new(*args)
-      CleanRoom.class_exec { middleware.helper }
-      @middleware = [] if @middleware.nil?
-      @middleware << middleware
-      @body_accept = middleware.body_accept
+      Midori::CleanRoom.class_exec { middleware.helper }
+      @scope_middlewares << middleware
       nil
     end
 
-    # Return websocket header with given key
-    # @param [String] key 'Sec-WebSocket-Key' in request header
-    # @return [Hash] header
-    def websocket_header(key)
-      header = Midori::Const::WEBSOCKET_HEADER.clone
-      header['Sec-WebSocket-Accept'] = Digest::SHA1.base64digest(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
-      header
+    def filter(middleware, *args)
+      middleware = middleware.new(*args)
+      Midori::CleanRoom.class_exec { middleware.helper }
+      @temp_middlewares << middleware
+      nil
     end
 
     # Helper block for defining methods in APIs
@@ -245,6 +158,10 @@ class Midori::API
     def helper(&block)
       Midori::CleanRoom.class_exec(&block)
     end
+
+    def inherited(subclass)
+      subclass.class_initialize
+    end
   end
 
   private_class_method :add_route
@@ -255,7 +172,10 @@ class Midori::API
   # Magics to fill DSL methods through dynamically class method definition
   METHODS.each do |method|
     define_singleton_method(method) do |*args, &block|
-      add_route(method.upcase, args[0], block) # args[0]: path
+      add_route(method.upcase.to_sym, args[0], block) # args[0]: path
     end
   end
+
+  singleton_class.send :alias_method, :ws, :websocket
+  singleton_class.send :alias_method, :es, :eventsource
 end

data/lib/em-midori/api_engine.rb

@@ -0,0 +1,84 @@
+class Midori::APIEngine
+  attr_accessor :routes
+  def initialize(root_api, type = :sinatra)
+    @routes = {
+      GET: [],
+      POST: [],
+      PUT: [],
+      DELETE: [],
+      OPTIONS: [],
+      LINK: [],
+      UNLINK: [],
+      WEBSOCKET: [],
+      EVENTSOURCE: []
+    }
+    @root_api = root_api
+    @type = type
+    @routes = merge('', root_api, [])
+    @routes.delete :MOUNT
+    @routes.each do |method|
+      method[1].each do |route|
+        route.path = Mustermann.new(route.path, type: type)
+      end
+    end
+  end
+
+  def merge(prefix, root_api, middlewares)
+    # Merge all routes with a Depth-first search
+    root_api.routes[:MOUNT].each do |mount|
+      root_api.routes.merge!(merge(mount[0], mount[1], root_api.scope_middlewares)) do |_key, old_val, new_val|
+        old_val + new_val
+      end
+    end
+    root_api.routes.delete :MOUNT
+    root_api.routes.each do |method|
+      method[1].each do |route|
+        route.path = prefix + route.path
+        route.middlewares = middlewares + route.middlewares
+      end
+    end
+    root_api.routes
+  end
+
+  # Process after receive data from client
+  # @param request [ Midori::Request ] Http Raw Request
+  # @param connection [ EM::Connection ] A connection created by EventMachine
+  # @return [ Midori::Response ] Http Response
+  # @raise [ Midori::Error::NotFound ] If no route matched
+  def receive(request, connection = nil)
+    @routes[request.method].each do |route|
+      params = route.path.params(request.path)
+      next unless params
+      request.params = params
+      route.middlewares.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, Midori::APIEngine.websocket_header(request.header['Sec-WebSocket-Key']), '')
+        connection.websocket.request = request
+        -> { clean_room.instance_exec(connection.websocket, &route.function) }.call
+        return Midori::Response.new
+      elsif request.eventsource?
+        connection.send_data Midori::Response.new(200, Midori::Const::EVENTSOURCE_HEADER, '')
+        -> { clean_room.instance_exec(connection.eventsource, &route.function) }.call
+        return Midori::Response.new
+      else
+        result = -> { clean_room.instance_exec(&route.function) }.call
+        clean_room.body = result if result.is_a?String
+        response = clean_room.raw_response
+        route.middlewares.reverse_each { |middleware| response = middleware.after(request, response) }
+        return response
+      end
+    end
+    raise Midori::Error::NotFound
+  end
+
+  # Return websocket header with given key
+  # @param [String] key 'Sec-WebSocket-Key' in request header
+  # @return [Hash] header
+  def self.websocket_header(key)
+    header = Midori::Const::WEBSOCKET_HEADER.clone
+    header['Sec-WebSocket-Accept'] = Digest::SHA1.base64digest(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
+    header
+  end
+end

data/lib/em-midori/clean_room.rb

@@ -7,34 +7,16 @@
 class Midori::CleanRoom
   attr_accessor :code, :header, :body, :request
   # @param [Midori::Request] request HTTP request
-  # @param [Array<Midori::Middleware>] middleware middlewares to run
-  # @param [Array<Class>] body_accept what class for body could last middleware accept by default
-  def initialize(request, middleware = [], body_accept = [String])
+  def initialize(request)
     @status = 200
     @header = Midori::Const::DEFAULT_HEADER.clone
     @body = ''
     @request = request
-    @middleware = middleware
-    @body_accept = body_accept
   end
 
-  # Genenrate response from variables inside +Midori::CleanRoom+
+  # Generate response from variables inside +Midori::CleanRoom+
   # @return [Midori::Response] midori response
   def raw_response
     Midori::Response.new(@status, @header, @body)
   end
-
-  # Add a middleware to a specific route
-  # @param [Class] middleware inherited form +Midori::Middleware+ class
-  # @param [Array<Object>] args for middleware initialize
-  # @return [nil] nil
-  def use(middleware, *args)
-    middleware = middleware.new(*args)
-    middleware.helper
-    @middleware = [] if @middleware.nil?
-    @middleware << middleware
-    @body_accept.replace middleware.body_accept
-    @request = middleware.before(request)
-    nil
-  end
 end

data/lib/em-midori/configure.rb

@@ -1,9 +1,10 @@
 ##
 # Default configuration of Midori, extends +Midori::Configurable+
 class Midori::Configure
-  extend Midori::Configurable
+  extend Configurable
 
   set :logger, ::Logger.new(STDOUT)
   set :bind, '127.0.0.1'
   set :port, 8080
+  set :route_type, :sinatra
 end

data/lib/em-midori/core_ext/configurable.rb

@@ -1,32 +1,31 @@
-module Midori
-  # Provide flexible configuration for Midori Server
-  module Configurable
-    # Modified from Sinatra
-    # Sets an option to the given value.
-    # @param [Symbol] option the name of config
-    # @param [Object] value value to the name
-    # @param [Boolean] read_only Generate option= method or not
-    def set(option, value = (not_set = true), read_only = false)
-      raise ArgumentError if not_set
+##
+# Modified from Sinatra
+# Provide flexible configuration for Midori Server
+module Configurable
+  # Sets an option to the given value.
+  # @param [Symbol] option the name of config
+  # @param [Object] value value to the name
+  # @param [Boolean] read_only Generate option= method or not
+  def set(option, value = (not_set = true), read_only = false)
+    raise ArgumentError if not_set
 
-      setter = proc { |val| set option, val }
-      getter = proc { value }
+    setter = proc { |val| set option, val }
+    getter = proc { value }
 
-      define_singleton("#{option}=", setter) unless read_only
-      define_singleton(option, getter)
-      define_singleton("#{option}?", "!!#{option}") unless method_defined? "#{option}?"
+    define_singleton("#{option}=", setter) unless read_only
+    define_singleton(option, getter)
+    define_singleton("#{option}?", "!!#{option}") unless method_defined? "#{option}?"
 
-      self
-    end
+    self
+  end
 
-    private
+  private
 
-    # Dynamically defines a method on settings.
-    def define_singleton(name, content = Proc.new)
-      singleton_class.class_eval do
-        undef_method(name) if method_defined? name
-        String === content ? class_eval("def #{name}() #{content}; end") : define_method(name, &content)
-      end
+  # Dynamically defines a method on settings.
+  def define_singleton(name, content = Proc.new)
+    singleton_class.class_eval do
+      undef_method(name) if method_defined? name
+      String === content ? class_eval("def #{name}() #{content}; end") : define_method(name, &content)
     end
   end
 end

data/lib/em-midori/{promise.rb → core_ext/promise.rb}

@@ -7,9 +7,9 @@ class Promise
     @callback = callback
   end
 
-  # Define what to do after a method callbacked
-  # @param [Proc] resolve what if callbacked
-  # @param [Proc] reject what if callback failed
+  # Define what to do after a method callbacks
+  # @param [Proc] resolve what on callback
+  # @param [Proc] reject what on callback failed
   # @return [nil] nil
   def then(resolve = ->() {}, reject = ->() {})
     @callback.call(resolve, reject)

data/lib/em-midori/middleware.rb

@@ -24,10 +24,4 @@ class Midori::Middleware
   # @return [nil] nil
   def helper
   end
-
-  # Acceptable body
-  # @return [Array<Class>] array of acceptable type's class
-  def body_accept
-    [String]
-  end
 end

data/lib/em-midori/request.rb

@@ -11,7 +11,7 @@
 class Midori::Request
   attr_accessor :ip, :port,
                 :protocol, :method, :path, :query_string,
-                :header, :body, :parsed
+                :header, :body, :parsed, :params
 
   # Init Request
   def initialize
@@ -19,6 +19,7 @@ class Midori::Request
     @is_websocket = false
     @is_eventsource = false
     @parser = Http::Parser.new
+    @params = {}
     @parser.on_headers_complete = proc do
       @protocol = @parser.http_version
       @method = @parser.http_method
@@ -39,32 +40,33 @@ class Midori::Request
 
     # Deal with WebSocket
     if @header['Upgrade'] == 'websocket' && @header['Connection'] == 'Upgrade'
-      @method = 'WEBSOCKET'
+      @method = :WEBSOCKET
       @is_websocket = true
     end
 
     # Deal with EventSource
     if @header['Accept'] == 'text/event-stream'
-      @method = 'EVENTSOURCE'
+      @method = :EVENTSOURCE
       @is_eventsource = true
     end
 
+    @method = @method.to_sym
     @parsed = true
   end
 
-  # Syntatic sugur for whether a request is parsed
+  # Syntatic sugar for whether a request is parsed
   # @return [Boolean] parsed or not
   def parsed?
     @parsed
   end
 
-  # Syntatic sugur for whether a request is a websocket request
+  # Syntatic sugar for whether a request is a websocket request
   # @return [Boolean] websocket or not
   def websocket?
     @is_websocket
   end
 
-  # Syntatic sugur for whether a request is an eventsource request
+  # Syntatic sugar for whether a request is an eventsource request
   # @return [Boolean] eventsource or not
   def eventsource?
     @is_eventsource

data/lib/em-midori/route.rb

@@ -4,7 +4,7 @@
 # @attr [Regexp] path regex to match
 # @attr [Proc] function what to do after matched
 class Midori::Route
-  attr_accessor :method, :path, :function
+  attr_accessor :method, :path, :function, :middlewares
 
   # @param [String] method HTTP method
   # @param [Regexp] path regex to match
@@ -13,5 +13,6 @@ class Midori::Route
     @method = method
     @path = path
     @function = function
+    @middlewares = []
   end
 end

data/lib/em-midori/runner.rb

@@ -7,8 +7,7 @@ class Midori::Runner
     @logger = configure.logger
     @bind = configure.bind
     @port = configure.port
-
-    @api = api
+    @api = ((api.is_a?Midori::APIEngine) ? api : Midori::APIEngine.new(api, configure.route_type))
   end
 
   # Get Midori server whether running

data/lib/em-midori/version.rb

@@ -1,5 +1,5 @@
 # Midori Module
 module Midori
   # Current Version Code
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/lib/em-midori/websocket.rb

@@ -5,7 +5,7 @@
 # @attr [Hash] events response for different event
 # @attr [EM::Connection] connection raw EventMachine connection
 class Midori::WebSocket
-  attr_accessor :msg, :opcode, :events, :connection
+  attr_accessor :msg, :opcode, :events, :connection, :request
 
   # @param [EM::Connection] connection raw EventMachine connection
   def initialize(connection)
@@ -70,7 +70,7 @@ class Midori::WebSocket
     elsif msg.is_a?Array
       output << 0b10000010 << msg.size
       output.concat msg
-      @connection.send_data(output.pack("C*"))
+      @connection.send_data(output.pack('C*'))
     else
       raise Midori::Error::OpCodeError
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.2.0.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: mustermann
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: EM Midori is an EventMachine-based Web Framework written in pure Ruby,
   providing high performance and proper abstraction.
 email: business@heckpsi.com
@@ -51,24 +59,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CONTRIBUTOR_COVENANT_CODE_OF_CONDUCT.md
 - LICENSE
 - lib/em-midori.rb
 - lib/em-midori/api.rb
+- lib/em-midori/api_engine.rb
 - lib/em-midori/clean_room.rb
 - lib/em-midori/configure.rb
 - lib/em-midori/const.rb
 - lib/em-midori/core_ext/configurable.rb
-- lib/em-midori/define_class.rb
+- lib/em-midori/core_ext/define_class.rb
+- lib/em-midori/core_ext/promise.rb
+- lib/em-midori/core_ext/string.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
 - lib/em-midori/route.rb
 - lib/em-midori/runner.rb
 - lib/em-midori/server.rb
-- lib/em-midori/string.rb
 - lib/em-midori/version.rb
 - lib/em-midori/websocket.rb
 homepage: https://github.com/heckpsi-lab/em-midori