barometer 0.6.7 → 0.7.0

data/lib/barometer.rb

@@ -17,7 +17,11 @@ module Barometer
   
   @@google_geocode_key = nil
   def self.google_geocode_key; @@google_geocode_key; end;
-  def self.google_geocode_key=(key); @@google_geocode_key = key; end;
+  def self.google_geocode_key=(google_key); @@google_geocode_key = google_key; end;
+  
+  @@yahoo_placemaker_app_id = nil
+  def self.yahoo_placemaker_app_id; @@yahoo_placemaker_app_id; end;
+  def self.yahoo_placemaker_app_id=(yahoo_key); @@yahoo_placemaker_app_id = yahoo_key; end;
   
   # sometimes a query is used as is and never gets geocoded (ie zipcode)
   # often, it is useful to have queries geocoded to know where in the

data/lib/barometer/data/local_datetime.rb

@@ -70,13 +70,17 @@ module Barometer
         month = string.mon
         day = string.day
       elsif string.is_a?(String)
-        datetime = Time.parse(string)
-        year = datetime.year
-        month = datetime.mon
-        day = datetime.day
-        hour = datetime.hour
-        min = datetime.min
-        sec = datetime.sec
+        begin
+          datetime = Time.parse(string)
+          year = datetime.year
+          month = datetime.mon
+          day = datetime.day
+          hour = datetime.hour
+          min = datetime.min
+          sec = datetime.sec
+        rescue ArgumentError
+          return nil
+        end
       end
       Data::LocalDateTime.new(year, month, day, hour, min, sec)
     end

data/lib/barometer/formats.rb

@@ -9,4 +9,5 @@ require 'formats/postalcode'
 require 'formats/weather_id'
 require 'formats/coordinates'
 require 'formats/icao'
-require 'formats/geocode'
+require 'formats/geocode'
+require 'formats/woe_id'

data/lib/barometer/formats/coordinates.rb

@@ -12,16 +12,16 @@ module Barometer
     def self.format; :coordinates; end
     def self.regex; /^[-]?[0-9\.]+[,]{1}\s?[-]?[0-9\.]+$/; end
     def self.convertable_formats
-      [:short_zipcode, :zipcode, :postalcode, :weather_id, :coordinates, :icao, :geocode]
+      [:short_zipcode, :zipcode, :postalcode, :weather_id, :coordinates, :icao, :geocode, :woe_id]
     end
     
     # convert to this format, X -> :coordinates
     #
     def self.to(original_query)
       raise ArgumentError unless is_a_query?(original_query)
-    #   return nil unless converts?(original_query)
+      return nil unless converts?(original_query)
       converted_query = Barometer::Query.new
-
+      
       # pre-convert
       #
       pre_query = nil
@@ -30,6 +30,8 @@ module Barometer
           pre_query = Query::Format::WeatherID.reverse(original_query)
           original_query.post_conversion(pre_query)
         end
+      elsif original_query.format == :woe_id
+        pre_query = Query::Format::WoeID.reverse(original_query)
       end
       
       # convert & adjust
@@ -40,6 +42,16 @@ module Barometer
 
       converted_query
     end
+    
+    def self.parse_latitude(query)
+      coordinates = query.to_s.split(',')
+      coordinates ? coordinates[0] : nil
+    end
+    
+    def self.parse_longitude(query)
+      coordinates = query.to_s.split(',')
+      coordinates ? coordinates[1] : nil
+    end
 
   end
 end

data/lib/barometer/formats/format.rb

@@ -10,6 +10,10 @@ module Barometer
   #
   class Query::Format
 
+    @@fixes_file = File.expand_path(
+      File.join(File.dirname(__FILE__), '..', 'translations', 'weather_country_codes.yml'))
+    @@fixes = nil
+
     # stubs
     #
     def self.regex; raise NotImplementedError; end
@@ -20,6 +24,7 @@ module Barometer
     def self.to(query=nil,country=nil); nil; end
     def self.country_code(query=nil); nil; end
     def self.convertable_formats; []; end
+    def self.convert_query(text); text; end
   
     # is the query of this format?
     #
@@ -41,6 +46,19 @@ module Barometer
       return false unless object
       object.is_a?(Barometer::Query)
     end
+    
+    private
+    
+    # fix the country code
+    #
+    # weather.com uses non-standard two letter country codes that
+    # hinder the ability to determine the country or fetch geo_data.
+    # correct these "mistakes"
+    #
+    def self._fix_country(country_code)
+      @@fixes ||= YAML.load_file(@@fixes_file)
+      @@fixes[country_code.upcase.to_s] || country_code
+    end
   
   end
 end

data/lib/barometer/formats/geocode.rb

@@ -13,7 +13,7 @@ module Barometer
     def self.format; :geocode; end
     def self.is?(query=nil); query.is_a?(String) ? true : false; end
     def self.convertable_formats
-      [:short_zipcode, :zipcode, :coordinates, :weather_id, :icao]
+      [:short_zipcode, :zipcode, :coordinates, :weather_id, :icao, :woe_id]
     end
 
     # convert to this format, X -> :geocode
@@ -26,9 +26,16 @@ module Barometer
       
       unless converted_query = original_query.get_conversion(format)
         converted_query = Barometer::Query.new
-        converted_query = (original_query.format == :weather_id ?
-         Query::Format::WeatherID.reverse(original_query) :
-         geocode(original_query))
+        
+        converted_query = case original_query.format
+        when :weather_id
+          Query::Format::WeatherID.reverse(original_query)
+        when :woe_id
+          Query::Format::WoeID.reverse(original_query)
+        else
+          geocode(original_query)
+        end
+        
         original_query.post_conversion(converted_query) if converted_query
       end
       converted_query
@@ -40,7 +47,7 @@ module Barometer
       raise ArgumentError unless is_a_query?(original_query)
       
       converted_query = Barometer::Query.new
-      converted_query.geo = WebService::Geocode.fetch(original_query)
+      converted_query.geo = Barometer::WebService::Geocode.fetch(original_query)
       if converted_query.geo
         converted_query.country_code = converted_query.geo.country_code
         converted_query.q = converted_query.geo.to_s

data/lib/barometer/formats/weather_id.rb

@@ -10,10 +10,6 @@ module Barometer
   #
   class Query::Format::WeatherID < Query::Format
   
-    @@fixes_file = File.expand_path(
-      File.join(File.dirname(__FILE__), '..', 'translations', 'weather_country_codes.yml'))
-    @@fixes = nil
-    
     def self.format; :weather_id; end
     def self.regex; /(^[A-Za-z]{4}[0-9]{4}$)/; end
     def self.convertable_formats
@@ -91,17 +87,6 @@ module Barometer
       output.delete("")
       output.compact.join(', ')
     end
-    
-    # fix the country code
-    #
-    # weather.com uses non-standard two letter country codes that
-    # hinder the ability to determine the country or fetch geo_data.
-    # correct these "mistakes"
-    #
-    def self._fix_country(country_code)
-      @@fixes ||= YAML.load_file(@@fixes_file)
-      @@fixes[country_code.upcase.to_s] || country_code
-    end
 
   end
 end

data/lib/barometer/formats/woe_id.rb

