barometer 0.7.3 → 0.8.0

data/lib/barometer/base.rb

@@ -1,22 +1,22 @@
 module Barometer
   class Base
-    
+
     # allow the configuration of specific weather APIs to be used,
     # and the order in which they would be used
     #
     @@config = { 1 => [:wunderground] }
     def self.config; @@config; end;
     def self.config=(hash); @@config = hash; end;
-    
+
     attr_reader   :query
     attr_accessor :weather, :success
-    
+
     def initialize(query=nil)
       @query = Barometer::Query.new(query)
       @weather = Barometer::Weather.new
       @success = false
     end
-    
+
     # iterate through all the configured sources and
     # collect weather data for each one
     #
@@ -33,15 +33,15 @@ module Barometer
         end
         level += 1
       end
-      
+
       @weather.end_at = Time.now.utc
       @weather
     end
-    
+
     def success?; @success; end
-    
+
     private
-    
+
     # iterate through the setup until we have a source name (and possibly
     # a config for that source), then measure with that source
     #
@@ -66,7 +66,7 @@ module Barometer
         end
       end
     end
-    
+
     # do that actual source measurement
     #
     def _measure(datum, config=nil, metric=nil)
@@ -80,4 +80,4 @@ module Barometer
     end
 
   end
-end
+end

data/lib/barometer/data.rb

@@ -18,4 +18,4 @@ require 'data/local_datetime'
 #
 require 'measurements/measurement'
 require 'measurements/result'
-require 'measurements/result_array'
+require 'measurements/result_array'

data/lib/barometer/data/distance.rb

@@ -1,51 +1,51 @@
 module Barometer
   #
   # A simple Distance class
-  # 
+  #
   # Think of this like the Integer class. Enhancement
   # is that you can create a number (in a certain unit), then
   # get that number back already converted to another unit.
   #
   # All comparison operations will be done in metric
-  # 
+  #
   # NOTE: this currently only supports the scale of
   #       kilometers (km) and miles (m).  There is currently
   #       no way to scale to smaller units (eg km -> m -> mm)
   #
   class Data::Distance < Data::Units
-    
+
     METRIC_UNITS = "km"
     IMPERIAL_UNITS = "m"
-    
+
     attr_accessor :kilometers, :miles
-    
+
     def initialize(metric=true)
       @kilometers = nil
       @miles = nil
       super(metric)
     end
-    
+
     def metric_default=(value); self.km = value; end
     def imperial_default=(value); self.m = value; end
 
     #
     # CONVERTERS
     #
-    
+
     def self.km_to_m(km)
       return nil unless km && (km.is_a?(Integer) || km.is_a?(Float))
       km.to_f * 0.622
     end
-    
+
     def self.m_to_km(m)
       return nil unless m && (m.is_a?(Integer) || m.is_a?(Float))
       m.to_f * 1.609
     end
-    
+
     #
     # ACCESSORS
     #
-    
+
     # store kilometers
     #
     def km=(km)
@@ -53,7 +53,7 @@ module Barometer
       @kilometers = km.to_f
       self.update_miles(km.to_f)
     end
-    
+
     # store miles
     #
     def m=(m)
@@ -61,57 +61,57 @@ module Barometer
       @miles = m.to_f
       self.update_kilometers(m.to_f)
     end
-    
+
     # return the stored kilometers or convert from miles
     #
     def km(as_integer=true)
       km = (@kilometers || Data::Distance.m_to_km(@miles))
       km ? (as_integer ? km.to_i : (100*km).round/100.0) : nil
     end
-    
+
     # return the stored miles or convert from kilometers
     #
     def m(as_integer=true)
       m = (@miles || Data::Distance.km_to_m(@kilometers))
       m ? (as_integer ? m.to_i : (100*m).round/100.0) : nil
     end
-    
+
     #
     # OPERATORS
     #
-    
+
     def <=>(other)
       self.km <=> other.km
     end
-    
+
     #
     # HELPERS
     #
