barometer 0.1.0 → 0.2.1

data/lib/barometer/data/geo.rb

@@ -8,7 +8,7 @@ module Barometer
   class Geo
     
     attr_accessor :latitude, :longitude
-    attr_accessor :locality, :region, :country, :country_code
+    attr_accessor :locality, :region, :country, :country_code, :address
     
     #
     # this will take a Location object (either generated by Graticule
@@ -60,6 +60,7 @@ module Barometer
       @region = location.region
       @country = location.country
       @country_code = location.country_code
+      @address = location.address_line
     end
     
     def build_from_httparty(location=nil)
@@ -87,6 +88,7 @@ module Barometer
         end
         @country = placemark["AddressDetails"]["Country"]["CountryName"]
         @country_code = placemark["AddressDetails"]["Country"]["CountryNameCode"]
+        @address = placemark["AddressDetails"]["Country"]["AddressLine"]
       end
     end
     

data/lib/barometer/extensions/graticule.rb

@@ -1,10 +1,10 @@
 module Graticule
   class Location
     
-    attr_accessor :country_code
+    attr_accessor :country_code, :address_line
     
     def attributes
-      [:latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision, :cuntry_code].inject({}) do |result,attr|
+      [:latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision, :cuntry_code, :address_line].inject({}) do |result,attr|
         result[attr] = self.send(attr) unless self.send(attr).blank?
         result
       end
@@ -39,6 +39,7 @@ module Graticule
             l.postal_code = value(address.elements['.//PostalCodeNumber/text()'])
             l.country = value(address.elements['.//CountryName/text()'])
             l.country_code = value(address.elements['.//CountryNameCode/text()'])
+            l.address_line = value(address.elements['.//AddressLine/text()'])
             l.precision = PRECISION[address.attribute('Accuracy').value.to_i] || :unknown
           end
         end

data/lib/barometer/query.rb

@@ -31,20 +31,23 @@ module Barometer
       self.analyze!
     end
     
-    # analyze the saved query to determine the format.  for the format of
-    # :zipcode and :postalcode the country_code can also be set
+    # analyze the saved query to determine the format.
     def analyze!
       return unless @q
       if Barometer::Query.is_us_zipcode?(@q)
         @format = :zipcode
+        @country_code = Barometer::Query.format_to_country_code(@format)
       elsif Barometer::Query.is_canadian_postcode?(@q)
         @format = :postalcode
+        @country_code = Barometer::Query.format_to_country_code(@format)
       elsif Barometer::Query.is_coordinates?(@q)
         @format = :coordinates
+      elsif Barometer::Query.is_icao?(@q)
+        @format = :icao
+#        @country_code = Barometer::Query.icao_to_country_code(@q)
       else
         @format = :geocode
       end
-      @country_code = Barometer::Query.format_to_country_code(@format)
     end
     
     # take a list of acceptable (and ordered by preference) formats and convert
@@ -93,6 +96,7 @@ module Barometer
     def postalcode?; @format == :postalcode; end
     def coordinates?; @format == :coordinates; end
     def geocode?; @format == :geocode; end
+    def icao?; @format == :icao; end
     
     def self.is_us_zipcode?(query)
       us_zipcode_regex = /(^[0-9]{5}$)|(^[0-9]{5}-[0-9]{4}$)/
@@ -112,12 +116,25 @@ module Barometer
       return !(query =~ coordinates_regex).nil?
     end
     
+    def self.is_icao?(query)
+      # allow any 3 or 4 letter word ... unfortunately this means some locations
+      # (ie Utah, Goa, Kiev, etc) will be detected as ICAO.  This won't matter for
+      # returning weather results ... it will just effect what happens to the query.
+      # For example, wunderground will accept :icao above :coordinates and :geocode,
+      # which means that a city like Kiev would normally get converted to :coordinates
+      # but in this case it will be detected as :icao so it will be passed as is.
+      # Currently, only wunderground accepts ICAO, and they process ICAO the same as a
+      # city name, so it doesn't matter.
+      icao_regex = /^[A-Za-z]{3,4}$/
+      return !(query =~ icao_regex).nil?
+    end
+    
     #
     # CONVERTERS
     #
     
     # this will take all query formats and convert them to coordinates
-    # accepts- :zipcode, :postalcode, :geocode
+    # accepts- :zipcode, :postalcode, :geocode, :icao
     # returns- :coordinates
     # if the conversion fails, return nil
     def self.to_coordinates(query, format)
@@ -129,7 +146,7 @@ module Barometer
     end
     
     # this will take all query formats and convert them to coorinates
-    # accepts- :zipcode, :postalcode, :coordinates
+    # accepts- :zipcode, :postalcode, :coordinates, :icao
     # returns- :geocode
     def self.to_geocode(query, format)
       perform_geocode = false
@@ -143,8 +160,17 @@ module Barometer
       if perform_geocode
         geo = self.geocode(query, country_code)
         country_code ||= geo.country_code if geo
-        return nil unless geo && geo.locality && geo.region && geo.country
-        return ["#{geo.locality}, #{geo.region}, #{geo.country}", country_code, geo]
+        # different formats have different acceptance criteria
+        q = nil
+        case format
+        when :icao
+          return nil unless geo && geo.address && geo.country
+          q = "#{geo.address}, #{geo.country}"
+        else
+          return nil unless geo && geo.locality && geo.region && geo.country
+          q = "#{geo.locality}, #{geo.region}, #{geo.country}"
+        end
+        return [q, country_code, geo]
       else
         # without geocoding, the best we can do is just make use the given query as
         # the query for the "geocode" format
@@ -207,7 +233,6 @@ module Barometer
         },
         :format => :xml
       )['kml']['Response']
-      #puts location.inspect
       geo = Barometer::Geo.new(location)
     end
     
@@ -223,6 +248,30 @@ module Barometer
       end
       country_code
     end
+    
+    # todo, the fist letter in a 4-letter icao can designate country:
+    # c=canada
+    # k=usa
+    # etc...
+    # def self.icao_to_country_code(icao_code)
+    #   return unless icao_code.is_a?(String)
+    #   country_code = nil
+    #   if icao_code.size == 4
+    #     case icao_code.first_letter
+    #     when "C"
+    #       country_code = "CA"
+    #     when "K"
+    #       country_code = "US"
+    #     end
+    #     if coutry_code.nil?
+    #       case icao_code.first_two_letters
+    #       when "ET"
+    #         country_code = "GERMANY"
+    #       end
+    #     end
+    #   end  
+    #   country_code
+    # end
 
   end
 end  

data/lib/barometer/services/wunderground.rb

@@ -39,7 +39,7 @@ module Barometer
   class Wunderground < Service
     
     def self.accepted_formats
-      [:zipcode, :postalcode, :coordinates, :geocode]
+      [:zipcode, :postalcode, :icao, :coordinates, :geocode]
     end
     
     def self.source_name
@@ -48,8 +48,9 @@ module Barometer
     
     # these are the icon codes that indicate "wet", used by wet? function
     def self.wet_icon_codes
-      %w(flurries rain sleet snow tstorms nt_flurries nt_rain nt_sleet nt_snow nt_tstorms)
+      %w(flurries rain sleet snow tstorms nt_flurries nt_rain nt_sleet nt_snow nt_tstorms chancerain)
     end
+    # these are the icon codes that indicate "sun", used by sunny? function
     def self.sunny_icon_codes
       %w(clear mostlysunny partlysunny sunny partlycloudy)
     end

data/lib/barometer/weather.rb

@@ -34,17 +34,9 @@ module Barometer
     # Quick access methods
     #
     
-    def current
-      (default = self.default) ? default.current : nil
-    end
-    
-    def forecast
-      (default = self.default) ? default.forecast : nil
-    end
-
-    def now
-      self.current
-    end
+    def current; (default = self.default) ? default.current : nil; end
+    def forecast; (default = self.default) ? default.forecast : nil; end
+    def now; self.current; end
     
     def today
       default = self.default
@@ -72,37 +64,48 @@ module Barometer
     # averages
     #
     
-    # average of all humidity values
-    # def humidity
-    # end
-    # 
-    # # average of all temperature values
-    # def temperature
-    # end
-    # 
-    # # average of all wind speed values
-    # def wind
-    # end
-    # 
-    # # average of all pressure values
-    # def pressure
-    # end
-    # 
-    # # average of all dew_point values
-    # def dew_point
-    # end
-    # 
-    # # average of all heat_index values
-    # def heat_index
-    # end
-    # 
-    # # average of all wind_chill values
-    # def wind_chill
-    # end
-    # 
-    # # average of all visibility values
-    # def visibility
-    # end
+    # TODO: not tested (except via averages)
+    def metric?
+      self.default ? self.default.metric? : true
+    end
+    
+    # TODO: not tested (except via averages)
+    # this assumes calculating for current, and that "to_f" for a value
+    # will return the value needed
+    # value_name = the name of the value we are averaging
+    def current_average(value_name)
+      values = []
+      @measurements.each do |measurement|
+        values << measurement.current.send(value_name).to_f if measurement.success?
+      end
+      return nil unless values && values.size > 0
+      values.inject(0.0) { |sum,v| sum += v } / values.size
+    end
+    
+    # TODO: not tested (except via averages)
+    def average(value_name, do_average=true, class_name=nil)
+      if class_name
+        if do_average
+          avg = Barometer.const_get(class_name).new(self.metric?)
+          avg << self.current_average(value_name)
+        else
+          avg = self.now.send(value_name)
+        end
+      else
+        avg = (do_average ? self.current_average(value_name) : self.now.send(value_name))
+      end
+      avg
+    end
+      
+    # average of all values
+    def humidity(do_average=true); average("humidity",do_average); end
+    def temperature(do_average=true); average("temperature",do_average,"Temperature"); end
+    def wind(do_average=true); average("wind",do_average,"Speed"); end
+    def pressure(do_average=true); average("pressure",do_average,"Pressure"); end
+    def dew_point(do_average=true); average("dew_point",do_average,"Temperature"); end
+    def heat_index(do_average=true); average("heat_index",do_average,"Temperature"); end
+    def wind_chill(do_average=true); average("wind_chill",do_average,"Temperature"); end
+    def visibility(do_average=true); average("visibility",do_average,"Distance"); end
     
     #
     # quick access methods

data/lib/webometer/public/css/master.css

@@ -0,0 +1,254 @@
+body {
+  color:#000;
+  font-family:'lucida grande', 'lucida sans unicade', sans-serif;
+  font-size:100%;
+  line-height:1.3;
+  background-color:#fff;
+  margin:0;
+  padding:0;
+}
+
+/* HEADER */
+#head {
+  text-align:center;
+}
+#head img {
+  vertical-align:middle;
+  margin:-10px 0 0 -82px;
+  padding:0 15px 0 0;
+  border:0;
+}
+#head h1 {
+  color:#000;
+  font-family:'georgia', 'bitstream vera serif', serif;
+  font-size:4em;
+  font-weight:normal;
+  letter-spacing:-3px;
+  line-height:1;
+  margin:0;
+  padding:20px 0 8px 0;
+}
+#head h1 a, #head h1 a:link, #head h1 a:visited, #head h1 a:hover {
+  color:#100;
+  text-decoration:none;
+}
+#head ul {
+  font-size:1.1em;
+  font-family:"lucida console", "monaco", "andale mono", "bitstream vera sans mono",
+    "consolas", monospace;
+  font-weight:normal;
+  text-transform:uppercase;
+  letter-spacing:2px;
+  text-align:center;
+  margin:0;
+  padding:0 40px 0.25em 40px;
+}
+#head ul li {
+  display:inline;
+  list-style-type:none;
+  padding:0 0.5em 0 0;
+}
+#head ul a, #head ul a:link, #head ul a:visited {
+  color:#56534f;
+  text-decoration:none;
+}
+#head ul a:hover {
+  color:#000;
+  text-decoration:underline
+}
+
+/* CONTENT */
+
+#content {
+  color:#333;
+  font-size:1.1em;
+  max-width:44em;
+  min-width:27em;
+  margin:7px auto;
+  border-top:2px solid #837d7c;
+}
+strong {
+  font-weight:bold;
+}
+
+/* HEADINGS */
+
+h1, h2, h3, h4, h5, h6 {
+  color:#000;
+}
+h1, h2 {
+  color:#211d1f;
+  font-family:'georgia', 'bitstream vera serif', serif;
+  font-weight:normal;
+}
+h1 a, h2 a { color:#222 }
+h1 {
+  font-size:2.25em;
+  letter-spacing:-1px;
+  margin-bottom:0;
+}
+h2 {
+  font-size:1.5em;
+  letter-spacing:-1px;
+  margin:1.25em 0 -0.32em 0;
+}
+h3 {
+  color:#211d1f;
+  font-size:1.02em;
+  font-weight:bold;
+  margin:1.8em 0 -0.25em 0;
+  letter-spacing:-1px;
+}
+h3 a {
+  color:#000;
+  text-decoration:underline;
+}
+
+/* LINKS */
+a {
+  color:#000;
+  text-decoration:underline;
+}
+a:hover {
+  color:#910;
+  text-decoration:underline;
+}
+a img {
+  border:none;
+}
+a.out {
+  background: url('/images/link-out.gif') center right no-repeat;
+  padding-right: 12px;
+}
+
+
+/* CODE */
+
+code, pre, textarea, tt {
+  font-family:"lucida console", "monaco", "andale mono", "bitstream vera sans mono",
+    "consolas", monospace;
+}
+pre {
+  font-size:0.85em;
+  background:#f4f5f5;
+  border:2px solid #d5d0d2;
+  padding:0.5em;
+  line-height:1.15;
+  color:#222;
+}
+code, tt {
+  font-size:0.85em;
+  color:#444;
+}
+h1 code, h2 code, h3 code, h4 code {
+  color:#333;
+}
+pre code {
+  font-size:1em;
+  color:#222;
+}
+
+/* MISC */
+
+hr {
+  margin:3em 0;
+  padding:0;
+  color:#eee;
+}
+
+/* HOME */
+
+body#home {
+  background: #fff url(../images/legend.gif) no-repeat fixed right 130px;
+}
+#home #content {
+  font-size:1.05em;
+  margin:20px 0 0 0;
+  padding:0 20px;
+  border-width:0;
+}
+#home #head, #home #foot {
+  display:none;
+}
+.pipe {
+  clear:both;
+  padding:50px 0;
+}
+.pipe p {
+  color:#000;
+  font-size:62px;
+  font-family:'georgia', 'bitstream vera serif', serif;
+  letter-spacing:-3px;
+  line-height:1;
+  text-align:right;
+  margin:0em 43% 0 0;
+  padding:0 60px 0 0;
+}
+.pipe pre {
+  float:right;
+  background:transparent;
+  font-size:28px;
+  margin:0;
+  padding:5px 0 0 0;
+  width:42%;
+  border-width:0;
+}
+.pipe pre code {
+  color:#666;
+  background:transparent;
+}
+.pipe.shell p {
+  font-size:56px;
+}
+.pipe.shell pre {
+  font-size:18px;
+}
+.pipe.nav p {
+  font-size:100px;
+  letter-spacing:-6px;
+}
+.pipe.nav pre {
+  font-size:36px;
+  padding-top:20px;
+  text-transform:uppercase;
+  letter-spacing:4px;
+  line-height:1.25;
+}
+.pipe.nav {
+  padding:25px 0 50px 0;
+}
+.pipe.nav a, .pipe.nav a:link, .pipe.nav a:visited {
+  color:#444;
+  text-decoration:none;
+}
+.pipe.nav a:hover {
+  color:#000;
+  text-decoration:underline;
+}
+
+form {
+	text-align: center;
+}
+	
+form .text-input input {
+	font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Helvetica, Arial, sans-serif;
+	margin: 10px 0 5px 10px;
+	color: #686868;
+	font-size: 40px;
+	text-align: left;
+	text-transform: lowercase;
+}
+
+form .submit-input input {
+	position: relative;
+	margin: 0 7% 0 0;
+	float: right;
+}
+
+form .options-input {
+	position: relative;
+	margin: 0 7% 0 0;
+	float: left;
+	text-align: left;
+}
+