barometer 0.5.0 → 0.6.1

data/spec/weather_services/wunderground_spec.rb

@@ -11,15 +11,19 @@ describe "Wunderground" do
   describe "the class methods" do
     
     it "defines accepted_formats" do
-      WeatherService::Wunderground.accepted_formats.should == @accepted_formats
+      WeatherService::Wunderground._accepted_formats.should == @accepted_formats
     end
     
-    it "defines get_current" do
-      WeatherService::Wunderground.respond_to?("get_current").should be_true
+    it "defines source_name" do
+      WeatherService::Wunderground._source_name.should == :wunderground
     end
     
-    it "defines get_forecast" do
-      WeatherService::Wunderground.respond_to?("get_forecast").should be_true
+    it "defines fetch_current" do
+      WeatherService::Wunderground.respond_to?("_fetch_current").should be_true
+    end
+    
+    it "defines fetch_forecast" do
+      WeatherService::Wunderground.respond_to?("_fetch_forecast").should be_true
     end
     
   end
@@ -27,18 +31,18 @@ describe "Wunderground" do
   describe "building the current data" do
     
     it "defines the build method" do
-      WeatherService::Wunderground.respond_to?("build_current").should be_true
+      WeatherService::Wunderground.respond_to?("_build_current").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Wunderground.build_current }.should raise_error(ArgumentError)
-      WeatherService::Wunderground.build_current({})
-      lambda { WeatherService::Wunderground.build_current({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_current }.should raise_error(ArgumentError)
+      WeatherService::Wunderground._build_current({})
+      lambda { WeatherService::Wunderground._build_current({}) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Barometer::CurrentMeasurement object" do
-      current = WeatherService::Wunderground.build_current({})
-      current.is_a?(Data::CurrentMeasurement).should be_true
+      current = WeatherService::Wunderground._build_current({})
+      current.is_a?(Measurement::Current).should be_true
     end
     
   end
@@ -46,16 +50,16 @@ describe "Wunderground" do
   describe "building the forecast data" do
     
     it "defines the build method" do
-      WeatherService::Wunderground.respond_to?("build_forecast").should be_true
+      WeatherService::Wunderground.respond_to?("_build_forecast").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Wunderground.build_forecast }.should raise_error(ArgumentError)
-      lambda { WeatherService::Wunderground.build_forecast({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_forecast }.should raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_forecast({}) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Array object" do
-      current = WeatherService::Wunderground.build_forecast({})
+      current = WeatherService::Wunderground._build_forecast({})
       current.is_a?(Array).should be_true
     end
     
@@ -64,16 +68,16 @@ describe "Wunderground" do
   describe "building the station data" do
     
     it "defines the build method" do
-      WeatherService::Wunderground.respond_to?("build_station").should be_true
+      WeatherService::Wunderground.respond_to?("_build_station").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Wunderground.build_station }.should raise_error(ArgumentError)
-      lambda { WeatherService::Wunderground.build_station({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_station }.should raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_station({}) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Barometer::Location object" do
-      station = WeatherService::Wunderground.build_station({})
+      station = WeatherService::Wunderground._build_station({})
       station.is_a?(Data::Location).should be_true
     end
     
@@ -82,16 +86,16 @@ describe "Wunderground" do
   describe "building the location data" do
     
     it "defines the build method" do
-      WeatherService::Wunderground.respond_to?("build_location").should be_true
+      WeatherService::Wunderground.respond_to?("_build_location").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Wunderground.build_location }.should raise_error(ArgumentError)
-      lambda { WeatherService::Wunderground.build_location({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_location }.should raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_location({}) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Barometer::Location object" do
-      location = WeatherService::Wunderground.build_location({})
+      location = WeatherService::Wunderground._build_location({})
       location.is_a?(Data::Location).should be_true
     end
     
@@ -100,39 +104,34 @@ describe "Wunderground" do
   describe "building the timezone" do
     
     it "defines the build method" do
-      WeatherService::Wunderground.respond_to?("build_timezone").should be_true
+      WeatherService::Wunderground.respond_to?("_parse_full_timezone").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Wunderground.build_timezone }.should raise_error(ArgumentError)
-      lambda { WeatherService::Wunderground.build_timezone({}) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._parse_full_timezone }.should raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._parse_full_timezone({}) }.should_not raise_error(ArgumentError)
     end
     
   end
   
   describe "building the sun data" do
        
-    before(:each) do
-      @zone = Data::Zone.new("Europe/Paris")
-    end
-
     it "defines the build method" do
-      WeatherService::Wunderground.respond_to?("build_sun").should be_true
+      WeatherService::Wunderground.respond_to?("_build_sun").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Wunderground.build_sun }.should raise_error(ArgumentError)
-      lambda { WeatherService::Wunderground.build_sun({},@zone) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_sun }.should raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_sun({}) }.should_not raise_error(ArgumentError)
     end
     
     it "requires Barometer::Zone input" do
-      lambda { WeatherService::Wunderground.build_sun({}) }.should raise_error(ArgumentError)
-      lambda { WeatherService::Wunderground.build_sun({}, "invalid") }.should raise_error(ArgumentError)
-      lambda { WeatherService::Wunderground.build_sun({},@zone) }.should_not raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_sun({}, "invalid") }.should raise_error(ArgumentError)
+      lambda { WeatherService::Wunderground._build_sun({}) }.should_not raise_error(ArgumentError)
     end
     
     it "returns Barometer::Sun object" do
-      sun = WeatherService::Wunderground.build_sun({},@zone)
+      sun = WeatherService::Wunderground._build_sun({})
       sun.is_a?(Data::Sun).should be_true
     end
     
@@ -142,7 +141,7 @@ describe "Wunderground" do
 
     before(:each) do
       @query = Barometer::Query.new("Calgary,AB")
-      @measurement = Data::Measurement.new
+      @measurement = Barometer::Measurement.new
       
       FakeWeb.register_uri(:get, 
         "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=#{CGI.escape(@query.q)}",
@@ -182,114 +181,20 @@ describe "Wunderground" do
       
       it "returns a Barometer::Measurement object" do
         result = WeatherService::Wunderground._measure(@measurement, @query)
-        result.is_a?(Data::Measurement).should be_true
-        result.current.is_a?(Data::CurrentMeasurement).should be_true
+        result.is_a?(Barometer::Measurement).should be_true
+        result.current.is_a?(Measurement::Current).should be_true
         result.forecast.is_a?(Array).should be_true
-        
-        result.source.should == :wunderground
-      end
-      
-    end
-
-  end
-  
-  describe "when answering the simple questions," do
-    
-    before(:each) do
-      @measurement = Data::Measurement.new
-    end
-    
-    describe "currently_wet_by_icon?" do
-      
-      before(:each) do
-        @measurement.current = Data::CurrentMeasurement.new
-      end
-
-      it "returns true if matching icon code" do
-        @measurement.current.icon = "rain"
-        @measurement.current.icon?.should be_true
-        WeatherService::Wunderground.currently_wet_by_icon?(@measurement.current).should be_true
-      end
-      
-      it "returns false if NO matching icon code" do
-        @measurement.current.icon = "sunny"
-        @measurement.current.icon?.should be_true
-        WeatherService::Wunderground.currently_wet_by_icon?(@measurement.current).should be_false
-      end
-      
-    end
-    
-    describe "forecasted_wet_by_icon?" do
-      
-      before(:each) do
-        @measurement.forecast = [Data::ForecastMeasurement.new]
-        @measurement.forecast.first.date = Date.today
-        @measurement.forecast.size.should == 1
-      end
-
-      it "returns true if matching icon code" do
-        @measurement.forecast.first.icon = "rain"
-        @measurement.forecast.first.icon?.should be_true
-        WeatherService::Wunderground.forecasted_wet_by_icon?(@measurement.forecast.first).should be_true
-      end
-      
-      it "returns false if NO matching icon code" do
-        @measurement.forecast.first.icon = "sunny"
-        @measurement.forecast.first.icon?.should be_true
-        WeatherService::Wunderground.forecasted_wet_by_icon?(@measurement.forecast.first).should be_false
-      end
-      
-    end
-    
-    describe "currently_sunny_by_icon?" do
-      
-      before(:each) do
-        @measurement.current = Data::CurrentMeasurement.new
-      end
-
-      it "returns true if matching icon code" do
-        @measurement.current.icon = "sunny"
-        @measurement.current.icon?.should be_true
-        WeatherService::Wunderground.currently_sunny_by_icon?(@measurement.current).should be_true
-      end
-      
-      it "returns false if NO matching icon code" do
-        @measurement.current.icon = "rain"
-        @measurement.current.icon?.should be_true
-        WeatherService::Wunderground.currently_sunny_by_icon?(@measurement.current).should be_false
       end
       
     end
-    
-    describe "forecasted_sunny_by_icon?" do
-      
-      before(:each) do
-        @measurement.forecast = [Data::ForecastMeasurement.new]
-        @measurement.forecast.first.date = Date.today
-        @measurement.forecast.size.should == 1
-      end
 
-      it "returns true if matching icon code" do
-        @measurement.forecast.first.icon = "sunny"
-        @measurement.forecast.first.icon?.should be_true
-        WeatherService::Wunderground.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_true
-      end
-      
-      it "returns false if NO matching icon code" do
-        @measurement.forecast.first.icon = "rain"
-        @measurement.forecast.first.icon?.should be_true
-        WeatherService::Wunderground.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_false
-      end
-      
-    end
-    
   end
   
   describe "overall data correctness" do
     
     before(:each) do
       @query = Barometer::Query.new("Calgary,AB")
-      @measurement = Data::Measurement.new
+      @measurement = Barometer::Measurement.new
       
       FakeWeb.register_uri(:get, 
         "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=#{CGI.escape(@query.q)}",
@@ -312,7 +217,8 @@ describe "Wunderground" do
       result = WeatherService::Wunderground._measure(@measurement, @query)
       
       # build timezone
-      @measurement.timezone.timezone.should == "America/Edmonton"
+      @measurement.timezone.zone_full.should == "America/Edmonton"
+      @measurement.timezone.current.should == "America/Edmonton"
       
       # time = Time.local(2009, 4, 23, 18, 00, 0)
       # rise = Time.local(time.year, time.month, time.day, 6, 23)

data/spec/weather_services/yahoo_spec.rb

@@ -11,11 +11,15 @@ describe "Yahoo" do
   describe "the class methods" do
     
     it "defines accepted_formats" do
-      WeatherService::Yahoo.accepted_formats.should == @accepted_formats
+      WeatherService::Yahoo._accepted_formats.should == @accepted_formats
+    end
+    
+    it "defines source_name" do
+      WeatherService::Yahoo._source_name.should == :yahoo
     end
     
     it "defines get_all" do
-      WeatherService::Yahoo.respond_to?("fetch").should be_true
+      WeatherService::Yahoo.respond_to?("_fetch").should be_true
     end
     
   end
@@ -23,17 +27,17 @@ describe "Yahoo" do
   describe "building the current data" do
     
     it "defines the build method" do
-      WeatherService::Yahoo.respond_to?("build_current").should be_true
+      WeatherService::Yahoo.respond_to?("_build_current").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Yahoo.build_current }.should raise_error(ArgumentError)
-      lambda { WeatherService::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 = WeatherService::Yahoo.build_current({})
-      current.is_a?(Data::CurrentMeasurement).should be_true
+      current = WeatherService::Yahoo._build_current({})
+      current.is_a?(Measurement::Current).should be_true
     end
     
   end
@@ -41,16 +45,16 @@ describe "Yahoo" do
   describe "building the forecast data" do
     
     it "defines the build method" do
-      WeatherService::Yahoo.respond_to?("build_forecast").should be_true
+      WeatherService::Yahoo.respond_to?("_build_forecast").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Yahoo.build_forecast }.should raise_error(ArgumentError)
-      lambda { WeatherService::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 = WeatherService::Yahoo.build_forecast({})
+      current = WeatherService::Yahoo._build_forecast({})
       current.is_a?(Array).should be_true
     end
     
@@ -59,22 +63,22 @@ describe "Yahoo" do
   describe "building the location data" do
     
     it "defines the build method" do
-      WeatherService::Yahoo.respond_to?("build_location").should be_true
+      WeatherService::Yahoo.respond_to?("_build_location").should be_true
     end
     
     it "requires Hash input" do
-      lambda { WeatherService::Yahoo.build_location }.should raise_error(ArgumentError)
-      lambda { WeatherService::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 = Data::Geo.new({})
-      lambda { WeatherService::Yahoo.build_location({}, {}) }.should raise_error(ArgumentError)
-      lambda { WeatherService::Yahoo.build_location({}, geo) }.should_not raise_error(ArgumentError)
+      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 = WeatherService::Yahoo.build_location({})
+      location = WeatherService::Yahoo._build_location({})
       location.is_a?(Data::Location).should be_true
     end
     
@@ -84,7 +88,7 @@ describe "Yahoo" do
   
     before(:each) do
       @query = Barometer::Query.new("90210")
-      @measurement = Data::Measurement.new
+      @measurement = Barometer::Measurement.new
       
       FakeWeb.register_uri(:get, 
         "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.q)}",
@@ -111,120 +115,26 @@ describe "Yahoo" do
       it "requires a Barometer::Query query" do
         lambda { WeatherService::Yahoo._measure }.should raise_error(ArgumentError)
         lambda { WeatherService::Yahoo._measure(@measurement, 1) }.should raise_error(ArgumentError)
-        
+
         lambda { WeatherService::Yahoo._measure(@measurement, @query) }.should_not raise_error(ArgumentError)
       end
       
       it "returns a Barometer::Measurement object" do
         result = WeatherService::Yahoo._measure(@measurement, @query)
-        result.is_a?(Data::Measurement).should be_true
-        result.current.is_a?(Data::CurrentMeasurement).should be_true
+        result.is_a?(Barometer::Measurement).should be_true
+        result.current.is_a?(Measurement::Current).should be_true
         result.forecast.is_a?(Array).should be_true
-        
-        result.source.should == :yahoo
       end
       
     end
   
   end
   
-  describe "when answering the simple questions," do
-    
-    before(:each) do
-      @measurement = Data::Measurement.new
-    end
-    
-    describe "currently_wet_by_icon?" do
-      
-      before(:each) do
-        @measurement.current = Data::CurrentMeasurement.new
-      end
-
-      it "returns true if matching icon code" do
-        @measurement.current.icon = "4"
-        @measurement.current.icon?.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
-        WeatherService::Yahoo.currently_wet_by_icon?(@measurement.current).should be_false
-      end
-      
-    end
-    
-    describe "forecasted_wet_by_icon?" do
-      
-      before(:each) do
-        @measurement.forecast = [Data::ForecastMeasurement.new]
-        @measurement.forecast.first.date = Date.today
-        @measurement.forecast.size.should == 1
-      end
-
-      it "returns true if matching icon code" do
-        @measurement.forecast.first.icon = "4"
-        @measurement.forecast.first.icon?.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
-        WeatherService::Yahoo.forecasted_wet_by_icon?(@measurement.forecast.first).should be_false
-      end
-      
-    end
-    
-    describe "currently_sunny_by_icon?" do
-      
-      before(:each) do
-        @measurement.current = Data::CurrentMeasurement.new
-      end
-
-      it "returns true if matching icon code" do
-        @measurement.current.icon = "32"
-        @measurement.current.icon?.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
-        WeatherService::Yahoo.currently_sunny_by_icon?(@measurement.current).should be_false
-      end
-      
-    end
-    
-    describe "forecasted_sunny_by_icon?" do
-      
-      before(:each) do
-        @measurement.forecast = [Data::ForecastMeasurement.new]
-        @measurement.forecast.first.date = Date.today
-        @measurement.forecast.size.should == 1
-      end
-
-      it "returns true if matching icon code" do
-        @measurement.forecast.first.icon = "32"
-        @measurement.forecast.first.icon?.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
-        WeatherService::Yahoo.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_false
-      end
-      
-    end
-    
-  end
-  
   describe "overall data correctness" do
     
     before(:each) do
       @query = Barometer::Query.new("90210")
-      @measurement = Data::Measurement.new
+      @measurement = Barometer::Measurement.new
 
       FakeWeb.register_uri(:get, 
         "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.q)}",