emmy-extends 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f9ee9bea9ad286bcb4470f18c00287c0db4239
-  data.tar.gz: 9eb27aa0534a251b5682adf7dea625f440fc7bdb
+  metadata.gz: 3445b83150979fc91751faea105e47ab4959f2a4
+  data.tar.gz: bb928f912f37a0f3517b5a9b7da756ac8d0f494e
 SHA512:
-  metadata.gz: 13ff69b825ba007f5305fa321db72faef64c722d14a730e268b6b398dc83c3312794497a922aee27bca1dc2f43e9bd6ebcab99dfe8851a9fe52d35cad781a2d3
-  data.tar.gz: ebdaeaa9367b60bfd67dc686c4894d7b051081c59f207ae1fe894048db7549662ef09f7785487e89b479dde2e53ba865805b5e484614c7c19896da628cecc45c
+  metadata.gz: 29b398950507b0298e357c9338ceb5ff746509773fbf0f57b3e2c5aadefa954f8a1f638b4a8ff6cfb41f5da8a23a80bcd420500d855c4e15d9122c892cceb06a
+  data.tar.gz: be3c1b5191ca3f576b4eaae238a08a9fc875d65d24231d8c5e0983841f16f1a7d63c534b00ba2bc104f61b853464fa68fa7ad502ee2dd33929076729df5c7591

data/README.md

@@ -1,28 +1,22 @@
 # Emmy::Extends
 
-TODO: Write a gem description
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'httpi'
+gem 'em-http-request' # if savon em-http-request
+gem 'httpi'           # if httpi required
+gem 'mysql2'          # if mysql2 required
 gem 'savon', github: 'chelovekov/savon' # if savon required
 gem 'emmy-extends'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install emmy-extends
-
 ## Usage EmHttpRequest
 
 ```ruby
+require 'emmy_extends/em_http_request'
+
 EmmyMachine.run_block do
   using Fibre::Synchrony
   request = EmmyHttp::Request.new(
@@ -38,6 +32,8 @@ end
 ## Usage HTTPI
 
 ```ruby
+require 'emmy_extends/httpi'
+
 EmmyMachine.run_block do
   request = HTTPI.post("http://example.com", "bangarang", :emmy)
   response = request.sync
@@ -47,6 +43,8 @@ end
 ## Usage Savon
 
 ```ruby
+require 'emmy_extends/savon'
+
 EmmyMachine.run_block do
   savon = EmmyExtends::Savon
   client = savon.client(wsdl: "http://example.com?wsdl")
@@ -58,7 +56,11 @@ EmmyMachine.run_block do
 end
 ```
 
+or,
+
 ```ruby
+require 'emmy_extends/savon'
+
 class User
   include EmmyExtends::Savon::Model
 
@@ -74,6 +76,8 @@ response = user.authenticate(message: { username: "luke", secret: "secret" }).sy
 ## Usage Thin
 
 ```ruby
+require 'emmy_extends/thin'
+
 class Application < Sinatra::Base
   get '/' do
     'Hello world!'
@@ -90,6 +94,22 @@ EmmyMachine.run do
 end
 ```
 
+## Usage Mysql2
+
+```ruby
+require 'benchmark'
+require 'emmy_extends/mysql2'
+
+EmmyMachine.run_block do
+  conn1 = EmmyExtends::Mysql2::Client.new
+  conn2 = EmmyExtends::Mysql2::Client.new
+  puts Benchmark.measure {
+    using Fibre::Synchrony
+    [conn1.query("SELECT sleep(1) as mysql2_query"), conn2.query("SELECT sleep(2) as mysql2_query")].sync
+  }
+end
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/chelovekov/emmy-extends/fork )

data/emmy-extends.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.name          = "emmy-extends"
   spec.version       = EmmyExtends::VERSION
   spec.authors       = ["che"]
