weatherzone 0.6.5 → 0.7.0

data/lib/weatherzone/connection.rb

@@ -5,7 +5,7 @@ module Weatherzone
   class RequestFailed < Exception
     attr_reader :message, :original_exception
     def initialize(url, original_exception)
-      @message   = "Failed to retreive #{url} and no cached version available"
+      @message            = "Failed to retreive #{url} and no cached version available"
       @original_exception = original_exception
     end
   end
@@ -19,25 +19,19 @@ module Weatherzone
 
     DEFAULT_TIMEOUT_AFTER = 1
 
-    include Singleton
-
     attr_accessor :username, :password, :url, :keygen, :logger, :timeout_after
     
-    def initialize
-      @logger       = Logger.new(STDOUT)
-      @logger.level = Logger::DEBUG
+    def initialize(username=nil, password=nil, keygen=nil, options={})
+      @logger        = Logger.new(STDOUT)
+      @logger.level  = Logger::DEBUG
+      @username      = username
+      @password      = password
+      @url           = options[:url]
+      @keygen        = keygen
+      @logger        = options[:logger]
+      @timeout_after = options[:timeout_after] || DEFAULT_TIMEOUT_AFTER
     end
     
-    def self.connect(username=nil, password=nil, options={}, &block)
-      connection               = Weatherzone::Connection.instance
-      connection.username      = username
-      connection.password      = password
-      connection.url           = options[:url]
-      connection.keygen        = block
-      connection.logger        = options[:logger]
-      connection.timeout_after = options[:timeout_after] || DEFAULT_TIMEOUT_AFTER
-    end
-  
     def self.settings
       Weatherzone::Settings.instance
     end
@@ -47,7 +41,7 @@ module Weatherzone
     end
   
     def key
-      @keygen.call
+      instance_eval &@keygen
     end
     
     def base_url

data/lib/weatherzone/finder.rb

@@ -33,70 +33,68 @@ module Weatherzone
 
     def self.included(klass)
       klass.class_eval do
-        @@connection = Weatherzone::Connection.instance
-
         class << self
           def parse_file(file_name)
             parse(File.open(file_name))
           end
           
-          def find(options, location_code=nil)
-            set_options(options)
-            make_request(build_params(location_code, options))
+          def find(connection, options, location_code=nil)
+            set_options(connection, options)
+            make_request(connection, build_params(location_code, options))
           end
           
-          def find_by_location_code(location_code, options={})
+          def find_by_location_code(connection, location_code, options={})
             options = options.dup
-            find(options, location_code)
+            find(connection, options, location_code)
           end
           
-          def find_by_twcid(twcid, options={})
+          def find_by_twcid(connection, twcid, options={})
             options = options.dup
             options.merge!(:params => "&lt=twcid&lc=#{twcid}")
-            find(options)
+            find(connection, options)
           end
 
-          def find_by_location_name(location_name, options={})
+          def find_by_location_name(connection, location_name, options={})
             options = options.dup
             location_name = location_name.gsub(" ", "%20").gsub("-", "%20")
             options.merge!(:params => "&lt=aploc&ln=#{location_name}")
-            find(options)
+            find(connection, options)
           end
 
-          def find_by_swellnet_code(swellnet_code, options={})
+          def find_by_swellnet_code(connection, swellnet_code, options={})
             options = options.dup
             options.merge!(:params => "&lt=swellnet&lc=#{swellnet_code}")
-            find(options)
+            find(connection, options)
           end
 
-          def find_by_location_filter(filter, options={})
+          def find_by_location_filter(connection, filter, options={})
             options = options.dup
             options.merge!(:params => "&lt=twcid&lf=#{filter}")
-            find(options)
+            find(connection, options)
           end
           
-          def find_by_district(district_code, options={})
+          def find_by_district(connection, district_code, options={})
             options = options.dup
             options.merge!(:params => "&lt=twcid&dist=#{district_code}")
-            find(options)            
+            find(connection, options)            
           end
 
-          def find_districts_by_state(state, options={})
+          def find_districts_by_state(connection, state, options={})
             options = options.dup
             options.merge!(:params => "&lt=dist&state=#{state}")
-            find(options).countries.first.locations
+            find(connection, options).countries.first.locations
           end
 
-          def find_radars_by_state(state, options={})
+          def find_radars_by_state(connection, state, options={})
             options = options.dup
             options.merge!(:params => "&lt=radar&links=1&ra=1&state=#{state}")
-            find(options).countries.first.locations
+            find(connection, options).countries.first.locations
           end
           
-          def find_by_radar_code(radar_code, options={})
+          def find_by_radar_code(connection, radar_code, options={})
             options = options.dup
             options.merge!(:params => "&lt=radar&lc=#{radar_code}&links=1&ra=1")
-            find(options)   
+            find(connection, options)   
           end
 
           def build_params(location_code, options)
@@ -109,13 +107,13 @@ module Weatherzone
           end
 
           protected
-          def set_options(options)
-            @@connection.settings.weather_class ||= self
+          def set_options(connection, options)
+            connection.settings.weather_class ||= self
             self.temperature_unit = options.delete(:temperature_unit)
           end
 
-          def make_request(params)
-            response = @@connection.request(params)
+          def make_request(connection, params)
+            response = connection.request(params)
             parse(response)
           end
           

data/lib/weatherzone.rb

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

data/test/test_almanac.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestAlmanac < Test::Unit::TestCase
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @almanac = location.almanacs.first

data/test/test_almanac_period.rb

@@ -4,7 +4,7 @@ class TestAlmanacPeriod < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     almanac = location.almanacs.first

data/test/test_buoy_observation.rb

@@ -4,7 +4,7 @@ class TestBuoyObservation < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @buoy_observation = location.buoy_observations.first

data/test/test_climate_period.rb

@@ -4,7 +4,7 @@ class TestClimatePeriod < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @climate_period = location.climate_periods.first

data/test/test_conditions.rb

@@ -4,7 +4,7 @@ class TestConditions < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @conditions = location.conditions.first

data/test/test_connection.rb

@@ -3,10 +3,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestConnection < Test::Unit::TestCase
 
   def setup
-    Weatherzone::Connection.connect("username", "password", :url => "http://ws1.theweather.com.au/") do
-      "sekret" + Weatherzone::Connection.instance.password
-    end
-    @connection = Weatherzone::Connection.instance
+    keygen = lambda { "sekret" + password }
+    @connection = Weatherzone::Connection.new("username", "password", keygen, :url => "http://ws1.theweather.com.au/")
   end
 
   def test_should_set_username

data/test/test_country.rb

@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestCountry < Test::Unit::TestCase
 
   def setup
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/everything.xml")  )
-    weather = Weather.find_by_location_code("9770")
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
+    end
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)    
+    @connection.stubs(:request).returns( File.open("test/response/everything.xml")  )
+    weather = Weather.find_by_location_code(@connection, "9770")
     @country = weather.countries.first
   end
   

data/test/test_daily_observation.rb

@@ -4,7 +4,7 @@ class TestDailyObservtion < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @daily_observation = location.daily_observations.first

data/test/test_district_forecast.rb

@@ -4,7 +4,7 @@ class TestDistrictForecast < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @district_forecast = location.district_forecasts.first

data/test/test_exceptions.rb

@@ -2,11 +2,16 @@ require File.dirname(__FILE__) + '/support/dependencies.rb'
 
 class TestExceptions < Test::Unit::TestCase
 
+  # These tests connect to the weatherzone webservice and therefore require your webservice credentials to function as expected.
+  # Set your credentials using the WZ_USER and WZ_PASS environment variables.
+  # Set your web service instance url using the WZ_URL envionment variable.
+  # Create a file .wzkey.rb in the root of this project containing your keygen algorithm.
+
   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)
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
     end
-    @connection = Weatherzone::Connection.instance
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)
   end
   
   def test_should_have_credentials
@@ -36,7 +41,7 @@ class TestExceptions < Test::Unit::TestCase
   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")
+      Weather.find_by_location_name(@connection, "Sydney")
     end
   end
     

data/test/test_farenheit_conversion_factor.rb

@@ -6,11 +6,12 @@ class TestFarenheitConversionFactor < Test::Unit::TestCase
   C22P7_AS_F = (BigDecimal("22.7") * BigDecimal("1.8")) + BigDecimal("32")
   
   def setup
-    Weatherzone::Connection.connect("username", "password") do
-      "sekret" + Weatherzone::Connection.instance.password
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
     end
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/everything.xml") )
-    weather     = Weather.find_by_location_code("9770", :temperature_unit => "F")
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)
+    @connection.stubs(:request).returns( File.open("test/response/everything.xml") )
+    weather     = Weather.find_by_location_code(@connection, "9770", :temperature_unit => "F")
     country     = weather.countries.first
     location    = country.locations.first
     @forecast   = location.forecasts.first

data/test/test_finder.rb

@@ -17,44 +17,44 @@ class TestFinder < Test::Unit::TestCase
   
   def test_should_build_parameters
     SomeResource.expects(:build_params).with(9770, :include => [:forecast])
-    SomeResource.find_by_location_code(9770, :include => [:forecast])
+    SomeResource.find_by_location_code(@connection, 9770, :include => [:forecast])
   end
 
   def test_should_make_request
-    Weatherzone::Connection.instance.expects(:request).returns( File.open("test/response/everything.xml") )
-    SomeResource.find_by_location_code(9770, :include => [:forecast])
+    @connection.expects(:request).returns( File.open("test/response/everything.xml") )
+    SomeResource.find_by_location_code(@connection, 9770, :include => [:forecast])
   end
 
   def test_should_parse_response
     f = File.open("test/response/everything.xml")
-    Weatherzone::Connection.instance.stubs(:request).returns( f )
+    @connection.stubs(:request).returns( f )
     SomeResource.expects(:parse).with(f)
-    SomeResource.find_by_location_code(9770, :include => [:forecast])
+    SomeResource.find_by_location_code(@connection, 9770, :include => [:forecast])
   end
 
   def test_should_find_by_location_name
     SomeResource.expects(:build_params).with(nil, :params => "&lt=aploc&ln=Sydney%20NSW")
-    SomeResource.find_by_location_name("Sydney NSW")
+    SomeResource.find_by_location_name(@connection, "Sydney NSW")
   end
 
   def test_should_find_by_location_filter
     SomeResource.expects(:build_params).with(nil, :params => "&lt=twcid&lf=twccapcity")
-    SomeResource.find_by_location_filter("twccapcity")
+    SomeResource.find_by_location_filter(@connection, "twccapcity")
   end
 
   def test_should_find_by_district
     SomeResource.expects(:build_params).with(nil, :params => "&lt=twcid&dist=N00")
-    SomeResource.find_by_district("N00")
+    SomeResource.find_by_district(@connection, "N00")
   end
 
   def test_should_find_districts_by_state
     DistrictResource.expects(:build_params).with(nil, :params => "&lt=dist&state=nsw")
-    DistrictResource.find_districts_by_state("nsw")
+    DistrictResource.find_districts_by_state(@connection, "nsw")
   end
 
   def test_should_find_using_arbitrary_include
     SomeResource.expects(:build_params).with(nil, :include => [:moon_phases])
-    SomeResource.find(:include => [:moon_phases])
+    SomeResource.find(@connection, :include => [:moon_phases])
   end
   
   def test_should_include_location_parameter_string

data/test/test_forecast.rb

@@ -4,7 +4,7 @@ class TestForecast < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @forecast = location.forecasts.first

data/test/test_helper.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/support/dependencies.rb'
 
 class Test::Unit::TestCase
   def setup
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/everything.xml") )
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
+    end
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)
+    @connection.stubs(:request).returns( File.open("test/response/everything.xml") )
   end
 end

data/test/test_historical_observation.rb

@@ -4,7 +4,7 @@ class TestHistoricalObservtion < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @historical_observation = location.historical_observations.first

data/test/test_image.rb

@@ -4,7 +4,7 @@ class TestImage < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @image = location.synoptic_charts.first

data/test/test_location.rb

@@ -4,7 +4,7 @@ class TestLocation < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     @location = country.locations.first
   end

data/test/test_marine_forecast.rb

@@ -4,7 +4,7 @@ class TestMarineForecast < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @marine_forecast = location.marine_forecasts.first

data/test/test_marine_summary.rb

@@ -4,7 +4,7 @@ class TestMarineSummary < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @marine_forecast = location.marine_forecasts.first

data/test/test_moon_phase.rb

@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestMoonPhase < Test::Unit::TestCase
 
   def setup
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/moon.xml") )
-    weather = Weather.find_by_location_code("9770")
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
+    end
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)
+    @connection.stubs(:request).returns( File.open("test/response/moon.xml") )
+    weather = Weather.find_by_location_code(@connection, "9770")
     @moon_phases = weather.moon_phases
     @moon_phase = @moon_phases.first
   end

data/test/test_news_item.rb

@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestNewsItem < Test::Unit::TestCase
 
   def setup
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/news.xml") )
-    weather = Weather.find_by_location_code("9770")
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
+    end
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)    
+    @connection.stubs(:request).returns( File.open("test/response/news.xml") )
+    weather = Weather.find_by_location_code(@connection, "9770")
     @news_items = weather.news_items
     @news_item = @news_items.first
   end

data/test/test_point_forecast.rb

@@ -4,7 +4,7 @@ class TestPointForecast < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     forecast = location.forecasts.first

data/test/test_snow_report.rb

@@ -4,7 +4,7 @@ class TestSnowReport < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @snow_report = location.snow_reports.first

data/test/test_state_forecast.rb

@@ -4,7 +4,7 @@ class TestStateForecast < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @state_forecast = location.state_forecasts.first

data/test/test_surf_report.rb

@@ -4,7 +4,7 @@ class TestSurfReport < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @surf_report = location.surf_reports.first

data/test/test_tide.rb

@@ -4,7 +4,7 @@ class TestTide < Test::Unit::TestCase
 
   def setup
     super
-    weather = Weather.find_by_location_code("9770")
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @tide = location.tides.first

data/test/test_value_and_unit_helpers.rb

@@ -3,11 +3,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestValueAndUnitHelpers < Test::Unit::TestCase
 
   def setup
-    Weatherzone::Connection.connect("username", "password") do
-      "sekret" + Weatherzone::Connection.instance.password
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
     end
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/everything.xml") )
-    weather     = Weather.find_by_location_code("9770")
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)
+    @connection.stubs(:request).returns( File.open("test/response/everything.xml") )
+    weather     = Weather.find_by_location_code(@connection, "9770")
     country     = weather.countries.first
     location    = country.locations.first
     @forecast   = location.forecasts.first

data/test/test_warning.rb

@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestWarning < Test::Unit::TestCase
 
   def setup
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/warnings.xml") )
-    weather = Weather.find_by_location_code("9770")
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
+    end
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)    
+    @connection.stubs(:request).returns( File.open("test/response/warnings.xml") )
+    weather = Weather.find_by_location_code(@connection, "9770")
     country = weather.countries.first
     location = country.locations.first
     @warning = location.warnings.first

data/test/test_weather.rb

@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestWeather < Test::Unit::TestCase
 
   def setup
-    Weatherzone::Connection.instance.stubs(:request).returns( File.open("test/response/everything.xml")  )
-    @weather = Weather.find_by_location_code("9770")
+    keygen = lambda do
+      eval(File.open(File.dirname(__FILE__) + '/../.wzkey.rb', 'r').read)      
+    end
+    @connection = Weatherzone::Connection.new(ENV['WZ_USER'], ENV['WZ_PASS'], keygen, :url => ENV['WZ_URL'], :timeout_after => 10)
+    @connection.stubs(:request).returns( File.open("test/response/everything.xml")  )
+    @weather = Weather.find_by_location_code(@connection, "9770")
   end
   
   def test_should_be_an_instance_of_weather

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 5
-  version: 0.6.5
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ben Askins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 +10:00
+date: 2010-04-21 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency