emmy-extends 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a6f69f0941e54acfcd890f332fb090d94c0a1b
-  data.tar.gz: c0fac984497be6ae193848e2f94d7a1826658d50
+  metadata.gz: 1624f89876a6b983feb2ef303af554bf028d0c9f
+  data.tar.gz: ab8447a5126604596a62355ff97e13a81d2f7171
 SHA512:
-  metadata.gz: 4abbe5770d657006bd11916db991c3b01984c74f0841b1b96ee9115e193aac28bbc4e1120c99148f739049efa0e534589e594010b5ba67e7b7411c441bae964c
-  data.tar.gz: 45337b8049768051e36530c219b27dc308bb3352209783e5b32d151175136d2c36d2129f8dc9d10cdbb975580cd0d5a1529cc21efde05b5275175c0969d50e8c
+  metadata.gz: 9ff72bae48a52032402d089316ce980c26031b3620199944d84286a1dac803fbbd92b1372e4a739fffa14f79b582a3203751d0704e4c98f1d24e7cfd24340495
+  data.tar.gz: 4d45bb4c53a18dd946634681f8267cd05af034c42a439e88ca62ccb11287256773e07976ec4e4f85a49c98e5d8eafb753034664fe0b32fc49119bb811f2c6667

data/Gemfile

@@ -8,3 +8,6 @@ gem 'mysql2'
 gem 'httpi'
 gem 'savon', github: 'inre/savon', branch: 'version2'
 gem 'remailer'
+
+gem 'emmy-http', '0.2.13'
+gem 'emmy-machine', '0.1.12'

data/emmy-extends.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "emmy-machine", "~> 0.1"
   spec.add_dependency "emmy-http", "~> 0.1"
 
-  spec.add_development_dependency "eventmachine", "~> 1.0.3"
+  spec.add_development_dependency "eventmachine", "~> 1.2.1"
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -125,7 +125,7 @@ module EmmyExtends
     def request_options
       {
         redirects: 5,
-        keepalive: false,
+        keepalive: operation.request.keep_alive,
         path: url.path,
         query: url.query,
         body: encode_body(body),
@@ -178,6 +178,7 @@ module EmmyExtends
     end
 
     def setup_http_request
+      # return EventMachine::HttpConnection
       @http_request = EventMachine::HttpRequest.new(url, connection_options)
     end
 

data/lib/emmy_extends/httpi/adapter.rb

@@ -31,7 +31,8 @@ module EmmyExtends
       if @request.ssl?
         ssl = {
           cert_chain_file: @request.auth.ssl.ca_cert_file,
-          verify_peer: @request.auth.ssl.verify_mode
+          verify_peer: @request.auth.ssl.verify_mode,
+          ssl_version: @request.auth.ssl.ssl_version
         }
       end
 

data/lib/emmy_extends/httpi/operation.rb

@@ -29,7 +29,7 @@ module EmmyExtends
 
         on :error do |error, operation, conn|
           # FIXME: TimeoutError separate
-          fiber.leave ConnectionError, error.to_s
+          fiber.leave EmmyHttp::ConnectionError, error.to_s
         end
       end
     end

data/lib/emmy_extends/httpi.rb

@@ -1,6 +1,11 @@
 require "emmy_extends/em_http_request"
 require "httpi"
 
+# TLS FIX:
+class HTTPI::Auth::SSL
+  attr_writer :ssl_version
+end
+
 module EmmyExtends
   module HTTPI
     require "emmy_extends/httpi/adapter"

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/spec/em_http_request_spec.rb

@@ -69,4 +69,29 @@ describe EmmyExtends::EmHttpRequest do
     expect(response.content_type).to eq("application/json")
     expect(response.content["json"]).to include('points' => [{'x' => 5, 'y' => 6}, {'x' => 3, 'y' => 2}])
   end
+
+  it "sends two request one by one over single connection" do
+    req1 = EmmyHttp::Request.new(
+      type: 'get',
+      url: 'http://httpbin.org/get',
+      query: {param: 5},
+      keep_alive: true
+    )
+
+    req2 = req1.copy
+    # change query params
+    req2.query = {param: 10}
+
+    op1 = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new)
+    res1 = op1.sync
+
+    op2 = EmmyHttp::Operation.new(request, EmmyExtends::EmHttpRequest::Adapter.new, op1.connection)
+    res2 = op2.sync
+    p res2
+
+    expect(res1).to_not be nil
+    expect(res1.status).to be 200
+    expect(res2).to_not be nil
+    expect(res2.status).to be 200
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Emmy support em-http-request, thin, savon, mysql2 etc.