-  spec.email         = ["max@kupibilet.ru"]
-  spec.summary       = %q{Emmy support em-http-request, thin etc.}
+  spec.email         = ["chelovekov@gmail.com"]
+  spec.summary       = %q{Emmy support em-http-request, thin, savon, mysql2 etc.}
   #spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.homepage      = ""
   spec.license       = "MIT"

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -56,11 +56,23 @@ module EmmyExtends
         keepalive: false,
         path: delegate.request.url.path,
         query: delegate.request.url.query,
-        body: delegate.request.body,
+        body: encode_body(delegate.request.body),
         head: delegate.request.headers
       }
     end
 
+    def encode_body(body)
+      return body if delegate.request.headers["Content-Encoding"] != "gzip"
+      wio = StringIO.new("w")
+      begin
+        w_gz = Zlib::GzipWriter.new(wio)
+        w_gz.write(body)
+        wio.string
+      ensure
+        w_gz.close
+      end
+    end
+
     def setup
       raise 'delegator must be set before' unless delegate
       setup_http_request
@@ -70,7 +82,8 @@ module EmmyExtends
     def setup_http_client
       @http_client = begin
         method = delegate.request.method.to_s.upcase
-        EventMachine::HttpClient.new(@http_request, HttpClientOptions.new(delegate.request.url, request_options, method)).tap do |client|
+        http_client_options = HttpClientOptions.new(delegate.request.url, request_options, method)
+        EventMachine::HttpClient.new(@http_request, http_client_options).tap do |client|
           client.stream do |chunk|
             @body << chunk
           end

data/lib/emmy_extends/mysql2/client.rb

@@ -3,7 +3,7 @@ module EmmyExtends
     using EventObject
 
      def query(sql, opts={})
-      if ::EM.reactor_running?
+      if ::EventMachine.reactor_running?
         super(sql, opts.merge(:async => true))
         Mysql2::Operation.new(self)
       else

data/lib/emmy_extends/savon/operation.rb

@@ -40,14 +40,14 @@ module EmmyExtends
     def setup
       @httpi.on :success do |response, httpi, conn|
         @response = ::Savon::Response.new(response, globals, locals)
-        unless @response.http_error
-          unless @response.soap_fault
+        unless @response.soap_fault
+          unless @response.http_error
             success!(@response, self, conn)
           else
-            error!("SOAP error (#{@response.soap_fault.to_s})", self, conn)
+            error!("HTTP error (#{@response.http.code})", self, conn)
           end
         else
-          error!("HTTP error (#{@response.http.code})", self, conn)
+          error!("SOAP error (#{@response.soap_fault.to_s})", self, conn)
         end
       end
 

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/em_http_request_spec.rb

@@ -7,7 +7,7 @@ describe EmmyExtends::EmHttpRequest do
     EmmyMachine.run_block &example
   end
 
-  it "should send request to github.com home page" do
+  it "should send request to httpbin.org" do
     request = EmmyHttp::Request.new(
       method: 'get',
       url: 'http://httpbin.org'
@@ -20,4 +20,19 @@ describe EmmyExtends::EmHttpRequest do
     expect(response.headers["Server"]).to eq("gunicorn/18.0")
     expect(response.body.empty?).to be false
   end
+
+  it "should send https request to httpbin.org" do
+    request = EmmyHttp::Request.new(
+      method: 'get',
+      url: 'https://httpbin.org'
+    )
+    operation = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)
+    response = operation.sync
+
+    expect(operation.to_a.first).to eq("tcp://httpbin.org:443")
+    expect(response.status).to be 200
+    expect(response.headers).to include("Content-Type")
+    expect(response.headers["Server"]).to eq("gunicorn/18.0")
+    expect(response.body.empty?).to be false
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -96,7 +96,7 @@ dependencies:
         version: '10.0'
 description: 
 email:
-- max@kupibilet.ru
+- chelovekov@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -131,7 +131,6 @@ files:
 - lib/emmy_extends/thin/connection.rb
 - lib/emmy_extends/thin/controller.rb
 - lib/emmy_extends/version.rb
-- npm-debug.log
 - spec/ConvertTemperature.asmx.xml
 - spec/em_http_request_spec.rb
 - spec/httpi_spec.rb
@@ -161,7 +160,7 @@ rubyforge_project:
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: Emmy support em-http-request, thin etc.
+summary: Emmy support em-http-request, thin, savon, mysql2 etc.
 test_files:
 - spec/ConvertTemperature.asmx.xml
 - spec/em_http_request_spec.rb

data/npm-debug.log

@@ -1,62 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/local/bin/npm', 'install', 'bit8' ]
-2 info using npm@1.3.11
-3 info using node@v0.10.21
-4 verbose cache add [ 'bit8', null ]
-5 verbose cache add name=undefined spec="bit8" args=["bit8",null]
-6 verbose parsed url { protocol: null,
-6 verbose parsed url   slashes: null,
-6 verbose parsed url   auth: null,
-6 verbose parsed url   host: null,
-6 verbose parsed url   port: null,
-6 verbose parsed url   hostname: null,
-6 verbose parsed url   hash: null,
-6 verbose parsed url   search: null,
-6 verbose parsed url   query: null,
-6 verbose parsed url   pathname: 'bit8',
-6 verbose parsed url   path: 'bit8',
-6 verbose parsed url   href: 'bit8' }
-7 silly lockFile dda9e3ba-bit8 bit8
-8 verbose lock bit8 /Users/che/.npm/dda9e3ba-bit8.lock
-9 silly lockFile dda9e3ba-bit8 bit8
-10 silly lockFile dda9e3ba-bit8 bit8
-11 verbose addNamed [ 'bit8', '' ]
-12 verbose addNamed [ null, '*' ]
-13 silly lockFile b74efb73-bit8 bit8@
-14 verbose lock bit8@ /Users/che/.npm/b74efb73-bit8.lock
-15 silly addNameRange { name: 'bit8', range: '*', hasData: false }
-16 verbose url raw bit8
-17 verbose url resolving [ 'https://registry.npmjs.org/', './bit8' ]
-18 verbose url resolved https://registry.npmjs.org/bit8
-19 info trying registry request attempt 1 at 18:31:24
-20 http GET https://registry.npmjs.org/bit8
-21 http 404 https://registry.npmjs.org/bit8
-22 silly registry.get cb [ 404,
-22 silly registry.get   { date: 'Sat, 20 Sep 2014 14:31:25 GMT',
-22 silly registry.get     server: 'CouchDB/1.5.0 (Erlang OTP/R16B03)',
-22 silly registry.get     'content-type': 'application/json',
-22 silly registry.get     'cache-control': 'max-age=0',
-22 silly registry.get     'content-length': '52',
-22 silly registry.get     'accept-ranges': 'bytes',
-22 silly registry.get     via: '1.1 varnish',
-22 silly registry.get     age: '0',
-22 silly registry.get     'x-served-by': 'cache-ams4133-AMS',
-22 silly registry.get     'x-cache': 'MISS',
-22 silly registry.get     'x-cache-hits': '0',
-22 silly registry.get     'x-timer': 'S1411223485.110665,VS0,VE714',
-22 silly registry.get     'keep-alive': 'timeout=10, max=50',
-22 silly registry.get     connection: 'Keep-Alive' } ]
-23 silly lockFile b74efb73-bit8 bit8@
-24 silly lockFile b74efb73-bit8 bit8@
-25 error 404 'bit8' is not in the npm registry.
-25 error 404 You should bug the author to publish it
-25 error 404
-25 error 404 Note that you can also install from a
-25 error 404 tarball, folder, or http url, or git url.
-26 error System Darwin 13.3.0
-27 error command "node" "/usr/local/bin/npm" "install" "bit8"
-28 error cwd /Users/che/Dropbox/Projects/emmy-extends
-29 error node -v v0.10.21
-30 error npm -v 1.3.11
-31 error code E404
-32 verbose exit [ 1, true ]