barometer 0.3.2 → 0.5.0

data/spec/{service_yahoo_spec.rb → weather_services/yahoo_spec.rb}

@@ -1,24 +1,21 @@
 require 'spec_helper'
+include Barometer
 
 describe "Yahoo" do
   
   before(:each) do
-    @accepted_formats = [:zipcode]
+    @accepted_formats = [:zipcode, :weather_id]
     #@base_uri = "http://google.com"
   end
   
   describe "the class methods" do
     
     it "defines accepted_formats" do
-      Barometer::Yahoo.accepted_formats.should == @accepted_formats
+      WeatherService::Yahoo.accepted_formats.should == @accepted_formats
     end
     
-    # it "defines base_uri" do
-    #   Barometer::Google.base_uri.should == @base_uri
-    # end
-    
     it "defines get_all" do
-      Barometer::Yahoo.respond_to?("get_all").should be_true
+      WeatherService::Yahoo.respond_to?("fetch").should be_true
     end
     
   end
@@ -26,17 +23,17 @@ describe "Yahoo" do
   describe "building the current data" do
     
     it "defines the build method" do
-      Barometer::Yahoo.respond_to?("build_current").should be_true
+      WeatherService::Yahoo.respond_to?("build_current").should be_true
     end
     
     it "requires Hash input" do
