barometer 0.7.3 → 0.8.0

data/lib/barometer/data/units.rb

@@ -1,15 +1,15 @@
 module Barometer
   class Data::Units
     include Comparable
-    
+
     attr_accessor :metric
-    
+
     def initialize(metric=true); @metric = metric; end
-    
+
     #
     # HELPERS
     #
-    
+
     def metric?; @metric; end
     def metric!; @metric=true; end
     def imperial!; @metric=false; end
@@ -18,10 +18,10 @@ module Barometer
     #
     def <<(value)
       return unless value
-      
+
       # these values can be treated like 'nil'
       nil_values = ["NA", "N/A", ""]
-    
+
       begin
         if value.is_a?(Array)
           value_m = value[0].to_f if (value[0] && !nil_values.include?(value[0]))
@@ -35,15 +35,15 @@ module Barometer
       rescue
         # do nothing
       end
-    
+
       self.metric? ? self.metric_default = value_m || value_b :
         self.imperial_default = value_i || value_b
     end
-    
+
     # stubs
     #
     def metric_default=(value); raise NotImplementedError; end
     def imperial_default=(value); raise NotImplementedError; end
 
   end
-end
+end

data/lib/barometer/data/zone.rb

@@ -4,19 +4,19 @@ require 'tzinfo'
 module Barometer
   #
   # A simple Zone class
-  # 
+  #
   # Used for building and converting timezone aware date and times
   # Really, these are just wrappers for TZInfo conversions plus
   # some extras.
   #
   class Data::Zone
-    
+
     @@zone_codes_file = File.expand_path(
       File.join(File.dirname(__FILE__), '..', 'translations', 'zone_codes.yml'))
     @@zone_codes = nil
 
     attr_accessor :zone_full, :zone_code, :zone_offset, :tz
-    
+
     def initialize(zone)
       if Data::Zone.is_zone_full?(zone)
         @zone_full = zone
@@ -29,22 +29,22 @@ module Barometer
         raise(ArgumentError, "invalid time zone")
       end
     end
-    
+
     def current
       @zone_full || @zone_offset || @zone_code
     end
-    
+
     # what is the Timezone Short Code for the current timezone
     def code
       return @zone_code if @zone_code
       return nil unless @tz
       @tz.period_for_utc(Time.now.utc).zone_identifier.to_s
     end
-    
+
     def full
       @zone_full || nil
     end
-    
+
     def offset
       if @zone_offset
         @zone_offset.to_f * 60 * 60
@@ -53,13 +53,13 @@ module Barometer
       elsif @zone_full
       end
     end
-    
+
     # is the current timezone in daylights savings mode?
     def dst?
       return nil unless @tz
       @tz.period_for_utc(Time.now.utc).dst?
     end
-    
+
     # return Time.now.utc for the set timezone
     def now(convert=false)
       if @zone_full
@@ -69,13 +69,13 @@ module Barometer
       end
       convert ? Data::LocalTime.parse(now) : now
     end
-    
+
     # return Date.today for the set timezone
     def today
       now = self.now
       Date.new(now.year, now.month, now.day)
     end
-    
+
     def local_to_utc(local_time)
       if @zone_full
         @tz.local_to_utc(local_time)
@@ -85,7 +85,7 @@ module Barometer
           local_time.hour,local_time.min,local_time.sec)
       end
     end
-    
+
     def utc_to_local(utc_time)
       if @zone_full
         @tz.utc_to_local(utc_time)
@@ -93,22 +93,22 @@ module Barometer
         utc_time + self.offset
       end
     end
-    
+
     #
     # Class Methods
     #
-    
+
     def self.is_zone_code?(zone)
       return false unless (zone && zone.is_a?(String))
       _load_zone_codes unless @@zone_codes
       Time.zone_offset(zone) || (@@zone_codes && @@zone_codes.has_key?(zone))
     end
-    
+
     def self.is_zone_full?(zone)
       return false unless (zone && zone.is_a?(String))
       zone.match(/[A-Za-z]+\/[A-Za-z]+/) ? true : false
     end
-    
+
     def self.is_zone_offset?(zone)
       return false unless (zone && (zone.is_a?(Fixnum) || zone.is_a?(Float)))
       zone.to_f.abs <= 14
@@ -131,11 +131,11 @@ module Barometer
       end
       offset
     end
-    
+
     def self._load_zone_codes
       $:.unshift(File.dirname(__FILE__))
       @@zone_codes ||= YAML.load_file(@@zone_codes_file)
     end
-    
+
   end
-end
+end

data/lib/barometer/formats.rb

@@ -10,4 +10,4 @@ require 'formats/weather_id'
 require 'formats/coordinates'
 require 'formats/icao'
 require 'formats/geocode'
-require 'formats/woe_id'
+require 'formats/woe_id'

data/lib/barometer/formats/coordinates.rb

@@ -8,20 +8,20 @@ module Barometer
   # :coordinates and how to convert to :coordinates.
   #
   class Query::Format::Coordinates < Query::Format
-  
+
     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, :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)
       converted_query = Barometer::Query.new
-      
+
       # pre-convert
       #
       pre_query = nil
@@ -33,7 +33,7 @@ module Barometer
       elsif original_query.format == :woe_id
         pre_query = Query::Format::WoeID.reverse(original_query)
       end
-      
+
       # convert & adjust
       #
       converted_query = Query::Format::Geocode.geocode(pre_query || original_query)
@@ -42,16 +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
+end

data/lib/barometer/formats/format.rb

@@ -18,14 +18,14 @@ module Barometer
     #
     def self.regex; raise NotImplementedError; end
     def self.format; raise NotImplementedError; end
-  
+
     # defaults
     #
     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?
     #
     def self.is?(query=nil)
@@ -46,9 +46,9 @@ 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
@@ -59,6 +59,6 @@ module Barometer
       @@fixes ||= YAML.load_file(@@fixes_file)
       @@fixes[country_code.upcase.to_s] || country_code
     end
-  
+
   end
-end
+end

data/lib/barometer/formats/geocode.rb

@@ -23,10 +23,10 @@ module Barometer
       unless converts?(original_query)
         return (original_query.format == format ? original_query.dup : nil)
       end
-      
+
       unless converted_query = original_query.get_conversion(format)
         converted_query = Barometer::Query.new
-        
+
         converted_query = case original_query.format
         when :weather_id
           Query::Format::WeatherID.reverse(original_query)
@@ -35,7 +35,7 @@ module Barometer
         else
           geocode(original_query)
         end
-        
+
         original_query.post_conversion(converted_query) if converted_query
       end
       converted_query
@@ -45,7 +45,7 @@ module Barometer
     #
     def self.geocode(original_query)
       raise ArgumentError unless is_a_query?(original_query)
-      
+
       converted_query = Barometer::Query.new
       converted_query.geo = Barometer::WebService::Geocode.fetch(original_query)
       if converted_query.geo
@@ -57,4 +57,4 @@ module Barometer
     end
 
   end
-end
+end

data/lib/barometer/formats/icao.rb

@@ -2,26 +2,26 @@ module Barometer
   #
   # Format: ICAO (International Civil Aviation Organization)
   #
-  # eg. KLAX (Los Angeles Airport) 
+  # eg. KLAX (Los Angeles Airport)
   #
   # This class is used to determine if a query is a
   # :icao and what the country_code is.
   #
   class Query::Format::Icao < Query::Format
-  
+
     @@codes_file = File.expand_path(
       File.join(File.dirname(__FILE__), '..', 'translations', 'icao_country_codes.yml'))
     @@codes = nil
 
     def self.format; :icao; end
-    
+
     # call any 3-4 letter query, :icao ... obviously this will have a lot
     # of false positives.  So far this isn't an issue as all weather services
     # that take :icao (which is just one, :wunderground) also take what
     # this would have been if it was not called :icao.
     #
     def self.regex; /^[A-Za-z]{3,4}$/; end
-    
+
     # in some cases the first letter can designate the country
     #
     def self.country_code(query=nil)
@@ -32,6 +32,6 @@ module Barometer
       @@codes['one_letter'][query[0..0].upcase.to_s] ||
         @@codes['two_letter'][query[0..1].upcase.to_s] || nil
     end
-  
+
   end
-end
+end

data/lib/barometer/formats/postalcode.rb

@@ -8,7 +8,7 @@ module Barometer
   # :postalcode and what the country_code is.
   #
   class Query::Format::Postalcode < Query::Format
-  
+
     def self.format; :postalcode; end
     def self.country_code(query=nil); "CA"; end
     def self.regex
@@ -17,6 +17,6 @@ module Barometer
       #   [ ]?[0-9]{1}[ABCEGHJ-NPRSTV-Z]{1}[0-9]{1}$
       /^[A-Z]{1}[\d]{1}[A-Z]{1}[ ]?[\d]{1}[A-Z]{1}[\d]{1}$/
     end
-  
+
   end
-end
+end

data/lib/barometer/formats/short_zipcode.rb

@@ -8,10 +8,10 @@ module Barometer
   # :short_zipcode and what the country_code is.
   #
   class Query::Format::ShortZipcode < Query::Format
-  
+
     def self.format; :short_zipcode; end
     def self.country_code(query=nil); "US"; end
     def self.regex; /(^[0-9]{5}$)/; end
 
   end
-end
+end

data/lib/barometer/formats/weather_id.rb

@@ -9,19 +9,19 @@ module Barometer
   # and what the country_code is.
   #
   class Query::Format::WeatherID < Query::Format
-  
+
     def self.format; :weather_id; end
     def self.regex; /(^[A-Za-z]{4}[0-9]{4}$)/; end
     def self.convertable_formats
       [:short_zipcode, :zipcode, :coordinates, :icao, :geocode]
     end
-      
+
     # the first two letters of the :weather_id is the country_code
     #
     def self.country_code(query=nil)
       (query && query.size >= 2) ? _fix_country(query[0..1]) : nil
     end
-      
+
     # convert to this format, X -> :weather_id
     #
     def self.to(original_query)
@@ -37,7 +37,7 @@ module Barometer
       converted_query.country_code = country_code(converted_query.q)
       converted_query
     end
-    
+
     # reverse lookup, :weather_id -> (:geocode || :coordinates)
     #
     def self.reverse(original_query)
@@ -48,9 +48,9 @@ module Barometer
       converted_query.format = Query::Format::Geocode.format
       converted_query
     end
-    
+
     private
-    
+
     # :geocode -> :weather_id
     # search weather.com for the given query
     #
@@ -60,7 +60,7 @@ module Barometer
       response = WebService::WeatherID.fetch(query)
       _parse_weather_id(response)
     end
-    
+
     # :weather_id -> :geocode
     # query yahoo with :weather_id and parse geo_data
     #
@@ -70,7 +70,7 @@ module Barometer
       response = WebService::WeatherID.reverse(query)
       _parse_geocode(response)
     end
-    
+
     # match the first :weather_id (from search results)
     #
     def self._parse_weather_id(text)
@@ -78,7 +78,7 @@ module Barometer
       match = text.match(/loc id=[\\]?['|""]([0-9a-zA-Z]*)[\\]?['|""]/)
       match ? match[1] : nil
     end
-    
+
     # parse the geo_data
     #
     def self._parse_geocode(text)
@@ -89,4 +89,4 @@ module Barometer
     end
 
   end
-end
+end