@@ -0,0 +1,150 @@
+module Barometer
+  #
+  # Format: WOEID
+  #   "Where on Earth" ID (by Yahoo!)
+  #
+  # eg. 2459115, 615702 or w90210
+  #
+  # NOTE: zipcodes and WoeIDs can look exactly the same when the WoeID
+  #   is 5 digits long.  For now, a 5 digit number will be detected as
+  #   zipcode.  The way to override this is to prepend a number with the
+  #   letter 'w'.  Therefore 90210 will be a zipcode and w90210 will be
+  #   a WoeID.  In the future, if WoeIDs are moe popular then zipcodes,
+  #   then I will reverse this ...
+  #
+  # This class is used to determine if a query is a
+  # :woe_id and how to convert to a :woe_id.
+  #
+  class Query::Format::WoeID < Query::Format
+  
+    def self.format; :woe_id; end
+    def self.regex; /(^[0-9]{4}$)|(^[0-9]{6,7}$)|(^w[0-9]{4,7}$)/; end
+    def self.convertable_formats
+      [:short_zipcode, :zipcode, :weather_id, :coordinates, :icao, :geocode, :postalcode]
+    end
+    
+    # remove the 'w' from applicable queries (only needed for detection)
+    #
+    def self.convert_query(text)
+      return nil unless text
+      text.delete('w')
+    end
+    
+    # convert to this format, X -> :woeid
+    #
+    def self.to(original_query)
+      raise ArgumentError unless is_a_query?(original_query)
+      return nil unless converts?(original_query)
+    
+      # pre-convert (:weather_id -> :geocode)
+      #
+      pre_query = nil
+      if original_query.format == :weather_id
+        pre_query = Query::Format::WeatherID.reverse(original_query)
+      end
+
+      # pre-convert ([:short_zipcode, :zipcode, :postalcode, :icao] -> :geocode)
+      #
+      unless pre_query
+        if [:short_zipcode, :zipcode, :icao].include?(original_query.format)
+          unless pre_query = original_query.get_conversion(Query::Format::Geocode.format)
+            pre_query = Query::Format::Geocode.to(original_query)
+          end
+        end
+      end
+
+      converted_query = Barometer::Query.new
+      converted_query.country_code = original_query.country_code if original_query
+      
+      # TODO
+      # use Geomojo.com (when no Yahoo! appid)
+      #
+      # if [:coordinates].include?(pre_query ? pre_query.format : original_query.format) &&
+      #   Barometer.yahoo_placemaker_app_id.nil?
+      #   converted_query.q = _query_geomojo(pre_query || original_query)
+      #   converted_query.format = format
+      # end
+
+      # use Yahoo! Placemaker
+      #
+      if [:coordinates, :geocode, :postalcode].include?(pre_query ? pre_query.format : original_query.format) &&
+        !Barometer.yahoo_placemaker_app_id.nil?
+        converted_query.q = _query_placemaker(pre_query || original_query)
+        converted_query.format = format
+      end
+      
+      converted_query.geo = pre_query.geo if pre_query
+      converted_query.country_code = pre_query.country_code if pre_query
+      converted_query
+    end
+    
+    # reverse lookup, :woe_id -> (:geocode || :coordinates)
+    #
+    def self.reverse(original_query)
+      raise ArgumentError unless is_a_query?(original_query)
+      return nil unless original_query.format == self.format
+      converted_query = Barometer::Query.new
+      converted_query.q = _reverse(original_query)
+      converted_query.format = Barometer::Query::Format::Geocode.format
+      converted_query
+    end
+    
+    private
+    
+    # Yahoo! Placemaker
+    # [:geocode,:coordinates] -> :woe_id
+    #
+    def self._query_placemaker(query=nil)
+      return nil unless query
+      raise ArgumentError unless is_a_query?(query)
+      doc = WebService::Placemaker.fetch(query)
+      _parse_woe_from_placemaker(doc)
+    end
+    
+    # Geomojo.com
+    # [:coordinates] -> :woe_id
+    #
+    # def self._query_geomojo(query=nil)
+    #   return nil unless query
+    #   raise ArgumentError unless is_a_query?(query)
+    #   doc = WebService::Geomojo.fetch(query)
+    #   _parse_woe_from_geomojo(doc)
+    # end
+    
+    # :woe_id -> :geocode
+    # query yahoo with :woe_id and parse geo_data
+    #
+    def self._reverse(query=nil)
+      return nil unless query
+      raise ArgumentError unless is_a_query?(query)
+      response = WebService::Placemaker.reverse(query)
+      _parse_geocode(response)
+    end
+
+    # match the first :woe_id (from search results)
+    #   expects a Nokogiri doc
+    #
+    def self._parse_woe_from_placemaker(doc)
+      return nil unless doc
+      WebService::Placemaker.parse_woe_id(doc)
+    end
+    
+    # match the first :woe_id (from search results)
+    #   expects a Nokogiri doc
+    #
+    # def self._parse_woe_from_geomojo(doc)
+    #   return nil unless doc
+    #   WebService::Geomojo.parse_woe_id(doc)
+    # end
+
+    # parse the geo_data
+    #
+    def self._parse_geocode(text)
+      return nil unless text
+      output = [text["city"], text["region"], _fix_country(text["country"])]
+      output.delete("")
+      output.compact.join(', ')
+    end
+    
+  end
+end

