barometer 0.6.1 → 0.6.2

data/lib/barometer/weather_services/weather_dot_com.rb

@@ -3,6 +3,7 @@ module Barometer
   # = Weather.com
   # www.weather.com
   #
+  # - usage restrictions: YES ... many !!!
   # - key required: YES (partnerid & licensekey)
   # - registration required: YES
   # - supported countries: US (by zipcode), International (by Weather Location ID)
@@ -27,16 +28,32 @@ module Barometer
   # - Weather Location ID (International)
   #
   # = Weather.com terms of use
-  # ???
+  # There are many conditions when using weather.com. Please read the EULA you
+  # received when you registered for your API keys.  In a nutshell (but not limited
+  # to), do the following:
+  # - display the weather.com links (all 5)
+  # - respect the data refresh rates
+  # - do not alter/delete content
+  # - display when weather was last updated
+  # - do not display data in combination with other 3rd party data (except NOAA or GOV)
+  # - do not reproduce, rent, lease, lend, distribute or re-market data
+  # - do not resell
+  # - do not use in combination with a service that charges a fee
+  # - do not use in a mobile application
+  # - use the images properly
+  # - do not display weather for more then 3 locations at a time
+  # - do not allow the data to be scraped (via robots, spiders, web crawlers, etc)
+  # - do not use the latitude and longitude information
   #
   # == notes
-  # - the Weather Location ID is a propreitary number (possibly shared with yahoo.com)
+  # - the Weather Location ID is a propreitary number (shared with yahoo.com)
   #
   # == TODO
   # - improve "forecasted_wet_by_icon?" to determine if day or night and use right code
   # - improve "forecasted_sunny_by_icon?" to determine if day or night and use right code
   # - improve "forcasted_wet_by_humidity?" to use forecasted values
   # - improve "forcasted_windy?" to use forecasted values
+  # - collect moon and uv information
   #
   class WeatherService::WeatherDotCom < WeatherService
     
