em-midori 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dcc440db5d1538e1e4530d9d6879c9a4115ee85
-  data.tar.gz: b6912e55681783ebcd555de7b13c5d8681a213a8
+  metadata.gz: 6f38d205f0e4f20a31cfdec6103d2f51367dc4f8
+  data.tar.gz: 5edb796b384fdf26b0f2ad2e1e4c7d4ff74308b4
 SHA512:
-  metadata.gz: 6b004b9d39d894840e6c2652dda4162d25be4be82f5532c3bedf61a189103e64b9d874312a686ccaa60469977d4f070bc4a6e09959cbcc24db3f7448ca0af648
-  data.tar.gz: 9d4c89c1930ce59fe8590f2f26f2fda1972d768145c054803e8f0f2d8aecf840a44f52c50d026c5026cb0233ed8759ff6f443b11e9dd89043ee301a09a2fae88
+  metadata.gz: c1fb15aa76bac728a030b5f2989c401cddd29a279505fd51c9b52c6c74c3c00759336edcc091cc864b7f3cab060de7bbf7de3c0e77cc2019e62e4cc48cee3f15
+  data.tar.gz: c3dd1c67a230b4a3de6d5b7e1a41d225021728c50951d4993703c1579d2e2c18086bd5ec8ba144023acdff81c403938b4b2c3a00a5be43f2f2422461ac511fcb

data/lib/em-midori.rb

@@ -11,6 +11,7 @@ require_relative 'em-midori/core_ext/configurable'
 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/core_ext/proc'
 
 require_relative 'em-midori/version'
 require_relative 'em-midori/const'
@@ -21,6 +22,7 @@ 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/sandbox'
 require_relative 'em-midori/server'
 require_relative 'em-midori/websocket'
 require_relative 'em-midori/eventsource'

data/lib/em-midori/api.rb

@@ -107,7 +107,7 @@ class Midori::API
     #      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
@@ -117,6 +117,10 @@ class Midori::API
       @routes[:MOUNT] << [prefix, api]
     end
 
+    def capture(error, &block)
+      Midori::Sandbox.add_rule(error, block)
+    end
+
     # Implementation of route DSL
     # @param [ String ] method HTTP method
     # @param [ String, Regexp ] path path definition

data/lib/em-midori/api_engine.rb

@@ -56,16 +56,16 @@ class Midori::APIEngine
         # 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
+        Midori::Sandbox.run(clean_room, route.function, connection.websocket)
         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
+        Midori::Sandbox.run(clean_room, route.function, connection.eventsource)
         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
+        result = Midori::Sandbox.run(clean_room, route.function)
+        clean_room.body = result unless result.nil?
+        response = (result.is_a?Midori::Response) ? result : clean_room.raw_response
         route.middlewares.reverse_each { |middleware| response = middleware.after(request, response) }
         return response
       end

data/lib/em-midori/clean_room.rb

@@ -1,11 +1,11 @@
 ##
 # This class is used to be sandbox of requests processing.
-# @attr [Fixnum] code HTTP response code
+# @attr [Fixnum] status HTTP response code
 # @attr [Hash] header HTTP response header
-# @attr [Object] body HTTP response body. String could is accepted by default, but could leave for further process with +Midori::Midlleware+
+# @attr [Object] body HTTP response body. String could is accepted by default, but could leave for further process with +Midori::Middleware+
 # @attr [Midori::Request] request HTTP request
 class Midori::CleanRoom
-  attr_accessor :code, :header, :body, :request
+  attr_accessor :status, :header, :body, :request
   # @param [Midori::Request] request HTTP request
   def initialize(request)
     @status = 200

data/lib/em-midori/configure.rb

@@ -1,5 +1,5 @@
 ##
-# Default configuration of Midori, extends +Midori::Configurable+
+# Default configuration of Midori, extends +Configurable+
 class Midori::Configure
   extend Configurable
 

data/lib/em-midori/const.rb

@@ -1,5 +1,5 @@
 ##
-# Module for store Midori Consts
+# Module for store Midori Const
 module Midori::Const
   # Hash table for converting numbers to HTTP/1.1 status code line
   STATUS_CODE = {
@@ -51,14 +51,14 @@ module Midori::Const
     'Server' => "Midori/#{Midori::VERSION}"
   }
 
-  # Default header for Evenrsource response
+  # Default header for EventSource response
   EVENTSOURCE_HEADER = {
     'Content-Type' => 'text-event-stream',
     'Cache-Control' => 'no-cache',
     'Connection' => 'keep-alive'
   }
 
