emmy-extends 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b715412f362627d471570cb954c2a0cbc67c915
-  data.tar.gz: c2cddcc8d334cb02a444651acbe73879b15d978f
+  metadata.gz: 4a0e3a4faca05d0d6a5c8538652143080296e81c
+  data.tar.gz: e1d0b56934235795d602acdc37f0fa46b8025d4b
 SHA512:
-  metadata.gz: 9dbb89b9ed86d5480f24462e76312707e66eca20682697c6c233b39e6317553af847c4ed5da7cd74787d83aa63b4871799e9875cc81bcf3fb6cf65199231eea1
-  data.tar.gz: 7b605d851a17de3ba6494c31b93b3f65df5d5a366a7c6f188a64bf7f22462aab263fdf80bacefa1f21395b7e4b076c6c61b141a4fa7917ea8792f67a655f2d0a
+  metadata.gz: b9fca19b26b97bde2a10297b5c29861ce43c2bb04b4a5b37e036e44bd5bb866a4e2bb5d455337ffd540c96837c45ec571439eb12a83a6e936345a86d5138615d
+  data.tar.gz: 046dc4b7d3bfbca15de50b826125bc94553ff558c8f59f12e644bfdd2cf105befa10d0e9122de62c596374edc1896a89e1c2183194a8f77f4fabcca988ec20aa

data/Gemfile

@@ -3,4 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in emmy-extends.gemspec
 gemspec
 
+gem 'httpi'
 gem 'savon', github: 'chelovekov/savon', branch: 'version2'
+gem 'mysql2'

data/emmy-extends.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "eventmachine", "~> 1.0.3"
   spec.add_dependency "em-http-request", "~> 1.1.2"
-  spec.add_dependency "emmy-machine", "~> 0.1.3"
+  spec.add_dependency "emmy-machine", "~> 0.1.6"
   spec.add_dependency "emmy-http", "~> 0.1.1"
 
   spec.add_development_dependency "rspec", "~> 3"

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -71,7 +71,8 @@ module EmmyExtends
 
     def setup_http_client
       @http_client = begin
-        EventMachine::HttpClient.new(@http_request, HttpClientOptions.new(delegate.request.url, request_options, delegate.request.method)).tap do |client|
+        method = delegate.request.method.to_s.upcase
+        EventMachine::HttpClient.new(@http_request, HttpClientOptions.new(delegate.request.url, request_options, method)).tap do |client|
           client.stream do |chunk|
             @body << chunk
           end

data/lib/emmy_extends/httpi/adapter.rb

@@ -8,22 +8,13 @@ module EmmyExtends
 
     def initialize(request)
       @request = request
-      @emmy_request = EmmyHttp::Request.new(
-        url: build_request_url(@request.url),
-        method: 'POST',
-        timeouts: { connect: @request.open_timeout, inactivity: @request.read_timeout },
-        headers: @request.headers.to_hash,
-        body: @request.body
-      )
-      @emmy_operation = EmmyHttp::Operation.new(@emmy_request, EmmyExtends::EmHttpRequest::Adapter.new)
-      @operation = HTTPI::Operation.new(@emmy_operation)
     end
 
     def setup_http_auth
       unless @request.auth.type == :basic
         raise NotSupportedError, "EM-HTTP-Request does only support HTTP basic auth"
       end
-      @emmy_request.headers[:authorization] = @request.auth.credentials
+      @http_request.headers[:authorization] = @request.auth.credentials
     end
 
     def proxy_options
@@ -35,15 +26,24 @@ module EmmyExtends
     end
 
     def request(method)
-      # FIXME: proxy support # proxy_options if @request.proxy
-      #setup_proxy(options) if @request.proxy
-      setup_http_auth if @request.auth.http?
-
       if @request.on_body
         raise NotSupportedError, "EM-HTTP-Request does not support response streaming"
       end
 
