em-net-http 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6070eb6b7aae30b3ab077b936d68f5ee32b3b822
-  data.tar.gz: 5fdcd37f3555645f559c5e276bd335c6e1068446
+  metadata.gz: 38af6438fd2b8255ce7756ad1bf1a313b3b1fcef
+  data.tar.gz: df1038c3a426d3733a714233ec956719c519070a
 SHA512:
-  metadata.gz: acd7c4fc86030532a0fec13994b82c687d658b624183178155fdf5029011af5a9af228f3ef22b7d6a6b7169aec56f14207fe900e6fdba5cc5b677cf41fd4b070
-  data.tar.gz: 64b6532a1a7219c99d74a8d9401a72e8b51c42c5c252ef417941f68c64036dd1f8317cc887e11e571191568eec872e1eb7558430ecad2bfeb01043ad5fd5e5a0
+  metadata.gz: f521f421707ec1a8342f01bda1af50018779bb0961509f3e064196c4f99d8cfe0ff051a7ada8b6a5ad47c944c30d25e2fc4edc55fdae006b5e1272bfecc0ec7b
+  data.tar.gz: 488044d712388932f55dc0c78da40d2bb6e0b68c9e19aea0d044f6715430b3df765e02b4c22f52f538d470e7f23c80801d7ae3a9eb3417a97919f53aa6790561

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/em-net-http.gemspec

@@ -26,8 +26,7 @@ Gem::Specification.new do |s|
     "lib/test_weary.rb",
     "spec/em-net-http_spec.rb",
     "spec/image.jpg",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
+    "spec/spec.opts"
   ]
   s.homepage = %q{http://github.com/jfairbairn/em-net-http}
   s.require_paths = ["lib"]
@@ -41,4 +40,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<mimic>, [">= 0.3.0"])
   s.add_development_dependency(%q<weary>, [">= 0"])
 end
-

data/lib/em-net-http.rb

@@ -126,6 +126,7 @@ module Net
         sslopts[:cert_chain_file] = ca_file if ca_file
       end
       opts[:timeout] = self.read_timeout
+      opts[:decoding] = false
 
       headers = opts[:head] = {}
       req.each do |k, v|
@@ -135,8 +136,10 @@ module Net
       headers['content-type'] ||= "application/x-www-form-urlencoded"
 
       t0 = Time.now
+      http = EM::HttpRequest.new(uri)
       request_method = (req.respond_to?(:method) ? req.method : req.class::METHOD).downcase.to_sym
-      httpreq = EM::HttpRequest.new(uri).send(request_method, opts)
+      request_method = :"a#{request_method}" if http.respond_to?(:"a#{request_method}")
+      httpreq = http.send(request_method, opts)
 
       f=Fiber.current
 
@@ -146,7 +149,11 @@ module Net
         nhresclass = Net::HTTPResponse.response_class(emres.code)
         nhres = nhresclass.new(emres.http_version, emres.code, emres.message)
         emres.to_hash.each do |k, v|
-          nhres.add_field(k, v)
+          if v.is_a?(Array)
+            v.each {|e| nhres.add_field(k, e)}
+          else
+            nhres.add_field(k, v)
+          end
         end
         nhres.body = emres.body if req.response_body_permitted? && nhresclass.body_permitted?
         nhres.instance_variable_set '@read', true
@@ -161,11 +168,15 @@ module Net
           nhresclass = Net::HTTPResponse.response_class(emres.code)
           nhres = nhresclass.new(emres.http_version, emres.code, emres.message)
           emres.to_hash.each do |k, v|
-            nhres.add_field(k, v)
+            if v.is_a?(Array)
+              v.each {|e| nhres.add_field(k, e)}
+            else
+              nhres.add_field(k, v)
+            end
           end
           f.resume nhres
         }
-        httpreq.errback {|err|f.resume(:error)}
+        httpreq.errback {|err|f.resume(err)}
 
         nhres = yield_with_error_check(t0)
         nhres.instance_variable_set :@httpreq, httpreq
@@ -174,7 +185,7 @@ module Net
         nhres
       else
         httpreq.callback &convert_em_http_response
-        httpreq.errback {|err|f.resume(:error)}
+        httpreq.errback {|err|f.resume(err)}
 
         yield_with_error_check(t0)
       end
@@ -185,10 +196,7 @@ module Net
     def yield_with_error_check(t0)
       res = Fiber.yield
 
-      if res == :error
-        raise 'EM::HttpRequest error - request timed out' if Time.now - self.read_timeout > t0
-        raise 'EM::HttpRequest error - unknown error'
-      end
+      raise res.error if res.class == EM::HttpClient
 
       res
     end

data/spec/em-net-http_spec.rb

@@ -1,94 +1,155 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'em-net-http'
+require 'time'
+require 'rspec'
+require 'mimic'
 
 describe "em-net-http" do
+  around(:each) do |example|
+    Fiber.new do
+      example.run
+    end.resume
+  end
+
+  describe '' do
+    before(:all) do
+      Mimic.mimic do
+        Net::HTTPResponse::CODE_TO_OBJ.each do |code, klass|
+          get("/code/#{code}").returning("#{code} #{klass.name}", code.to_i, {})
+        end
 
-  it 'should support streaming the response' do
-    assert_identical(:streamed => true) {
-      body = StringIO.new '', 'wb'
+        get('/hello').returning('Hello World!', 200, {'Content-Type'=>'text/plain'})
 
-      Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
-        http.request_get "/image" do |resp|
-          resp.should be_a_kind_of(Net::HTTPOK)
-          resp.read_body { |chunk| body.write chunk }
-          resp
+        class BigImageResponse
+          def each
+            ::File.open('spec/image.jpg', "rb") { |file|
+              while part = file.read(8192)
+                yield part
+              end
+            }
+          end
         end
-      end.tap do |resp|
-        resp.instance_variable_set :@streamed_body, body.string
-      end
-    }
-  end
+        resp = BigImageResponse.new
+        get('/image').returning(resp, 200, {"Content-Type" => 'image/jpeg'})
 
-  it 'should support buffering the response' do
-    assert_identical {
-      Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
-        respone = http.request_get "/image" do |resp|
-          resp.should be_a_kind_of(Net::HTTPOK)
-          resp.read_body # force reading the body before the test tears down the EM loop
-          resp
+        post('/testpost') do
+          "You said #{request.body.read}."
         end
-        respone.tap { respone.should be_a_kind_of(Net::HTTPOK) }
       end
-    }
-  end
+    end
+
+    it 'should support streaming the response' do
+      assert_identical(true) {
+        body = StringIO.new '', 'wb'
 
-  describe 'should be compatible' do
-    it 'for Net::HTTP.get()' do
-      run_requests {Net::HTTP.get(URI.parse("http://localhost:#{Mimic::MIMIC_DEFAULT_PORT}/hello"))}
-      @expected_res.should == @actual_res
+        Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
+          http.request_get "/image" do |resp|
+            resp.should be_a_kind_of(Net::HTTPOK)
+            resp.read_body { |chunk| body.write chunk }
+            resp
+          end
+        end.tap do |resp|
+          resp.instance_variable_set :@streamed_body, body.string
+        end
+      }
     end
 
-    # it 'for Net::HTTP.get_print()' do
-    #   run_requests {Net::HTTP.get_print(URI.parse('http://localhost/hello'))}
-    #   @expected_res.should == @actual_res
-    # end
+    it 'should support buffering the response' do
+      assert_identical {
+        Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
+          respone = http.request_get "/image" do |resp|
+            resp.should be_a_kind_of(Net::HTTPOK)
+            resp.read_body # force reading the body before the test tears down the EM loop
+            resp
+          end
+          respone.tap { respone.should be_a_kind_of(Net::HTTPOK) }
+        end
+      }
+    end
+
+    describe 'should be compatible' do
+      it 'with Net::HTTP.get()' do
+        run_requests {Net::HTTP.get(URI.parse("http://localhost:#{Mimic::MIMIC_DEFAULT_PORT}/hello"))}
+        @expected_res.should == @actual_res
+      end
 
-    # We don't test responses like 100 Continue at the moment.
-    %w(200 201 202 203 204 205 206 300 301 302 303 307 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 500 501 502 503 504 505).each do |code|
-      it "for Net::HTTP.start(host, port, &block) with response code #{code}" do
+      # it 'for Net::HTTP.get_print()' do
+      #   run_requests {Net::HTTP.get_print(URI.parse('http://localhost/hello'))}
+      #   @expected_res.should == @actual_res
+      # end
+
+      # We don't test responses like 100 Continue at the moment.
+      %w(200 201 202 203 204 205 206 300 301 302 303 307 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 500 501 502 503 504 505).each do |code|
+        it "with Net::HTTP.start(host, port, &block) with response code #{code}" do
+          assert_identical {
+            Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
+              http.get("/code/#{code}").tap { |resp|
+                # Force the response to be buffered while we are still in the EM loop, since we shut it down EM before the verifications
+                resp.body
+              }
+            end
+          }
+        end
+
+        it "with Net::HTTP.new(host, port).start(&block) with response code #{code}" do
+          assert_identical {
+            h = Net::HTTP.new('localhost', Mimic::MIMIC_DEFAULT_PORT)
+            h.start do |http|
+              http.get("/code/#{code}")
+            end
+          }
+        end
+      end
+
+      it "with response code 304" do
         assert_identical {
           Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
-            http.get("/code/#{code}").tap { |resp|
-              # Force the response to be buffered while we are still in the EM loop, since we shut it down EM before the verifications
-              resp.body
-            }
+            req = Net::HTTP::Get.new('/code/304')
+            req['If-Modified-Since'] = Time.now.rfc2822
+            http.request(req)
           end
         }
