attack-barometer 0.5.0 → 0.6.0

data/spec/data/sun_spec.rb

@@ -46,4 +46,57 @@ describe "Data::Sun" do
     
   end
   
+  describe "comparisons" do
+    
+    before(:each) do
+      now = Time.local(2009,5,5,11,40,00)
+      @mid_time = Data::LocalTime.new.parse(now)
+      @early_time = Data::LocalTime.new.parse(now - (60*60*8))
+      @late_time = Data::LocalTime.new.parse(now + (60*60*8))
+    end
+    
+    describe "after_rise?" do
+      
+      it "requires a LocalTime object" do
+        sun = Data::Sun.new(@early_time,@late_time)
+        lambda { sun.after_rise? }.should raise_error(ArgumentError)
+        lambda { sun.after_rise?("invalid") }.should raise_error(ArgumentError)
+        lambda { sun.after_rise?(@mid_time) }.should_not raise_error(ArgumentError)
+      end
+      
+      it "returns true when after sun rise" do
+        sun = Data::Sun.new(@early_time,@late_time)
+        sun.after_rise?(@mid_time).should be_true
+      end
+      
+      it "returns false when before sun rise" do
+        sun = Data::Sun.new(@mid_time,@late_time)
+        sun.after_rise?(@early_time).should be_false
+      end
+      
+    end
+    
+    describe "before_set?" do
+      
+      it "requires a LocalTime object" do
+        sun = Data::Sun.new(@early_time,@late_time)
+        lambda { sun.before_set? }.should raise_error(ArgumentError)
+        lambda { sun.before_set?("invalid") }.should raise_error(ArgumentError)
+        lambda { sun.before_set?(@mid_time) }.should_not raise_error(ArgumentError)
+      end
+      
+      it "returns true when before sun set" do
+        sun = Data::Sun.new(@early_time,@late_time)
+        sun.before_set?(@mid_time).should be_true
+      end
+      
+      it "returns false when before sun set" do
+        sun = Data::Sun.new(@early_time,@mid_time)
+        sun.before_set?(@late_time).should be_false
+      end
+      
+    end
+    
+  end
+  
 end

data/spec/data/zone_spec.rb

@@ -2,130 +2,360 @@ require 'spec_helper'
 
 describe "Data::Zone" do
   
-  describe "and class methods" do
-    
-    it "responds to now and returns Time object" do
-      Data::Zone.respond_to?("now").should be_true
-      Data::Zone.now.is_a?(Time).should be_true
-    end
-
-    it "responds to today and returns Date object" do
-      Data::Zone.respond_to?("today").should be_true
-      Data::Zone.today.is_a?(Date).should be_true
-    end
-    
-  end
+  # describe "and class methods" do
+  #   
+  #   it "responds to now and returns Time object" do
+  #     Data::Zone.respond_to?("now").should be_true
+  #     Data::Zone.now.is_a?(Time).should be_true
+  #   end
+  # 
+  #   it "responds to today and returns Date object" do
+  #     Data::Zone.respond_to?("today").should be_true
+  #     Data::Zone.today.is_a?(Date).should be_true
+  #   end
+  #   
+  # end
   
   describe "when initialized" do
     
-    before(:each) do
-      @utc = Time.now.utc
-      @timezone = "Europe/Paris"
-      @zone = Data::Zone.new(@timezone)
-    end
+    describe "with a full zone" do
     
-    it "responds to timezone" do
-      @zone.timezone.should_not be_nil
-      @zone.timezone.should == @timezone
-    end
+      before(:each) do
+        @utc = Time.now.utc
+        @timezone = "Europe/Paris"
+        @zone = Data::Zone.new(@timezone)
+      end
     
-    it "responds to tz" do
-      lambda { Data::Zone.new("invalid timezone") }.should raise_error(TZInfo::InvalidTimezoneIdentifier)
-      
-      zone = Data::Zone.new(@timezone)
-      zone.tz.should_not be_nil
-    end
+      it "responds to zone_full" do
+        @zone.zone_full.should_not be_nil
+        @zone.zone_full.should == @timezone
+      end
     
-    it "responds to code" do
-      @zone.respond_to?("code").should be_true
-      zone = Data::Zone.new(@timezone)
-      zone.tz = nil
-      zone.tz.should be_nil
-      zone.code.should == ""
+      it "responds to zone_code" do
+        @zone.zone_code.should be_nil
+      end
+
+      it "responds to zone_offset" do
+        @zone.zone_offset.should be_nil
+      end
+
+      it "responds to tz" do
+        lambda { Data::Zone.new("invalid timezone") }.should raise_error(ArgumentError)
       
-      zone = Data::Zone.new(@timezone)
-      zone.code.should == "CEST"
-    end
+        zone = Data::Zone.new(@timezone)
+        zone.tz.should_not be_nil
+      end
     
-    it "responds to dst?" do
-      @zone.respond_to?("dst?").should be_true
-      zone = Data::Zone.new(@timezone)
-      zone.tz = nil
-      zone.tz.should be_nil
-      zone.dst?.should be_nil
-    end
+      it "responds to full" do
+        @zone.respond_to?("full").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.full.should == @timezone
+      
+        zone = Data::Zone.new(@timezone)
+        zone.full.should == @timezone
+      end
     
-    it "responds to now" do
-      @zone.respond_to?("now").should be_true
-      @zone.now.is_a?(Time).should be_true
-    end
+      it "responds to code" do
+        @zone.respond_to?("code").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.code.should be_nil
 
-    it "responds to today" do
-      @zone.respond_to?("today").should be_true
-      @zone.today.is_a?(Date).should be_true
-    end
+        zone = Data::Zone.new(@timezone)
+        zone.code.should == "CEST"
+      end
+
+      it "responds to dst?" do
+        @zone.respond_to?("dst?").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.dst?.should be_nil
+      end
     
-    it "responds to now" do
-      Data::Zone.respond_to?("now").should be_true
-    end
+      it "responds to now" do
+        @zone.respond_to?("now").should be_true
+        @zone.now.is_a?(Time).should be_true
+        
+        period = @zone.tz.period_for_utc(Time.now)
+        actual_now = Time.now.utc + period.utc_total_offset
+        
+        now = @zone.now
+        now.hour.should == actual_now.hour
+        now.min.should == actual_now.min
+        now.sec.should == actual_now.sec
+        now.year.should == actual_now.year
+        now.month.should == actual_now.month
+        now.day.should == actual_now.day
+      end
     
-    it "responds to today" do
-      Data::Zone.respond_to?("today").should be_true
+      it "responds to today" do
+        @zone.respond_to?("today").should be_true
+        @zone.today.is_a?(Date).should be_true
+        
+        period = @zone.tz.period_for_utc(Time.now)
+        actual_now = Time.now.utc + period.utc_total_offset
+        
+        now = @zone.today
+        now.year.should == actual_now.year
+        now.month.should == actual_now.month
+        now.day.should == actual_now.day
+      end
+    
+      it "converts local_time to utc" do
+        local_time = Time.now.utc
+        utc_time = @zone.local_to_utc(local_time)
+      
+        offset =  @zone.tz.period_for_utc(local_time).utc_total_offset
+        utc_time.should == (local_time - offset)
+      end
+    
+      it "converts utc to local_time" do
+        utc_time = Time.now.utc
+        local_time = @zone.utc_to_local(utc_time)
+      
+        offset =  @zone.tz.period_for_utc(local_time).utc_total_offset
+        utc_time.should == (local_time - offset)
+      end
+      
     end
     
-    it "converts local_time to utc" do
-      local_time = Time.now.utc
-      utc_time = @zone.local_to_utc(local_time)
+    describe "with a zone code" do
       
