weatherzone 0.6.3 → 0.6.5

data/lib/weatherzone.rb

@@ -35,5 +35,5 @@ require 'weatherzone/helpers/date_parser'
 require 'weatherzone/helpers/units'
 
 module Weatherzone
-  VERSION = '0.6.3'
+  VERSION = '0.6.5'
 end

data/lib/weatherzone/connection.rb

@@ -3,9 +3,10 @@ require 'singleton'
 module Weatherzone  
   
   class RequestFailed < Exception
-    attr_reader :message
-    def initialize(url)
-      @message = "Failed to retreive #{url} and no cached version available"
+    attr_reader :message, :original_exception
+    def initialize(url, original_exception)
+      @message   = "Failed to retreive #{url} and no cached version available"
+      @original_exception = original_exception
     end
   end
   
@@ -64,22 +65,22 @@ module Weatherzone
         response = OpenURI::open(url)
         response.read
       end
-    rescue Timeout::Error, SocketError
-      error("webservice connection failed")
-      raise RequestFailed.new(url)
+    rescue Timeout::Error, SocketError => e
+      error("webservice connection failed #{e}")
+      raise RequestFailed.new(url, e)
     end
     
-    def debug(message)
-      @logger.debug("[weatherzone] #{message}") if @logger
+    def debug(message) 
+      @logger.debug("[weatherzone] [DEBUG] #{message}") if @logger
     end
 
     def info(message)
-      @logger.info("[weatherzone] #{message}") if @logger
+      @logger.info("[weatherzone] [INFO] #{message}") if @logger
     end
 
     def error(message)
-      @logger.error("[weatherzone] #{message}") if @logger
+      @logger.error("[weatherzone] [ERROR] #{message}") if @logger
     end
-    
+   
   end
 end

data/test/test_exceptions.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/support/dependencies.rb'
+
+class TestExceptions < Test::Unit::TestCase
+
+  def setup
+    Weatherzone::Connection.connect(ENV['WZ_USER'], ENV['WZ_PASS'], :url => ENV['WZ_URL'], :timeout_after => 10) do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)
+    end
+    @connection = Weatherzone::Connection.instance
+  end
+  
+  def test_should_have_credentials
+    assert ENV['WZ_USER'], "You need to set the WZ_USER environment variable to run these tests"
+    assert ENV['WZ_PASS'], "You need to set the WZ_PASS environment variable to run these tests"
+    assert ENV['WZ_URL'],  "You need to set the WZ_URL  environment variable to run these tests"
+  end
+  
+  def test_should_have_keygen
+    File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r')
+  rescue Exception
+    assert false, "You need to create #{File.dirname(__FILE__) + '/../.wzkey.rb'} to run these tests"
+  end
+  
+  def test_request_failed_should_capture_original_exception
+    timeout(0.1) do
+      sleep(1)
+    end
+  rescue Exception => e
+    begin
+      raise Weatherzone::RequestFailed.new("url", e)
+    rescue Weatherzone::RequestFailed => weatherzone_exception
+      assert_instance_of Timeout::Error, weatherzone_exception.original_exception
+    end
+  end
+    
+  def test_connection_should_raise_request_failed_on_timeout
+    @connection.timeout_after = 0.1
+    assert_raises Weatherzone::RequestFailed do
+      Weather.find_by_location_name("Sydney")
+    end
+  end
+    
+end

data/test/test_helper.rb

@@ -1,35 +1,4 @@
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
-require 'logger'
-require 'ruby-debug'
-
-require File.dirname(__FILE__) + '/../lib/weatherzone'
-
-require 'weatherzone/resources/point_forecast'
-require 'weatherzone/resources/forecast'
-require 'weatherzone/resources/conditions'
-require 'weatherzone/resources/district_forecast'
-require 'weatherzone/resources/state_forecast'
-require 'weatherzone/resources/marine_summary'
-require 'weatherzone/resources/marine_forecast'
-require 'weatherzone/resources/surf_report'
-require 'weatherzone/resources/lift'
-require 'weatherzone/resources/snow_report'
-require 'weatherzone/resources/historical_observation'
-require 'weatherzone/resources/daily_observation'
-require 'weatherzone/resources/climate_period'
-require 'weatherzone/resources/warning'
-require 'weatherzone/resources/image'
-require 'weatherzone/resources/almanac_period'
-require 'weatherzone/resources/almanac'
-require 'weatherzone/resources/tide'
-require 'weatherzone/resources/buoy_observation'
-require 'weatherzone/resources/location'
-require 'weatherzone/resources/country'
-require 'weatherzone/resources/moon_phase'
-require 'weatherzone/resources/news_item'
-require 'weatherzone/resources/weather'
+require File.dirname(__FILE__) + '/support/dependencies.rb'
 
 class Test::Unit::TestCase
   def setup

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Ben Askins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +11:00
+date: 2010-04-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ test_files:
 - test/test_country.rb
 - test/test_daily_observation.rb
 - test/test_district_forecast.rb
+- test/test_exceptions.rb
 - test/test_farenheit_conversion_factor.rb
 - test/test_file_parser.rb
 - test/test_finder.rb