em-midori 0.1.4 → 0.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde61e335c329326e0e04c9d2e433077923260ed
-  data.tar.gz: f866ca5439372bde2d084e4cded2f66c27283904
+  metadata.gz: 8eb56ad166b1af740a4fa22b34129cd1c7d7661d
+  data.tar.gz: e6103dbed135744e21eaaf931ce2dda5e984ae72
 SHA512:
-  metadata.gz: 93593618d3d46c284937ad42d1fce33e4fe7375644717744773b537fd1c8a8e9717b86334f5b968c4388b9fd40daece5a94b2b0ce5e9f9d89cd6c61cfd12916f
-  data.tar.gz: 28a9dae73071f578989377e7e312606a7a88feada47057b264e4e7363dbe1a5b3162f8c2926fd393d5208db769d4cf91c643590e1b588b5c22636f6e17810637
+  metadata.gz: 09a9e1b5b9661828e276593c224062b672bf5a99a360912143dc2d60df10756b6c9ab45e4841b3f7c9b8a4212709ea5c391a8eb0a256abdd86c4d0a48f35008d
+  data.tar.gz: 245df6e2b0baf5c4c05996d61fd3884e1b725c8b7f76e28424971f24480767edbd38ca249e8e55268fd004de3784b667d6f01651fcb3121a5dc010c3da92997a

data/lib/em-midori.rb

@@ -10,6 +10,7 @@ require 'socket'
 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/promise_exception'
 require_relative 'em-midori/core_ext/define_class'
 require_relative 'em-midori/core_ext/proc'
 

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

@@ -18,13 +18,14 @@ end
 
 class DeferPromise < Promise
   def initialize(deffered)
-    super(->(resolve, _reject){
-      EventMachine.defer(deffered, 
-        proc { |result|
-          resolve.call(result)
-        }, proc { |error| 
-          raise error
-        })
+    super(->(resolve, reject){
+      EventMachine.defer(proc {
+        begin
+          deffered.call
+        rescue Exception => e
+          PromiseException.new(e)
+        end
+      }, proc { |result| resolve.call(result) })
     })
   end
 end
@@ -64,6 +65,8 @@ module Kernel
   # @example
   #   result = await SQL.query('SELECT * FROM hello')
   def await(promise)
-    Fiber.yield promise
+    result = Fiber.yield promise
+    raise result.raw_exception if result.is_a?PromiseException
+    result
   end
 end

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

@@ -0,0 +1,7 @@
+class PromiseException < StandardError
+  attr_reader :raw_exception
+  def initialize(raw_exception)
+    super(nil)
+    @raw_exception = raw_exception
+  end
+end

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

@@ -13,9 +13,20 @@ class Midori::Postgres
 
   def query(sql)
     await(Promise.new(->(resolve, _reject) {
-      @db.query(sql).callback do |status, result, errors|
-        status ? resolve.call(result) : (puts errors; raise RuntimeError)
+      begin
+        @db.query(sql).callback do |status, result, errors|
+          resolve.call(Midori::Postgres::Result.new(status, result, errors))
+        end
       end
     }))
   end
 end
+
+class Midori::Postgres::Result
+  attr_reader :status, :result, :errors
+  def initialize(status, result, errors)
+    @status = status
+    @result = result
+    @errors = errors
+  end
+end

data/lib/em-midori/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.4.1
 platform: ruby
 authors:
 - HeckPsi Lab
@@ -85,6 +85,7 @@ files:
 - 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/promise_exception.rb
 - lib/em-midori/core_ext/string.rb
 - lib/em-midori/eventsource.rb
 - lib/em-midori/exception.rb