-      offset =  @zone.tz.period_for_utc(local_time).utc_total_offset
-      utc_time.should == (local_time - offset)
+      before(:each) do
+        @utc = Time.now.utc
+        @timezone = "EAST"
+        @zone = Data::Zone.new(@timezone)
+      end
+
+      it "responds to zone_code" do
+        @zone.zone_code.should_not be_nil
+        @zone.zone_code.should == @timezone
+      end
+
+      it "responds to zone_full" do
+        @zone.zone_full.should be_nil
+      end
+
+      it "responds to zone_offset" do
+        @zone.zone_offset.should be_nil
+      end
+
+      it "responds to tz" do
+        zone = Data::Zone.new(@timezone)
+        zone.tz.should be_nil
+      end
+
+      it "responds to code" do
+        @zone.respond_to?("code").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.code.should == @timezone
+
+        zone = Data::Zone.new(@timezone)
+        zone.code.should == @timezone
+      end
+
+      it "responds to full" do
+        @zone.respond_to?("full").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.full.should be_nil
+
+        zone = Data::Zone.new(@timezone)
+        zone.full.should be_nil
+      end
+
+      it "responds to now" do
+        @zone.respond_to?("now").should be_true
+        @zone.now.is_a?(Time).should be_true
+
+        actual_now = Time.now.utc + (-6*60*60)
+
+        now = @zone.now
+        now.hour.should == actual_now.hour
+        now.min.should == actual_now.min
+        now.sec.should == actual_now.sec
+        now.year.should == actual_now.year
+        now.month.should == actual_now.month
+        now.day.should == actual_now.day
+      end
+
+      it "responds to today" do
+        @zone.respond_to?("today").should be_true
+        @zone.today.is_a?(Date).should be_true
+
+        actual_now = Time.now.utc + (-6*60*60)
+
+        now = @zone.today
+        now.year.should == actual_now.year
+        now.month.should == actual_now.month
+        now.day.should == actual_now.day
+      end
+
+      it "converts local_time to utc" do
+        local_time = Time.now.utc
+        utc_time = @zone.local_to_utc(local_time)
+
+        utc_time.year.should == (local_time - @zone.offset).year
+        utc_time.month.should == (local_time - @zone.offset).month
+        utc_time.day.should == (local_time - @zone.offset).day
+        utc_time.hour.should == (local_time - @zone.offset).hour
+        utc_time.min.should == (local_time - @zone.offset).min
+        utc_time.sec.should == (local_time - @zone.offset).sec
+      end
+
+      it "converts utc to local_time" do
+        utc_time = Time.now.utc
+        local_time = @zone.utc_to_local(utc_time)
+
+        local_time.year.should == (utc_time + @zone.offset).year
+        local_time.month.should == (utc_time + @zone.offset).month
+        local_time.day.should == (utc_time + @zone.offset).day
+        local_time.hour.should == (utc_time + @zone.offset).hour
+        local_time.min.should == (utc_time + @zone.offset).min
+        local_time.sec.should == (utc_time + @zone.offset).sec
+      end
+
     end
     
-    it "converts utc to local_time" do
-      utc_time = Time.now.utc
-      local_time = @zone.utc_to_local(utc_time)
+    describe "with a zone offset" do
       
