emmy-extends 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62c3d3f001e9b3d11387006dac45b263cc5c5b58
-  data.tar.gz: 2604f4f3c1bf4574bc01b764dc2c33195d96f330
+  metadata.gz: 8a3710c71f753f825f9b64bec852bc517d174f26
+  data.tar.gz: d849f5f3e4753900dd30a76647b7161729bd4373
 SHA512:
-  metadata.gz: 53f5b935129d09a71a202715b3a30dc3f07f3d33aff5964cebcd163e34f00c764f5199696ad78753916b74721891d60573d75359c560471d14f087b69292f40b
-  data.tar.gz: 9e81ebdc54bcac45cf9db94ae0fced2b06efd296b995090134ff60e11e9833ce9bfbe46ea7c9ced6cfa7da9f9653eed3009a69eed607c10a23427f83b1e67b35
+  metadata.gz: 8dec14fbc285fe82e87924c1d26ca38d501e48e8cb7f40763b21ac18b65e7adba5b9a8595b9bbeb76bdd4a1647724e2f637900707771aba3134e34967e583c74
+  data.tar.gz: b41d0223c7801402509c2dd42258cb30f1d972f55e9909baeb47415922e55760d10a14df966b9f95a80996e484a1fe709c103e6d788cc765de7c39f0d91d64cc

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in emmy-extends.gemspec
 gemspec
 
-gem 'em-http-request', '~> 1.1.2'
+gem 'em-http-request'
 gem 'mysql2'
 gem 'httpi'
 gem 'savon', github: 'chelovekov/savon', branch: 'version2'

data/emmy-extends.gemspec

@@ -6,8 +6,8 @@ require 'emmy_extends/version'
 Gem::Specification.new do |spec|
   spec.name          = "emmy-extends"
   spec.version       = EmmyExtends::VERSION
-  spec.authors       = ["che"]
-  spec.email         = ["chelovekov@gmail.com"]
+  spec.authors       = ["inre"]
+  spec.email         = ["inre.storm@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      = ""
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "eventmachine", "~> 1.0.3"
+  #spec.add_dependency "eventmachine", "~> 1.0.3"
   spec.add_dependency "emmy-machine", "~> 0.1.6"
-  spec.add_dependency "emmy-http", "~> 0.1.2"
+  spec.add_dependency "emmy-http", "~> 0.1.4"
 
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -1,11 +1,27 @@
+using EventObject
+
 module EmmyExtends
-  class EmHttpRequest::Adapter < EmmyHttp::Adapter
-    using EventObject
+  class EmHttpRequest::Adapter
+    include EmmyHttp::Adapter
 
     attr_reader :http_request
     attr_reader :http_client
     attr_reader :body
     attr_reader :connection
+    attr_reader :operation
+    attr_reader :response
+
+    # required for adapter
+
+    def delegate=(operation)
+      @operation = operation
+      setup_http_request
+      setup_http_client
+    end
+
+    def to_a
+      ["tcp://#{operation.request.url.host}:#{operation.request.url.port}", EmmyMachine::Connection, method(:initialize_connection), self]
+    end
 
     def initialize_connection(conn)
       @connection = conn
@@ -32,20 +48,22 @@ module EmmyExtends
       conn.comm_inactivity_timeout = http_request.connopts.inactivity_timeout
 
       @body = ''
-      delegate.init!(delegate, conn)
+      #operation.connection = conn  # update connection handler
+      operation.init!(operation, conn)
 
     rescue EventMachine::ConnectionError => e
       EventMachine.next_tick { @http_client.close(e.message) }
-      delegate.error!("connection error", self)
+      operation.error!("connection error", self)
     end
 
     def connection_options
       {
-        connect_timeout: delegate.request.timeouts.connect,
-        inactivity_timeout: delegate.request.timeouts.inactivity,
-        :ssl => (delegate.request.ssl?) ? {
-          :cert_chain_file => delegate.request.ssl.cert_chain_file,
-          :verify_peer => (delegate.request.ssl.verify_peer == :peer)
+        connect_timeout: operation.request.timeouts.connect,
+        inactivity_timeout: operation.request.timeouts.inactivity,
+        ssl: (operation.request.ssl?) ? {
+          cert_chain_file: operation.request.ssl.cert_chain_file,
+          verify_peer:     (operation.request.ssl.verify_peer == :peer),
+          ssl_version:     operation.request.ssl.ssl_version
         } : {}
       }
     end
@@ -54,15 +72,15 @@ module EmmyExtends
       {
         redirects: 5,
         keepalive: false,
-        path: delegate.request.url.path,
-        query: delegate.request.url.query,
-        body: encode_body(delegate.request.body),
-        head: delegate.request.headers
+        path: operation.request.url.path,
+        query: operation.request.url.query,
+        body: encode_body(operation.request.body),
+        head: operation.request.headers
       }
     end
 
     def encode_body(body)
-      return body if delegate.request.headers["Content-Encoding"] != "gzip"
+      return body if operation.request.headers["Content-Encoding"] != "gzip"
       wio = StringIO.new("w")
       begin
         w_gz = Zlib::GzipWriter.new(wio)
@@ -73,50 +91,40 @@ module EmmyExtends
       end
     end
 
-    def setup
-      raise 'delegator must be set before' unless delegate
-      setup_http_request
-      setup_http_client
-    end
-
     def setup_http_client
       @http_client = begin
-        type = delegate.request.type.to_s.upcase # http method
-        http_client_options = HttpClientOptions.new(delegate.request.url, request_options, type)
+        type = operation.request.type.to_s.upcase # http method
+        http_client_options = HttpClientOptions.new(operation.request.url, request_options, type)
         EventMachine::HttpClient.new(@http_request, http_client_options).tap do |client|
           client.stream do |chunk|
             @body << chunk
           end
 
           client.headers do |response_header|
-            delegate.head!(delegate, connection)
+            @response = EmmyHttp::Response.new
+            response.headers = http_client.response_header
+            response.status  = status
+            operation.head!(response, operation, connection)
           end
 
           client.callback do
             if @http_client.response_header && @http_client.response_header.status.zero?
-              delegate.error!("connection timed out", delegate, connection)
+              operation.error!("connection timed out", operation, connection)
             else
-              delegate.success!(delegate.response, delegate, connection)
+              response.body   = body
+              operation.success!(response, operation, connection)
             end
           end
 
           client.errback do |c|
-            delegate.error!(client.error, delegate, connection)
+            operation.error!(client.error, operation, connection)
           end
         end
       end
     end
 
     def setup_http_request
-      @http_request = EventMachine::HttpRequest.new(delegate.request.url, connection_options)
-    end
-
-    def to_a
-      ["tcp://#{delegate.request.url.host}:#{delegate.request.url.port}", EmmyMachine::Connection, method(:initialize_connection), self]
-    end
-
-    def headers
-      @http_client.response_header
+      @http_request = EventMachine::HttpRequest.new(operation.request.url, connection_options)
     end
 
     def status

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/em_http_request_spec.rb

@@ -17,7 +17,7 @@ describe EmmyExtends::EmHttpRequest do
 
     expect(response.status).to be 200
     expect(response.headers).to include("Content-Type")
-    expect(response.headers["Server"]).to eq("gunicorn/18.0")
+    expect(response.headers["Server"]).to eq("nginx")
     expect(response.body.empty?).to be false
   end
 
@@ -32,7 +32,7 @@ describe EmmyExtends::EmHttpRequest do
     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.headers["Server"]).to eq("nginx")
     expect(response.body.empty?).to be false
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
-- che
+- inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: emmy-machine
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +82,7 @@ dependencies:
         version: '10.0'
 description: 
 email:
-- chelovekov@gmail.com
+- inre.storm@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -157,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Emmy support em-http-request, thin, savon, mysql2 etc.