barometer 0.3.1 → 0.3.2

data/README.rdoc

@@ -10,7 +10,7 @@ unavailable.
 
 == version
 
-Version 0.3.1 is the current release of this gem.
+Version 0.3.2 is the current release of this gem.
 The gem is available from github (attack-barometer) or rubyforge (barometer).
 It is fully functional (for three weather service APIs).
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 3

data/bin/barometer

@@ -65,7 +65,7 @@ require 'yaml'
 KEY_FILE = File.expand_path(File.join('~', '.barometer'))
 
 class App
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   
   attr_reader :options
 
@@ -168,11 +168,33 @@ class App
     
     def output_help
       output_version
-      RDoc::usage('Usage') #exits app
+      #output_usage
     end
     
     def output_usage
-      RDoc::usage('Usage') # gets usage from comments above
+      puts "Usage: "
+      puts "barometer [options] query"
+      puts
+      puts "For help use: barometer -h"
+      puts
+      puts "options:"
+      puts "  -v, --version       Display the version, then exit"
+      puts "  -V, --verbose       Verbose output"
+      puts "  -t, --timeout       seconds until service queries will timeout"
+      puts "  -g, --geocode       Force Geocoding of query"
+      puts "  -m, --metric        measure in metric"
+      puts "  -i, --imperial      measure in imperial"
+      puts "  --no-wunderground   DONT use default wunderground as source"
+      puts "  --yahoo             use yahoo as source"
+      puts "  --google            use google as source"
+      puts "  -p, --pop           pop threshold used to determine wet?"
+      puts "  -s, --wind          wind speed threshold used to determine windy?"
+      puts "  -a, --at            time/date used to determine when to calculate summary"
+      puts
+      puts "  Web Demo:"
+      puts "  -w, --web           run web-app with barometer demo"
+      puts "  -k, --kill          stop the web demo background process"
+      puts "  -S, --status        show the web demo status"
     end
     
     def output_version

data/lib/barometer/data/units.rb

@@ -19,16 +19,19 @@ module Barometer
     # assigns a value to the right attribute based on metric setting    
     def <<(value)
       return unless value
+      
+      # these values can be treated like 'nil'
+      nil_values = ["NA"]
     
       begin
         if value.is_a?(Array)
-          value_m = value[0].to_f
-          value_i = value[1].to_f
+          value_m = value[0].to_f if (value[0] && !nil_values.include?(value[0]))
+          value_i = value[1].to_f if (value[1] && !nil_values.include?(value[1]))
           value_b = nil
         else
           value_m = nil
           value_i = nil
-          value_b = value.to_f
+          value_b = value.to_f if (value && !nil_values.include?(value))
         end
       rescue
         # do nothing

data/lib/barometer/services/google.rb

@@ -40,6 +40,15 @@ module Barometer
       :google
     end
     
+    # these are the icon codes that indicate "wet", used by wet? function
+    def self.wet_icon_codes
+      %w(rain chance_of_rain chance_of_storm thunderstorm mist)
+    end
+    # these are the icon codes that indicate "sun", used by sunny? function
+    def self.sunny_icon_codes
+      %w(sunny mostly_sunny partly_cloudy)
+    end
+    
     def self._measure(measurement, query, metric=true)
       raise ArgumentError unless measurement.is_a?(Barometer::Measurement)
       raise ArgumentError unless query.is_a?(Barometer::Query)
@@ -68,7 +77,10 @@ module Barometer
       
       if data['current_conditions']
         data = data['current_conditions']
-        current.icon = data['icon']['data'] if data['icon']
+        if data['icon']
+          icon_match = data['icon']['data'].match(/.*\/([A-Za-z_]*)\.png/)
+          current.icon = icon_match[1] if icon_match
+        end
         current.condition = data['condition']['data'] if data['condition']
 
         humidity_match = data['humidity']['data'].match(/[\d]+/)
@@ -100,7 +112,10 @@ module Barometer
       d = 0
       data.each do |forecast|
         forecast_measurement = ForecastMeasurement.new
-        forecast_measurement.icon = forecast['icon']['data'] if forecast['icon']
+        if forecast['icon']
+          icon_match = forecast['icon']['data'].match(/.*\/([A-Za-z_]*)\.png/)
+          forecast_measurement.icon = icon_match[1] if icon_match
+        end
         forecast_measurement.condition = forecast['condition']['data'] if forecast['condition']
 
         if (start_date + d).strftime("%a").downcase == forecast['day_of_week']['data'].downcase