@@ -100,7 +117,7 @@ module Barometer
 
     def self._build_current(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      current = Measurement::Current.new
+      current = Measurement::Result.new
       if data
         if data['cc']
           current.updated_at = Data::LocalDateTime.parse(data['cc']['lsup'])
@@ -132,60 +149,76 @@ module Barometer
     
     def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      forecasts = Measurement::ForecastArray.new
+      forecasts = Measurement::ResultArray.new
     
       if data && data['dayf'] && data['dayf']['day']
         local_date = data['dayf']['lsup']
         data['dayf']['day'].each do |forecast|
-          forecast_measurement = Measurement::Forecast.new
-          forecast_measurement.date = Date.parse(forecast['dt'])
+          day_measurement = Measurement::Result.new
+          night_measurement = Measurement::Result.new
           
-          forecast_measurement.high = Data::Temperature.new(metric)
-          forecast_measurement.high << forecast['hi']
-          forecast_measurement.low = Data::Temperature.new(metric)
-          forecast_measurement.low << forecast['low']
+          # as stated by weather.com "day = 7am-7pm"
+          # and "night = 7pm-7am"
+          date = Date.parse(forecast['dt'])
+          date_string = date.strftime("%b %d")
+          day_measurement.valid_start_date = Data::LocalDateTime.new(date.year,date.month,date.day,7,0,0)
+          day_measurement.valid_end_date = Data::LocalDateTime.new(date.year,date.month,date.day,18,59,59)
+          night_measurement.valid_start_date = Data::LocalDateTime.new(date.year,date.month,date.day,19,0,0)
+          night_measurement.valid_end_date = Data::LocalDateTime.new(date.year,date.month,date.day+1,6,59,59)
+          
+          high = Data::Temperature.new(metric)
+          high << forecast['hi']
+          low = Data::Temperature.new(metric)
+          low << forecast['low']
+          day_measurement.high = high
+          day_measurement.low = low
+          night_measurement.high = high
+          night_measurement.low = low
           
           # build sun
           rise_local_time = Data::LocalTime.parse(forecast['sunr'])
           set_local_time = Data::LocalTime.parse(forecast['suns'])
           sun = Data::Sun.new(rise_local_time, set_local_time)
-          forecast_measurement.sun = sun
+          day_measurement.sun = sun
+          night_measurement.sun = sun
           
           if forecast['part']
             forecast['part'].each do |part|
               if part['p'] == 'd'
-                # add this to the ForecastMeasurement
-                forecast_measurement.condition = part['t']
-                forecast_measurement.icon = part['icon']
-                forecast_measurement.pop = part['ppcp'].to_i
-                forecast_measurement.humidity = part['hmid'].to_i
+                # add this to the day
+                day_measurement.description = "#{date_string} - Day"
+                day_measurement.condition = part['t']
+                day_measurement.icon = part['icon']
+                day_measurement.pop = part['ppcp'].to_i
+                day_measurement.humidity = part['hmid'].to_i
                 
                 if part['wind']
-                  forecast_measurement.wind = Data::Speed.new(metric)
-                  forecast_measurement.wind << part['wind']['s']
-                  forecast_measurement.wind.degrees = part['wind']['d'].to_i
-                  forecast_measurement.wind.direction = part['wind']['t']
+                  day_measurement.wind = Data::Speed.new(metric)
+                  day_measurement.wind << part['wind']['s']
+                  day_measurement.wind.degrees = part['wind']['d'].to_i
+                  day_measurement.wind.direction = part['wind']['t']
                 end
                 
               elsif part['p'] == 'n'  
-                # add this to the NightMeasurement
-                forecast_measurement.night = Measurement::ForecastNight.new
-                forecast_measurement.night.condition = part['t']
-                forecast_measurement.night.icon = part['icon']
-                forecast_measurement.night.pop = part['ppcp'].to_i
-                forecast_measurement.night.humidity = part['hmid'].to_i
+                # add this to the night
+                night_measurement.description = "#{date_string} - Night"
+                night_measurement.condition = part['t']
+                night_measurement.icon = part['icon']
+                night_measurement.pop = part['ppcp'].to_i
+                night_measurement.humidity = part['hmid'].to_i
                 
                 if part['wind']
-                  forecast_measurement.night.wind = Data::Speed.new(metric)
-                  forecast_measurement.night.wind << part['wind']['s']
-                  forecast_measurement.night.wind.degrees = part['wind']['d'].to_i
-                  forecast_measurement.night.wind.direction = part['wind']['t']
+                  night_measurement.wind = Data::Speed.new(metric)
+                  night_measurement.wind << part['wind']['s']
+                  night_measurement.wind.degrees = part['wind']['d'].to_i
+                  night_measurement.wind.direction = part['wind']['t']
                 end
                 
               end
             end
           end
-          forecasts << forecast_measurement
+          forecasts << day_measurement
+          forecasts << night_measurement
         end
       end
       forecasts
@@ -243,10 +276,4 @@ module Barometer
     end
     
   end
-end
-
-# FUTURE DATA TO SUPPORT?
-#    "cc"=>
-#     {"obst"=>"Santa Monica, CA",
-#      "uv"=>{"i"=>"0", "t"=>"Low"},
-#      "moon"=>{"icon"=>"9", "t"=>"Waxing Gibbous"}
+end

data/lib/barometer/weather_services/wunderground.rb

@@ -102,7 +102,7 @@ module Barometer
     def self._build_current(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
       
-      current = Measurement::Current.new
+      current = Measurement::Result.new
       current.updated_at = Data::LocalDateTime.parse(data['observation_time']) if data['observation_time']
       current.humidity = data['relative_humidity'].to_i
       current.icon = data['icon'] if data['icon']
@@ -135,13 +135,13 @@ module Barometer
     
     def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      forecasts = Measurement::ForecastArray.new
+      forecasts = Measurement::ResultArray.new
       # go through each forecast and create an instance
       if data && data['simpleforecast'] &&
          data['simpleforecast']['forecastday']
          
         data['simpleforecast']['forecastday'].each do |forecast|
-          forecast_measurement = Measurement::Forecast.new
+          forecast_measurement = Measurement::Result.new
           forecast_measurement.icon = forecast['icon']
           forecast_measurement.date = Date.parse(forecast['date']['pretty'])
           forecast_measurement.pop = forecast['pop'].to_i

data/lib/barometer/weather_services/yahoo.rb

@@ -92,7 +92,7 @@ module Barometer
     
     def self._build_current(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      current = Measurement::Current.new(metric)
+      current = Measurement::Result.new(metric)
       if data
         if data['item'] && data['item']['yweather:condition']
           condition_result = data['item']['yweather:condition']
@@ -124,13 +124,13 @@ module Barometer
     
     def self._build_forecast(data, metric=true)
       raise ArgumentError unless data.is_a?(Hash)
-      forecasts = Measurement::ForecastArray.new
+      forecasts = Measurement::ResultArray.new
       
       if data && data['item'] && data['item']['yweather:forecast']
          forecast_result = data['item']['yweather:forecast']
          
         forecast_result.each do |forecast|
-          forecast_measurement = Measurement::Forecast.new
+          forecast_measurement = Measurement::Result.new
           forecast_measurement.icon = forecast['code']
           forecast_measurement.date = Date.parse(forecast['date'])
           forecast_measurement.condition = forecast['text']

data/lib/demometer/demometer.rb

@@ -12,7 +12,7 @@ else
   exit
 end
 
-class Demometer < Sinatra::Default
+#class Demometer < Sinatra::Default
 
   def config_weather_dot_com
     if File.exists?(@@config_file)
@@ -101,4 +101,4 @@ class Demometer < Sinatra::Default
     erb :about
   end
 
-end
+#end

data/lib/demometer/public/css/master.css

@@ -1,11 +1,10 @@
 /*
-	Copyright: Blake Mizerany, www.sinatrarb.com
-	Permission Pending
+	Inspired By: Blake Mizerany, www.sinatrarb.com
 */
 
 body {
   color:#000;
-  font-family:'lucida grande', 'lucida sans unicade', sans-serif;
+  font-family:"Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Helvetica, Arial, sans-serif;
   font-size:100%;
   line-height:1.3;
   background-color:#fff;
@@ -17,21 +16,14 @@ body {
 #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;
+  padding:20px 0 15px 0;
 }
 #head h1 a, #head h1 a:link, #head h1 a:visited, #head h1 a:hover {
   color:#100;
@@ -39,8 +31,6 @@ body {
 }
 #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;
@@ -68,7 +58,7 @@ body {
   color:#333;
   font-size:1.1em;
   max-width:44em;
-  min-width:27em;
+  min-width:30em;
   margin:7px auto;
   border-top:2px solid #837d7c;
 }
@@ -83,7 +73,6 @@ h1, h2, h3, h4, h5, h6 {
 }
 h1, h2 {
   color:#211d1f;
-  font-family:'georgia', 'bitstream vera serif', serif;
   font-weight:normal;
 }
 h1 a, h2 a { color:#222 }
@@ -163,9 +152,6 @@ hr {
 
 /* 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;
@@ -175,62 +161,6 @@ body#home {
 #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;
 }
@@ -253,7 +183,6 @@ form .submit-input input {
 form .options-input {
 	position: relative;
 	margin: 0 7% 0 0;
-	float: left;
 	text-align: left;
 }
 

data/lib/demometer/public/css/print.css

@@ -1,6 +1,5 @@
 /*
-	Copyright: Blake Mizerany, www.sinatrarb.com
-	Permission Pending
+	Inspired By: Blake Mizerany, www.sinatrarb.com
 */
 body
   { color: #000;

data/lib/demometer/public/css/syntax.css

@@ -1,6 +1,5 @@
 /*
-	Copyright: Blake Mizerany, www.sinatrarb.com
-	Permission Pending
+	Inspired By: Blake Mizerany, www.sinatrarb.com
 */
 .highlight  { background: #ffffff; }
 .highlight .c { color: #999988; font-style: italic } /* Comment */

data/lib/demometer/views/about.erb

@@ -6,5 +6,5 @@
 
 <ul>
 <li><a href='http://sinatra.github.com/'>Blake Mizerany</a> (bmizerany) for Sinatra and
-  the layout for this demo app (permission pending).</li>
+  the inspiration for the layout of the demo app.</li>
 </ul>

data/lib/demometer/views/contributing.erb

@@ -1,12 +1,12 @@
 <h1 id='contribute'>Contribute</h1>
 
-<p>Want to advance Barometer? Help out by contributing!</p>
+<p>Help build Barometer.</p>
 
-<h2 id='find_a_bug'>Find a bug?</h2>
+<h2>Find a bug?</h2>
 
 <p>Add it to GitHub by <a href='http://github.com/attack/barometer/issues'>creating a new issue</a>. Be sure to include all relevant information, like the versions of Barometer and Ruby you&#8217;re using. A <a href='http://gist.github.com/'>gist</a> of the code that caused the issue as well as any error messages are also very helpful.</p>
 
-<h2 id='have_a_patch'>Have a patch?</h2>
+<h2>Have a patch?</h2>
 
 <p>Bugs and feature requests that include patches are much more likely to get attention. Here are some guidelines that will help ensure your patch can be applied as quickly as possible:</p>
 
@@ -22,7 +22,7 @@
 </li>
 
 <li>
-<p><strong>Mind the <code>README</code>:</strong> If the patch adds or modifies a major feature, modify the <code>README.rdoc</code> file to reflect that.</p>
+<p><strong>Update the <code>README</code>:</strong> If the patch adds or modifies a major feature, modify the <code>README.rdoc</code> file to reflect that.</p>
 
 </li>
 

data/lib/demometer/views/index.erb

@@ -14,21 +14,20 @@
       <input id="query_metric" name="query[metric]" type="checkbox" value="1" checked="checked" />
     <br/>
     Source :
-      <input type="checkbox" name="query[source]" value="wunderground" checked="checked" /> Wunderground
-      <input type="checkbox" name="query[source]" value="yahoo" /> Yahoo
-      <input type="checkbox" name="query[source]" value="google" /> Google
-      <input type="checkbox" name="query[source]" value="weather_dot_com" /> Weather.com
-      <input type="checkbox" name="query[source]" value="weather_bug" /> Weather Bug
-    <br/>
+    <ul>
+      <li><input type="checkbox" name="query[source]" value="wunderground" checked="checked" /> Wunderground</li>
+      <li><input type="checkbox" name="query[source]" value="yahoo" /> Yahoo</li>
+      <li><input type="checkbox" name="query[source]" value="google" /> Google</li>
+      <li><input type="checkbox" name="query[source]" value="weather_dot_com" /> Weather.com</li>
+      <li><input type="checkbox" name="query[source]" value="weather_bug" /> Weather Bug</li>
+    </ul>
     Force Geocode? :
       <input id="query_geocode" name="query[geocode]" type="checkbox" value="1" checked="checked" />
   </div>
 </form>
 
-<p>&nbsp;</p>
-<br/>
-
 <% if params[:query] && !params[:query][:q].empty? %>
+<hr/>
 <h2>query: "<%= params[:query][:q] %>"</h2>
 <% end %>