-    
+
     # will just return the value (no units)
     #
     def to_i(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.km : self.m
     end
-    
+
     # will just return the value (no units) with more precision
     #
     def to_f(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.km(false) : self.m(false)
     end
-    
+
     # will return the value with units
     #
     def to_s(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? "#{self.km} #{METRIC_UNITS}" : "#{self.m} #{IMPERIAL_UNITS}"
     end
-    
+
     # will just return the units (no value)
     #
     def units(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? METRIC_UNITS : IMPERIAL_UNITS
     end
-    
+
     # when we set miles, it is possible the a non-equivalent value of
     # kilometers remains.  if so, clear it.
     def update_kilometers(m)
@@ -121,7 +121,7 @@ module Barometer
       # then the conversion of miles
       @kilometers = nil unless difference.abs <= 1.0
     end
-    
+
     # when we set kilometers, it is possible the a non-equivalent value of
     # miles remains.  if so, clear it.
     #
@@ -132,10 +132,10 @@ module Barometer
       # then the conversion of kilometers
       @miles = nil unless difference.abs <= 1.0
     end
-    
+
     def nil?
       (@kilometers || @miles) ? false : true
     end
-    
+
   end
-end
+end

data/lib/barometer/data/geo.rb

@@ -1,30 +1,30 @@
 module Barometer
   #
   # A simple Geo class
-  # 
+  #
   # Used to store location data
   #
   class Data::Geo
-    
+
     attr_accessor :latitude, :longitude, :query
     attr_accessor :locality, :region, :country, :country_code, :address
-    
+
     def initialize(location=nil)
       return unless location
       raise ArgumentError unless location.is_a?(Hash)
       self.build_from_hash(location)
       self
     end
-    
+
     def build_from_hash(location=nil)
       return nil unless location
       raise ArgumentError unless location.is_a?(Hash)
-      
+
       if location["geometry"] && location["geometry"]["location"]
         @latitude = location["geometry"]["location"]["lat"].to_f
         @longitude = location["geometry"]["location"]["lng"].to_f
       end
-      
+
       query_parts = []
       if location["address_components"]
         location["address_components"].each do |address_components|
@@ -49,7 +49,7 @@ module Barometer
           end
         end
       end
-      
+
       @query = query_parts.join(', ')
       @address = ""
     end
@@ -57,7 +57,7 @@ module Barometer
     def coordinates
       [@latitude, @longitude].join(',')
     end
-    
+
     def to_s
       s = [@address, @locality, @region, @country || @country_code]
       s.delete("")
@@ -65,4 +65,4 @@ module Barometer
     end
 
   end
-end
+end

data/lib/barometer/data/local_datetime.rb

@@ -2,12 +2,12 @@ require 'date'
 module Barometer
   #
   # A simple DateTime class
-  # 
+  #
   # A time class that represents the local date_time ...
   # it has no concept of time zone
   #
   class Data::LocalDateTime < Data::LocalTime
-    
+
     attr_reader :year, :month, :day
 
     def initialize(y,mon,d,h=0,m=0,s=0)
@@ -18,31 +18,31 @@ module Barometer
       super(h,m,s)
       self
     end
-    
+
     def year=(y)
       unless y && y.is_a?(Fixnum) && Date.civil(y,@month,@day)
         raise(ArgumentError, "invalid year")
       end
       @year = y
     end
-    
+
     def month=(m)
       unless m && m.is_a?(Fixnum) && Date.civil(@year,m,@day)
         raise(ArgumentError, "invalid month")
       end
       @month = m
     end
-    
+
     def day=(d)
       unless d && d.is_a?(Fixnum) && Date.civil(@year,@month,d)
         raise(ArgumentError, "invalid day")
       end
       @day = d
     end
-  
-    def parse(string)
+
+    def parse(string, format=nil)
       return unless string
-      new_date = Data::LocalDateTime.parse(string)
+      new_date = Data::LocalDateTime.parse(string, format)
       @year = new_date.year
       @month = new_date.month
       @day = new_date.day
@@ -51,11 +51,11 @@ module Barometer
       @sec = new_date.sec
       self
     end
-    
-    def self.parse(string)
+
+    def self.parse(string, format=nil)
       return nil unless string
       return string if string.is_a?(Data::LocalDateTime)
-      
+
       year = nil; month = nil; day = nil;
       hour = nil; min = nil; sec = nil;
       if string.is_a?(Time) || string.is_a?(DateTime)
@@ -71,7 +71,11 @@ module Barometer
         day = string.day
       elsif string.is_a?(String)
         begin
-          datetime = Time.parse(string)
+          datetime = if format
+            Time.strptime(string, format)
+          else
+            DateTime.parse(string)
+          end
           year = datetime.year
           month = datetime.mon
           day = datetime.day
@@ -84,19 +88,19 @@ module Barometer
       end
       Data::LocalDateTime.new(year, month, day, hour, min, sec)
     end
-    
+
     # convert to a Date class
     #
     def to_d
       Date.civil(@year, @month, @day)
     end
-    
+
     # convert to a DateTime class
     #
     def to_dt
       DateTime.new(@year, @month, @day, @hour, @min, @sec)
     end
-  
+
     def <=>(other)
       if other.is_a?(String) || other.is_a?(Time) || other.is_a?(DateTime) || other.is_a?(Date)
         the_other = Data::LocalDateTime.parse(other)
@@ -104,7 +108,7 @@ module Barometer
         the_other = other
       end
       raise ArgumentError unless the_other.is_a?(Data::LocalDateTime) || the_other.is_a?(Data::LocalTime)
-      
+
       if ((other.is_a?(String) || other.is_a?(Time) || other.is_a?(DateTime)) &&
         the_other.is_a?(Data::LocalDateTime)) || other.is_a?(Data::LocalDateTime)
         # we are counting days + seconds
@@ -121,21 +125,21 @@ module Barometer
         return total_seconds <=> the_other.total_seconds
       end
     end
-  
+
     def to_s(time=false)
       datetime = self.to_dt
       format = (time ? "%Y-%m-%d %I:%M:%S %p" : "%Y-%m-%d")
       datetime.strftime(format).downcase
     end
-    
+
     def nil?; @year == 0 && @month == 0 && @day == 0 && super; end
-    
+
     # this assumes all years have 366 days (which only is true for leap years)
     # but since this is just for comparisons, this will be accurate
     #
     def _total_days
       self.to_d.yday + (@year * 366)
     end
-    
+
   end
 end

data/lib/barometer/data/local_time.rb

@@ -1,13 +1,13 @@
 module Barometer
   #
   # A simple Time class
-  # 
+  #
   # A time class that represents the local time ...
   # it has no concept of time zone or date
   #
   class Data::LocalTime
     include Comparable
-    
+
     attr_reader :hour, :min, :sec
 
     def initialize(h=0,m=0,s=0)
@@ -16,7 +16,7 @@ module Barometer
       self.sec = s
       self
     end
-    
+
     def hour=(h)
       raise ArgumentError unless (h.is_a?(Fixnum) || h.nil?)
       hour_cap = 24
@@ -26,7 +26,7 @@ module Barometer
         @hour = h
       end
     end
-    
+
     def min=(m)
       raise ArgumentError unless (m.is_a?(Fixnum) || m.nil?)
       minute_cap = 60
@@ -38,7 +38,7 @@ module Barometer
         @min = m
       end
     end
-    
+
     def sec=(s)
       raise ArgumentError unless (s.is_a?(Fixnum) || s.nil?)
       second_cap = 60
@@ -50,7 +50,7 @@ module Barometer
         @sec = s
       end
     end
-    
+
     def parse(string)
       if string.is_a?(Time) || string.is_a?(DateTime)
         @hour = string.hour
@@ -64,21 +64,21 @@ module Barometer
       end
       self
     end
-    
+
     def self.parse(string)
       return string if string.is_a?(Data::LocalTime)
       local = Data::LocalTime.new
       local.parse(string)
       local
     end
-    
+
     # convert to a Time class
     #
     def to_t
       date = Date.today
       Time.local(date.year,date.month,date.day,@hour,@min,@sec)
     end
-    
+
     def total_seconds
       (@hour * 60 * 60) + (@min * 60) + @sec
     end
@@ -92,7 +92,7 @@ module Barometer
       raise ArgumentError unless the_other.is_a?(Data::LocalTime)
       total_seconds <=> the_other.total_seconds
     end
-    
+
     def +(seconds)
       local_time = Data::LocalTime.new
       if seconds.is_a?(Fixnum) || seconds.is_a?(Float)
@@ -121,14 +121,14 @@ module Barometer
       raise ArgumentError unless the_other.is_a?(Data::LocalTime)
       (self.total_seconds - the_other.total_seconds).to_i.abs
     end
-  
+
     def to_s(seconds=false)
       time = self.to_t
       format = (seconds ? "%I:%M:%S %p" : "%I:%M %p")
       time.strftime(format).downcase
     end
-    
+
     def nil?; @hour == 0 && @min == 0 && @sec == 0; end
-    
+
   end
 end