barometer 0.7.3 → 0.8.0

data/lib/barometer/data/location.rb

@@ -1,25 +1,25 @@
 module Barometer
   #
   # A simple Location class
-  # 
+  #
   # Used to store location information about the station that
   # gave the measurement data for a weather query, or the location
   # that was queried
   #
   class Data::Location
-    
+
     attr_accessor :id, :name, :city
     attr_accessor :state_name, :state_code, :country, :country_code, :zip_code
     attr_accessor :latitude, :longitude
-    
+
     def coordinates
       [@latitude, @longitude].join(',')
     end
-    
+
     def to_s
       [@name, @city, @state_name || @state_cocde,
         @country || @country_code].compact.join(', ')
     end
-    
+
   end
-end
+end

data/lib/barometer/data/pressure.rb

@@ -1,7 +1,7 @@
 module Barometer
   #
   # A simple Pressure 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.
@@ -13,40 +13,40 @@ module Barometer
   #       and it seems that it is more common in this case
   #
   class Data::Pressure < Data::Units
-    
+
     METRIC_UNITS = "mb"
     IMPERIAL_UNITS = "in"
-    
+
     attr_accessor :millibars, :inches
-    
+
     def initialize(metric=true)
       @millibars = nil
       @inches = nil
       super(metric)
     end
-    
+
     def metric_default=(value); self.mb = value; end
     def imperial_default=(value); self.in = value; end
 
     #
     # CONVERTERS
     #
-    
+
     def self.mb_to_in(mb)
       return nil unless mb && (mb.is_a?(Integer) || mb.is_a?(Float))
       mb.to_f * 0.02953
     end
-    
+
     def self.in_to_mb(inches)
       return nil unless inches &&
         (inches.is_a?(Integer) || inches.is_a?(Float))
       inches.to_f * 33.8639
     end
-    
+
     #
     # ACCESSORS
     #
-    
+
     # store millibars
     #
     def mb=(mb)
@@ -54,7 +54,7 @@ module Barometer
       @millibars = mb.to_f
       self.update_inches(mb.to_f)
     end
-    
+
     # store inches
     #
     def in=(inches)
@@ -62,57 +62,57 @@ module Barometer
       @inches = inches.to_f
       self.update_millibars(inches.to_f)
     end
-    
+
     # return the stored millibars or convert from inches
     #
     def mb(as_integer=true)
       mb = (@millibars || Data::Pressure.in_to_mb(@inches))
       mb ? (as_integer ? mb.to_i : (100*mb).round/100.0) : nil
     end
-    
+
     # return the stored inches or convert from millibars
     #
     def in(as_integer=true)
       inches = (@inches || Data::Pressure.mb_to_in(@millibars))
       inches ? (as_integer ? inches.to_i : (100*inches).round/100.0) : nil
     end
-    
+
     #
     # OPERATORS
     #
-    
+
     def <=>(other)
       self.mb <=> other.mb
     end
-    
+
     #
     # HELPERS
     #