-      offset =  @zone.tz.period_for_utc(local_time).utc_total_offset
-      utc_time.should == (local_time - offset)
+      before(:each) do
+        @utc = Time.now.utc
+        @timezone = 8.5
+        @zone = Data::Zone.new(@timezone)
+      end
+
+      it "responds to zone_offset" do
+        @zone.zone_offset.should_not be_nil
+        @zone.zone_offset.should == @timezone
+      end
+
+      it "responds to zone_full" do
+        @zone.zone_full.should be_nil
+      end
+
+      it "responds to zone_code" do
+        @zone.zone_code.should be_nil
+      end
+
+      it "responds to tz" do
+        zone = Data::Zone.new(@timezone)
+        zone.tz.should be_nil
+      end
+
+      it "responds to offset" do
+        @zone.respond_to?("offset").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.offset.should == (@timezone * 60 * 60)
+
+        zone = Data::Zone.new(@timezone)
+        zone.offset.should == (@timezone * 60 * 60)
+      end
+
+      it "responds to full" do
+        @zone.respond_to?("full").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.full.should be_nil
+
+        zone = Data::Zone.new(@timezone)
+        zone.full.should be_nil
+      end
+
+      it "responds to code" do
+        @zone.respond_to?("code").should be_true
+        zone = Data::Zone.new(@timezone)
+        zone.tz = nil
+        zone.tz.should be_nil
+        zone.code.should be_nil
+
+        zone = Data::Zone.new(@timezone)
+        zone.code.should be_nil
+      end
+
+      it "responds to now" do
+        @zone.respond_to?("now").should be_true
+        @zone.now.is_a?(Time).should be_true
+
+        actual_now = Time.now.utc + (@timezone.to_f*60*60)
+
+        now = @zone.now
+        now.hour.should == actual_now.hour
+        now.min.should == actual_now.min
+        now.sec.should == actual_now.sec
+        now.year.should == actual_now.year
+        now.month.should == actual_now.month
+        now.day.should == actual_now.day
+      end
+
+      it "responds to today" do
+        @zone.respond_to?("today").should be_true
+        @zone.today.is_a?(Date).should be_true
+
+        actual_now = Time.now.utc + (@timezone.to_f*60*60)
+
+        now = @zone.today
+        now.year.should == actual_now.year
+        now.month.should == actual_now.month
+        now.day.should == actual_now.day
+      end
+
+      it "converts local_time to utc" do
+        local_time = Time.now.utc
+        utc_time = @zone.local_to_utc(local_time)
+
+        utc_time.year.should == (local_time - @zone.offset).year
+        utc_time.month.should == (local_time - @zone.offset).month
+        utc_time.day.should == (local_time - @zone.offset).day
+        utc_time.hour.should == (local_time - @zone.offset).hour
+        utc_time.min.should == (local_time - @zone.offset).min
+        utc_time.sec.should == (local_time - @zone.offset).sec
+      end
+
+      it "converts utc to local_time" do
+        utc_time = Time.now.utc
+        local_time = @zone.utc_to_local(utc_time)
+
+        local_time.year.should == (utc_time + @zone.offset).year
+        local_time.month.should == (utc_time + @zone.offset).month
+        local_time.day.should == (utc_time + @zone.offset).day
+        local_time.hour.should == (utc_time + @zone.offset).hour
+        local_time.min.should == (utc_time + @zone.offset).min
+        local_time.sec.should == (utc_time + @zone.offset).sec
+      end
+
     end
     
   end
   
-  describe "when manipulating times" do
-    
-    it "converts a time to utc based on TimeZone Short Code" do
-      target_zone = "PDT"
-      target_offset = Time.zone_offset("PDT")
-      target_time = Time.now
-      local_time = target_time
-      local_offset = Time.zone_offset(local_time.zone)
-      
-      # converting two times (ie 6am PDT and 6am MDT) to UTC should result
-      # in two UTC times that are off by the same offset
-      original_difference = local_offset - target_offset
-      
-      target_utc_time = Data::Zone.code_to_utc(target_time, target_zone)
-      local_utc_time = local_time.utc
-      
-      (target_utc_time - local_time.utc).to_i.should == original_difference.to_i
+  describe "when detecting zones" do
+    
+    it "recognozes a full time zone format" do
+      Data::Zone.is_zone_full?("invalid").should be_false
+      Data::Zone.is_zone_full?("America/New York").should be_true
+    end
+    
+    it "matches a zone offset" do
+      Data::Zone.is_zone_offset?("invalid").should be_false
+      Data::Zone.is_zone_offset?("MST").should be_false
+      Data::Zone.is_zone_offset?("10").should be_false
+      Data::Zone.is_zone_offset?(-10).should be_true
     end
       
-    it "merges a date and a time to one utc time (biased by TimeZone Short Code)" do
-      merge_date = "1 March 1990"
-      merge_time = "5:35 am"
-      merge_zonecode = "UTC"
-      
-      date = Date.parse(merge_date)
-      time = Time.parse(merge_time)
-      
-      utc_time = Data::Zone.merge(merge_time, merge_date, merge_zonecode)
-      
-      utc_time.year.should == date.year
-      utc_time.month.should == date.month
-      utc_time.day.should == date.day
-      utc_time.hour.should == time.hour
-      utc_time.min.should == time.min
-      utc_time.sec.should == time.sec
+    it "matches a zone code" do
+      Data::Zone.is_zone_code?("invalid").should be_false
+      Data::Zone.is_zone_code?("MST").should be_true
+      Data::Zone.is_zone_code?("EAST").should be_true
     end
     
   end