-  # Default header for Websocket response
+  # Default header for WebSocket response
   WEBSOCKET_HEADER = {
     'Upgrade' => 'websocket',
     'Connection' => 'Upgrade'

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

@@ -0,0 +1,8 @@
+class Proc
+  # @note Converting {Proc} to {Lambda} may have incorrect behaviours on corner cases.
+  # @note See {Ruby Language Issues}[https://bugs.ruby-lang.org/issues/7314] for more details.
+  def to_lambda (instance = Object.new)
+    instance.define_singleton_method(:_, &self)
+    instance.method(:_).to_proc
+  end
+end

data/lib/em-midori/error.rb

@@ -1,8 +1,10 @@
 ##
-# This module store errors to be handled in Midori
+# This module store errors to be handled inside Midori
 module Midori::Error
   # No route matched
   class NotFound < StandardError; end
+  # Internal Error
+  class InternalError < StandardError; end
   # Midori doesn't support continuous frame of WebSockets yet
   class ContinuousFrame < StandardError; end
   # WebSocket OpCode not defined in RFC standards

data/lib/em-midori/request.rb

@@ -54,19 +54,19 @@ class Midori::Request
     @parsed = true
   end
 
-  # Syntatic sugar for whether a request is parsed
+  # Syntactic sugar for whether a request is parsed
   # @return [Boolean] parsed or not
   def parsed?
     @parsed
   end
 
-  # Syntatic sugar for whether a request is a websocket request
+  # Syntactic sugar for whether a request is a websocket request
   # @return [Boolean] websocket or not
   def websocket?
     @is_websocket
   end
 
-  # Syntatic sugar for whether a request is an eventsource request
+  # Syntactic sugar for whether a request is an eventsource request
   # @return [Boolean] eventsource or not
   def eventsource?
     @is_eventsource

data/lib/em-midori/sandbox.rb

@@ -0,0 +1,30 @@
+class Midori::Sandbox
+  class << self
+    def class_initialize
+      @handlers = Hash.new
+      @handlers[Midori::Error::InternalError] = proc {|_e| Midori::Response.new(500, {}, 'Internal Server Error')}
+      @handlers[Midori::Error::NotFound] = proc {|_e| Midori::Response.new(404, {}, '404 Not Found')}
+    end
+
+    def add_rule(class_name, block)
+      @handlers[class_name] = block
+    end
+
+    def capture(error)
+      if @handlers[error.class].nil?
+        @handlers[Midori::Error::InternalError].call(error)
+      else
+        @handlers[error.class].call(error) 
+      end
+    end
+
+    def run(clean_room, function, *args)
+      begin
+        function.to_lambda(clean_room).call(*args)
+      rescue StandardError => e
+        capture(e)
+      end
+    end
+  end
+  class_initialize
+end

data/lib/em-midori/server.rb

@@ -1,5 +1,5 @@
 ##
-# Logics to EventMachine TCP Server, running inside +EM::Connection+
+# Logic to EventMachine TCP Server, running inside +EM::Connection+
 # @attr [Midori::Request] request
 # @attr [Class] api inherited from Midori::API
 # @attr [Midori::WebSocket] websocket websocket instance
@@ -17,7 +17,7 @@ module Midori::Server
     @eventsource = Midori::EventSource.new(self)
   end
 
-  # Logics of receiving data
+  # Logic of receiving data
   # @param [String] data raw data
   def receive_data(data)
     lambda do
@@ -37,17 +37,17 @@ module Midori::Server
     end.call
   end
 
-  # Logics of receiving new request
+  # Logic of receiving new request
   # @param [String] data raw data
   def receive_new_request(data)
     begin
       @request.parse(data)
       @response = @api.receive(request, self)
       call_event(:open) if @request.websocket?
-    rescue Midori::Error::NotFound => _e
-      @response = Midori::Response.new(404, {}, '404 Not Found')
+    rescue Midori::Error::NotFound => e
+      @response = Midori::Sandbox.capture(e)
     rescue => e
-      @response = Midori::Response.new(500, {}, 'Internal Server Error')
+      @response = Midori::Sandbox.capture(e)
       @logger.error e.inspect.red
       @logger.warn e.backtrace.join("\n").yellow
     end
@@ -57,7 +57,7 @@ module Midori::Server
     end
   end
 
-  # Logics of receiving WebSocket request
+  # Logic of receiving WebSocket request
   # @param [StringIO] data raw data
   def websocket_request(data)
     @websocket.decode(data)
@@ -76,7 +76,9 @@ module Midori::Server
     close_connection_after_writing
   rescue Midori::Error::PingPongSizeTooLarge => e
     @logger.warn e.inspect.yellow
-    call_event(:error) # Neglect Too large ping request
+    call_event(:error) # Too large ping request
+    send_data "\b" # Opcode 0x8
+    close_connection_after_writing
   rescue => e
     call_event(:error)
     @logger.error e.inspect.red

data/lib/em-midori/version.rb

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

data/lib/em-midori/websocket.rb

@@ -14,7 +14,7 @@ class Midori::WebSocket
   end
 
   # Decode raw data send from client
-  # @param [String] data raw data
+  # @param [StringIO] data raw data
   def decode(data)
     # Fin and Opcode
     byte_tmp = data.getbyte
@@ -29,7 +29,7 @@ class Midori::WebSocket
   end
 
   # Decode masked message send from client
-  # @param [String] data raw data
+  # @param [StringIO] data raw data
   def decode_mask(data)
     # Mask
     byte_tmp = data.getbyte

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -69,6 +69,7 @@ files:
 - lib/em-midori/const.rb
 - lib/em-midori/core_ext/configurable.rb
 - lib/em-midori/core_ext/define_class.rb
+- lib/em-midori/core_ext/proc.rb
 - lib/em-midori/core_ext/promise.rb
 - lib/em-midori/core_ext/string.rb
 - lib/em-midori/error.rb
@@ -78,6 +79,7 @@ files:
 - lib/em-midori/response.rb
 - lib/em-midori/route.rb
 - lib/em-midori/runner.rb
+- lib/em-midori/sandbox.rb
 - lib/em-midori/server.rb
 - lib/em-midori/version.rb
 - lib/em-midori/websocket.rb