Refactored out the custom way of preserving an original exception

lib/pwned/error.rb

@@ -1,13 +1,7 @@
 module Pwned
   class Error < StandardError
-    attr_reader :original_error
-
-    def initialize(message, original_error)
-      @original_error = original_error
-      super(message)
-    end
   end
 
   class TimeoutError < Error
   end
-end
+end

lib/pwned/password.rb

@@ -35,21 +35,19 @@ def hashes
     end
 
     def get_hashes
-      begin
-        open("#{API_URL}#{hashed_password[0..(HASH_PREFIX_LENGTH-1)]}", @request_options) do |io|
-          @hashes = io.read
-        end
-        @hashes
-      rescue Timeout::Error => e
-        raise Pwned::TimeoutError.new(e.message, e)
-      rescue => e
-        raise Pwned::Error.new(e.message, e)
+      open("#{API_URL}#{hashed_password[0..(HASH_PREFIX_LENGTH-1)]}", @request_options) do |io|
+        @hashes = io.read
       end
+      @hashes
+    rescue Timeout::Error => e
+      raise Pwned::TimeoutError, e.message
+    rescue => e
+      raise Pwned::Error, e.message
     end
 
     def match_data
       @match_data ||= hashes.match(/#{hashed_password[HASH_PREFIX_LENGTH..-1]}:(\d+)/)
     end
 
   end
-end
+end

spec/pwned/password_spec.rb

@@ -52,10 +52,18 @@
     end
 
     it "raises a custom error" do
-      expect { password.pwned? }.to raise_error(Pwned::TimeoutError)
-      expect { password.pwned_count }.to raise_error(Pwned::TimeoutError)
+      expect { password.pwned? }.to raise_error(&method(:verify_timeout_error))
+      expect { password.pwned_count }.to raise_error(&method(:verify_timeout_error))
       expect(@stub).to have_been_requested.times(2)
     end
+
+    def verify_timeout_error(error)
+      aggregate_failures "testing custom error" do
+        expect(error).to be_kind_of(Pwned::TimeoutError)
+        expect(error.message).to match(/execution expired/)
+        expect(error.cause).to be_kind_of(Net::OpenTimeout)
+      end
+    end
   end
 
   describe "when the API returns an error" do
@@ -64,10 +72,18 @@
     end
 
     it "raises a custom error" do
-      expect { password.pwned? }.to raise_error(Pwned::Error)
-      expect { password.pwned_count }.to raise_error(Pwned::Error)
+      expect { password.pwned? }.to raise_error(&method(:verify_internal_error))
+      expect { password.pwned_count }.to raise_error(&method(:verify_internal_error))
       expect(@stub).to have_been_requested.times(2)
     end
+
+    def verify_internal_error(error)
+      aggregate_failures "testing custom error" do
+        expect(error).to be_kind_of(Pwned::Error)
+        expect(error.message).to match(/500/)
+        expect(error.cause).to be_kind_of(OpenURI::HTTPError)
+      end
+    end
   end
 
   describe "when the API returns a 404" do
@@ -77,10 +93,18 @@
     end
 
     it "raises a custom error" do
-      expect { password.pwned? }.to raise_error(Pwned::Error)
-      expect { password.pwned_count }.to raise_error(Pwned::Error)
+      expect { password.pwned? }.to raise_error(&method(:verify_not_found_error))
+      expect { password.pwned_count }.to raise_error(&method(:verify_not_found_error))
       expect(@stub).to have_been_requested.times(2)
     end
+
+    def verify_not_found_error(error)
+      aggregate_failures "testing custom error" do
+        expect(error).to be_kind_of(Pwned::Error)
+        expect(error.message).to match(/404/)
+        expect(error.cause).to be_kind_of(OpenURI::HTTPError)
+      end
+    end
   end
 
   describe "advanced requests" do
@@ -106,4 +130,4 @@
         to have_been_made.once
     end
   end
-end
+end