em-net-http 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/em-net-http.gemspec

@@ -5,14 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-net-http}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Fairbairn"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-09-01}
   s.description = %q{Monkeypatching Net::HTTP to use em-http-request under the hood.}
   s.email = %q{james@netlagoon.com}
-  s.executables = ["autospec", "edit_json.rb", "htmldiff", "jeweler", "ldiff", "oauth", "prettify_json.rb", "rackup", "rake", "rubyforge", "spec", "tumblr"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.md"

data/lib/em-net-http.rb

@@ -101,6 +101,7 @@ module Net
 
       headers['content-type'] ||= "application/x-www-form-urlencoded"
       
+      t0 = Time.now
       httpreq = EM::HttpRequest.new(uri).send(req.class::METHOD.downcase.to_sym, opts)
 
       f=Fiber.current
@@ -120,7 +121,11 @@ module Net
       httpreq.callback &convert_em_http_response
       httpreq.errback {|err|f.resume(:error)}
       res = Fiber.yield
-      raise 'EM::HttpRequest error - request timed out?' if res == :error
+      if res == :error
+        raise 'EM::HttpRequest error - request timed out' if Time.now - self.read_timeout > t0
+        raise 'EM::HttpRequest error - unknown error'
+      end
+      
       yield res if block_given?
       res
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - James Fairbairn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +01:00
+date: 2010-09-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,19 +131,8 @@ dependencies:
   version_requirements: *id008
 description: Monkeypatching Net::HTTP to use em-http-request under the hood.
 email: james@netlagoon.com
-executables: 
-- autospec
-- edit_json.rb
-- htmldiff
-- jeweler
-- ldiff
-- oauth
-- prettify_json.rb
-- rackup
-- rake
-- rubyforge
-- spec
-- tumblr
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -165,18 +154,6 @@ files:
 - spec/em-net-http_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- bin/autospec
-- bin/edit_json.rb
-- bin/htmldiff
-- bin/jeweler
-- bin/ldiff
-- bin/oauth
-- bin/prettify_json.rb
-- bin/rackup
-- bin/rake
-- bin/rubyforge
-- bin/spec
-- bin/tumblr
 has_rdoc: true
 homepage: http://github.com/jfairbairn/em-net-http
 licenses: []
@@ -191,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2810802488439209821
+      hash: 624102514265912067
       segments: 
       - 0
       version: "0"

data/bin/autospec

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'autospec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec', 'autospec')

data/bin/edit_json.rb

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'edit_json.rb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('json_pure', 'edit_json.rb')

data/bin/htmldiff

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/jeweler

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'jeweler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('jeweler', 'jeweler')

data/bin/ldiff

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/oauth

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'oauth' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('oauth', 'oauth')

data/bin/prettify_json.rb

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'prettify_json.rb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('json_pure', 'prettify_json.rb')

data/bin/rackup

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rackup' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rack', 'rackup')

data/bin/rake

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

data/bin/rubyforge

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rubyforge' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rubyforge', 'rubyforge')

data/bin/spec

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'spec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec', 'spec')

data/bin/tumblr

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'tumblr' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('tumblr-rb', 'tumblr')