-    
+
     # will just return the value (no units)
     #
     def to_i(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.mb : self.in
     end
-    
+
     # will just return the value (no units) with more precision
     #
     def to_f(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.mb(false) : self.in(false)
     end
-    
+
     # will return the value with units
     #
     def to_s(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? "#{self.mb} #{METRIC_UNITS}" : "#{self.in} #{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 inches, it is possible the a non-equivalent value of
     # millibars remains.  if so, clear it.
     #
@@ -123,7 +123,7 @@ module Barometer
       # then the conversion of inches
       @millibars = nil unless difference.abs <= 1.0
     end
-    
+
     # when we set millibars, it is possible the a non-equivalent value of
     # inches remains.  if so, clear it.
     #
@@ -134,10 +134,10 @@ module Barometer
       # then the conversion of millibars
       @inches = nil unless difference.abs <= 1.0
     end
-    
+
     def nil?
       (@millibars || @inches) ? false : true
     end
-    
+
   end
-end
+end

data/lib/barometer/data/speed.rb

@@ -1,7 +1,7 @@
 module Barometer
   #
   # A simple Speed 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.
@@ -10,19 +10,19 @@ module Barometer
   # the direction is independent of the units
   #
   # All comparison operations will be done in metric
-  # 
+  #
   # NOTE: this currently only supports the scale of
   #       kilometers (km) and miles (m) per hour.  There is currently
   #       no way to scale to smaller units (eg km -> m -> mm)
   #
   class Data::Speed < Data::Units
-    
+
     METRIC_UNITS = "kph"
     IMPERIAL_UNITS = "mph"
-    
+
     attr_accessor :kilometers, :miles
     attr_accessor :degrees, :direction
-    
+
     def initialize(metric=true)
       @kilometers = nil
       @miles = nil
@@ -30,28 +30,28 @@ module Barometer
       @direction = nil
       super(metric)
     end
-    
+
     def metric_default=(value); self.kph = value; end
     def imperial_default=(value); self.mph = 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 per hour
     #
     def kph=(kph)
@@ -59,7 +59,7 @@ module Barometer
       @kilometers = kph.to_f
       self.update_miles(kph.to_f)
     end
-    
+
     # store miles per hour
     #
     def mph=(mph)
@@ -67,67 +67,67 @@ module Barometer
       @miles = mph.to_f
       self.update_kilometers(mph.to_f)
     end
-    
+
     def direction=(direction)
       return if !direction || !direction.is_a?(String)
       @direction = direction
     end
-    
+
     def degrees=(degrees)
       return if !degrees || !(degrees.is_a?(Integer) || degrees.is_a?(Float))
       @degrees = degrees
     end
-    
+
     # return the stored kilometers or convert from miles
     #
     def kph(as_integer=true)
       km = (@kilometers || Data::Speed.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 mph(as_integer=true)
       m = (@miles || Data::Speed.km_to_m(@kilometers))
       m ? (as_integer ? m.to_i : (100*m).round/100.0) : nil
     end
-    
+
     #
     # OPERATORS
     #
-    
+
     def <=>(other)
       self.kph <=> other.kph
     end
-    
+
     #
     # HELPERS
     #
-    
+
     # will just return the value (no units)
     #
     def to_i(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.kph : self.mph
     end
-    
+
     # will just return the value (no units) with more precision
     #
     def to_f(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.kph(false) : self.mph(false)
     end
-    
+
     # will return the value with units
     #
     def to_s(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? "#{self.kph} #{METRIC_UNITS}" : "#{self.mph} #{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.
     #
@@ -138,7 +138,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.
     #
@@ -149,10 +149,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/sun.rb

@@ -1,13 +1,13 @@
 module Barometer
   #
   # A simple Sun class
-  # 
+  #
   # Used to store sunrise and sunset information
   #
   class Data::Sun
-    
+
     attr_reader :rise, :set
-    
+
     def initialize(rise=nil, set=nil)
       raise ArgumentError unless (rise.is_a?(Data::LocalTime) || rise.nil?)
       raise ArgumentError unless (set.is_a?(Data::LocalTime) || set.nil?)
@@ -18,16 +18,16 @@ module Barometer
     def nil?
       (@rise || @set) ? false : true
     end
-   
+
     def after_rise?(time)
       raise ArgumentError unless time.is_a?(Data::LocalTime)
       time >= @rise
     end
-    
+
     def before_set?(time)
       raise ArgumentError unless time.is_a?(Data::LocalTime)
       time <= @set
     end
-   
+
   end
-end
+end

data/lib/barometer/data/temperature.rb

@@ -1,7 +1,7 @@
 module Barometer
   #
   # A simple Temperature 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.
@@ -10,66 +10,66 @@ module Barometer
   # scale of Kelvin (K)
   #
   class Data::Temperature < Data::Units
-    
+
     METRIC_UNITS = "C"
     IMPERIAL_UNITS = "F"
-    
+
     attr_accessor :celsius, :fahrenheit, :kelvin
-    
+
     def initialize(metric=true)
       @celsius = nil
       @fahrenheit = nil
       @kelvin = nil
       super(metric)
     end
-    
+
     def metric_default=(value); self.c = value; end
     def imperial_default=(value); self.f = value; end
 
     #
     # CONVERTERS
     #
-    
+
     def self.c_to_k(c)
       return nil unless c && (c.is_a?(Integer) || c.is_a?(Float))
       273.15 + c.to_f
     end
-    
+
     # Tf = (9/5)*Tc+32
     #
     def self.c_to_f(c)
       return nil unless c && (c.is_a?(Integer) || c.is_a?(Float))
        ((9.0/5.0)*c.to_f)+32.0
     end
-    
+
     # Tc = (5/9)*(Tf-32)
     #
     def self.f_to_c(f)
       return nil unless f && (f.is_a?(Integer) || f.is_a?(Float))
       (5.0/9.0)*(f.to_f-32.0)
     end
-    
+
     def self.f_to_k(f)
       return nil unless f && (f.is_a?(Integer) || f.is_a?(Float))
       c = self.f_to_c(f.to_f)
       self.c_to_k(c)
     end
-    
+
     def self.k_to_c(k)
       return nil unless k && (k.is_a?(Integer) || k.is_a?(Float))
       k.to_f - 273.15
     end
-    
+
     def self.k_to_f(k)
       return nil unless k && (k.is_a?(Integer) || k.is_a?(Float))
       c = self.k_to_c(k.to_f)
       self.c_to_f(c)
     end
-    
+
     #
     # ACCESSORS
     #
-    
+
     # store celsius and kelvin
     #
     def c=(c)
@@ -78,7 +78,7 @@ module Barometer
       @kelvin = Data::Temperature.c_to_k(c.to_f)
       self.update_fahrenheit(c.to_f)
     end
-    
+
     # store fahrenheit and kelvin
     #
     def f=(f)
@@ -87,7 +87,7 @@ module Barometer
       @kelvin = Data::Temperature.f_to_k(f.to_f)
       self.update_celsius(f.to_f)
     end
-    
+
     # store kelvin, convert to all
     #
     def k=(k)
@@ -96,57 +96,57 @@ module Barometer
       @celsius = Data::Temperature.k_to_c(k.to_f)
       @fahrenheit = Data::Temperature.k_to_f(k.to_f)
     end
-    
+
     # return the stored celsius or convert from Kelvin
     #
     def c(as_integer=true)
       c = (@celsius || Data::Temperature.k_to_c(@kelvin))
       c ? (as_integer ? c.to_i : (100*c).round/100.0) : nil
     end
-    
+
     # return the stored fahrenheit or convert from Kelvin
     #
     def f(as_integer=true)
       f = (@fahrenheit || Data::Temperature.k_to_f(@kelvin))
       f ? (as_integer ? f.to_i : (100*f).round/100.0) : nil
     end
-    
+
     #
     # OPERATORS
     #
-    
+
     def <=>(other)
       @kelvin <=> other.kelvin
     end
-    
+
     #
     # HELPERS
     #
-    
+
     # will just return the value (no units)
     #
     def to_i(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.c : self.f
     end
-    
+
     # will just return the value (no units) with more precision
     #
     def to_f(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? self.c(false) : self.f(false)
     end
-    
+
     # will return the value with units
     #
     def to_s(metric=nil)
       (metric || (metric.nil? && self.metric?)) ? "#{self.c} #{METRIC_UNITS}" : "#{self.f} #{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 fahrenheit, it is possible the a non-equivalent value of
     # celsius remains.  if so, clear it.
     #
@@ -157,7 +157,7 @@ module Barometer
       # then the conversion of fahrenheit
       @celsius = nil unless difference.abs <= 1.0
     end
-    
+
     # when we set celsius, it is possible the a non-equivalent value of
     # fahrenheit remains.  if so, clear it.
     #
@@ -168,10 +168,10 @@ module Barometer
       # then the conversion of celsius
       @fahrenheit = nil unless difference.abs <= 1.0
     end
-    
+
     def nil?
       (@celsius || @fahrenheit || @kelvin) ? false : true
     end
-    
+
   end
-end
+end