emmy-http-client 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f09132d4635069e25e3f3fb0696d6bce46af748
-  data.tar.gz: 526ca185eaeeccb43eced27d93af59ada4e34d10
+  metadata.gz: 0817f9c453e0652d1a0911177cca1feb40a2a9a2
+  data.tar.gz: f303d956e687752b0bf90649a9bdb0fe3b8f5fa1
 SHA512:
-  metadata.gz: 5cbb8c57397146cc7356e8fa9a70c581952a78e2d835285f1d3971a6cbc4bdb86f5ebd729a6b9954eacfa89854535f7ec826fe089ba8d651db234e75743227fd
-  data.tar.gz: 583937c63e3e098020d8e4101ef96b4b0565bf15720bf488492fb1d9a5cc0cdee63eb9067666bc9b07f66d8a799e12776725c7cd9a22151afa55045bd9e703bb
+  metadata.gz: 32dc9b70af63d31f3f108520035d5c60224d8711ef8f643c7c7513fbb9796b1010e71ec2f9d2249e21c4aa603ee8c6189482f3ecf7d9e6e68e1425f5e92b9447
+  data.tar.gz: 7b892786b160e6907b41d92b2b7d5d320554026f7c9a762f966165aad9ef6b704f8f5418093e1cfa5c4b44bd66e9e018170aa62be61d0e3a40b87820e0d9fff2

data/emmy-http-client.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "eventmachine", ">= 1.0.7"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3"
 end

data/example/Gemfile

@@ -0,0 +1,3 @@
+
+gem 'emmy'
+gem 'emmy-http-client', path: '../'

data/example/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: ../
+  specs:
+    emmy-http-client (0.1.9)
+      addressable (>= 2.3.8)
+      emmy-machine (~> 0.1.7)
+      event_object (~> 0.9.1)
+      fibre (~> 0.9.7)
+      http_parser.rb (= 0.6.0)
+
+GEM
+  specs:
+    addressable (2.3.8)
+    emmy (0.2.3)
+      emmy-engine (~> 0.1)
+      eventmachine (~> 1.0)
+    emmy-engine (0.2.8)
+      emmy-http (~> 0.2)
+      emmy-http-client (~> 0.1)
+      emmy-machine (~> 0.1)
+    emmy-http (0.2.8)
+      addressable (~> 2.3)
+      emmy-machine (~> 0.1)
+      event_object (~> 0.9)
+      fibre (~> 0.9)
+      model_pack (~> 0.9)
+      util_pack (~> 0.1)
+    emmy-machine (0.1.12)
+      fibre (~> 0.9.9)
+    event_object (0.9.4)
+    eventmachine (1.0.7)
+    fibre (0.9.14)
+      event_object (>= 0.9)
+    http_parser.rb (0.6.0)
+    model_pack (0.9.10)
+    util_pack (0.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  emmy
+  emmy-http-client!

data/example/simple.rb

@@ -0,0 +1,19 @@
+require 'bundler/setup'
+require 'emmy'
+
+Emmy.run_block do
+  request = Emmy::Http.request(
+    type: 'GET',
+    url:  'http://localhost:3003',
+    path: '/ping',
+    timeouts: { connect: 5, inactivity: 20}
+  )
+
+  puts "#{request.type} #{request.real_url}"
+
+  response = request.sync
+
+  puts "RESPONSE #{response.status}"
+  puts response.headers
+  puts response.body
+end

data/lib/emmy_http/client/client.rb

@@ -36,7 +36,6 @@ module EmmyHttp
 
       conn.pending_connect_timeout = request.timeouts.connect
       conn.comm_inactivity_timeout = request.timeouts.inactivity
-
       attach(conn)
 
       parser.on :head do |headers|
@@ -71,20 +70,12 @@ module EmmyHttp
     end
 
     def data(chunk)
-      begin
-        parser << chunk
-      rescue EmmyHttp::ParserError => e
-        stop(e.message)
-      end
+      parser << chunk
+    rescue EmmyHttp::ParserError => e
+      stop(e.message)
     end
 
     def close(reason=nil)
-      if stop_reason
-        change_state(:catch_error)
-        operation.error!(stop_reason)
-        return
-      end
-
       if state == :body && !response.content_length?
         response.finish
       end
@@ -94,11 +85,15 @@ module EmmyHttp
         self.url = url + response.location
         self.response = nil
         parser.reset!
-        operation.reconnect
+        begin
+          operation.reconnect
+        rescue EventMachine::ConnectionError => e
+          finalize(e.to_s)
+        end
         return
       end
 
-      finalize(reason)
+      finalize(stop_reason || reason)
     end
 
     def send_request
@@ -143,8 +138,8 @@ module EmmyHttp
 
       elsif json
         json_string = json.is_a?(String) ? json : (json.respond_to?(:to_json) ? json.to_json : JSON.dump(json))
-        headers['Content-Length'] = json_string.size
         headers['Content-Type']   = 'application/json'
+        headers['Content-Length'] = json_string.size
         json_string
 
       elsif file

data/lib/emmy_http/client/version.rb

@@ -1,5 +1,5 @@
 module EmmyHttp
   module Client
-    VERSION = "0.1.8"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http-client
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: EventMachine-based HTTP request client
 email:
 - inre.storm@gmail.com
@@ -138,6 +152,9 @@ files:
 - Rakefile
 - TODO.md
 - emmy-http-client.gemspec
+- example/Gemfile
+- example/Gemfile.lock
+- example/simple.rb
 - lib/emmy_http/client.rb
 - lib/emmy_http/client/adapter.rb
 - lib/emmy_http/client/client.rb
@@ -167,8 +184,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: HTTP request client
 test_files: []
+has_rdoc: