attack-barometer 0.5.0 → 0.6.0

data/spec/weather_spec.rb

@@ -38,16 +38,16 @@ describe "Weather" do
     
     before(:each) do
       module Barometer
-        class Data::Measurement
+        class Barometer::Measurement
           attr_accessor :success
         end
       end
       @weather = Barometer::Weather.new
-      @wunderground = Data::Measurement.new(:wunderground)
+      @wunderground = Barometer::Measurement.new(:wunderground)
       @wunderground.success = true
-      @yahoo = Data::Measurement.new(:yahoo)
+      @yahoo = Barometer::Measurement.new(:yahoo)
       @yahoo.success = true
-      @google = Data::Measurement.new(:google)
+      @google = Barometer::Measurement.new(:google)
       @weather.measurements << @wunderground
       @weather.measurements << @yahoo
       @weather.measurements << @google
@@ -82,13 +82,13 @@ describe "Weather" do
     
     before(:each) do
       @weather = Barometer::Weather.new
-      @wunderground = Data::Measurement.new(:wunderground)
-      @wunderground.current = Data::CurrentMeasurement.new
+      @wunderground = Barometer::Measurement.new(:wunderground)
+      @wunderground.current = Measurement::Current.new
       @wunderground.success = true
-      @yahoo = Data::Measurement.new(:yahoo)
-      @yahoo.current = Data::CurrentMeasurement.new
+      @yahoo = Barometer::Measurement.new(:yahoo)
+      @yahoo.current = Measurement::Current.new
       @yahoo.success = true
-      @google = Data::Measurement.new(:google)
+      @google = Barometer::Measurement.new(:google)
       @weather.measurements << @wunderground
       @weather.measurements << @yahoo
       @weather.measurements << @google
@@ -278,15 +278,15 @@ describe "Weather" do
     
     describe "windy?" do
       
-      it "requires threshold as a number" do
-        lambda { @weather.windy?("a") }.should raise_error(ArgumentError)
-        lambda { @weather.windy?(1) }.should_not raise_error(ArgumentError)
-        lambda { @weather.windy?(1.1) }.should_not raise_error(ArgumentError)
-      end
+      # 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 "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)
+      it "requires threshold as a number" do
+        lambda { @weather.windy?(@now,"a") }.should raise_error(ArgumentError)
+        lambda { @weather.windy?(@now,1) }.should_not raise_error(ArgumentError)
+        lambda { @weather.windy?(@now,1.1) }.should_not raise_error(ArgumentError)
       end
       
       it "returns nil when no measurements" do
@@ -295,20 +295,20 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true" do
-        wunderground = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::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 = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def windy?(a=nil,b=nil); false; end
         end; end
         @weather.windy?.should be_false
@@ -319,15 +319,15 @@ describe "Weather" do
     describe "wet?" do
       
       it "requires threshold as a number" do
-        lambda { @weather.wet?("a") }.should raise_error(ArgumentError)
-        lambda { @weather.wet?(1) }.should_not raise_error(ArgumentError)
-        lambda { @weather.wet?(1.1) }.should_not raise_error(ArgumentError)
+        lambda { @weather.wet?(@now,"a") }.should raise_error(ArgumentError)
+        lambda { @weather.wet?(@now,1) }.should_not raise_error(ArgumentError)
+        lambda { @weather.wet?(@now,1.1) }.should_not raise_error(ArgumentError)
       end
       
-      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 "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
         @weather.measurements.should be_empty
@@ -335,20 +335,20 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true" do
-        wunderground = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::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 = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def wet?(a=nil,b=nil); false; end
         end; end
         @weather.wet?.should be_false
@@ -375,10 +375,10 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true (night is opposite)" do
-        wunderground = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def day?(a=nil); true; end
         end; end
         @weather.day?.should be_true
@@ -386,10 +386,10 @@ describe "Weather" do
       end
 
       it "returns false if a measurement returns false (night is opposite)" do
-        wunderground = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def day?(a=nil); false; end
         end; end
         @weather.day?.should be_false
@@ -411,40 +411,40 @@ describe "Weather" do
       end
       
       it "returns true if a measurement returns true" do
-        wunderground = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def day?(a=nil); true; end
         end; end
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::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 = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def day?(a=nil); true; end
         end; end
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::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 = Data::Measurement.new(:wunderground)
+        wunderground = Barometer::Measurement.new(:wunderground)
         wunderground.success = true
         @weather.measurements << wunderground
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def sunny?(a=nil,b=nil); true; end
         end; end
         @weather.sunny?.should be_true
-        module Barometer; class Data::Measurement
+        module Barometer; class Barometer::Measurement
             def day?(a=nil); false; end
         end; end
         @weather.sunny?.should be_false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: attack-barometer
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Mark G
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-05-15 00:00:00 -07:00
 default_executable: barometer
 dependencies: []
 
@@ -29,15 +29,11 @@ files:
 - lib/barometer
 - lib/barometer/base.rb
 - lib/barometer/data
-- lib/barometer/data/current.rb
 - lib/barometer/data/distance.rb
-- lib/barometer/data/forecast.rb
 - lib/barometer/data/geo.rb
 - lib/barometer/data/local_datetime.rb
 - lib/barometer/data/local_time.rb
 - lib/barometer/data/location.rb
-- lib/barometer/data/measurement.rb
-- lib/barometer/data/night.rb
 - lib/barometer/data/pressure.rb
 - lib/barometer/data/speed.rb
 - lib/barometer/data/sun.rb
@@ -46,7 +42,6 @@ files:
 - lib/barometer/data/zone.rb
 - lib/barometer/data.rb
 - lib/barometer/extensions
-- lib/barometer/extensions/graticule.rb
 - lib/barometer/extensions/httparty.rb
 - lib/barometer/formats
 - lib/barometer/formats/coordinates.rb
@@ -58,11 +53,19 @@ files:
 - lib/barometer/formats/weather_id.rb
 - 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/query.rb
 - lib/barometer/services.rb
 - lib/barometer/translations
 - lib/barometer/translations/icao_country_codes.yml
 - lib/barometer/translations/weather_country_codes.yml
+- lib/barometer/translations/zone_codes.yml
 - lib/barometer/weather.rb
 - lib/barometer/weather_services
 - lib/barometer/weather_services/google.rb
@@ -74,6 +77,7 @@ files:
 - lib/barometer/weather_services/yahoo.rb
 - lib/barometer/web_services
 - lib/barometer/web_services/geocode.rb
+- lib/barometer/web_services/timezone.rb
 - lib/barometer/web_services/weather_id.rb
 - lib/barometer/web_services/web_service.rb
 - lib/barometer.rb
@@ -93,15 +97,11 @@ files:
 - lib/demometer/views/readme.erb
 - spec/barometer_spec.rb
 - spec/data
-- spec/data/current_spec.rb
 - spec/data/distance_spec.rb
-- spec/data/forecast_spec.rb
 - spec/data/geo_spec.rb
 - spec/data/local_datetime_spec.rb
 - spec/data/local_time_spec.rb
 - spec/data/location_spec.rb
-- spec/data/measurement_spec.rb
-- spec/data/night_measurement_spec.rb
 - spec/data/pressure_spec.rb
 - spec/data/speed_spec.rb
 - spec/data/sun_spec.rb
@@ -114,6 +114,7 @@ files:
 - spec/fixtures/formats/weather_id/90210.xml
 - spec/fixtures/formats/weather_id/atlanta.xml
 - spec/fixtures/formats/weather_id/from_USGA0028.xml
+- spec/fixtures/formats/weather_id/ksfo.xml
 - spec/fixtures/formats/weather_id/new_york.xml
 - spec/fixtures/geocode
 - spec/fixtures/geocode/40_73.xml
@@ -126,6 +127,9 @@ files:
 - spec/fixtures/services
 - spec/fixtures/services/google
 - spec/fixtures/services/google/calgary_ab.xml
+- spec/fixtures/services/weather_bug
+- spec/fixtures/services/weather_bug/90210_current.xml
+- spec/fixtures/services/weather_bug/90210_forecast.xml
 - spec/fixtures/services/weather_dot_com
 - spec/fixtures/services/weather_dot_com/90210.xml
 - spec/fixtures/services/wunderground
@@ -142,11 +146,19 @@ files:
 - spec/formats/short_zipcode_spec.rb
 - 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/query_spec.rb
 - spec/spec_helper.rb
 - spec/weather_services
 - spec/weather_services/google_spec.rb
 - spec/weather_services/services_spec.rb
+- spec/weather_services/weather_bug_spec.rb
 - spec/weather_services/weather_dot_com_spec.rb
 - spec/weather_services/wunderground_spec.rb
 - spec/weather_services/yahoo_spec.rb

data/lib/barometer/data/forecast.rb

@@ -1,84 +0,0 @@
-require 'date'
-module Barometer
-  #
-  # Forecast Measurement
-  # a data class for forecasted weather conditions
-  #
-  # This is basically a data holding class for the forecasted weather
-  # conditions.
-  #
-  class Data::ForecastMeasurement
-    
-    attr_reader :date, :icon, :condition
-    attr_reader :low, :high, :pop, :wind, :humidity, :sun, :night
-    
-    # accessors (with input checking)
-    #
-    def date=(date)
-      raise ArgumentError unless date.is_a?(Date)
-      @date = date
-    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 high=(high)
-      raise ArgumentError unless high.is_a?(Data::Temperature)
-      @high = high
-    end
-    
-    def low=(low)
-      raise ArgumentError unless low.is_a?(Data::Temperature)
-      @low = low
-    end
-    
-    def pop=(pop)
-      raise ArgumentError unless pop.is_a?(Fixnum)
-      @pop = pop
-    end
-    
-    def wind=(wind)
-      raise ArgumentError unless wind.is_a?(Data::Speed)
-      @wind = wind
-    end
-    
-    def humidity=(humidity)
-      raise ArgumentError unless humidity.is_a?(Fixnum)
-      @humidity = humidity
-    end
-    
-    def sun=(sun)
-      raise ArgumentError unless sun.is_a?(Data::Sun)
-      @sun = sun
-    end
-    
-    def night=(night)
-      raise ArgumentError unless night.is_a?(Data::NightMeasurement)
-      @night = night
-    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
-    
-  end
-end

data/lib/barometer/data/night.rb

@@ -1,69 +0,0 @@
-require 'date'
-module Barometer
-  #
-  # Night Measurement
-  # a data class for forecasted night weather conditions
-  #
-  # This is basically a data holding class for the forecasted night 
-  # weather conditions.
-  #
-  class Data::NightMeasurement
-    
-    attr_reader :date, :icon, :condition
-    attr_reader :pop, :wind, :humidity
-    
-    # accessors (with input checking)
-    #
-    def date=(date)
-      raise ArgumentError unless date.is_a?(Date)
-      @date = date
-    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 pop=(pop)
-      raise ArgumentError unless pop.is_a?(Fixnum)
-      @pop = pop
-    end
-    
-    def wind=(wind)
-      raise ArgumentError unless wind.is_a?(Data::Speed)
-      @wind = wind
-    end
-    
-    def humidity=(humidity)
-      raise ArgumentError unless humidity.is_a?(Fixnum)
-      @humidity = humidity
-    end
-    
-    def sun=(sun)
-      raise ArgumentError unless sun.is_a?(Data::Sun)
-      @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
-    
-  end
-end

data/lib/barometer/extensions/graticule.rb

@@ -1,51 +0,0 @@
-module Graticule
-  class Location
-    
-    attr_accessor :country_code, :address_line
-    
-    def attributes
-      [:latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision, :cuntry_code, :address_line].inject({}) do |result,attr|
-        result[attr] = self.send(attr) unless self.send(attr).blank?
-        result
-      end
-    end
-    
-  end
-  
-  module Geocoder
-    
-    class Google < Rest
-      
-      # Locates +address+ returning a Location
-      # add ability to bias towards a country
-      def locate(address, country_bias=nil)
-        get :q => (address.is_a?(String) ? address : location_from_params(address).to_s),
-          :gl => country_bias
-      end
-      
-      private
-      
-      # Extracts a Location from +xml+.
-      def parse_response(xml) #:nodoc:
-        longitude, latitude, = xml.elements['/kml/Response/Placemark/Point/coordinates'].text.split(',').map { |v| v.to_f }
-        returning Location.new(:latitude => latitude, :longitude => longitude) do |l|
-          address = REXML::XPath.first(xml, '//xal:AddressDetails',
-            'xal' => "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0")
- 
-          if address
-            l.street = value(address.elements['.//ThoroughfareName/text()'])
-            l.locality = value(address.elements['.//LocalityName/text()'])
-            l.region = value(address.elements['.//AdministrativeAreaName/text()'])
-            l.postal_code = value(address.elements['.//PostalCodeNumber/text()'])
-            l.country = value(address.elements['.//CountryName/text()'])
-            l.country_code = value(address.elements['.//CountryNameCode/text()'])
-            l.address_line = value(address.elements['.//AddressLine/text()'])
-            l.precision = PRECISION[address.attribute('Accuracy').value.to_i] || :unknown
-          end
-        end
-      end
-      
-    end
-    
-  end
-end