-      @emmy_request.method = method
+      @http_request = EmmyHttp::Request.new(
+        url: build_request_url(@request.url),
+        method: method,
+        timeouts: { connect: @request.open_timeout, inactivity: @request.read_timeout },
+        headers: @request.headers.to_hash,
+        body: @request.body
+      )
+
+      # FIXME: proxy support # proxy_options if @request.proxy
+      #setup_proxy(options) if @request.proxy
+      setup_http_auth if @request.auth.http?
+
+      @http_operation = EmmyHttp::Operation.new(@http_request, EmmyExtends::EmHttpRequest::Adapter.new)
+      @operation = HTTPI::Operation.new(@http_operation)
       @operation
     end
 

data/lib/emmy_extends/mysql2/client.rb

@@ -0,0 +1,21 @@
+module EmmyExtends
+  class Mysql2::Client < ::Mysql2::Client
+    using EventObject
+
+     def query(sql, opts={})
+      if ::EM.reactor_running?
+        super(sql, opts.merge(:async => true))
+        Mysql2::Operation.new(self)
+      else
+        super(sql, opts)
+      end
+    end
+
+    def close(*args)
+      @watch.detach if @watch
+      super(*args)
+    end
+
+    #<<<
+  end
+end

data/lib/emmy_extends/mysql2/operation.rb

@@ -0,0 +1,36 @@
+module EmmyExtends
+  class Mysql2::Operation
+    using EventObject
+    events :success, :error
+
+    attr_accessor :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    def watch
+      @watch ||= EmmyMachine.watch(*self)
+    end
+
+    def sync
+      Fiber.sync do |fiber|
+        watch
+
+        on :success do |response, operation, conn|
+          fiber.resume response
+        end
+
+        on :error do |error, operation, conn|
+          fiber.leave error
+        end
+      end
+    end
+
+    def to_a
+      [client.socket, Mysql2::Watcher, @client, self, {notify_readable: true, notify_writable: false}]
+    end
+
+    #<<<
+  end
+end

data/lib/emmy_extends/mysql2/watcher.rb

@@ -0,0 +1,24 @@
+module EmmyExtends
+  module Mysql2::Watcher
+
+    attr_accessor :client, :operation
+
+    def initialize(client, operation)
+      @client = client
+      @operation = operation
+    end
+
+    def notify_readable
+      detach
+      begin
+        result = @client.async_result
+      rescue Exception => e
+        @operation.error!(e.to_s, @operation, self)
+      else
+        @operation.success!(result, @operation, self)
+      end
+    end
+
+    #<<<
+  end
+end

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/emmy_extends.rb

@@ -13,6 +13,12 @@ module EmmyExtends
     autoload :Operation,  "emmy_extends/httpi/operation"
   end
 
+  module Mysql2
+    autoload :Operation,  "emmy_extends/mysql2/operation"
+    autoload :Client,     "emmy_extends/mysql2/client"
+    autoload :Watcher,    "emmy_extends/mysql2/watcher"
+  end
+
   module Savon
     autoload :ClassMethods, "emmy_extends/savon/class_methods"
     autoload :Response,     "emmy_extends/savon/response"

data/spec/em_http_request_spec.rb

@@ -3,26 +3,20 @@ require "spec_helper"
 describe EmmyExtends::EmHttpRequest do
 
   around do |example|
-    EventMachine.run do
-      EmmyMachine.fiber_block &example
-    end
+    EmmyMachine.run_block &example
   end
 
   it "should send request to github.com home page" do
-    begin
-      request = EmmyHttp::Request.new(
-        method: 'get',
-        url: 'http://github.com'
-      )
-      operation = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)
-      response = operation.sync
-    ensure
-      EventMachine.stop
-    end
+    request = EmmyHttp::Request.new(
+      method: 'get',
+      url: 'http://httpbin.org'
+    )
+    operation = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)
+    response = operation.sync
 
     expect(response.status).to be 200
     expect(response.headers).to include("Content-Type")
-    expect(response.headers["Server"]).to eq("GitHub.com")
+    expect(response.headers["Server"]).to eq("gunicorn/18.0")
     expect(response.body.empty?).to be false
   end
 end

data/spec/httpi_spec.rb

@@ -4,18 +4,13 @@ require "httpi"
 
 describe EmmyExtends::HTTPI do
   around do |example|
-    EventMachine.run do
-      EmmyMachine.fiber_block &example
-    end
+    EmmyMachine.run_block &example
   end
 
   it "should send request to github.com home page" do
