jdpace-weatherman 0.1.0 → 0.1.1

data/lib/weather_man.rb

@@ -2,19 +2,20 @@ require 'net/http'
 require 'xmlsimple'
 require 'weather_man_response'
 
-# Raised if partner_id and license_key are not provided
-class WeatherManNotConfiguredError < StandardError
-end
-
-# Raised when the API returns an error
-class WeatherManApiError < StandardError
-end
-
-# Raised when a location is not found by id
-class WeatherManLocationNotFoundError < StandardError
-end
-
 class WeatherMan
+  
+  # Raised if partner_id and license_key are not provided
+  class NotConfiguredError < StandardError
+  end
+
+  # Raised when the API returns an error
+  class ApiError < StandardError
+  end
+  
+  # Raised when there is no response from the server
+  class NoResponseError < StandardError
+  end
+  
   VALID_UNITS = ['s', 'm']
   DEFAULT_UNIT = 's' #standard
   
@@ -94,16 +95,16 @@ class WeatherMan
       response = XmlSimple.xml_in(xml_data)
       
       # Check if a response was returned at all
-      raise(WeatherManNoResponseError, "WeatherMan Error: No Response.") unless response
+      raise(WeatherMan::NoResponseError, "WeatherMan Error: No Response.") unless response
       
       # Check if API call threw an error
-      raise(WeatherManApiError, "WeatherMan Error #{response['err'][0]['type']}: #{response['err'][0]['content']}") if response['err']
+      raise(WeatherMan::ApiError, "WeatherMan Error #{response['err'][0]['type']}: #{response['err'][0]['content']}") if response['err']
       
       response
     end
     
     def self.check_authentication
-      raise(WeatherManNotConfiguredError, 'A partner id and a license key must be provided before acessing the API') unless @@partner_id && @@license_key
+      raise(WeatherMan::NotConfiguredError, 'A partner id and a license key must be provided before acessing the API') unless @@partner_id && @@license_key
     end
     
     # API url for searching for locations

data/spec/weather_man_spec.rb

@@ -5,13 +5,13 @@ describe WeatherMan, 'trying to access the api before being configured' do
   it 'should throw an error when searching' do
     lambda {
       WeatherMan.search('test')
-    }.should raise_error(WeatherManNotConfiguredError)
+    }.should raise_error(WeatherMan::NotConfiguredError)
   end
   
   it 'should throw an error when initializing' do
     lambda {
       WeatherMan.new('28115')
-    }.should raise_error(WeatherManNotConfiguredError)
+    }.should raise_error(WeatherMan::NotConfiguredError)
   end
 end
 
@@ -45,7 +45,7 @@ describe WeatherMan, 'using a bad partner id / license key' do
   it 'should raise an error when fetching the weather' do
     lambda {
       @weatherman.fetch
-    }.should raise_error(WeatherManApiError)
+    }.should raise_error(WeatherMan::ApiError)
   end
 end
 
@@ -58,7 +58,7 @@ describe WeatherMan, 'trying to use a bad location id' do
   it 'should raise an error when fetching the weather' do
     lambda {
       @weatherman.fetch
-    }.should raise_error(WeatherManApiError)
+    }.should raise_error(WeatherMan::ApiError)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jdpace-weatherman
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jared Pace