em-net-http 0.2.0 → 0.2.3

data/Gemfile

@@ -9,4 +9,5 @@ group :development do
   gem 'tumblr-rb'
   gem 'mimic', '>= 0.3.0'
   gem 'rake'
+  gem 'jeweler'
 end

data/Rakefile

@@ -10,6 +10,9 @@ begin
     gem.email = "james@netlagoon.com"
     gem.homepage = "http://github.com/jfairbairn/em-net-http"
     gem.authors = ["James Fairbairn"]
+    gem.add_dependency 'eventmachine', '>= 0.12.10'
+    gem.add_dependency 'addressable'
+    gem.add_dependency 'em-http-request', '>= 0.2.10'
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "mimic", ">= 0.3.0"
     gem.add_development_dependency 'weary'

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.3

data/bin/edit_json.rb

@@ -0,0 +1,14 @@
+#!/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/jeweler

@@ -0,0 +1,14 @@
+#!/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/prettify_json.rb

@@ -0,0 +1,14 @@
+#!/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/rubyforge

@@ -0,0 +1,14 @@
+#!/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/em-net-http.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-net-http}
-  s.version = "0.2.0"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Fairbairn"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2010-08-30}
   s.description = %q{Monkeypatching Net::HTTP to use em-http-request under the hood.}
   s.email = %q{james@netlagoon.com}
-  s.executables = ["autospec", "htmldiff", "ldiff", "oauth", "rackup", "rake", "spec", "tumblr"]
+  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"
@@ -49,12 +49,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
+      s.add_runtime_dependency(%q<em-http-request>, [">= 0.2.10"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mimic>, [">= 0.3.0"])
       s.add_development_dependency(%q<weary>, [">= 0"])
       s.add_development_dependency(%q<right_aws>, [">= 0"])
       s.add_development_dependency(%q<tumblr-rb>, [">= 0"])
     else
+      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
+      s.add_dependency(%q<addressable>, [">= 0"])
+      s.add_dependency(%q<em-http-request>, [">= 0.2.10"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mimic>, [">= 0.3.0"])
       s.add_dependency(%q<weary>, [">= 0"])
@@ -62,6 +68,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<tumblr-rb>, [">= 0"])
     end
   else
+    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
+    s.add_dependency(%q<addressable>, [">= 0"])
+    s.add_dependency(%q<em-http-request>, [">= 0.2.10"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mimic>, [">= 0.3.0"])
     s.add_dependency(%q<weary>, [">= 0"])

data/lib/em-net-http.rb

@@ -92,6 +92,7 @@ module Net
         sslopts[:private_key_file] = key if key
         sslopts[:cert_chain_file] = ca_file if ca_file
       end
+      opts[:timeout] = self.read_timeout
 
       headers = opts[:head] = {}
       req.each do |k, v|
@@ -117,8 +118,9 @@ module Net
       end
 
       httpreq.callback &convert_em_http_response
-      httpreq.errback &convert_em_http_response
+      httpreq.errback {|err|f.resume(:error)}
       res = Fiber.yield
+      raise 'EM::HttpRequest error - request timed out?' if res == :error
       yield res if block_given?
       res
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - James Fairbairn
@@ -14,12 +14,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 +01:00
+date: 2010-08-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: eventmachine
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 10
+        version: 0.12.10
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 10
+        version: 0.2.10
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,10 +74,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mimic
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,10 +89,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: weary
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,10 +102,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: right_aws
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,10 +115,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: tumblr-rb
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,16 +128,20 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  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
 extensions: []
@@ -119,11 +166,15 @@ files:
 - 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
@@ -140,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 969805767585921057
+      hash: -2810802488439209821
       segments: 
       - 0
       version: "0"