data/spec/fixtures/formats/weather_id/ksfo.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- This document is intended only for use by authorized licensees of The --> <!-- Weather Channel. Unauthorized use is prohibited. Copyright 1995-2009, --> <!-- The Weather Channel Interactive, Inc. All Rights Reserved. --> <search ver="3.0"> <loc id="USCA0987" type="1">San Francisco, CA</loc> <loc id="USCA1085" type="1">South San Francisco, CA</loc> </search>

data/spec/fixtures/services/weather_bug/90210_current.xml

@@ -0,0 +1 @@
+<aws:weather xmlns:aws="http://www.aws.com/aws"><aws:api version="2.0" /><aws:WebURL>http://weather.weatherbug.com/CA/Los Angeles-weather.html?ZCode=Z5546&amp;Units=1&amp;stat=LSNGH</aws:WebURL><aws:InputLocationURL>http://weather.weatherbug.com/CA/Beverly Hills-weather.html?ZCode=Z5546&amp;Units=1</aws:InputLocationURL><aws:ob><aws:ob-date><aws:year number="2009" /><aws:month number="5" text="May" abbrv="May" /><aws:day number="15" text="Friday" abbrv="Fri" /><aws:hour number="11" hour-24="11" /><aws:minute number="00" /><aws:second number="02" /><aws:am-pm abbrv="AM" /><aws:time-zone offset="-7" text="Pacific Daylight Time" abbrv="PDT" /></aws:ob-date><aws:requested-station-id /><aws:station-id>LSNGH</aws:station-id><aws:station>Milken Community HS</aws:station><aws:city-state zipcode="90049">Los Angeles, CA</aws:city-state><aws:country>USA</aws:country><aws:latitude>34.1258316040039</aws:latitude><aws:longitude>-118.478332519531</aws:longitude><aws:site-url>http://www.milkenschool.org/</aws:site-url><aws:aux-temp units="&amp;deg;C">23.5</aws:aux-temp><aws:aux-temp-rate units="&amp;deg;C">-17.8</aws:aux-temp-rate><aws:current-condition icon="http://deskwx.weatherbug.com/images/Forecast/icons/cond023.gif">Hazy</aws:current-condition><aws:dew-point units="&amp;deg;C">14.4444444444444</aws:dew-point><aws:elevation units="m">383</aws:elevation><aws:feels-like units="&amp;deg;C">22</aws:feels-like><aws:gust-time><aws:year number="2009" /><aws:month number="5" text="May" abbrv="May" /><aws:day number="15" text="Friday" abbrv="Fri" /><aws:hour number="10" hour-24="10" /><aws:minute number="53" /><aws:second number="00" /><aws:am-pm abbrv="AM" /><aws:time-zone offset="-7" text="Pacific Daylight Time" abbrv="PDT" /></aws:gust-time><aws:gust-direction>SSE</aws:gust-direction><aws:gust-speed units="km/h">16</aws:gust-speed><aws:humidity units="%">62</aws:humidity><aws:humidity-high units="%">100</aws:humidity-high><aws:humidity-low units="%">62</aws:humidity-low><aws:humidity-rate>-9</aws:humidity-rate><aws:indoor-temp units="&amp;deg;C">46</aws:indoor-temp><aws:indoor-temp-rate units="&amp;deg;C">1</aws:indoor-temp-rate><aws:light>34.2</aws:light><aws:light-rate>0.4</aws:light-rate><aws:moon-phase moon-phase-img="http://api.wxbug.net/images/moonphase/mphase18.gif">71</aws:moon-phase><aws:pressure units="mb">1011.31</aws:pressure><aws:pressure-high units="mb">1,011.36</aws:pressure-high><aws:pressure-low units="mb">1,010.39</aws:pressure-low><aws:pressure-rate units="mb/h">0.23</aws:pressure-rate><aws:rain-month units="mm">0.00</aws:rain-month><aws:rain-rate units="mm/h">0.00</aws:rain-rate><aws:rain-rate-max units="mm/h">0.00</aws:rain-rate-max><aws:rain-today units="mm">0.00</aws:rain-today><aws:rain-year units="mm">38.35</aws:rain-year><aws:temp units="&amp;deg;C">22.2</aws:temp><aws:temp-high units="&amp;deg;C">22</aws:temp-high><aws:temp-low units="&amp;deg;C">13</aws:temp-low><aws:temp-rate units="&amp;deg;C/h">2.2</aws:temp-rate><aws:sunrise><aws:year number="2009" /><aws:month number="5" text="May" abbrv="May" /><aws:day number="15" text="Friday" abbrv="Fri" /><aws:hour number="5" hour-24="05" /><aws:minute number="52" /><aws:second number="17" /><aws:am-pm abbrv="AM" /><aws:time-zone offset="-7" text="Pacific Daylight Time" abbrv="PDT" /></aws:sunrise><aws:sunset><aws:year number="2009" /><aws:month number="5" text="May" abbrv="May" /><aws:day number="15" text="Friday" abbrv="Fri" /><aws:hour number="7" hour-24="19" /><aws:minute number="48" /><aws:second number="37" /><aws:am-pm abbrv="PM" /><aws:time-zone offset="-7" text="Pacific Daylight Time" abbrv="PDT" /></aws:sunset><aws:wet-bulb units="&amp;deg;C">17.39</aws:wet-bulb><aws:wind-speed units="km/h">11</aws:wind-speed><aws:wind-speed-avg units="km/h">8</aws:wind-speed-avg><aws:wind-direction>SE</aws:wind-direction><aws:wind-direction-avg>SE</aws:wind-direction-avg></aws:ob></aws:weather>

