em-midori 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63375f6e8a60a297804f655301642f3a4301bae3
-  data.tar.gz: 7862191b4a720a0568759b8a325eec7f6e4d6277
+  metadata.gz: cde61e335c329326e0e04c9d2e433077923260ed
+  data.tar.gz: f866ca5439372bde2d084e4cded2f66c27283904
 SHA512:
-  metadata.gz: ea4d98047259403a5c37ca083639a72b93612cc37e1879a2deecee2a2abca4aaccf25922df172d5a48750fea1cec614b4ccd07f5eddc85ea262d58e5d3d9971d
-  data.tar.gz: c4860155f3ae3a2ae0861604c637c36fbe883d6a633e5bfa744fbafbd9db59c31945e8c5c1b278e74947375ff075dfa50944d548d18070ac6801bfb26a0ff610
+  metadata.gz: 93593618d3d46c284937ad42d1fce33e4fe7375644717744773b537fd1c8a8e9717b86334f5b968c4388b9fd40daece5a94b2b0ce5e9f9d89cd6c61cfd12916f
+  data.tar.gz: 28a9dae73071f578989377e7e312606a7a88feada47057b264e4e7363dbe1a5b3162f8c2926fd393d5208db769d4cf91c643590e1b588b5c22636f6e17810637

data/lib/em-midori.rb

@@ -15,7 +15,7 @@ require_relative 'em-midori/core_ext/proc'
 
 require_relative 'em-midori/version'
 require_relative 'em-midori/const'
-require_relative 'em-midori/error'
+require_relative 'em-midori/exception'
 require_relative 'em-midori/clean_room'
 require_relative 'em-midori/request'
 require_relative 'em-midori/response'

data/lib/em-midori/api_engine.rb

@@ -70,7 +70,7 @@ class Midori::APIEngine
         return response
       end
     end
-    raise Midori::Error::NotFound
+    raise Midori::Exception::NotFound
   end
 
   # Return websocket header with given key

data/lib/em-midori/eventsource.rb

@@ -12,7 +12,7 @@ class Midori::EventSource
   # Send data and close the connection
   # @param [String] data data to be sent
   def send(data)
-    raise Midori::Error::EventSourceTypeError unless data.is_a?String
+    raise Midori::Exception::EventSourceTypeError unless data.is_a? String
     @connection.send_data(data.split("\n").map {|str| "data: #{str}\n"}.join + "\n")
     @connection.close_connection_after_writing
   end

data/lib/em-midori/{error.rb → exception.rb}

@@ -1,6 +1,6 @@
 ##
 # This module store errors to be handled inside Midori
-module Midori::Error
+module Midori::Exception
   # No route matched
   class NotFound < StandardError; end
   # Internal Error

data/lib/em-midori/extension/file.rb

@@ -1,19 +1,11 @@
 class Midori::File
   class << self
-    def read_promise(*args)
-      defer { File.read(*args) }
-    end
-
     def read(*args)
-      await read_promise(*args)
-    end
-
-    def write_promise(*args)
-      defer { File.write(*args) }
+      await(defer{File.read(*args)})
     end
 
     def write(*args)
-      await write_promise(*args)
+      await(defer{File.write(*args)})
     end
   end
 end

data/lib/em-midori/extension/postgres.rb

@@ -0,0 +1,21 @@
+class Midori::Postgres
+  def initialize(*args)
+    @db = EM.connect(*args, EM::P::Postgres3)
+  end
+
+  def connect(db_name, username, password)
+    await(Promise.new(->(resolve, _reject) {
+      @db.connect(db_name, username, password).callback do |status|
+        resolve.call(status)
+      end
+    }))
+  end
+
+  def query(sql)
+    await(Promise.new(->(resolve, _reject) {
+      @db.query(sql).callback do |status, result, errors|
+        status ? resolve.call(result) : (puts errors; raise RuntimeError)
+      end
+    }))
+  end
+end

data/lib/em-midori/sandbox.rb

@@ -2,8 +2,8 @@ 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')}
+      @handlers[Midori::Exception::InternalError] = proc {|_e| Midori::Response.new(500, {}, 'Internal Server Error')}
+      @handlers[Midori::Exception::NotFound] = proc {|_e| Midori::Response.new(404, {}, '404 Not Found')}
     end
 
     def add_rule(class_name, block)
@@ -12,7 +12,7 @@ class Midori::Sandbox
 
     def capture(error)
       if @handlers[error.class].nil?
-        @handlers[Midori::Error::InternalError].call(error)
+        @handlers[Midori::Exception::InternalError].call(error)
       else
         @handlers[error.class].call(error) 
       end

data/lib/em-midori/server.rb

@@ -44,7 +44,7 @@ module Midori::Server
       @request.parse(data)
       @response = @api.receive(request, self)
       call_event(:open) if @request.websocket?
-    rescue Midori::Error::NotFound => e
+    rescue Midori::Exception::NotFound => e
       @response = Midori::Sandbox.capture(e)
     rescue => e
       @response = Midori::Sandbox.capture(e)
@@ -70,11 +70,11 @@ module Midori::Server
     when 0xA
       call_event(:pong)
     end
-  rescue Midori::Error::FrameEnd => _e
+  rescue Midori::Exception::FrameEnd => _e
     call_event(:close)
     send_data "\b" # Opcode 0x8
     close_connection_after_writing
-  rescue Midori::Error::PingPongSizeTooLarge => e
+  rescue Midori::Exception::PingPongSizeTooLarge => e
     @logger.warn e.inspect.yellow
     call_event(:error) # Too large ping request
     send_data "\b" # Opcode 0x8

data/lib/em-midori/version.rb

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

data/lib/em-midori/websocket.rb

@@ -21,8 +21,8 @@ class Midori::WebSocket
     fin = byte_tmp & 0b10000000
     @opcode = byte_tmp & 0b00001111
     # NOT Support Multiple Fragments
-    raise Midori::Error::ContinuousFrame unless fin
-    raise Midori::Error::OpCodeError unless [0x1, 0x2, 0x8, 0x9, 0xA].include?opcode
+    raise Midori::Exception::ContinuousFrame unless fin
+    raise Midori::Exception::OpCodeError unless [0x1, 0x2, 0x8, 0x9, 0xA].include? opcode
     close if @opcode == 0x8 # Close Frame
     # return if @opcode == 0x9 || @opcode == 0xA # Ping Pong
     decode_mask(data)
@@ -34,7 +34,7 @@ class Midori::WebSocket
     # Mask
     byte_tmp = data.getbyte
     is_masked = byte_tmp & 0b10000000
-    raise Midori::Error::NotMasked unless is_masked == 128
+    raise Midori::Exception::NotMasked unless is_masked == 128
     # Payload
     payload = byte_tmp & 0b01111111
     mask = Array.new(4) { data.getbyte }
@@ -72,7 +72,7 @@ class Midori::WebSocket
       output.concat msg
       @connection.send_data(output.pack('C*'))
     else
-      raise Midori::Error::OpCodeError
+      raise Midori::Exception::OpCodeError
     end
   end
 
@@ -92,12 +92,12 @@ class Midori::WebSocket
   # @param [Fixnum] method opcode
   # @param [String] str string to send
   def heartbeat(method, str)
-      raise Midori::Error::PingPongSizeTooLarge if str.size > 125
+      raise Midori::Exception::PingPongSizeTooLarge if str.size > 125
       @connection.send_data [method, str.size, str].pack("CCA#{str.size}")
   end
 
   # Close a websocket connection
   def close
-    raise Midori::Error::FrameEnd
+    raise Midori::Exception::FrameEnd
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: postgres-pr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: EM Midori is an EventMachine-based Web Framework written in pure Ruby,
   providing high performance and proper abstraction.
 email: business@heckpsi.com
@@ -72,9 +86,10 @@ files:
 - 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
 - lib/em-midori/eventsource.rb
+- lib/em-midori/exception.rb
 - lib/em-midori/extension/file.rb
+- lib/em-midori/extension/postgres.rb
 - lib/em-midori/middleware.rb
 - lib/em-midori/request.rb
 - lib/em-midori/response.rb