barometer 0.6.1 → 0.6.2

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'spec'
+require 'mocha'
 require 'fakeweb'
 require 'cgi'
 require 'yaml'

data/spec/weather_services/google_spec.rb

@@ -41,7 +41,7 @@ describe "Google" do
     
     it "returns Measurement::Current object" do
       current = WeatherService::Google._build_current({})
-      current.is_a?(Measurement::Current).should be_true
+      current.is_a?(Measurement::Result).should be_true
     end
     
   end
@@ -59,7 +59,7 @@ describe "Google" do
     
     it "returns Array object" do
       current = WeatherService::Google._build_forecast({})
-      current.is_a?(Measurement::ForecastArray).should be_true
+      current.is_a?(Measurement::ResultArray).should be_true
     end
     
   end
@@ -135,8 +135,8 @@ describe "Google" do
       it "returns a Barometer::Measurement object" do
         result = Barometer::WeatherService::Google._measure(@measurement, @query)
         result.is_a?(Barometer::Measurement).should be_true
-        result.current.is_a?(Measurement::Current).should be_true
-        result.forecast.is_a?(Measurement::ForecastArray).should be_true
+        result.current.is_a?(Measurement::Result).should be_true
+        result.forecast.is_a?(Measurement::ResultArray).should be_true
       end
       
     end

data/spec/weather_services/services_spec.rb

@@ -134,7 +134,7 @@ describe "WeatherServices" do
     
     it "returns current and future" do
       measurement = @service.measure(@query)
-      measurement.current.is_a?(Measurement::Current).should be_true
+      measurement.current.is_a?(Measurement::Result).should be_true
       measurement.forecast.is_a?(Array).should be_true
     end
     

data/spec/weather_services/weather_bug_spec.rb

@@ -52,7 +52,7 @@ describe "WeatherBug" do
     
     it "returns Measurement::Current object" do
       current = WeatherService::WeatherBug._build_current({})
-      current.is_a?(Measurement::Current).should be_true
+      current.is_a?(Measurement::Result).should be_true
     end
     
   end
@@ -181,8 +181,8 @@ describe "WeatherBug" do
       it "returns a Barometer::Measurement object" do
         result = WeatherService::WeatherBug._measure(@measurement, @query)
         result.is_a?(Barometer::Measurement).should be_true
-        result.current.is_a?(Measurement::Current).should be_true
-        result.forecast.is_a?(Measurement::ForecastArray).should be_true
+        result.current.is_a?(Measurement::Result).should be_true
+        result.forecast.is_a?(Measurement::ResultArray).should be_true
       end
       
     end

data/spec/weather_services/weather_dot_com_spec.rb

@@ -48,7 +48,7 @@ describe "WeatherDotCom" do
     
     it "returns Measurement::Current object" do
       current = WeatherService::WeatherDotCom._build_current({})
-      current.is_a?(Measurement::Current).should be_true
+      current.is_a?(Measurement::Result).should be_true
     end
     
   end
@@ -153,8 +153,8 @@ describe "WeatherDotCom" do
       it "returns a Barometer::Measurement object" do
         result = WeatherService::WeatherDotCom._measure(@measurement, @query)
         result.is_a?(Barometer::Measurement).should be_true
-        result.current.is_a?(Measurement::Current).should be_true
-        result.forecast.is_a?(Measurement::ForecastArray).should be_true
+        result.current.is_a?(Measurement::Result).should be_true
+        result.forecast.is_a?(Measurement::ResultArray).should be_true
       end
       
     end
@@ -195,10 +195,6 @@ describe "WeatherDotCom" do
       @measurement.current.visibility.to_f.should == 16.1
       
       # build sun
-      # sun_rise = Barometer::Zone.merge("6:01 am", "5/4/09 12:51 AM PDT", -7)
-      # sun_set = Barometer::Zone.merge("7:40 pm", "5/4/09 12:51 AM PDT", -7)
-      # @measurement.current.sun.rise.should == sun_rise
-      # @measurement.current.sun.set.should == sun_set
       @measurement.current.sun.rise.to_s.should == "06:01 am"
       @measurement.current.sun.set.to_s.should == "07:40 pm"
 
@@ -208,9 +204,11 @@ describe "WeatherDotCom" do
       @measurement.location.longitude.to_f.should == -118.41
       
       # builds forecasts
-      @measurement.forecast.size.should == 5
+      @measurement.forecast.size.should == 10
 
-      @measurement.forecast[0].date.should == Date.parse("May 3")
+      # day
+      @measurement.forecast[0].valid_start_date.should == Date.parse("May 3 7:00 am")
+      @measurement.forecast[0].valid_end_date.should == Date.parse("May 3 6:59:59 pm")
       @measurement.forecast[0].condition.should == "Partly Cloudy"
       @measurement.forecast[0].icon.should == "30"
       @measurement.forecast[0].high.should be_nil
@@ -223,23 +221,22 @@ describe "WeatherDotCom" do
       @measurement.forecast[0].wind.degrees.to_i.should == 288
       @measurement.forecast[0].wind.direction.should == "WNW"
       
-      # sun_rise = Barometer::Zone.merge("6:02 am", "5/4/09 12:25 AM PDT", -7)
-      # sun_set = Barometer::Zone.merge("7:40 pm", "5/4/09 12:25 AM PDT", -7)
-      # @measurement.forecast[0].sun.rise.should == sun_rise
-      # @measurement.forecast[0].sun.set.should == sun_set
       @measurement.forecast[0].sun.rise.to_s.should == "06:02 am"
       @measurement.forecast[0].sun.set.to_s.should == "07:40 pm"
       
-      @measurement.forecast[0].night.should_not be_nil
-      @measurement.forecast[0].night.condition.should == "Partly Cloudy"
-      @measurement.forecast[0].night.icon.should == "29"
-      @measurement.forecast[0].night.pop.to_i.should == 10
-      @measurement.forecast[0].night.humidity.to_i.should == 71
+      # night
+      @measurement.forecast[1].should_not be_nil
+      @measurement.forecast[1].valid_start_date.should == Date.parse("May 3 7:00 pm")
+      @measurement.forecast[1].valid_end_date.should == Date.parse("May 4 6:59:59 am")
+      @measurement.forecast[1].condition.should == "Partly Cloudy"
+      @measurement.forecast[1].icon.should == "29"
+      @measurement.forecast[1].pop.to_i.should == 10
+      @measurement.forecast[1].humidity.to_i.should == 71
       
-      @measurement.forecast[0].night.wind.should_not be_nil
-      @measurement.forecast[0].night.wind.to_i.should == 14
-      @measurement.forecast[0].night.wind.degrees.to_i.should == 335
-      @measurement.forecast[0].night.wind.direction.should == "NNW"
+      @measurement.forecast[1].wind.should_not be_nil
+      @measurement.forecast[1].wind.to_i.should == 14
+      @measurement.forecast[1].wind.degrees.to_i.should == 335
+      @measurement.forecast[1].wind.direction.should == "NNW"
     end
     
   end

data/spec/weather_services/wunderground_spec.rb

@@ -42,7 +42,7 @@ describe "Wunderground" do
     
     it "returns Barometer::CurrentMeasurement object" do
       current = WeatherService::Wunderground._build_current({})
-      current.is_a?(Measurement::Current).should be_true
+      current.is_a?(Measurement::Result).should be_true
     end
     
   end
@@ -182,7 +182,7 @@ describe "Wunderground" do
       it "returns a Barometer::Measurement object" do
         result = WeatherService::Wunderground._measure(@measurement, @query)
         result.is_a?(Barometer::Measurement).should be_true
-        result.current.is_a?(Measurement::Current).should be_true
+        result.current.is_a?(Measurement::Result).should be_true
         result.forecast.is_a?(Array).should be_true
       end
       

data/spec/weather_services/yahoo_spec.rb

@@ -37,7 +37,7 @@ describe "Yahoo" do
     
     it "returns Barometer::CurrentMeasurement object" do
       current = WeatherService::Yahoo._build_current({})
-      current.is_a?(Measurement::Current).should be_true
+      current.is_a?(Measurement::Result).should be_true
     end
     
   end
@@ -122,7 +122,7 @@ describe "Yahoo" do
       it "returns a Barometer::Measurement object" do
         result = WeatherService::Yahoo._measure(@measurement, @query)
         result.is_a?(Barometer::Measurement).should be_true
-        result.current.is_a?(Measurement::Current).should be_true
+        result.current.is_a?(Measurement::Result).should be_true
         result.forecast.is_a?(Array).should be_true
       end
       

data/spec/weather_spec.rb

@@ -83,10 +83,10 @@ describe "Weather" do
     before(:each) do
       @weather = Barometer::Weather.new
       @wunderground = Barometer::Measurement.new(:wunderground)
-      @wunderground.current = Measurement::Current.new
+      @wunderground.current = Measurement::Result.new
       @wunderground.success = true
       @yahoo = Barometer::Measurement.new(:yahoo)
-      @yahoo.current = Measurement::Current.new
+      @yahoo.current = Measurement::Result.new
       @yahoo.success = true
       @google = Barometer::Measurement.new(:google)
       @weather.measurements << @wunderground
@@ -298,9 +298,7 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def windy?(a=nil,b=nil); true; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:windy?).returns(true)
         @weather.windy?.should be_true
       end
 
@@ -308,9 +306,7 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def windy?(a=nil,b=nil); false; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:windy?).returns(false)
         @weather.windy?.should be_false
       end
       
@@ -338,9 +334,7 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def wet?(a=nil,b=nil); true; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:wet?).returns(true)
         @weather.wet?.should be_true
       end
 
@@ -348,9 +342,7 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def wet?(a=nil,b=nil); false; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:wet?).returns(false)
         @weather.wet?.should be_false
       end
       
@@ -378,9 +370,7 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def day?(a=nil); true; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:day?).returns(true)
         @weather.day?.should be_true
         @weather.night?.should be_false
       end
@@ -389,9 +379,7 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def day?(a=nil); false; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:day?).returns(false)
         @weather.day?.should be_false
         @weather.night?.should be_true
       end
@@ -414,12 +402,8 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def day?(a=nil); true; end
-        end; end
-        module Barometer; class Barometer::Measurement
-            def sunny?(a=nil,b=nil); true; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:day?).returns(true)
+        Barometer::Measurement.any_instance.stubs(:sunny?).returns(true)
         @weather.sunny?.should be_true
       end
 
@@ -427,12 +411,8 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def day?(a=nil); true; end
-        end; end
-        module Barometer; class Barometer::Measurement
-            def sunny?(a=nil,b=nil); false; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:day?).returns(true)
+        Barometer::Measurement.any_instance.stubs(:sunny?).returns(false)
         @weather.sunny?.should be_false
       end
       
@@ -440,13 +420,8 @@ describe "Weather" do
         wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Barometer::Measurement
-            def sunny?(a=nil,b=nil); true; end
-        end; end
-        @weather.sunny?.should be_true
-        module Barometer; class Barometer::Measurement
-            def day?(a=nil); false; end
-        end; end
+        Barometer::Measurement.any_instance.stubs(:sunny?).returns(true)
+        Barometer::Measurement.any_instance.stubs(:day?).returns(false)
         @weather.sunny?.should be_false
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barometer
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Mark G
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 -06:00
+date: 2009-05-20 00:00:00 -06:00
 default_executable: barometer
 dependencies: []
 
@@ -54,12 +54,9 @@ files:
 - lib/barometer/formats/zipcode.rb
 - lib/barometer/formats.rb
 - lib/barometer/measurements
-- lib/barometer/measurements/common.rb
-- lib/barometer/measurements/current.rb
-- lib/barometer/measurements/forecast.rb
-- lib/barometer/measurements/forecast_array.rb
 - lib/barometer/measurements/measurement.rb
-- lib/barometer/measurements/night.rb
+- lib/barometer/measurements/result.rb
+- lib/barometer/measurements/result_array.rb
 - lib/barometer/query.rb
 - lib/barometer/services.rb
 - lib/barometer/translations
@@ -151,12 +148,9 @@ files:
 - spec/formats/weather_id_spec.rb
 - spec/formats/zipcode_spec.rb
 - spec/measurements
-- spec/measurements/common_spec.rb
-- spec/measurements/current_spec.rb
-- spec/measurements/forecast_array_spec.rb
-- spec/measurements/forecast_spec.rb
 - spec/measurements/measurement_spec.rb
-- spec/measurements/night_measurement_spec.rb
+- spec/measurements/result_array_spec.rb
+- spec/measurements/result_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/weather_services

data/lib/barometer/measurements/common.rb

@@ -1,113 +0,0 @@
-module Barometer
-  #
-  # Common Measurement
-  #
-  # Code common to both Current and Forecast Measurements
-  #
-  class Measurement::Common
-    
-    attr_reader :humidity, :icon, :condition
-    attr_reader :wind, :sun
-    attr_accessor :metric
-    
-    def initialize(metric=true)
-      @metric = metric
-    end
-    
-    def metric?; metric; end
-    
-    # accessors (with input checking)
-    #
-    def humidity=(humidity)
-      raise ArgumentError unless
-        (humidity.is_a?(Fixnum) || humidity.is_a?(Float))
-      @humidity = humidity
-    end
-    
-    def icon=(icon)
-      raise ArgumentError unless icon.is_a?(String)
-      @icon = icon
-    end
-    
-    def condition=(condition)
-      raise ArgumentError unless condition.is_a?(String)
-      @condition = condition
-    end
-    
-    def wind=(wind)
-      raise ArgumentError unless wind.is_a?(Data::Speed)
-      @wind = wind
-    end
-    
-    def sun=(sun)
-      raise ArgumentError unless (sun.is_a?(Data::Sun) || sun.nil?)
-      @sun = sun
-    end
-    
-    #
-    # helpers
-    #
-    
-    # creates "?" helpers for all attributes (which maps to nil?)
-    #
-    def method_missing(method,*args)
-      # if the method ends in ?, then strip it off and see if we
-      # respond to the method without the ?
-      if (call_method = method.to_s.chomp!("?")) && respond_to?(call_method)
-        return send(call_method).nil? ? false : true
-      else
-        super(method,*args)
-      end
-    end
-    
-    #
-    # answer simple questions
-    #
-    
-    def windy?(threshold=10)
-      raise ArgumentError unless (threshold.is_a?(Fixnum) || threshold.is_a?(Float))
-      return nil unless wind?
-      wind.to_f(metric?) >= threshold.to_f
-    end
-    
-    def day?(time)
-      return nil unless time && sun?
-      sun.after_rise?(time) && sun.before_set?(time)
-    end
-    
-    def wet?(wet_icons=nil, humidity_threshold=99)
-      result = nil
-      result ||= _wet_by_icon?(wet_icons) if icon?
-      result ||= _wet_by_humidity?(humidity_threshold) if humidity?
-      result
-    end
-    
-    def sunny?(time, sunny_icons=nil)
-      return nil unless time
-      is_day = day?(time)
-      return nil if is_day.nil?
-      is_day && _sunny_by_icon?(sunny_icons)
-    end
-    
-    private
-    
-    def _wet_by_humidity?(threshold=99)
-      raise ArgumentError unless (threshold.is_a?(Fixnum) || threshold.is_a?(Float))
-      return nil unless humidity?
-      humidity.to_f >= threshold.to_f
-    end
-    
-    def _wet_by_icon?(wet_icons=nil)
-      raise ArgumentError unless (wet_icons.nil? || wet_icons.is_a?(Array))
-      return nil unless (icon? && wet_icons)
-      wet_icons.include?(icon.to_s.downcase)
-    end
-    
-    def _sunny_by_icon?(sunny_icons=nil)
-      raise ArgumentError unless (sunny_icons.nil? || sunny_icons.is_a?(Array))
-      return nil unless (icon? && sunny_icons)
-      sunny_icons.include?(icon.to_s.downcase)
-    end
-    
-  end
-end