em-midori 0.1.4.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb56ad166b1af740a4fa22b34129cd1c7d7661d
-  data.tar.gz: e6103dbed135744e21eaaf931ce2dda5e984ae72
+  metadata.gz: f432595f5783ebce17b63e45e546d7875c62202f
+  data.tar.gz: 7a1b441d9baa8c203fd588bd95c92ad2cc3a39dd
 SHA512:
-  metadata.gz: 09a9e1b5b9661828e276593c224062b672bf5a99a360912143dc2d60df10756b6c9ab45e4841b3f7c9b8a4212709ea5c391a8eb0a256abdd86c4d0a48f35008d
-  data.tar.gz: 245df6e2b0baf5c4c05996d61fd3884e1b725c8b7f76e28424971f24480767edbd38ca249e8e55268fd004de3784b667d6f01651fcb3121a5dc010c3da92997a
+  metadata.gz: 479fe680e641aab68cc929be341745bfc1a505774a554b2f8590253add2a25441f011ab88ad6a1f10f07016a7613196d660262bf1467a5a8f5a9e12c8c23cf67
+  data.tar.gz: 22714ec1d12f80e3dc2de87e8b1265e9391ae71f9cb0dccd92cd585f835c3b54f4efb5dcd4e4f328a1637f781568c5a5ecb2b5e6032a527a8296a64ae05bf6d3

data/lib/em-midori.rb

@@ -13,6 +13,7 @@ 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'
+require_relative 'em-midori/core_ext/safe_require'
 
 require_relative 'em-midori/version'
 require_relative 'em-midori/const'

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

@@ -18,11 +18,11 @@ end
 
 class DeferPromise < Promise
   def initialize(deffered)
-    super(->(resolve, reject){
+    super(->(resolve, _reject){
       EventMachine.defer(proc {
         begin
           deffered.call
-        rescue Exception => e
+        rescue StandardError => e
           PromiseException.new(e)
         end
       }, proc { |result| resolve.call(result) })

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

@@ -0,0 +1,9 @@
+module Kernel
+  def safe_require(file, prompt)
+    begin
+      require file
+    rescue LoadError => _e
+      raise prompt
+    end
+  end
+end

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

@@ -1,11 +1,17 @@
+safe_require 'postgres-pr/message', 'gem install postgres-pr'
+
 class Midori::Postgres
+  attr_reader :connected
+
   def initialize(*args)
+    @connected = false
     @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|
+        @connected = status
         resolve.call(status)
       end
     }))
@@ -15,7 +21,8 @@ class Midori::Postgres
     await(Promise.new(->(resolve, _reject) {
       begin
         @db.query(sql).callback do |status, result, errors|
-          resolve.call(Midori::Postgres::Result.new(status, result, errors))
+          @connected = status
+          resolve.call(Midori::Postgres::Result.new(result, errors))
         end
       end
     }))
@@ -23,9 +30,8 @@ class Midori::Postgres
 end
 
 class Midori::Postgres::Result
-  attr_reader :status, :result, :errors
-  def initialize(status, result, errors)
-    @status = status
+  attr_reader :result, :errors
+  def initialize(result, errors)
     @result = result
     @errors = errors
   end

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

@@ -0,0 +1,14 @@
+safe_require 'sequel', 'gem install sequel'
+require 'sequel/adapters/postgres'
+
+module Sequel
+  module Postgres
+    class Adapter < ::PGconn
+      def execute_query(sql, args)
+        @db.log_connection_yield(sql, self, args) do
+          args ? await(defer{async_exec(sql, args)}) : await(defer{async_exec(sql)})
+        end
+      end
+    end
+  end
+end

data/lib/em-midori/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.4.1
+  version: 0.1.5
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -52,20 +52,6 @@ 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
@@ -86,11 +72,13 @@ files:
 - 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/safe_require.rb
 - lib/em-midori/core_ext/string.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/extension/sequel.rb
 - lib/em-midori/middleware.rb
 - lib/em-midori/request.rb
 - lib/em-midori/response.rb