gull 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f0268b1bbaa2d578bd56d7009ae77e6677844d
-  data.tar.gz: 36044cbee5417556bd2957b12617ac28fc9d97b2
+  metadata.gz: 6dd83076a56a80eb80bc1ff60c6952a74519d2f3
+  data.tar.gz: 4c9993c1ab28823f63face88678630c49e938074
 SHA512:
-  metadata.gz: f5a27d2ce025475eb49c36be539f36776836ce4bd817cad9293aa87b18004972720262a969cb57acab801566986da218bdb0b1faf45decddce7cab590dce0e52
-  data.tar.gz: 9fe4fc8c1eb48d41200f0b469cc8334c05adc6684ef8836d9489edd6f04936906887d6097cfbf5bd3c9344fbe9dacf6ebcb98d3b0f39d3043c5e3abec46dabeb
+  metadata.gz: 865775c7a423600f941f4811a80309aa24cb3a6a8315f30f142b579899bb15ddd577d76906b2d8dbeb3ad2ec856cec993eeed62ff16fe7d0a43824298dc009f2
+  data.tar.gz: 0d2d2bc96c97ef7198cb580cf0ce08d2582efdd568ba6286af6f918177abd2d69ebe3bee9c54c12486175560b20d32f86d3eb7c08d94973558d8d4d21faf20d2

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+#### 0.3.1 (6/25/2015)
+Added nested exception handling for other HTTPClient errors. HttpError has original attribute exposing the root exception.
 #### 0.3.0 (6/23/2015)
 Added Client class for error handling (bad entries accessed via errors array). Exposed option to turn on strict XML parsing for debugging. Alert.fetch uses new Client but is backwards compatible, however it doesn't give you access to errors array.
 *** 

data/lib/gull/client.rb

@@ -31,6 +31,8 @@ module Gull
         return client.get_content @options[:url]
       rescue HTTPClient::TimeoutError
         raise TimeoutError, 'Timeout while connecting to NWS web service'
+      rescue HTTPClient::KeepAliveDisconnected, SocketError
+        raise HttpError, 'HTTP error while connecting to NWS web service'
       end
     end
 

data/lib/gull/error.rb

@@ -1,4 +1,15 @@
+require 'English'
+
 module Gull
-  class TimeoutError < StandardError
+  class HttpError < StandardError
+    attr_reader :original
+
+    def initialize(message, original = $ERROR_INFO)
+      super(message)
+      @original = original
+    end
+  end
+
+  class TimeoutError < HttpError
   end
 end

data/lib/gull/version.rb

@@ -1,3 +1,3 @@
 module Gull
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/alert_spec.rb

@@ -100,15 +100,6 @@ describe Gull::Alert do
     expect(alerts.size).to eq(0)
   end
 
-  it 'should raise own error if timeout occurs' do
-    stub_request(:get, 'http://alerts.weather.gov/cap/us.php?x=1')
-      .with(headers: { 'Accept' => '*/*' }).to_timeout
-
-    message = 'Timeout while connecting to NWS web service'
-    expect { Gull::Alert.fetch }
-      .to raise_error(Gull::TimeoutError, message)
-  end
-
   it 'should handle missing cap section' do
     xml = File.read 'spec/fixtures/missing_cap.xml'
 

data/spec/{fixtures/client_spec.rb → client_spec.rb}

@@ -46,4 +46,36 @@ describe Gull::Client do
     expect(alerts.size).to eq 0
     expect(client.errors.size).to eq 1
   end
+
+  it 'should raise own error if timeout occurs' do
+    stub_request(:get, 'http://alerts.weather.gov/cap/us.php?x=1')
+      .with(headers: { 'Accept' => '*/*' })
+      .to_timeout
+
+    message = 'Timeout while connecting to NWS web service'
+    client = Gull::Client.new
+    expect { client.fetch }.to raise_error(Gull::TimeoutError, message)
+  end
+
+  it 'should raise own error if http error occurs' do
+    stub_request(:get, 'http://alerts.weather.gov/cap/us.php?x=1')
+      .with(headers: { 'Accept' => '*/*' })
+      .to_raise(HTTPClient::KeepAliveDisconnected)
+
+    message = 'HTTP error while connecting to NWS web service'
+    client = Gull::Client.new
+    expect { client.fetch }.to raise_error(Gull::HttpError, message) do |error|
+      expect(error.original).to be_a(HTTPClient::KeepAliveDisconnected)
+    end
+
+    stub_request(:get, 'http://alerts.weather.gov/cap/us.php?x=1')
+      .with(headers: { 'Accept' => '*/*' })
+      .to_raise(SocketError)
+
+    message = 'HTTP error while connecting to NWS web service'
+    client = Gull::Client.new
+    expect { client.fetch }.to raise_error(Gull::HttpError, message) do |error|
+      expect(error.original).to be_a(SocketError)
+    end
+  end
 end

data/spec/error_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Gull::HttpError do
+  it 'should instantiate and set original with current exception' do
+    error = StandardError.new 'inner'
+    begin
+      fail error
+    rescue StandardError
+      http_error = Gull::HttpError.new 'test'
+      expect(http_error.original).to eq error
+      expect(http_error.original.message). to eq 'inner'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gull
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -120,9 +120,10 @@ files:
 - lib/gull/polygon.rb
 - lib/gull/version.rb
 - spec/alert_spec.rb
+- spec/client_spec.rb
+- spec/error_spec.rb
 - spec/fixtures/alerts.xml
 - spec/fixtures/bad.xml
-- spec/fixtures/client_spec.rb
 - spec/fixtures/empty.xml
 - spec/fixtures/missing_cap.xml
 - spec/polygon_spec.rb
@@ -153,9 +154,10 @@ specification_version: 4
 summary: Client for parsing NOAA/NWS alerts, warnings, and watches.
 test_files:
 - spec/alert_spec.rb
+- spec/client_spec.rb
+- spec/error_spec.rb
 - spec/fixtures/alerts.xml
 - spec/fixtures/bad.xml
-- spec/fixtures/client_spec.rb
 - spec/fixtures/empty.xml
 - spec/fixtures/missing_cap.xml
 - spec/polygon_spec.rb