+
       end
-  
-      it "for Net::HTTP.new(host, port).start(&block) with response code #{code}" do
+
+      it 'with post' do
         assert_identical {
-          h = Net::HTTP.new('localhost', Mimic::MIMIC_DEFAULT_PORT)
-          h.start do |http|
-            http.get("/code/#{code}")
+          Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
+            req = Net::HTTP::Post.new('/testpost')
+            req.body = 'hello mimic'
+            http.request(req)
           end
         }
+
       end
+
     end
-    
-    it "with response code 304" do
-      assert_identical {
-        Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
-          req = Net::HTTP::Get.new('/code/304')
-          req['If-Modified-Since'] = Time.now.rfc2822
-          http.request(req)
-        end
-      }
-      
+
+
+
+    after(:all) do
+      Mimic.cleanup!
     end
-    
-    it 'with post' do
-      assert_identical {
-        Net::HTTP.start('localhost', Mimic::MIMIC_DEFAULT_PORT) do |http|
-          req = Net::HTTP::Post.new('/testpost')
-          req.body = 'hello mimic'
-          http.request(req)
+
+  end
+
+  it 'should raise relevant exceptions' do
+    EM.run do
+      Fiber.new do
+        begin
+          Net::HTTP.start('localhost', 1) do |r|
+            r.get('/')
+          end
+          fail('expected exception to be raised')
+        rescue => expected
+          expected.class.should == Errno::ECONNREFUSED
+          EM.stop_event_loop
         end
-      }
-      
+      end.resume
     end
-    
   end
-  
+
   def run_requests(&block)
     @expected_res = yield
     EM.run do
@@ -100,23 +161,23 @@ describe "em-net-http" do
       end
     end
   end
-  
+
   def assert_identical(streamed=false, &block)
     run_requests(&block)
     @actual_res.should be_a_kind_of(Net::HTTPResponse)
-    @actual_res.should match_response(@expected_res, :streamed => streamed)
+    @actual_res.should match_response(@expected_res, streamed)
   end
-  
+
   def match_response(expected, streamed=false)
     ResponseMatcher.new(expected, streamed)
   end
-  
+
   class ResponseMatcher
     def initialize(expected, streamed=false)
       @expected = expected
       @streamed = streamed
     end
-    
+
     def matches?(actual)
       # Dates could differ slightly :(
       expected_date = Time.parse(@expected.delete('date').join)
@@ -136,6 +197,6 @@ describe "em-net-http" do
       end
       true
     end
-    
+
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: em-net-http
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - James Fairbairn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.10
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: mimic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: weary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Monkeypatching Net::HTTP to use em-http-request under the hood.
@@ -116,7 +116,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
+- ".document"
 - Gemfile
 - LICENSE
 - README.md
@@ -130,7 +130,6 @@ files:
 - spec/em-net-http_spec.rb
 - spec/image.jpg
 - spec/spec.opts
-- spec/spec_helper.rb
 homepage: http://github.com/jfairbairn/em-net-http
 licenses: []
 metadata: {}
@@ -140,18 +139,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Non-blocking replacement for Net::HTTP, for use in EventMachine
 test_files: []
+has_rdoc: 

data/spec/spec_helper.rb

@@ -1,39 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'em-net-http'
-require 'time'
-require 'rspec'
-
-require 'mimic'
-
-RSpec.configure do |config|
-  config.before(:all) do
-    Mimic.mimic do
-      Net::HTTPResponse::CODE_TO_OBJ.each do |code, klass|
-        get("/code/#{code}").returning("#{code} #{klass.name}", code.to_i, {})
-      end
-      
-      get('/hello').returning('Hello World!', 200, {'Content-Type'=>'text/plain'})
-      
-      class BigImageResponse
-        def each
-          ::File.open('spec/image.jpg', "rb") { |file|
-            while part = file.read(8192)
-              yield part
-            end
-          }
-        end
-      end
-      resp = BigImageResponse.new
-      get('/image').returning(resp, 200, {"Content-Type" => 'image/jpeg'})
-
-      post('/testpost') do
-        "You said #{request.body.read}."
-      end
-    end
-  end
-  
-  config.after(:all) do
-    Mimic.cleanup!
-  end
-end