-      lambda { Barometer::Yahoo.build_current }.should raise_error(ArgumentError)
-      lambda { Barometer::Yahoo.build_current({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Yahoo.build_current }.should raise_error(ArgumentError)
+      lambda { WeatherService::Yahoo.build_current({}) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Barometer::CurrentMeasurement object" do
-      current = Barometer::Yahoo.build_current({})
-      current.is_a?(Barometer::CurrentMeasurement).should be_true
+      current = WeatherService::Yahoo.build_current({})
+      current.is_a?(Data::CurrentMeasurement).should be_true
     end
     
   end
@@ -44,16 +41,16 @@ describe "Yahoo" do
   describe "building the forecast data" do
     
     it "defines the build method" do
-      Barometer::Yahoo.respond_to?("build_forecast").should be_true
+      WeatherService::Yahoo.respond_to?("build_forecast").should be_true
     end
     
     it "requires Hash input" do
-      lambda { Barometer::Yahoo.build_forecast }.should raise_error(ArgumentError)
-      lambda { Barometer::Yahoo.build_forecast({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Yahoo.build_forecast }.should raise_error(ArgumentError)
+      lambda { WeatherService::Yahoo.build_forecast({}) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Array object" do
-      current = Barometer::Yahoo.build_forecast({})
+      current = WeatherService::Yahoo.build_forecast({})
       current.is_a?(Array).should be_true
     end
     
@@ -62,52 +59,38 @@ describe "Yahoo" do
   describe "building the location data" do
     
     it "defines the build method" do
-      Barometer::Yahoo.respond_to?("build_location").should be_true
+      WeatherService::Yahoo.respond_to?("build_location").should be_true
     end
     
     it "requires Hash input" do
-      lambda { Barometer::Yahoo.build_location }.should raise_error(ArgumentError)
-      lambda { Barometer::Yahoo.build_location({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Yahoo.build_location }.should raise_error(ArgumentError)
+      lambda { WeatherService::Yahoo.build_location({}) }.should_not raise_error(ArgumentError)
     end
     
     it "requires Barometer::Geo input" do
-      geo = Barometer::Geo.new({})
-      lambda { Barometer::Yahoo.build_location({}, {}) }.should raise_error(ArgumentError)
-      lambda { Barometer::Yahoo.build_location({}, geo) }.should_not raise_error(ArgumentError)
+      geo = Data::Geo.new({})
+      lambda { WeatherService::Yahoo.build_location({}, {}) }.should raise_error(ArgumentError)
+      lambda { WeatherService::Yahoo.build_location({}, geo) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Barometer::Location object" do
-      location = Barometer::Yahoo.build_location({})
-      location.is_a?(Barometer::Location).should be_true
+      location = WeatherService::Yahoo.build_location({})
+      location.is_a?(Data::Location).should be_true
     end
     
   end
 
-  # describe "building the timezone" do
-  #   
-  #   it "defines the build method" do
-  #     Barometer::Yahoo.respond_to?("build_timezone").should be_true
-  #   end
-  #   
-  #   it "requires Hash input" do
-  #     lambda { Barometer::Yahoo.build_timezone }.should raise_error(ArgumentError)
-  #     lambda { Barometer::Yahoo.build_timezone({}) }.should_not raise_error(ArgumentError)
-  #   end
-  #   
-  # end
-  
   describe "when measuring" do
   
     before(:each) do
       @query = Barometer::Query.new("90210")
-      @query.preferred = "90210"
-      @measurement = Barometer::Measurement.new
+      @measurement = Data::Measurement.new
       
       FakeWeb.register_uri(:get, 
-        "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.preferred)}",
-        :string => File.read(File.join(File.dirname(__FILE__), 
-          'fixtures', 
-          'yahoo_90210.xml')
+        "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.q)}",
+        :string => File.read(File.join(File.dirname(__FILE__),  
+          '../fixtures/services/yahoo',
+          '90210.xml')
         )
       )  
     end
@@ -115,27 +98,27 @@ describe "Yahoo" do
     describe "all" do
       
       it "responds to _measure" do
-        Barometer::Yahoo.respond_to?("_measure").should be_true
+        WeatherService::Yahoo.respond_to?("_measure").should be_true
       end
       
       it "requires a Barometer::Measurement object" do
-        lambda { Barometer::Yahoo._measure(nil, @query) }.should raise_error(ArgumentError)
-        lambda { Barometer::Yahoo._measure("invlaid", @query) }.should raise_error(ArgumentError)
-  
-        lambda { Barometer::Yahoo._measure(@measurement, @query) }.should_not raise_error(ArgumentError)
+        lambda { WeatherService::Yahoo._measure(nil, @query) }.should raise_error(ArgumentError)
+        lambda { WeatherService::Yahoo._measure("invlaid", @query) }.should raise_error(ArgumentError)
+
+        lambda { WeatherService::Yahoo._measure(@measurement, @query) }.should_not raise_error(ArgumentError)
       end
   
       it "requires a Barometer::Query query" do
-        lambda { Barometer::Yahoo._measure }.should raise_error(ArgumentError)
-        lambda { Barometer::Yahoo._measure(@measurement, 1) }.should raise_error(ArgumentError)
+        lambda { WeatherService::Yahoo._measure }.should raise_error(ArgumentError)
+        lambda { WeatherService::Yahoo._measure(@measurement, 1) }.should raise_error(ArgumentError)
         
-        lambda { Barometer::Yahoo._measure(@measurement, @query) }.should_not raise_error(ArgumentError)
+        lambda { WeatherService::Yahoo._measure(@measurement, @query) }.should_not raise_error(ArgumentError)
       end
       
       it "returns a Barometer::Measurement object" do
-        result = Barometer::Yahoo._measure(@measurement, @query)
-        result.is_a?(Barometer::Measurement).should be_true
-        result.current.is_a?(Barometer::CurrentMeasurement).should be_true
+        result = WeatherService::Yahoo._measure(@measurement, @query)
+        result.is_a?(Data::Measurement).should be_true
+        result.current.is_a?(Data::CurrentMeasurement).should be_true
         result.forecast.is_a?(Array).should be_true
         
         result.source.should == :yahoo
@@ -148,25 +131,25 @@ describe "Yahoo" do
   describe "when answering the simple questions," do
     
     before(:each) do
-      @measurement = Barometer::Measurement.new
+      @measurement = Data::Measurement.new
     end
     
     describe "currently_wet_by_icon?" do
       
       before(:each) do
-        @measurement.current = Barometer::CurrentMeasurement.new
+        @measurement.current = Data::CurrentMeasurement.new
       end
 
       it "returns true if matching icon code" do
         @measurement.current.icon = "4"
         @measurement.current.icon?.should be_true
-        Barometer::Yahoo.currently_wet_by_icon?(@measurement.current).should be_true
+        WeatherService::Yahoo.currently_wet_by_icon?(@measurement.current).should be_true
       end
       
       it "returns false if NO matching icon code" do
         @measurement.current.icon = "32"
         @measurement.current.icon?.should be_true
-        Barometer::Yahoo.currently_wet_by_icon?(@measurement.current).should be_false
+        WeatherService::Yahoo.currently_wet_by_icon?(@measurement.current).should be_false
       end
       
     end
@@ -174,7 +157,7 @@ describe "Yahoo" do
     describe "forecasted_wet_by_icon?" do
       
       before(:each) do
-        @measurement.forecast = [Barometer::ForecastMeasurement.new]
+        @measurement.forecast = [Data::ForecastMeasurement.new]
         @measurement.forecast.first.date = Date.today
         @measurement.forecast.size.should == 1
       end
@@ -182,13 +165,13 @@ describe "Yahoo" do
       it "returns true if matching icon code" do
         @measurement.forecast.first.icon = "4"
         @measurement.forecast.first.icon?.should be_true
-        Barometer::Yahoo.forecasted_wet_by_icon?(@measurement.forecast.first).should be_true
+        WeatherService::Yahoo.forecasted_wet_by_icon?(@measurement.forecast.first).should be_true
       end
       
       it "returns false if NO matching icon code" do
         @measurement.forecast.first.icon = "32"
         @measurement.forecast.first.icon?.should be_true
-        Barometer::Yahoo.forecasted_wet_by_icon?(@measurement.forecast.first).should be_false
+        WeatherService::Yahoo.forecasted_wet_by_icon?(@measurement.forecast.first).should be_false
       end
       
     end
@@ -196,19 +179,19 @@ describe "Yahoo" do
     describe "currently_sunny_by_icon?" do
       
       before(:each) do
-        @measurement.current = Barometer::CurrentMeasurement.new
+        @measurement.current = Data::CurrentMeasurement.new
       end
 
       it "returns true if matching icon code" do
         @measurement.current.icon = "32"
         @measurement.current.icon?.should be_true
-        Barometer::Yahoo.currently_sunny_by_icon?(@measurement.current).should be_true
+        WeatherService::Yahoo.currently_sunny_by_icon?(@measurement.current).should be_true
       end
       
       it "returns false if NO matching icon code" do
         @measurement.current.icon = "4"
         @measurement.current.icon?.should be_true
-        Barometer::Yahoo.currently_sunny_by_icon?(@measurement.current).should be_false
+        WeatherService::Yahoo.currently_sunny_by_icon?(@measurement.current).should be_false
       end
       
     end
@@ -216,7 +199,7 @@ describe "Yahoo" do
     describe "forecasted_sunny_by_icon?" do
       
       before(:each) do
-        @measurement.forecast = [Barometer::ForecastMeasurement.new]
+        @measurement.forecast = [Data::ForecastMeasurement.new]
         @measurement.forecast.first.date = Date.today
         @measurement.forecast.size.should == 1
       end
@@ -224,13 +207,13 @@ describe "Yahoo" do
       it "returns true if matching icon code" do
         @measurement.forecast.first.icon = "32"
         @measurement.forecast.first.icon?.should be_true
-        Barometer::Yahoo.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_true
+        WeatherService::Yahoo.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_true
       end
       
       it "returns false if NO matching icon code" do
         @measurement.forecast.first.icon = "4"
         @measurement.forecast.first.icon?.should be_true
-        Barometer::Yahoo.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_false
+        WeatherService::Yahoo.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_false
       end
       
     end
@@ -241,28 +224,29 @@ describe "Yahoo" do
     
     before(:each) do
       @query = Barometer::Query.new("90210")
-      @query.preferred = "90210"
-      @measurement = Barometer::Measurement.new
+      @measurement = Data::Measurement.new
 
       FakeWeb.register_uri(:get, 
-        "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.preferred)}",
+        "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.q)}",
         :string => File.read(File.join(File.dirname(__FILE__), 
-          'fixtures', 
-          'yahoo_90210.xml')
+          '../fixtures/services/yahoo',
+          '90210.xml')
         )
       )  
     end
 
     # TODO: complete this
     it "should correctly build the data" do
-      result = Barometer::Yahoo._measure(@measurement, @query)
+      result = WeatherService::Yahoo._measure(@measurement, @query)
       
-      sun_rise = Barometer::Zone.merge("6:09 am", "Sun, 26 Apr 2009 10:51 am PDT", "PDT")
-      sun_set = Barometer::Zone.merge("7:34 pm", "Sun, 26 Apr 2009 10:51 am PDT", "PDT")
+      #sun_rise = Barometer::Zone.merge("6:09 am", "Sun, 26 Apr 2009 10:51 am PDT", "PDT")
+      #sun_set = Barometer::Zone.merge("7:34 pm", "Sun, 26 Apr 2009 10:51 am PDT", "PDT")
       
       # build current
-      @measurement.current.sun.rise.should == sun_rise
-      @measurement.current.sun.set.should == sun_set
+      #@measurement.current.sun.rise.should == sun_rise
+      #@measurement.current.sun.set.should == sun_set
+      @measurement.current.sun.rise.to_s.should == "06:09 am"
+      @measurement.current.sun.set.to_s.should == "07:34 pm"
       
       # builds location
       @measurement.location.city.should == "Beverly Hills"
@@ -272,13 +256,13 @@ describe "Yahoo" do
       
       @measurement.forecast[0].condition.should == "Mostly Sunny"
       @measurement.forecast[0].icon.should == "34"
-      @measurement.forecast[0].sun.rise.should == sun_rise + (60*60*24*0)
-      @measurement.forecast[0].sun.set.should == sun_set + (60*60*24*0)
+      @measurement.forecast[0].sun.rise.should  == "06:09 am"
+      @measurement.forecast[0].sun.set.should == "07:34 pm"
       
       @measurement.forecast[1].condition.should == "Cloudy"
       @measurement.forecast[1].icon.should == "26"
-      @measurement.forecast[1].sun.rise.should == sun_rise + (60*60*24*1)
-      @measurement.forecast[1].sun.set.should == sun_set + (60*60*24*1)
+      @measurement.forecast[1].sun.rise.should == "06:09 am"
+      @measurement.forecast[1].sun.set.should == "07:34 pm"
       
     end
     # <yweather:location city="Beverly Hills" region="CA" country="US"/>

data/spec/weather_spec.rb

@@ -38,16 +38,16 @@ describe "Weather" do
     
     before(:each) do
       module Barometer
-        class Measurement
+        class Data::Measurement
           attr_accessor :success
         end
       end
       @weather = Barometer::Weather.new
-      @wunderground = Barometer::Measurement.new(:wunderground)
+      @wunderground = Data::Measurement.new(:wunderground)
       @wunderground.success = true
-      @yahoo = Barometer::Measurement.new(:yahoo)
+      @yahoo = Data::Measurement.new(:yahoo)
       @yahoo.success = true
-      @google = Barometer::Measurement.new(:google)
+      @google = Data::Measurement.new(:google)
       @weather.measurements << @wunderground
       @weather.measurements << @yahoo
       @weather.measurements << @google
@@ -82,36 +82,47 @@ describe "Weather" do
     
     before(:each) do
       @weather = Barometer::Weather.new
-      @wunderground = Barometer::Measurement.new(:wunderground)
-      @wunderground.current = Barometer::CurrentMeasurement.new
+      @wunderground = Data::Measurement.new(:wunderground)
+      @wunderground.current = Data::CurrentMeasurement.new
       @wunderground.success = true
-      @yahoo = Barometer::Measurement.new(:yahoo)
-      @yahoo.current = Barometer::CurrentMeasurement.new
+      @yahoo = Data::Measurement.new(:yahoo)
+      @yahoo.current = Data::CurrentMeasurement.new
       @yahoo.success = true
-      @google = Barometer::Measurement.new(:google)
+      @google = Data::Measurement.new(:google)
       @weather.measurements << @wunderground
       @weather.measurements << @yahoo
       @weather.measurements << @google
     end
     
     it "doesn't include nil values" do
-      @weather.source(:wunderground).current.temperature = Barometer::Temperature.new
+      @weather.source(:wunderground).current.temperature = Data::Temperature.new
       @weather.source(:wunderground).current.temperature.c = 10
       
       @weather.temperature.c.should == 10
       
-      @weather.source(:yahoo).current.temperature = Barometer::Temperature.new
+      @weather.source(:yahoo).current.temperature = Data::Temperature.new
       @weather.source(:yahoo).current.temperature.c = nil
       
       @weather.temperature.c.should == 10
     end
     
+    it "respects the measurement weight" do
+      @weather.source(:wunderground).current.temperature = Data::Temperature.new
+      @weather.source(:wunderground).current.temperature.c = 10
+      @weather.source(:yahoo).current.temperature = Data::Temperature.new
+      @weather.source(:yahoo).current.temperature.c = 4
+      
+      @weather.measurements.first.weight = 2
+      
+      @weather.temperature.c.should == 8
+    end
+    
     describe "for temperature" do
       
       before(:each) do
-        @weather.source(:wunderground).current.temperature = Barometer::Temperature.new
+        @weather.source(:wunderground).current.temperature = Data::Temperature.new
         @weather.source(:wunderground).current.temperature.c = 10
-        @weather.source(:yahoo).current.temperature = Barometer::Temperature.new
+        @weather.source(:yahoo).current.temperature = Data::Temperature.new
         @weather.source(:yahoo).current.temperature.c = 6
       end
 
@@ -128,9 +139,9 @@ describe "Weather" do
     describe "for wind" do
       
       before(:each) do
-        @weather.source(:wunderground).current.wind = Barometer::Speed.new
+        @weather.source(:wunderground).current.wind = Data::Speed.new
         @weather.source(:wunderground).current.wind.kph = 10
-        @weather.source(:yahoo).current.wind = Barometer::Speed.new
+        @weather.source(:yahoo).current.wind = Data::Speed.new
         @weather.source(:yahoo).current.wind.kph = 6
       end
 
@@ -164,9 +175,9 @@ describe "Weather" do
     describe "for pressure" do
       
       before(:each) do
-        @weather.source(:wunderground).current.pressure = Barometer::Pressure.new
+        @weather.source(:wunderground).current.pressure = Data::Pressure.new
         @weather.source(:wunderground).current.pressure.mb = 10
-        @weather.source(:yahoo).current.pressure = Barometer::Pressure.new
+        @weather.source(:yahoo).current.pressure = Data::Pressure.new
         @weather.source(:yahoo).current.pressure.mb = 6
       end
 
@@ -183,9 +194,9 @@ describe "Weather" do
     describe "for dew_point" do
       
       before(:each) do
-        @weather.source(:wunderground).current.dew_point = Barometer::Temperature.new
+        @weather.source(:wunderground).current.dew_point = Data::Temperature.new
         @weather.source(:wunderground).current.dew_point.c = 10
-        @weather.source(:yahoo).current.dew_point = Barometer::Temperature.new
+        @weather.source(:yahoo).current.dew_point = Data::Temperature.new
         @weather.source(:yahoo).current.dew_point.c = 6
       end
 
@@ -202,9 +213,9 @@ describe "Weather" do
     describe "for heat_index" do
       
       before(:each) do
-        @weather.source(:wunderground).current.heat_index = Barometer::Temperature.new
+        @weather.source(:wunderground).current.heat_index = Data::Temperature.new
         @weather.source(:wunderground).current.heat_index.c = 10
-        @weather.source(:yahoo).current.heat_index = Barometer::Temperature.new
+        @weather.source(:yahoo).current.heat_index = Data::Temperature.new
         @weather.source(:yahoo).current.heat_index.c = 6
       end
 
@@ -221,9 +232,9 @@ describe "Weather" do
     describe "for wind_chill" do
       
       before(:each) do
-        @weather.source(:wunderground).current.wind_chill = Barometer::Temperature.new
+        @weather.source(:wunderground).current.wind_chill = Data::Temperature.new
         @weather.source(:wunderground).current.wind_chill.c = 10
-        @weather.source(:yahoo).current.wind_chill = Barometer::Temperature.new
+        @weather.source(:yahoo).current.wind_chill = Data::Temperature.new
         @weather.source(:yahoo).current.wind_chill.c = 6
       end
 
@@ -240,9 +251,9 @@ describe "Weather" do
     describe "for visibility" do
       
       before(:each) do
-        @weather.source(:wunderground).current.visibility = Barometer::Distance.new
+        @weather.source(:wunderground).current.visibility = Data::Distance.new
         @weather.source(:wunderground).current.visibility.km = 10
-        @weather.source(:yahoo).current.visibility = Barometer::Distance.new
+        @weather.source(:yahoo).current.visibility = Data::Distance.new
         @weather.source(:yahoo).current.visibility.km = 6
       end
 
@@ -262,6 +273,7 @@ describe "Weather" do
     
     before(:each) do
       @weather = Barometer::Weather.new
+      @now = Data::LocalDateTime.parse("2:05 pm")
     end
     
     describe "windy?" do
@@ -272,9 +284,9 @@ describe "Weather" do
         lambda { @weather.windy?(1.1) }.should_not raise_error(ArgumentError)
       end
       
-      it "requires time as a Time object" do
-        lambda { @weather.windy?(1,"a") }.should raise_error(ArgumentError)
-        lambda { @weather.windy?(1,Time.now.utc) }.should_not raise_error(ArgumentError)
+      it "requires time as a Data::LocalTime object" do
+        #lambda { @weather.windy?(1,"a") }.should raise_error(ArgumentError)
+        lambda { @weather.windy?(1,@now) }.should_not raise_error(ArgumentError)
       end
       
       it "returns nil when no measurements" do
@@ -283,20 +295,20 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def windy?(a=nil,b=nil); true; end
         end; end
         @weather.windy?.should be_true
       end
 
       it "returns false if a measurement returns false" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def windy?(a=nil,b=nil); false; end
         end; end
         @weather.windy?.should be_false
@@ -312,9 +324,9 @@ describe "Weather" do
         lambda { @weather.wet?(1.1) }.should_not raise_error(ArgumentError)
       end
       
-      it "requires time as a Time object" do
-        lambda { @weather.wet?(1,"a") }.should raise_error(ArgumentError)
-        lambda { @weather.wet?(1,Time.now.utc) }.should_not raise_error(ArgumentError)
+      it "requires time as a Data::LocalTime object" do
+        #lambda { @weather.wet?(1,"a") }.should raise_error(ArgumentError)
+        lambda { @weather.wet?(1,@now) }.should_not raise_error(ArgumentError)
       end
       
       it "returns nil when no measurements" do
@@ -323,20 +335,20 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def wet?(a=nil,b=nil); true; end
         end; end
         @weather.wet?.should be_true
       end
 
       it "returns false if a measurement returns false" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def wet?(a=nil,b=nil); false; end
         end; end
         @weather.wet?.should be_false
@@ -346,14 +358,14 @@ describe "Weather" do
     
     describe "day? and night?" do
       
-      it "requires time as a Time object" do
-        lambda { @weather.day?("a") }.should raise_error(ArgumentError)
-        lambda { @weather.day?(Time.now.utc) }.should_not raise_error(ArgumentError)
+      it "requires time as a Data::LocalTime object" do
+        #lambda { @weather.day?("a") }.should raise_error(ArgumentError)
+        lambda { @weather.day?(@now) }.should_not raise_error(ArgumentError)
       end
       
-      it "requires time as a Time object" do
-        lambda { @weather.night?("a") }.should raise_error(ArgumentError)
-        lambda { @weather.night?(Time.now.utc) }.should_not raise_error(ArgumentError)
+      it "requires time as a Data::LocalTime object" do
+        #lambda { @weather.night?("a") }.should raise_error(ArgumentError)
+        lambda { @weather.night?(@now) }.should_not raise_error(ArgumentError)
       end
       
       it "returns nil when no measurements" do
@@ -363,10 +375,10 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true (night is opposite)" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def day?(a=nil); true; end
         end; end
         @weather.day?.should be_true
@@ -374,10 +386,10 @@ describe "Weather" do
       end
 
       it "returns false if a measurement returns false (night is opposite)" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def day?(a=nil); false; end
         end; end
         @weather.day?.should be_false
@@ -388,9 +400,9 @@ describe "Weather" do
     
     describe "sunny?" do
       
-      it "requires time as a Time object" do
-        lambda { @weather.sunny?("a") }.should raise_error(ArgumentError)
-        lambda { @weather.sunny?(Time.now.utc) }.should_not raise_error(ArgumentError)
+      it "requires time as a Data::LocalTime object" do
+        #lambda { @weather.sunny?("a") }.should raise_error(ArgumentError)
+        lambda { @weather.sunny?(@now) }.should_not raise_error(ArgumentError)
       end
       
       it "returns nil when no measurements" do
@@ -399,40 +411,40 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def day?(a=nil); true; end
         end; end
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def sunny?(a=nil,b=nil); true; end
         end; end
         @weather.sunny?.should be_true
       end
 
       it "returns false if a measurement returns false" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def day?(a=nil); true; end
         end; end
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def sunny?(a=nil,b=nil); false; end
         end; end
         @weather.sunny?.should be_false
       end
       
       it "returns false if night time" do
-        wunderground = Barometer::Measurement.new(:wunderground)
+        wunderground = Data::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def sunny?(a=nil,b=nil); true; end
         end; end
         @weather.sunny?.should be_true
-        module Barometer; class Measurement
+        module Barometer; class Data::Measurement
             def day?(a=nil); false; end
         end; end
         @weather.sunny?.should be_false