-    begin
-      request = HTTPI.get("http://github.com", :emmy)
-      response = request.sync
-    ensure
-      EventMachine.stop
-    end
+    request = HTTPI.get("http://httpbin.org", :emmy)
+    response = request.sync
+    
     expect(response).to be_a(HTTPI::Response)
     expect(response.code).to be 200
     expect(response.headers).to include("Content-Type")

data/spec/mysql2_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+require "mysql2"
+
+describe EmmyExtends::Mysql2 do
+  using EventObject
+
+  let(:delay) { 1.0/3 }
+  let(:query) { "SELECT sleep(#{delay}) as mysql2_query" }
+  let(:db) { EmmyExtends::Mysql2::Client.new }
+
+  context "fibers required" do
+    around do |example|
+      EmmyMachine.run_block &example
+    end
+
+    it "should query create operation" do
+      operation = db.query query
+      expect(operation).to be_a EmmyExtends::Mysql2::Operation
+    end
+
+    it "should execute query through sync" do
+      operation = db.query query
+      response = operation.sync
+      expect(response).to be_a Mysql2::Result
+    end
+  end
+
+  context "without fibres" do
+
+    it "should execute query without fibers" do
+      result = nil
+      expect {
+        EmmyMachine.run do
+          operation = db.query query
+          EmmyMachine.watch(*operation)
+          operation.on :success do |response|
+            EmmyMachine.stop
+            result = response
+          end
+
+          operation.on :error do |error|
+            EmmyMachine.stop
+            raise error
+          end
+        end
+      }.to_not raise_error
+
+      expect(result).to be_a Mysql2::Result
+    end
+  end
+end

data/spec/savon_spec.rb

@@ -5,26 +5,21 @@ require "savon"
 
 describe EmmyExtends::Savon do
   around do |example|
-    EventMachine.run do
-      EmmyMachine.fiber_block &example
-    end
+    EmmyMachine.run_block &example
   end
 
   it "should send SOAP request" do
     HTTPI.adapter = :emmy
-    begin
-      client = EmmyExtends::Savon.client(
-        wsdl: File.expand_path("../ConvertTemperature.asmx.xml", __FILE__),
-        convert_request_keys_to: :camelcase,
-        open_timeout: 10,
-        read_timeout: 10,
-        log: false
-      )
-      request = client.call(:convert_temp, :message => { :temperature => 30, :from_unit => "degreeCelsius", :to_unit => "degreeFahrenheit" })
-      response = request.sync
-    ensure
-      EventMachine.stop
-    end
+
+    client = EmmyExtends::Savon.client(
+      wsdl: File.expand_path("../ConvertTemperature.asmx.xml", __FILE__),
+      convert_request_keys_to: :camelcase,
+      open_timeout: 10,
+      read_timeout: 10,
+      log: false
+    )
+    request = client.call(:convert_temp, :message => { :temperature => 30, :from_unit => "degreeCelsius", :to_unit => "degreeFahrenheit" })
+    response = request.sync
 
     fahrenheit = response.body[:convert_temp_response][:convert_temp_result]
     expect(fahrenheit).to eq("86")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: emmy-http
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,9 @@ files:
 - lib/emmy_extends/em_http_request/connection.rb
 - lib/emmy_extends/httpi/adapter.rb
 - lib/emmy_extends/httpi/operation.rb
+- lib/emmy_extends/mysql2/client.rb
+- lib/emmy_extends/mysql2/operation.rb
+- lib/emmy_extends/mysql2/watcher.rb
 - lib/emmy_extends/savon/class_methods.rb
 - lib/emmy_extends/savon/model.rb
 - lib/emmy_extends/savon/response.rb
@@ -138,6 +141,7 @@ files:
 - spec/ConvertTemperature.asmx.xml
 - spec/em_http_request_spec.rb
 - spec/httpi_spec.rb
+- spec/mysql2_spec.rb
 - spec/savon_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -168,5 +172,6 @@ test_files:
 - spec/ConvertTemperature.asmx.xml
 - spec/em_http_request_spec.rb
 - spec/httpi_spec.rb
+- spec/mysql2_spec.rb
 - spec/savon_spec.rb
 - spec/spec_helper.rb