data/lib/barometer/query.rb

@@ -21,16 +21,17 @@ module Barometer
     # This array defines the order to check a query for the format
     #
     FORMATS = %w(
-      ShortZipcode Zipcode Postalcode WeatherID Coordinates Icao Geocode
+      ShortZipcode Zipcode Postalcode WeatherID Coordinates Icao WoeID Geocode
     )
     FORMAT_MAP = {
       :short_zipcode => "ShortZipcode", :zipcode => "Zipcode",
       :postalcode => "Postalcode", :weather_id => "WeatherID",
       :coordinates => "Coordinates", :icao => "Icao",
-      :geocode => "Geocode"
+      :woe_id => "WoeID", :geocode => "Geocode"
     }
     
-    attr_accessor :format, :q, :country_code
+    attr_writer :q
+    attr_accessor :format, :country_code
     attr_accessor :geo, :timezone, :conversions
     
     def initialize(query=nil)
@@ -39,6 +40,10 @@ module Barometer
       self.analyze!
       @conversions = {}
     end
+    
+    def q
+      format ? Barometer::Query::Format.const_get(FORMAT_MAP[format.to_sym].to_s).convert_query(@q) : @q
+    end
 
     # analyze the saved query to determine the format.
     # this delegates the detection to each formats class
@@ -81,13 +86,14 @@ module Barometer
         converted_query = Barometer::Query.new
         preferred_formats.each do |preferred_format|
           klass = FORMAT_MAP[preferred_format.to_sym]
+          # if we discover that the format we have is the preferred format, return it
           if preferred_format == @format
             converted = true
             converted_query = Barometer::Query.new(@q)
           end
           unless converted
             unless converted_query = get_conversion(preferred_format)
-              converted_query =  Query::Format.const_get(klass.to_s).to(self)
+              converted_query = Query::Format.const_get(klass.to_s).to(self)
             end  
             converted = true if converted_query
           end
@@ -151,6 +157,16 @@ def get_conversion(format)
     nil
   end
 end
+
+  def latitude
+    return nil unless self.format == Query::Format::Coordinates.format
+    Query::Format::Coordinates.parse_latitude(self.q)
+  end
+  
+  def longitude
+    return nil unless self.format == Query::Format::Coordinates.format
+    Query::Format::Coordinates.parse_longitude(self.q)
+  end
     
   end
 end  

data/lib/barometer/services.rb

@@ -15,4 +15,5 @@ require 'weather_services/weather_bug'
 require 'web_services/web_service'
 require 'web_services/geocode'
 require 'web_services/weather_id'
-require 'web_services/timezone'
+require 'web_services/timezone'
+require 'web_services/placemaker'

data/lib/barometer/weather_services/service.rb

@@ -1,10 +1,6 @@
 require 'rubygems'
 require 'httparty'
 
-$:.unshift(File.dirname(__FILE__))
-# load some changes to Httparty
-require 'extensions/httparty'
-
 module Barometer
   #
   # Service Class

data/lib/barometer/weather_services/weather_bug.rb

@@ -127,7 +127,7 @@ module Barometer
       forecasts = Measurement::ResultArray.new
       # go through each forecast and create an instance
       if data && data["aws:forecast"]
-        start_date = Date.strptime(data['date'], "%m/%d/%Y %H:%M:%S %p")
+        start_date = Date.strptime(data['date'], "%a, %d %b %Y %H:%M:%S %Z")
         i = 0
         data["aws:forecast"].each do |forecast|
           forecast_measurement = Measurement::Result.new
@@ -240,7 +240,7 @@ module Barometer
         }.merge(q),
         :format => :plain,
         :timeout => Barometer.timeout
-      )
+      )  
       
       # get icon
       icon_match = response.match(/cond(\d*)\.gif/)