em-midori 0.0.9.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b1ccfd36d54df0a60d8680cff40a36510d2544
-  data.tar.gz: c0d7993d03f0579d8b6e8c00624dddb00d086a11
+  metadata.gz: b6d10050423b7536832c5ef0b7d94ead6bb713a8
+  data.tar.gz: 949d87027c3feaece3ce05637b91569f37056978
 SHA512:
-  metadata.gz: 2bef5ca38679e84ae35ce3aa26ee9dea13776ef02de2b4f2219db0ab6da2b313b5c3b75df2a66ef1eb5ad66cd2e0a04a2dac03a815974b898ad7ab1d1a5fc622
-  data.tar.gz: 237bdbc93a65c78d3892c9eb5132ba43784d4116fec751c650a262e98c9ff15c94a26635269bede2d664b6fb24cb412e7d704fe979e02df40c951dbb0ec4ab81
+  metadata.gz: 69ee80d129f50421830b10c57dc3712211892d9cb5e047422e7b90e7b8bf2eb2bb01fb44b03c0d1d7b6424e1843a8861be7fa040d383b73dffa9cb22ca7bce5d
+  data.tar.gz: 1b97321457676354063864beb257e0b8ce43e5e873beb34b1dd9a08e6db0e00471ae3b99dc440071f3c561e984a608b215b0ad41f02fae2d6b4ea0d0c8dfeffb

data/lib/em-midori.rb

@@ -4,15 +4,16 @@ require 'eventmachine'
 require 'fiber'
 require 'logger'
 require 'http/parser'
+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/const'
 require_relative 'em-midori/define_class'
 require_relative 'em-midori/error'
 require_relative 'em-midori/clean_room'
-require_relative 'em-midori/em_midori'
 require_relative 'em-midori/request'
 require_relative 'em-midori/response'
 require_relative 'em-midori/api'
@@ -21,3 +22,5 @@ require_relative 'em-midori/server'
 require_relative 'em-midori/websocket'
 require_relative 'em-midori/eventsource'
 require_relative 'em-midori/middleware'
+require_relative 'em-midori/configure'
+require_relative 'em-midori/runner'

data/lib/em-midori/api.rb

@@ -235,11 +235,9 @@ class Midori::API
     # @param [String] key 'Sec-WebSocket-Key' in request header
     # @return [Hash] header
     def websocket_header(key)
-      {
-        'Upgrade' => 'websocket',
-        'Connection' => 'Upgrade',
-        'Sec-WebSocket-Accept' => Digest::SHA1.base64digest(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
-      }
+      header = Midori::Const::WEBSOCKET_HEADER.clone
+      header['Sec-WebSocket-Accept'] = Digest::SHA1.base64digest(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
+      header
     end
 
     # Helper block for defining methods in APIs

data/lib/em-midori/configure.rb

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

data/lib/em-midori/const.rb

@@ -57,4 +57,10 @@ module Midori::Const
     'Cache-Control' => 'no-cache',
     'Connection' => 'keep-alive'
   }
+
+  # Default header for Websocket response
+  WEBSOCKET_HEADER = {
+    'Upgrade' => 'websocket',
+    'Connection' => 'Upgrade'
+  }
 end

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

@@ -0,0 +1,32 @@
+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
+
+      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}?"
+
+      self
+    end
+
+    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
+    end
+  end
+end

data/lib/em-midori/runner.rb

@@ -0,0 +1,51 @@
+##
+# Abstract runner class to control instance of Midori Server
+class Midori::Runner
+  attr_reader :bind, :port
+
+  def initialize(api, configure = Midori::Configure)
+    @logger = configure.logger
+    @bind = configure.bind
+    @port = configure.port
+
+    @api = api
+  end
+
+  # Get Midori server whether running
+  # @return [Boolean] [true] running
+  # @return [Boolean] [false] not running
+  def running?
+    !!@server_signature
+  end
+
+  # Start the Midori server
+  # @note This is an async method, but no callback
+  def start
+    return if running?
+
+    EventMachine.set_simultaneous_accept_count(40) unless RUBY_PLATFORM == 'java'
+    EventMachine.run do
+      @logger.info "Midori #{Midori::VERSION} is now running on #{bind}:#{port}".blue
+      @server_signature = EventMachine.start_server bind, port, Midori::Server, @api, @logger
+    end
+
+    nil
+  end
+
+  # Stop the Midori server
+  # @note This is an async method, but no callback
+  # @return [Boolean] [true] stop successfully
+  # @return [Boolean] [false] nothing to stop
+  def stop
+    if running?
+      @logger.info 'Goodbye Midori'.blue
+      EventMachine.stop_server(@server_signature)
+      @server_signature = nil
+      EM.stop
+      true
+    else
+      @logger.error 'Midori Server has NOT been started'.red
+      false
+    end
+  end
+end

data/lib/em-midori/server.rb

@@ -32,7 +32,7 @@ module Midori::Server
                          receive_new_request(data)
                        end
                        now_time = Time.now
-                       @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path}\" #{@response.status} #{(now_time.to_f - start_time.to_f).round(6)}".green
+                       @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} HTTP/#{@request.protocol.join('.')}\" #{@response.status} #{(now_time.to_f - start_time.to_f).round(6)}".green
                      end)
     end.call
   end

data/lib/em-midori/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.0.9.5
+  version: 0.1.0
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -55,9 +55,10 @@ files:
 - lib/em-midori.rb
 - lib/em-midori/api.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/em_midori.rb
 - lib/em-midori/error.rb
 - lib/em-midori/eventsource.rb
 - lib/em-midori/middleware.rb
@@ -65,6 +66,7 @@ files:
 - 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

data/lib/em-midori/em_midori.rb

@@ -1,37 +0,0 @@
-##
-# The main module of Midori
-module Midori
-  @logger = ::Logger.new(STDOUT)
-  # Start Midori Server instance
-  # @note This is an async method, but no callback
-  # @param [Class] api Inherit from +Midori::API+
-  # @param [String] ip The ip address to bind
-  # @param [Fixnum] port Port number
-  # @param [Logger] logger Ruby logger
-  # @return [nil] nil
-  def self.run(api = Midori::API, ip = '127.0.0.1', port = 8081, logger = ::Logger.new(STDOUT))
-    @logger = logger
-    EventMachine.set_simultaneous_accept_count(40) unless RUBY_PLATFORM == "java"
-    EventMachine.run do
-      @logger.info "Midori #{Midori::VERSION} is now running on #{ip}:#{port}".blue
-      @midori_server = EventMachine.start_server ip, port, Midori::Server, api, logger
-    end
-    nil
-  end
-
-  # Stop Midori Server instance
-  # @note This is an async method, but no callback
-  # @return [Boolean] [true] stop successfully
-  # @return [Boolean] [false] nothing to stop
-  def self.stop
-    if @midori_server.nil?
-      @logger.error 'Midori Server has NOT been started'.red
-      return false
-    else
-      EventMachine.stop_server(@midori_server)
-      @midori_server = nil
-      @logger.info 'Goodbye Midori'.blue
-      return true
-    end
-  end
-end