data/spec/fixtures/services/weather_bug/90210_forecast.xml

@@ -0,0 +1 @@
+<aws:weather xmlns:aws="http://www.aws.com/aws"><aws:api version="2.0" /><aws:WebURL>http://weather.weatherbug.com/CA/Beverly Hills-weather/local-forecast/7-day-forecast.html?ZCode=Z5546&amp;Units=1</aws:WebURL><aws:forecasts type="Detailed" date="5/15/2009 8:26:00 AM"><aws:location><aws:city>Beverly Hills</aws:city><aws:state>CA</aws:state><aws:zip>90210</aws:zip><aws:zone>CA041</aws:zone></aws:location><aws:forecast><aws:title alttitle="FRI">Friday</aws:title><aws:short-prediction>Partly Cloudy</aws:short-prediction><aws:image isNight="0" icon="cond003.gif">http://deskwx.weatherbug.com/images/Forecast/icons/cond003.gif</aws:image><aws:description>Friday</aws:description><aws:prediction>Areas of low clouds and fog in the morning then sunny. Highs in the upper 60s to mid 70s at the beaches to the lower 80s inland.</aws:prediction><aws:high units="&amp;deg;C">27</aws:high><aws:low units="&amp;deg;C">17</aws:low></aws:forecast><aws:forecast><aws:title alttitle="SAT">Saturday</aws:title><aws:short-prediction>Partly Cloudy</aws:short-prediction><aws:image isNight="0" icon="cond003.gif">http://deskwx.weatherbug.com/images/Forecast/icons/cond003.gif</aws:image><aws:description>Saturday</aws:description><aws:prediction>Areas of low clouds and fog in the morning then sunny. Highs in the lower to mid 70s at the beaches to the lower to mid 80s inland.</aws:prediction><aws:high units="&amp;deg;C">28</aws:high><aws:low units="&amp;deg;C">17</aws:low></aws:forecast><aws:forecast><aws:title alttitle="SUN">Sunday</aws:title><aws:short-prediction>Partly Cloudy</aws:short-prediction><aws:image isNight="0" icon="cond003.gif">http://deskwx.weatherbug.com/images/Forecast/icons/cond003.gif</aws:image><aws:description>Sunday</aws:description><aws:prediction>Areas of low clouds and fog in the morning then sunny. Highs in the lower to mid 70s at the beaches to the lower to mid 80s inland.</aws:prediction><aws:high units="&amp;deg;C">28</aws:high><aws:low units="&amp;deg;C">17</aws:low></aws:forecast><aws:forecast><aws:title alttitle="MON">Monday</aws:title><aws:short-prediction>Mostly Sunny</aws:short-prediction><aws:image isNight="0" icon="cond026.gif">http://deskwx.weatherbug.com/images/Forecast/icons/cond026.gif</aws:image><aws:description>Monday</aws:description><aws:prediction>Areas of low clouds and fog in the morning then mostly sunny. Highs around 70 at the beaches to around 80 inland.</aws:prediction><aws:high units="&amp;deg;C">26</aws:high><aws:low units="&amp;deg;C">16</aws:low></aws:forecast><aws:forecast><aws:title alttitle="TUE">Tuesday</aws:title><aws:short-prediction>Mostly Sunny</aws:short-prediction><aws:image isNight="0" icon="cond026.gif">http://deskwx.weatherbug.com/images/Forecast/icons/cond026.gif</aws:image><aws:description>Tuesday</aws:description><aws:prediction>Night through morning low clouds and fog...otherwise mostly clear. Lows around 60. Highs in the mid to upper 60s at the beaches to the 70s inland.</aws:prediction><aws:high units="&amp;deg;C">25</aws:high><aws:low units="&amp;deg;C">16</aws:low></aws:forecast><aws:forecast><aws:title alttitle="WED">Wednesday</aws:title><aws:short-prediction>Mostly Sunny</aws:short-prediction><aws:image isNight="0" icon="cond026.gif">http://deskwx.weatherbug.com/images/Forecast/icons/cond026.gif</aws:image><aws:description>Wednesday</aws:description><aws:prediction>Night through morning low clouds and fog...otherwise mostly clear. Lows around 60. Highs in the mid to upper 60s at the beaches to the 70s inland.</aws:prediction><aws:high units="&amp;deg;C">24</aws:high><aws:low units="&amp;deg;C">16</aws:low></aws:forecast><aws:forecast><aws:title alttitle="THU">Thursday</aws:title><aws:short-prediction>Mostly Sunny</aws:short-prediction><aws:image isNight="0" icon="cond026.gif">http://deskwx.weatherbug.com/images/Forecast/icons/cond026.gif</aws:image><aws:description>Thursday</aws:description><aws:prediction>Night through morning low clouds and fog...otherwise mostly clear. Lows around 60. Highs in the mid to upper 60s at the beaches to the 70s inland.</aws:prediction><aws:high units="&amp;deg;C">24</aws:high><aws:low units="&amp;deg;C">--</aws:low></aws:forecast></aws:forecasts></aws:weather>

data/spec/formats/weather_id_spec.rb

@@ -167,6 +167,16 @@ describe "Query::WeatherID" do
         new_query.geo.should be_nil
       end
 
+      it "converts from icao" do
+        query = Barometer::Query.new(@icao)
+        query.format.should == :icao
+        new_query = Query::Format::WeatherID.to(query)
+        new_query.q.should == "USCA0987"
+        new_query.country_code.should == "US"
+        new_query.format.should == :weather_id
+        new_query.geo.should_not be_nil
+      end
+
       it "returns nil for other formats" do
         query = Barometer::Query.new(@weather_id)
         query.format.should == :weather_id
@@ -177,11 +187,6 @@ describe "Query::WeatherID" do
         query.format.should == :postalcode
         new_query = Query::Format::WeatherID.to(query)
         new_query.should be_nil
-        
-        query = Barometer::Query.new(@icao)
-        query.format.should == :icao
-        new_query = Query::Format::WeatherID.to(query)
-        new_query.should be_nil
       end
 
     end