emmy-extends 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a3710c71f753f825f9b64bec852bc517d174f26
-  data.tar.gz: d849f5f3e4753900dd30a76647b7161729bd4373
+  metadata.gz: d68faef36d091d24be9db8330045089ca9b55f54
+  data.tar.gz: f1ea4b0d2cf2f847f712ea6371c53aa76d6702a0
 SHA512:
-  metadata.gz: 8dec14fbc285fe82e87924c1d26ca38d501e48e8cb7f40763b21ac18b65e7adba5b9a8595b9bbeb76bdd4a1647724e2f637900707771aba3134e34967e583c74
-  data.tar.gz: b41d0223c7801402509c2dd42258cb30f1d972f55e9909baeb47415922e55760d10a14df966b9f95a80996e484a1fe709c103e6d788cc765de7c39f0d91d64cc
+  metadata.gz: d21d8cd5808698e91801aa7335b2f75104deeb1fd6cff65aa6a7baad375de223e6825d0090b59e5004f54c21015ab5eafa632003445c559d2728f95492a0c890
+  data.tar.gz: 6370b48e3e8f2c5363948988248528641d439e0f3312f02bafe31e1b4077d203928eb80f4f1fac1e82d63e240d27158767a312d10f7d0dbfc23d3fea9403be22

data/Gemfile

@@ -6,4 +6,4 @@ gemspec
 gem 'em-http-request'
 gem 'mysql2'
 gem 'httpi'
-gem 'savon', github: 'chelovekov/savon', branch: 'version2'
+gem 'savon', github: 'inre/savon', branch: 'version2'

data/README.md

@@ -8,7 +8,7 @@ Add this line to your application's Gemfile:
 gem 'em-http-request' # if em-http-request required
 gem 'httpi'           # if httpi required
 gem 'mysql2'          # if mysql2 required
-gem 'savon', github: 'chelovekov/savon' # if savon required
+gem 'savon', github: 'inre/savon' # if savon required
 gem 'emmy-extends'
 ```
 
@@ -109,11 +109,3 @@ EmmyMachine.run_block do
   }
 end
 ```
-
-## Contributing
-
-1. Fork it ( https://github.com/chelovekov/emmy-extends/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/emmy-extends.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   #spec.add_dependency "eventmachine", "~> 1.0.3"
   spec.add_dependency "emmy-machine", "~> 0.1.6"
-  spec.add_dependency "emmy-http", "~> 0.1.4"
+  spec.add_dependency "emmy-http", "~> 0.1.11"
 
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -10,17 +10,19 @@ module EmmyExtends
     attr_reader :connection
     attr_reader :operation
     attr_reader :response
+    attr_reader :url
 
     # required for adapter
 
     def delegate=(operation)
       @operation = operation
+      @url = operation.request.real_url
       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]
+      ["tcp://#{url.host}:#{url.port || url.default_port}", EmmyMachine::Connection, method(:initialize_connection), self]
     end
 
     def initialize_connection(conn)
@@ -60,7 +62,7 @@ module EmmyExtends
       {
         connect_timeout: operation.request.timeouts.connect,
         inactivity_timeout: operation.request.timeouts.inactivity,
-        ssl: (operation.request.ssl?) ? {
+        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
@@ -72,8 +74,8 @@ module EmmyExtends
       {
         redirects: 5,
         keepalive: false,
-        path: operation.request.url.path,
-        query: operation.request.url.query,
+        path: url.path,
+        query: url.query,
         body: encode_body(operation.request.body),
         head: operation.request.headers
       }
@@ -94,7 +96,7 @@ module EmmyExtends
     def setup_http_client
       @http_client = begin
         type = operation.request.type.to_s.upcase # http method
-        http_client_options = HttpClientOptions.new(operation.request.url, request_options, type)
+        http_client_options = HttpClientOptions.new(url, request_options, type)
         EventMachine::HttpClient.new(@http_request, http_client_options).tap do |client|
           client.stream do |chunk|
             @body << chunk
@@ -124,7 +126,7 @@ module EmmyExtends
     end
 
     def setup_http_request
-      @http_request = EventMachine::HttpRequest.new(operation.request.url, connection_options)
+      @http_request = EventMachine::HttpRequest.new(url, connection_options)
     end
 
     def status

data/lib/emmy_extends/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement