net_http_timeout_errors 0.0.2 → 0.1.0

data/README.md

@@ -4,6 +4,19 @@ Tired of having to rescue an ever-growing list of Net::HTTP timeout error types?
 
 Just include this gem and then do:
 
+``` ruby
+begin
+  NetHttpTimeoutErrors.conflate do
+    uri = URI.parse("http://google.com/")
+    response = Net::HTTP.get_response(uri)
+  end
+rescue NetHttpTimeoutError
+  puts "It timed out some way or other!"
+end
+```
+
+Or if you like:
+
 ``` ruby
 begin
   uri = URI.parse("http://google.com/")
@@ -15,7 +28,7 @@ rescue AnotherError, *NetHttpTimeoutErrors.all
 end
 ```
 
-Did we miss an exception? Please add it!
+Did we miss an error? Please add it!
 
 
 ## Installation

data/lib/net_http_timeout_errors.rb

@@ -1,7 +1,15 @@
 require "net_http_timeout_errors/version"
 require "net/http"
 
-module NetHttpTimeoutErrors
+class NetHttpTimeoutError < StandardError
+  attr_reader :original_error
+
+  def initialize(original_error)
+    @original_error = original_error
+  end
+end
+
+class NetHttpTimeoutErrors
   def self.all
     [
       Errno::ECONNREFUSED,
@@ -12,4 +20,10 @@ module NetHttpTimeoutErrors
       Timeout::Error,
     ]
   end
+
+  def self.conflate
+    yield
+  rescue *all => e
+    raise NetHttpTimeoutError.new(e)
+  end
 end

data/lib/net_http_timeout_errors/version.rb

@@ -1,3 +1,3 @@
-module NetHttpTimeoutErrors
-  VERSION = "0.0.2"
+class NetHttpTimeoutErrors
+  VERSION = "0.1.0"
 end

data/spec/net_http_timeout_errors_spec.rb

@@ -9,8 +9,40 @@ describe NetHttpTimeoutErrors, ".all" do
   # No assertions; more like runnable documentation.
   it "works splatted" do
     begin
-      raise Timeout::Error
+      raise an_error
     rescue ZeroDivisionError, *NetHttpTimeoutErrors.all
     end
   end
 end
+
+describe NetHttpTimeoutErrors, ".conflate" do
+  it "turns any handled error into a NetHttpTimeoutError" do
+    assert_raises(NetHttpTimeoutError) do
+      NetHttpTimeoutErrors.conflate do
+        raise an_error
+      end
+    end
+  end
+
+  it "leaves other errors alone" do
+    assert_raises(StandardError) do
+      NetHttpTimeoutErrors.conflate do
+        raise StandardError
+      end
+    end
+  end
+
+  it "keeps the original error" do
+    begin
+      NetHttpTimeoutErrors.conflate do
+        raise an_error
+      end
+    rescue => e
+      assert_instance_of Timeout::Error, e.original_error
+    end
+  end
+end
+
+def an_error
+  Timeout::Error
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net_http_timeout_errors
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: