attack-barometer 0.5.0 → 0.6.0

data/lib/barometer/query.rb

@@ -30,12 +30,14 @@ module Barometer
       :geocode => "Geocode"
     }
     
-    attr_accessor :format, :q, :country_code, :geo
+    attr_accessor :format, :q, :country_code
+    attr_accessor :geo, :timezone, :conversions
     
     def initialize(query=nil)
       return unless query
       @q = query
       self.analyze!
+      @conversions = {}
     end
 
     # analyze the saved query to determine the format.
@@ -61,10 +63,16 @@ module Barometer
       raise ArgumentError unless (preferred_formats && preferred_formats.size > 0)
       
       # why convert if we are already there?
+      # (except in the case that the serivce excepts coordinates and we have a
+      # a geocode ... the google geocode results are superior)
+      #
       skip_conversion = false
-      if preferred_formats.include?(@format.to_sym)
-        skip_conversion = true
-        converted_query = self.dup
+      unless (@format.to_sym == Query::Format::Geocode.format) &&
+             preferred_formats.include?(Query::Format::Coordinates.format)
+        if preferred_formats.include?(@format.to_sym)
+          skip_conversion = true
+          converted_query = self.dup
+        end
       end
       
       unless skip_conversion
@@ -78,11 +86,14 @@ module Barometer
             converted_query = Barometer::Query.new(@q)
           end
           unless converted
-            converted_query =  Query::Format.const_get(klass.to_s).to(self)
+            unless converted_query = get_conversion(preferred_format)
+              converted_query =  Query::Format.const_get(klass.to_s).to(self)
+            end  
             converted = true if converted_query
           end
           if converted
             converted_query.country_code ||= Query::Format.const_get(klass.to_s).country_code(converted_query.q)
+            post_conversion(converted_query)
             break
           end
         end
@@ -94,13 +105,52 @@ module Barometer
         if converted_query && converted_query.geo
           @geo = converted_query.geo
         else
+          puts "enhance geocode: #{converted_query.q}" if Barometer::debug?
           geo_query = Query::Format::Coordinates.to(converted_query)
           @geo = geo_query.geo if (geo_query && geo_query.geo)
+          converted_query.geo = @geo.dup
+        end
+      end
+      
+      # enhance timezone?, unless we already did
+      #
+      if Barometer.enhance_timezone && !@timezone
+        if converted_query && converted_query.timezone
+          @geo = converted_query.timezone
+        elsif @geo && @geo.latitude && @geo.longitude
+          puts "enhance timezone: #{@geo.latitude}, #{@geo.longitude}" if Barometer::debug?
+          @timezone = WebService::Timezone.fetch(@geo.latitude,@geo.longitude)
+          converted_query.timezone = @timezone.dup
         end
       end
       
       converted_query
     end
     
+# save the important parts of the conversion ... by saving conversion we
+# can avoid doing the same conversion multiple times
+#
+def post_conversion(converted_query)
+  return unless (converted_query && converted_query.q && converted_query.format)
+  @conversions = {} unless @conversions
+  return if @conversions.has_key?(converted_query.format.to_sym)
+  puts "store: #{self.format} -> #{converted_query.format.to_sym} = #{self.q} -> #{converted_query.q}" if Barometer::debug?
+  @conversions[converted_query.format.to_sym] = converted_query.q
+end
+
+def get_conversion(format)
+  return nil unless format && @conversions
+  puts "found: #{self.format} -> #{format.to_sym} = #{self.q} -> #{@conversions[format.to_sym]}" if Barometer::debug? && @conversions.has_key?(format.to_sym)
+  # re-constuct converted query
+  if q = @conversions[format.to_sym]
+    converted_query = self.dup
+    converted_query.q = q
+    converted_query.format = format
+    converted_query
+  else
+    nil
+  end
+end
+    
   end
 end  

data/lib/barometer/services.rb

@@ -7,10 +7,12 @@ require 'weather_services/wunderground'
 require 'weather_services/google'
 require 'weather_services/yahoo'
 require 'weather_services/weather_dot_com'
+require 'weather_services/weather_bug'
 
 #
 # web services (non weather)
 #
 require 'web_services/web_service'
 require 'web_services/geocode'
-require 'web_services/weather_id'
+require 'web_services/weather_id'
+require 'web_services/timezone'

data/lib/barometer/translations/zone_codes.yml

@@ -0,0 +1,360 @@
+# first term - time zone short code
+# second term - UTC offset (- or +)
+#
+A : 1
+ACDT : 10.5
+ACST : 9.5
+ADT : -3
+AEDT : 11
+
+AEST : 10
+AFT : 4.5
+AHDT : -9
+AHST : -10
+AKDT : -8
+AKST : -9
+AMST : 5
+AMT : 4
+ANAST : 13
+ANAT : 12
+ART : -3
+AST : -4
+AT : -1
+AWDT : 9
+AWST : 8
+AZOST : 0
+AZOT : -1
+AZST : 5
+AZT : 4
+
+B : 2
+BADT : 4
+BAT : 6
+BDST : 2
+BDT : 6
+BET : -11
+BNT : 8
+BORT : 8
+BOT : -4
+BRA : -3
+BST : 1
+BT : 6
+BTT : 6
+
+C : 3
+CAT : 2
+CCT : 8
+CEST : 2
+CET : 1
+CHADT : 13.75
+CHAST : 12.75
+CHST : 10
+CKT : -10
+CLST : -3
+CLT : -4
+COT : -5
+CUT : 0
+CVT : -1
+CWT : 8.75
+CXT : 7
+CEDT : 2
+
+D : 4
+DAVT : 7
+DDUT : 10
+DNT : 1
+DST : 2
+
+E : 5
+EASST : -5
+EAST : -6
+EAT : 3
+ECT : -5
+EEST : 3
+EET : 2
+EGST : 0
+EGT : -1
+EMT : 1
+EEDT : 3
+
+F : 6
+FDT : -1
+FJST : 13
+FJT : 12
+FKST : -3
+FKT : -4
+FST : 2
+FWT : 1
+
+G : 7
+GALT : -6
+GAMT : -9
+GEST : 5
+GET : 4
+GFT : -3
+GILT : 12
+GST : 4
+GT : 0
+GYT : -4
+GZ : 0
+
+H : 8
+HAA : -3
+HAC : -5
+HADT : -9
+HAE : -4
+HAP : -7
+HAR : -6
+HAST : -10
+HAT : -2.5
+HAY : -8
+HDT : -9.5
+HFE : 2
+HFH : 1
+HG : 0
+HKT : 8
+HNA : -4
+HNC : -6
+HNE : -5
+HNP : -8
+HNR : -7
+HNT : -3.5
+HNY : -9
+HOE : 1
+HST : -10
+
+I : 9
+ICT : 4
+IDLE : 12
+IDLW : -12
+IDT : 1
+IOT : 5
+IRDT : 4.5
+IRKST : 9
+IRKT : 8
+IRST : 3.5
+IRT : 3.5
+IST : 1
+IT : 3.5
+ITA : 1
+
+JAVT : 7
+JAYT : 9
+JFDT : -3
+JFST : -4
+JST : 9
+JT : 7
+
+K : 10
+KDT : 10
+KGST : 6
+KGT : 5
+KOST : 12
+KOVT : 7
+KOVST : 8
+KRAST : 8
+KRAT : 7
+KST : 9
+
+L : 11
+LHDT : 11
+LHST : 10.5
+LIGT : 10
+LINT : 14
+LKT : 6
+LST : 1
+
+M : 12
+MAGST : 12
+MAGT : 11
+MAL : 8
+MART : -9.5
+MAT : 3
+MAWT : 6
+MBT : 8
+MED : 2
+MEDST : 2
+MEST : 2
+MESZ : 2
+MET : 1
+MEWT : 1
+MEX : -6
+MEZ : 1
+MHT : 12
+MIT : 9.5
+MMT : 6.5
+MNT : 8
+MNST : 9
+MPT : 10
+MSD : 4
+MSK : 3
+MSKS : 4
+MT : 8.5
+MUT : 4
+MUST : 5
+MVT : 5
+MYT : 8
+MFPT : -10
+
+N : -1
+NCT : 11
+NDT : -2.5
+NFT : 11.5
+NOR : 1
+NOVST : 7
+NOVT : 6
+NPT : 5.75
+NRT : 12
+NST : -3.5
+NSUT : 6.5
+NT : -11
+NUT : -11
+NZDT : 13
+NZST : 12
+NZT : 12
+
+O : -2
+OESZ : 3
+OEZ : 2
+OMSK : 7
+OMSST : 7
+OMST : 6
+
+P : -3
+PET : -5
+PETST : 13
+PETT : 12
+PGT : 10
+PHOT : 13
+PHT : 8
+PIT : 8
+PKT : 5
+PKST : 6
+PMDT : -2
+PMST : -3
+PMT : -3
+PNT : -8.5
+PONT : 11
+PYST : -3
+PYT : -4
+PWT : 9
+
+Q : -4
+
+R : -5
+R1T : 2
+R2T : 3
+RET : 4
+ROK : 9
+ROTT : -3
+
+S : -6
+SADT : 10.5
+SAMST : 5
+SAMT : 4
+SAST : 2
+SBT : 11
+SCT : 4
+SCDT : 13
+SCST : 12
+SET : 1
+SGT : 8
+SIT : 8
+SLT : -4
+SLST : -3
+SRT : -3
+SST : -11
+SYST : 3
+SWT : 1
+SYT : 2
+
+T : -7
+TAHT : -10
+TFT : 5
+THA : 7
+THAT : -10
+TJT : 5
+TKT : -10
+TMT : 5
+TOT : 13
+TRUK : 10
+TPT : 9
+TRUT : 10
+TST : 3
+TUC : 0
+TVT : 12
+TWT : 8
+
+U : -8
+ULAST : 9
+ULAT : 8
+USZ1 : 2
+USZ1S : 3
+USZ3 : 4
+USZ3S : 5
+USZ4 : 5
+USZ4S : 6
+USZ5 : 6
+USZ5S : 7
+USZ6 : 7
+USZ6S : 8
+USZ7 : 8
+USZ7S : 9
+USZ8 : 9
+USZ8S : 10
+USZ9 : 10
+USZ9S : 11
+UTZ : -3
+UYT : -3
+UYST : -2
+UZ10 : 11
+UZ10S : 12
+UZ11 : 12
+UZ11S : 13
+UZ12 : 12
+UZ12S : 13
+UZT : 5
+
+V : -9
+VET : -4.5
+VLAST : 11
+VLAT : 10
+VOST : 6
+VST : -4.5
+VTZ : -2
+VUT : 11
+
+W : -10
+WAKT : 12
+WAST : 2
+WAT : 1
+WCT : 8.75
+WEST : 1
+WESZ : 1
+WET : 0
+WEZ : 0
+WFT : 12
+WGST : -2
+WGT : -3
+WIB : 7
+WITA : 8
+WIT : 9
+WST : 8
+WKST : 5
+WTZ : -1
+WUT : 1
+WEDT : 1
+WDT : 9
+
+X : -11
+
+Y : -12
+YAKST : 10
+YAKT : 9
+YAPT : 10
+YDT : -8
+YEKST : 6
+YEKT : 5
+YST : -9
+
+Z : 0

data/lib/barometer/weather.rb

@@ -8,6 +8,7 @@ module Barometer
   class Weather
     
     attr_accessor :measurements
+    attr_accessor :start_at, :end_at
     
     def initialize; @measurements = []; end
     
@@ -139,7 +140,7 @@ module Barometer
     # pass the question on to each successful measurement until we get an answer
     #
     
-    def windy?(threshold=10, time_string=nil)
+    def windy?(time_string=nil, threshold=10)
       local_datetime = Data::LocalDateTime.parse(time_string)
       raise ArgumentError unless (threshold.is_a?(Fixnum) || threshold.is_a?(Float))
       raise ArgumentError unless (local_datetime.nil? || local_datetime.is_a?(Data::LocalDateTime))
@@ -147,14 +148,14 @@ module Barometer
       is_windy = nil
       @measurements.each do |measurement|
         if measurement.success?
-          is_windy = measurement.windy?(threshold, local_datetime)
+          is_windy = measurement.windy?(local_datetime, threshold)
           return is_windy if !is_windy.nil?
         end
       end
       is_windy
     end
 
-    def wet?(threshold=50, time_string=nil)
+    def wet?(time_string=nil, threshold=50)
       local_datetime = Data::LocalDateTime.parse(time_string)
       raise ArgumentError unless (threshold.is_a?(Fixnum) || threshold.is_a?(Float))
       raise ArgumentError unless (local_datetime.nil? || local_datetime.is_a?(Data::LocalDateTime))
@@ -162,7 +163,7 @@ module Barometer
       is_wet = nil
       @measurements.each do |measurement|
         if measurement.success?
-          is_wet = measurement.wet?(threshold, local_datetime)
+          is_wet = measurement.wet?(local_datetime, threshold)
           return is_wet if !is_wet.nil?
         end
       end

data/lib/barometer/weather_services/google.rb

@@ -35,43 +35,25 @@ module Barometer
   #
   class WeatherService::Google < WeatherService
     
-    def self.source_name; :google; end
-    def self.accepted_formats; [:zipcode, :postalcode, :geocode]; end
+    #########################################################################
+    # PRIVATE
+    # If class methods could be private, the remaining methods would be.
+    #
     
-    def self.wet_icon_codes
+    def self._source_name; :google; end
+    def self._accepted_formats; [:zipcode, :postalcode, :geocode]; end
+    
+    def self._wet_icon_codes
       %w(rain chance_of_rain chance_of_storm thunderstorm mist)
     end
-    def self.sunny_icon_codes
+    def self._sunny_icon_codes
       %w(sunny mostly_sunny partly_cloudy)
     end
-    
-    def self._measure(measurement, query, metric=true)
-      raise ArgumentError unless measurement.is_a?(Data::Measurement)
-      raise ArgumentError unless query.is_a?(Barometer::Query)
-      measurement.source = self.source_name
-      
-      begin
-        result = self.get_all(query.q, metric)
-      rescue Timeout::Error => e
-        return measurement
-      end
-      
-      measurement.current = self.build_current(result, metric)
-      measurement.forecast = self.build_forecast(result, metric)
-      measurement.location = self.build_location(query.geo)
-      measurement
-    end
 
-    def self.build_current(data, metric=true)
+    def self._build_current(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      current = Data::CurrentMeasurement.new
+      current = Measurement::Current.new
 
-      # google gives utc time, no way to convert to local
-      #if data && data['forecast_information'] &&
-      #   data['forecast_information']['current_date_time']
-      #  current.updated_at = Data::LocalDateTime.parse(data['forecast_information']['current_date_time']['data'])
-      #end
-      
       if data['current_conditions']
         data = data['current_conditions']
         if data['icon']
@@ -96,10 +78,10 @@ module Barometer
       current
     end
     
-    def self.build_forecast(data, metric=true)
+    def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
 
-      forecasts = []
+      forecasts = Measurement::ForecastArray.new
       return forecasts unless data && data['forecast_information'] &&
                               data['forecast_information']['forecast_date']
       start_date = Date.parse(data['forecast_information']['forecast_date']['data'])
@@ -108,7 +90,7 @@ module Barometer
       # go through each forecast and create an instance
       d = 0
       data.each do |forecast|
-        forecast_measurement = Data::ForecastMeasurement.new
+        forecast_measurement = Measurement::Forecast.new
         if forecast['icon']
           icon_match = forecast['icon']['data'].match(/.*\/([A-Za-z_]*)\.png/)
           forecast_measurement.icon = icon_match[1] if icon_match
@@ -130,7 +112,7 @@ module Barometer
       forecasts
     end
     
-    def self.build_location(geo=nil)
+    def self._build_location(result=nil, geo=nil)
       raise ArgumentError unless (geo.nil? || geo.is_a?(Data::Geo))
       location = Data::Location.new
       if geo
@@ -145,10 +127,12 @@ module Barometer
     end
     
     # use HTTParty to get the current weather
-    def self.get_all(query, metric=true)
+    def self._fetch(query, metric=true)
+      return unless query
+      puts "fetch google: #{query.q}" if Barometer::debug?
       self.get(
         "http://google.com/ig/api",
-        :query => {:weather => query, :hl => (metric ? "en-GB" : "en-US")},
+        :query => {:weather => query.q, :hl => (metric ? "en-GB" : "en-US")},
         :format => :xml,
         :timeout => Barometer.timeout
       )['xml_api_reply']['weather']