data/lib/barometer/weather.rb

@@ -64,25 +64,24 @@ module Barometer
     # averages
     #
     
-    # 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?
+        values << measurement.current.send(value_name).to_f if measurement.success? &&
+          measurement.current.send(value_name)
       end
+      values.compact!
       return nil unless values && values.size > 0
-      values.inject(0.0) { |sum,v| sum += v } / values.size
+      values.inject(0.0) { |sum,v| sum += v if 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

data/lib/demometer/demometer.rb

@@ -12,6 +12,13 @@ end
 
 class Demometer < Sinatra::Default
 
+  helpers do
+    def data(title, value)
+      return if value.nil?
+      "<li>#{title}: #{value}</li>"
+    end
+  end
+
   get '/' do
     erb :index
   end
@@ -19,9 +26,11 @@ class Demometer < Sinatra::Default
   post '/' do
     # apply options
     Barometer.force_geocode = (params[:query][:geocode].to_s == "1" ? true : false)
-    Barometer.selection = { 1 => [ params[:query][:source].to_sym ] }
     metric = (params[:query][:metric].to_s == "1" ? true : false)
     
+    # determine sources
+    Barometer.selection = { 1 => params[:query][:source].collect{|s| s.to_sym } }
+    
     if params[:query] && !params[:query][:q].empty?
       @barometer = Barometer.new(params[:query][:q])
       @weather = @barometer.measure(metric)

data/lib/demometer/views/forecast.erb

@@ -1,14 +1,15 @@
 <h4>for: <%= forecast.date %></h4>
 <p>
   <ul>
-    <li>Date: <%= forecast.date %></li>
-    <li>Icon: <%= forecast.icon %></li>
-    <li>Condition: <%= forecast.condition %></li>
-    <li>High: <%= forecast.high %></li>
-    <li>Low: <%= forecast.low %></li>
-    <li>POP: <%= forecast.pop %></li>
+    <%= data("Date", forecast.date) %>
+    <%= data("Icon", forecast.icon) %>
+    <%= data("Condition", forecast.condition) %>
+    <%= data("High", forecast.high) %>
+    <%= data("Low", forecast.low) %>
+    <%= data("POP", forecast.pop) %>
     <% if forecast.sun %>
-    <li>Sun: rise - <%= forecast.sun.rise %>, set - <%= forecast.sun.set %></li>
+    <%= data("Sun Rise", forecast.sun.rise) %>
+    <%= data("Sun Set", forecast.sun.set) %>
     <% end %>
   </ul>
 </p>

data/lib/demometer/views/index.erb

@@ -14,9 +14,9 @@
       <input id="query_metric" name="query[metric]" type="checkbox" value="1" checked="checked" />
     <br/>
     Source :
-      <input type="radio" name="query[source]" value="wunderground" checked="checked" /> Wunderground
-      <input type="radio" name="query[source]" value="yahoo" /> Yahoo
-      <input type="radio" name="query[source]" value="google" /> Google
+      <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
     <br/>
     Force Geocode? :
       <input id="query_geocode" name="query[geocode]" type="checkbox" value="1" checked="checked" />
@@ -35,24 +35,24 @@
   <h2>Averages</h2>
   <p>
     <ul>
-      <li>Humidity: <%= @weather.humidity.to_i %></li>
-      <li>Temperature: <%= @weather.temperature %></li>
-      <li>Wind: <%= @weather.wind %></li>
-      <li>Pressure: <%= @weather.pressure %></li>
-      <li>Dew Point: <%= @weather.dew_point %></li>
-      <li>Heat Index: <%= @weather.heat_index %></li>
-      <li>Wind Chill: <%= @weather.wind_chill %></li>
-      <li>Visibility: <%= @weather.visibility %></li>
+      <%= data("Humidity", @weather.humidity.to_i) %>
+      <%= data("Temperature", @weather.temperature) %>
+      <%= data("Wind", @weather.wind) %>
+      <%= data("Pressure", @weather.pressure) %>
+      <%= data("Dew Point", @weather.dew_point) %>
+      <%= data("Heat Index", @weather.heat_index) %>
+      <%= data("Wind Chill", @weather.wind_chill) %>
+      <%= data("Visibility", @weather.visibility) %>
     </ul>
   </p>
   
   <h2>Summary</h2>
   <p>
     <ul>
-      <li>Day?: <%= @weather.day? %></li>
-      <li>Sunny?: <%= @weather.sunny? %></li>
-      <li>Windy?: <%= @weather.windy? %></li>
-      <li>Wet?: <%= @weather.wet? %></li>
+      <%= data("Day?", @weather.day?) %>
+      <%= data("Sunny?", @weather.sunny?) %>
+      <%= data("Windy?", @weather.windy?) %>
+      <%= data("Wet?", @weather.wet?) %>
     </ul>
   </p>
   
@@ -60,14 +60,14 @@
   <h3>Query</h3>
   <p>
     <ul>
-      <li>Format: <%= @barometer.query.format %></li>
+      <%= data("Format", @barometer.query.format) %>
       <% if @barometer.query.geo %>
-      <li>Locality: <%= @barometer.query.geo.locality %></li>
-      <li>Region: <%= @barometer.query.geo.region %></li>
-      <li>Country: <%= @barometer.query.geo.country %></li>
-      <li>Country Code: <%= @barometer.query.geo.country_code %></li>
-      <li>Latitude: <%= @barometer.query.geo.latitude %></li>
-      <li>Longitude: <%= @barometer.query.geo.longitude %></li>
+      <%= data("Locality", @barometer.query.geo.locality) %>
+      <%= data("Region", @barometer.query.geo.region) %>
+      <%= data("Country", @barometer.query.geo.country) %>
+      <%= data("Country Code", @barometer.query.geo.country_code) %>
+      <%= data("Latitude", @barometer.query.geo.latitude) %>
+      <%= data("Longitude", @barometer.query.geo.longitude) %>
       <% end %>
     </ul>
   </p>

data/lib/demometer/views/measurement.erb

@@ -1,10 +1,10 @@
 <h2><%= measurement.source.to_s.capitalize %></h2>
 <p>
   <ul>
-    <li>Source: <%= measurement.source %></li>
-    <li>Time: <%= measurement.time %></li>
-    <li>Metric: <%= measurement.metric? %></li>
-    <li>Success: <%= measurement.success? %></li>
+    <%= data("Source", measurement.source) %>
+    <%= data("Time", measurement.time) %>
+    <%= data("Metric", measurement.metric?) %>
+    <%= data("Success", measurement.success?) %>
   </ul>
 </p>
 
@@ -12,16 +12,16 @@
 <h3>Location</h3>
 <p>
   <ul>
-    <li>id: <%= measurement.location.id %></li>
-    <li>Name: <%= measurement.location.name %></li>
-    <li>City: <%= measurement.location.city %> %</li>
-    <li>State Name: <%= measurement.location.state_name %></li>
-    <li>State Code: <%= measurement.location.state_code %></li>
-    <li>Country: <%= measurement.location.country %></li>
-    <li>Country Code: <%= measurement.location.country_code %></li>
-    <li>Zip Code: <%= measurement.location.zip_code %></li>
-    <li>Latitude: <%= measurement.location.latitude %></li>
-    <li>Longitude: <%= measurement.location.longitude %></li>
+    <%= data("id", measurement.location.id) %>
+    <%= data("Name", measurement.location.name) %>
+    <%= data("City", measurement.location.city) %>
+    <%= data("State Name", measurement.location.state_name) %>
+    <%= data("State Code", measurement.location.state_code) %>
+    <%= data("Country", measurement.location.country) %>
+    <%= data("Country Code", measurement.location.country_code) %>
+    <%= data("Zip Code", measurement.location.zip_code) %>
+    <%= data("Latitude", measurement.location.latitude) %>
+    <%= data("Longitude", measurement.location.longitude) %>
   </ul>
 </p>
 <% end %>
@@ -30,16 +30,17 @@
 <h3>Station</h3>
 <p>
   <ul>
-    <li>id: <%= measurement.station.id %></li>
-    <li>Name: <%= measurement.station.name %></li>
-    <li>City: <%= measurement.station.city %> %</li>
-    <li>State Name: <%= measurement.station.state_name %></li>
-    <li>State Code: <%= measurement.station.state_code %></li>
-    <li>Country: <%= measurement.station.country %></li>
-    <li>Country Code: <%= measurement.station.country_code %></li>
-    <li>Zip Code: <%= measurement.station.zip_code %></li>
-    <li>Latitude: <%= measurement.station.latitude %></li>
-    <li>Longitude: <%= measurement.station.longitude %></li>
+    <%= data("id", measurement.station.id) %>
+    <%= data("Name", measurement.station.name) %>
+    <%= data("City", measurement.station.city) %>
+    <%= data("State Name", measurement.station.state_name) %>
+    <%= data("State Code", measurement.station.state_code) %>
+    <%= data("Country", measurement.station.country) %>
+    <%= data("Country Code", measurement.station.country_code) %>
+    <%= data("Zip Code", measurement.station.zip_code) %>
+    <%= data("Latitude", measurement.station.latitude) %>
+    <%= data("Longitude", measurement.station.longitude) %>
+    </ul>
   </ul>
 </p>
 <% end %>
@@ -48,9 +49,9 @@
 <h3>Timezone</h3>
 <p>
   <ul>
-    <li>Long: <%= measurement.timezone.timezone %></li>
-    <li>Code: <%= measurement.timezone.code %></li>
-    <li>DST?: <%= measurement.timezone.dst? %></li>
+    <%= data("Long", measurement.timezone.timezone) %>
+    <%= data("Code", measurement.timezone.code) %>
+    <%= data("DST?", measurement.timezone.dst?) %>
   </ul>
 </p>
 <% end %>
@@ -59,20 +60,25 @@
 <h3>Current</h3>
 <p>
   <ul>
-    <li>Time: <%= measurement.current.time %></li>
-    <li>Local Time: <%= measurement.current.local_time %></li>
-    <li>Humidity: <%= measurement.current.humidity %> %</li>
-    <li>Icon: <%= measurement.current.icon %></li>
-    <li>Condition: <%= measurement.current.condition %></li>
-    <li>Temperature: <%= measurement.current.temperature %></li>
-    <li>Dew Point: <%= measurement.current.dew_point %></li>
-    <li>Heat Index: <%= measurement.current.heat_index %></li>
-    <li>Wind Chill: <%= measurement.current.wind_chill %></li>
-    <li>Wind: <%= measurement.current.wind %> @ <%= measurement.current.wind.direction %> [<%= measurement.current.wind.degrees %> degrees]</li>
-    <li>Pressure: <%= measurement.current.pressure %></li>
-    <li>Visibility: <%= measurement.current.visibility %></li>
+    <%= data("Time", measurement.current.time) %>
+    <%= data("Local Time", measurement.current.local_time) %>
+    <%= data("Humidity", measurement.current.humidity) %>
+    <%= data("Icon", measurement.current.icon) %>
+    <%= data("Condition", measurement.current.condition) %>
+    <%= data("Temperature", measurement.current.temperature) %>
+    <%= data("Dew Point", measurement.current.dew_point) %>
+    <%= data("Heat Index", measurement.current.heat_index) %>
+    <%= data("Wind Chill", measurement.current.wind_chill) %>
+    <% if measurement.current.wind %>
+    <%= data("Wind Speed", measurement.current.wind) %>
+    <%= data("Wind Direction", measurement.current.wind.direction) %>
+    <%= data("Wind Degrees", measurement.current.wind.degrees) %>
+    <% end %>
+    <%= data("Pressure", measurement.current.pressure) %>
+    <%= data("Visibility", measurement.current.visibility) %>
     <% if measurement.current.sun %>
-    <li>Sun: rise - <%= measurement.current.sun.rise %>, set - <%= measurement.current.sun.set %></li>
+    <%= data("Sun Rise", measurement.current.sun.rise) %>
+    <%= data("Sun Set", measurement.current.sun.set) %>
     <% end %>
   </ul>
 </p>

data/spec/service_google_spec.rb

@@ -141,4 +141,139 @@ describe "Google" do
   
   end
   
+  describe "when answering the simple questions," do
+    
+    before(:each) do
+      @measurement = Barometer::Measurement.new
+    end
+    
+    describe "currently_wet_by_icon?" do
+      
+      before(:each) do
+        @measurement.current = Barometer::CurrentMeasurement.new
+      end
+    
+      it "returns true if matching icon code" do
+        @measurement.current.icon = "rain"
+        @measurement.current.icon?.should be_true
+        Barometer::Google.currently_wet_by_icon?(@measurement.current).should be_true
+      end
+      
+      it "returns false if NO matching icon code" do
+        @measurement.current.icon = "sunny"
+        @measurement.current.icon?.should be_true
+        Barometer::Google.currently_wet_by_icon?(@measurement.current).should be_false
+      end
+      
+    end
+    
+    describe "forecasted_wet_by_icon?" do
+      
+      before(:each) do
+        @measurement.forecast = [Barometer::ForecastMeasurement.new]
+        @measurement.forecast.first.date = Date.today
+        @measurement.forecast.size.should == 1
+      end
+    
+      it "returns true if matching icon code" do
+        @measurement.forecast.first.icon = "rain"
+        @measurement.forecast.first.icon?.should be_true
+        Barometer::Google.forecasted_wet_by_icon?(@measurement.forecast.first).should be_true
+      end
+      
+      it "returns false if NO matching icon code" do
+        @measurement.forecast.first.icon = "sunny"
+        @measurement.forecast.first.icon?.should be_true
+        Barometer::Google.forecasted_wet_by_icon?(@measurement.forecast.first).should be_false
+      end
+      
+    end
+    
+    describe "currently_sunny_by_icon?" do
+      
+      before(:each) do
+        @measurement.current = Barometer::CurrentMeasurement.new
+      end
+
+      it "returns true if matching icon code" do
+        @measurement.current.icon = "sunny"
+        @measurement.current.icon?.should be_true
+        Barometer::Google.currently_sunny_by_icon?(@measurement.current).should be_true
+      end
+      
+      it "returns false if NO matching icon code" do
+        @measurement.current.icon = "rain"
+        @measurement.current.icon?.should be_true
+        Barometer::Google.currently_sunny_by_icon?(@measurement.current).should be_false
+      end
+      
+    end
+    
+    describe "forecasted_sunny_by_icon?" do
+      
+      before(:each) do
+        @measurement.forecast = [Barometer::ForecastMeasurement.new]
+        @measurement.forecast.first.date = Date.today
+        @measurement.forecast.size.should == 1
+      end
+
+      it "returns true if matching icon code" do
+        @measurement.forecast.first.icon = "sunny"
+        @measurement.forecast.first.icon?.should be_true
+        Barometer::Google.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_true
+      end
+      
+      it "returns false if NO matching icon code" do
+        @measurement.forecast.first.icon = "rain"
+        @measurement.forecast.first.icon?.should be_true
+        Barometer::Google.forecasted_sunny_by_icon?(@measurement.forecast.first).should be_false
+      end
+      
+    end
+    
+  end
+  
+  # describe "overall data correctness" do
+  #   
+  #   before(:each) do
+  #     @query = Barometer::Query.new("Calgary,AB")
+  #     @query.preferred = "Calgary,AB"
+  #     @measurement = Barometer::Measurement.new
+  #     
+  #     FakeWeb.register_uri(:get, 
+  #       "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=#{CGI.escape(@query.preferred)}",
+  #       :string => File.read(File.join(File.dirname(__FILE__), 
+  #         'fixtures', 
+  #         'current_calgary_ab.xml')
+  #       )
+  #     )  
+  #     FakeWeb.register_uri(:get, 
+  #       "http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml?query=#{CGI.escape(@query.preferred)}",
+  #       :string => File.read(File.join(File.dirname(__FILE__), 
+  #         'fixtures', 
+  #         'forecast_calgary_ab.xml')
+  #       )
+  #     )
+  #   end
+  # 
+  #  # TODO: complete this
+  #  it "should correctly build the data" do
+  #     result = Barometer::Wunderground._measure(@measurement, @query)
+  #     
+  #     # build timezone
+  #     @measurement.timezone.timezone.should == "America/Edmonton"
+  #     
+  #     time = Time.local(2009, 4, 23, 18, 00, 0)
+  #     rise = Time.local(time.year, time.month, time.day, 6, 23)
+  #     set = Time.local(time.year, time.month, time.day, 20, 45)
+  #     sun_rise = @measurement.timezone.tz.local_to_utc(rise)
+  #     sun_set = @measurement.timezone.tz.local_to_utc(set)
+  #     
+  #     # build current
+  #     @measurement.current.sun.rise.should == sun_rise
+  #     @measurement.current.sun.set.should == sun_set
+  #   end
+  #   
+  # end
+  
 end

data/spec/weather_spec.rb

@@ -94,6 +94,18 @@ describe "Weather" do
       @weather.measurements << @google
     end
     
+    it "doesn't include nil values" do
+      @weather.source(:wunderground).current.temperature = Barometer::Temperature.new
+      @weather.source(:wunderground).current.temperature.c = 10
+      
+      @weather.temperature.c.should == 10
+      
+      @weather.source(:yahoo).current.temperature = Barometer::Temperature.new
+      @weather.source(:yahoo).current.temperature.c = nil
+      
+      @weather.temperature.c.should == 10
+    end
+    
     describe "for temperature" do
       
       before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barometer
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Mark G