barometer 0.3.2 → 0.5.0

data/lib/demometer/views/forecast.erb

@@ -7,9 +7,29 @@
     <%= data("High", forecast.high) %>
     <%= data("Low", forecast.low) %>
     <%= data("POP", forecast.pop) %>
+    <%= data("Humidity", forecast.humidity) %>
+    <% if forecast.wind %>
+    <%= data("Wind Speed", forecast.wind) %>
+    <%= data("Wind Direction", forecast.wind.direction) %>
+    <%= data("Wind Degrees", forecast.wind.degrees) %>
+    <% end %>
     <% if forecast.sun %>
     <%= data("Sun Rise", forecast.sun.rise) %>
     <%= data("Sun Set", forecast.sun.set) %>
     <% end %>
   </ul>
+  <% if forecast.night %>
+  <ul>- Night -
+    <%= data("Date", forecast.night.date) %>
+    <%= data("Date", forecast.night.icon) %>
+    <%= data("Date", forecast.night.condition) %>
+    <%= data("Date", forecast.night.pop) %>
+    <%= data("Date", forecast.night.humidity) %>
+    <% if forecast.night.wind %>
+    <%= data("Wind Speed", forecast.night.wind) %>
+    <%= data("Wind Direction", forecast.night.wind.direction) %>
+    <%= data("Wind Degrees", forecast.night.wind.degrees) %>
+    <% end %>
+  </ul>
+  <% end %>
 </p>

data/lib/demometer/views/index.erb

@@ -17,6 +17,7 @@
       <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
     <br/>
     Force Geocode? :
       <input id="query_geocode" name="query[geocode]" type="checkbox" value="1" checked="checked" />
@@ -60,16 +61,22 @@
   <h3>Query</h3>
   <p>
     <ul>
+      <%= data("Query", @barometer.query.q) %>
       <%= data("Format", @barometer.query.format) %>
-      <% if @barometer.query.geo %>
+      <%= data("Country Code", @barometer.query.country_code) %>
+    </ul>  
+    <% if @barometer.query.geo %>
+    <ul> - Geo -
+      <%= data("Query", @barometer.query.geo.query) %>
+      <%= data("Address", @barometer.query.geo.address) %>
       <%= 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>
+    </ul>  
+    <% end %>
   </p>
   <% end %>
 

data/lib/demometer/views/measurement.erb

@@ -1,11 +1,16 @@
 <h2><%= measurement.source.to_s.capitalize %></h2>
 <p>
   <ul>
+    <%= data("Measured At", measurement.measured_at) %>
     <%= data("Source", measurement.source) %>
-    <%= data("Time", measurement.time) %>
+    <%= data("Time Stamp", measurement.utc_time_stamp) %>
     <%= data("Metric", measurement.metric?) %>
     <%= data("Success", measurement.success?) %>
   </ul>
+  <ul>- Modified Query -
+    <%= data("Query", measurement.query) %>
+    <%= data("Format", measurement.format) %>
+  </ul>
 </p>
 
 <% if measurement.location %>
@@ -60,8 +65,8 @@
 <h3>Current</h3>
 <p>
   <ul>
-    <%= data("Time", measurement.current.time) %>
-    <%= data("Local Time", measurement.current.local_time) %>
+    <%= data("Measured At", measurement.current.current_at) %>
+    <%= data("Updated At", measurement.current.updated_at) %>
     <%= data("Humidity", measurement.current.humidity) %>
     <%= data("Icon", measurement.current.icon) %>
     <%= data("Condition", measurement.current.condition) %>

data/lib/demometer/views/readme.erb

@@ -11,12 +11,12 @@ unavailable.
 </p>
 <h2>version</h2>
 <p>
-
-Version 0.3.1 is the current release of this gem. The gem is available from
+Version 0.3.3 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).
 </p>
 <h2>status</h2>
+
 <p>
 Currently this project is in development and will only work for a few
 weather services (wunderground, google, yahoo).
@@ -31,10 +31,10 @@ Features to be added next:
 </ul>
 <h1>dependencies</h1>
 <h3>Google API key</h3>
-
 <p>
 In most cases you will need to have a free google geocode api key. Get one
 here: <a href="http://code.google.com/apis/maps/signup.html">code.google.com/apis/maps/signup.html</a>
+
 Then put it in the file &#8217;~/.barometer&#8217; by adding the line:
 geocode_google: YOUR_KEY_HERE
 </p>
@@ -44,10 +44,17 @@ You will need this for:
 <ul>
 <li>using the Barometer gem (unless you use queries that are directly supported
 by the weather source API, ie yahoo will take a zip code directly and
-doesn&#8217;t require any geocoding)</li>
-<li>running the Barometer binary</li>
-<li>running the Barometer Web Demo</li>
+doesn&#8217;t require any geocoding)
+
+</li>
+<li>running the Barometer binary
+
+</li>
+<li>running the Barometer Web Demo
+
+</li>
 </ul>
+
 <h3>HTTParty</h3>
 <p>
 Why? HTTParty was created and designed specifically for consuming web
@@ -63,9 +70,9 @@ Why? Barometer deals with time information for locations all over the
 world. This information doesn&#8217;t mean that much if it can&#8217;t be
 converted to times that don&#8217;t correspond to the applicable timezone.
 Tzinfo handles this time zone manipulation.
-
 </p>
 <h3>graticule (very soft dependency)</h3>
+
 <p>
 Why? Barometer returns the weather for a given location. Most weather
 service APIs are somewhat restricted on the query format they receive. To
@@ -85,11 +92,11 @@ Graticule gem, HTTParty will be used instead to provide the same geocoding.
 Basically Graticule is only used if it exists.
 </p>
 <p>
-
 NOTE: you can force Barometer not to use Graticule, even if you have it
 installed using the following:
 </p>
 <pre>
+
   Barometer.skip_graticule = true
 </pre>
 <h1>usage</h1>
@@ -106,26 +113,53 @@ with geo-coding.
   require 'barometer'
 
   Barometer.google_geocode_key = &quot;THE_GOOGLE_API_KEY&quot;
-
   barometer = Barometer.new(&quot;Paris&quot;)
   weather = barometer.measure
 
   puts weather.current.temperture
+
+</pre>
+<h2>source configuration</h2>
+<p>
+Barometer can be configured to use multiple weather service APIs (either in
+a primary/failover config or in parallel). Each weather service can also
+have its own config.
+</p>
+<p>
+Weather services in parallel
+</p>
+<pre>
+  Barometer.config = { 1 =&gt; [:yahoo, :google] }
+</pre>
+<p>
+Weather services in primary/failover
+
+</p>
+<pre>
+  Barometer.config = { 1 =&gt; [:yahoo], 2 =&gt; :wunderground }
+</pre>
+<p>
+Weather services, one with some configuration. In this case we are setting
+a weight value, this weight is respected when calculating averages.
+</p>
+<pre>
+  Barometer.config = { 1 =&gt; [{:wunderground =&gt; {:weight =&gt; 2}}, :google] }
+
 </pre>
-<h2>multiple weather API, with hierarchy</h2>
+<h3>multiple weather API, with hierarchy</h3>
 <pre>
   require 'barometer'
 
   Barometer.google_geocode_key = &quot;THE_GOOGLE_API_KEY&quot;
   # use yahoo and google, if they both fail, use wunderground
-  Barometer.selection = { 1 =&gt; [:yahoo, :google], 2 =&gt; :wunderground }
+  Barometer.config = { 1 =&gt; [:yahoo, :google], 2 =&gt; :wunderground }
 
   barometer = Barometer.new(&quot;Paris&quot;)
   weather = barometer.measure
 
   puts weather.current.temperture
-
 </pre>
+
 <h2>command line</h2>
 <p>
 You can use barometer from the command line.
@@ -140,8 +174,8 @@ for more command line information.
 <pre>
   # barometer -h
 </pre>
-
 <h3>web demo</h3>
+
 <p>
 There is a Sinatra application that demos the functionality of Barometer,
 and provides Barometer information. Start this local demo with:
@@ -152,8 +186,8 @@ and provides Barometer information. Start this local demo with:
 <p>
 NOTE: This requires the gems &quot;sinatra&quot; and &quot;vegas&quot;.
 </p>
-
 <h3>fail</h3>
+
 <p>
 What would cause a weather service to fail? The most obvious is that the
 particular weather service in currently unavailable or not reachable. Other
@@ -175,7 +209,6 @@ Wunderground, but since the driver interface is abstracted it will be the
 same for all supported services.
 </p>
 <pre>
-
   require 'barometer'
   Barometer.google_geocode_key = &quot;THE_GOOGLE_API_KEY&quot;
 
@@ -201,9 +234,9 @@ string instead of directly feeding the query string to the service (as in
 bootstrap example #1). The Barometer::Query object has behavior required by
 the service that a regular String doesn&#8217;t have. Using a driver
 directly WILL accept a String (as in bootstrap example #2).
-
 </p>
 <h2>searching</h2>
+
 <p>
 After you have measured the data, Barometer provides several methods to
 help you get the data you are after. All examples assume you already have
@@ -227,8 +260,8 @@ measured the data as shown in the above examples.
   weather.sources                 # lists all successful sources
 
   puts weather.source(:wunderground).current.temperature.c
-
 </pre>
+
 <h3>by date</h3>
 <pre>
   # note, the date is the date of the locations weather, not the date of the
@@ -248,9 +281,9 @@ measured the data as shown in the above examples.
   weather.source(:wunderground).for(time)   # same as above but specific source
 
   puts weather.source(:wunderground).for(time).low.f
-
 </pre>
 <h2>averages</h2>
+
 <p>
 If you consume more then one weather service, Barometer can provide
 averages for the values (currently only for the &#8216;current&#8217;
@@ -261,7 +294,7 @@ values and not the forecasted values).
 
   Barometer.google_geocode_key = &quot;THE_GOOGLE_API_KEY&quot;
   # use yahoo and wunderground
-  Barometer.selection = { 1 =&gt; [:yahoo, :wunderground] }
+  Barometer.config = { 1 =&gt; [:yahoo, :wunderground] }
 
   barometer = Barometer.new(&quot;90210&quot;)
   weather = barometer.measure
@@ -273,12 +306,19 @@ values and not the forecasted values).
 This will calculate the average temperature as given by :yahoo and
 :wunderground
 </p>
+<h3>weights</h3>
+<p>
+You can weight the values from a weather service so that the values from
+that web service have more influence then other values. The weights are set
+in the config &#8230; see the config section
+</p>
 <h2>simple answers</h2>
 <p>
 After you have measured the data, Barometer provides several &quot;simple
 answer&quot; methods to help you get answers to some basic questions. All
 examples assume you already have measured the data as shown in the above
 examples.
+
 </p>
 <p>
 All of these questions are ultimately specific to the weather source(s) you
@@ -287,7 +327,6 @@ will be asked, but if there is no data that can answer the question then
 there will be no answer.
 </p>
 <h3>is it windy?</h3>
-
 <pre>
   # 1st parameter is the threshold wind speed for being windy
   # 2nd parameter is the utc_time for which you want to know the answer,
@@ -306,6 +345,7 @@ there will be no answer.
   weather.wet?(50)
 </pre>
 <h3>is it sunny?</h3>
+
 <pre>
   # 1st parameter is the utc_time for which you want to know the answer,
   #   this defaults to the current time
@@ -313,7 +353,6 @@ there will be no answer.
   weather.sunny?
 </pre>
 <h3>is it day?</h3>
-
 <pre>
   # 1st parameter is the utc_time for which you want to know the answer,
   #   this defaults to the current time
@@ -328,6 +367,7 @@ there will be no answer.
   weather.night?
 </pre>
 <h1>design</h1>
+
 <ul>
 <li>create a Barometer instance
 
@@ -335,7 +375,6 @@ there will be no answer.
 <li>supply a query, there are very little restrictions on the format:
 
 <ul>
-
 <li>city, country, specific address (basically anything Google will geocode)
 
 </li>
@@ -355,6 +394,7 @@ accepts this directly)
 </li>
 </ul>
 </li>
+
 <li>if geocoding required, geocode the query
 
 </li>
@@ -363,7 +403,6 @@ accepts this directly)
 </li>
 <li>query the weather services
 
-
 </li>
 <li>save the data
 
@@ -378,9 +417,9 @@ Barometer attempts to be a common API to any weather service API. I have
 included several weather service &#8216;drivers&#8217;, but I know there
 are many more available. Please use the provided ones as examples to create
 more.
+
 </p>
 <h2>copyright</h2>
 <p>
 Copyright &#169; 2009 Mark G. See LICENSE for details.
-
 </p>

data/spec/barometer_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe "Barometer" do
   
   before(:each) do
-    @preference_hash = { 1 => [:wunderground] }
+    @config_hash = { 1 => [:wunderground] }
     @key = KEY
   end
   
   describe "and class methods" do
   
     it "defines selection" do
-      Barometer::Base.respond_to?("selection").should be_true
-      Barometer::Base.selection.should == { 1 => [:wunderground] }
-      Barometer::Base.selection = { 1 => [:yahoo] }
-      Barometer::Base.selection.should == { 1 => [:yahoo] }
-      Barometer.selection = @preference_hash
+      Barometer::Base.respond_to?("config").should be_true
+      Barometer::Base.config.should == { 1 => [:wunderground] }
+      Barometer::Base.config = { 1 => [:yahoo] }
+      Barometer::Base.config.should == { 1 => [:yahoo] }
+      Barometer.config = @config_hash
     end
     
     it "returns a Weather Service driver" do
-      Barometer.source(:wunderground).should == Barometer::Wunderground
+      Barometer.source(:wunderground).should == Barometer::WeatherService::Wunderground
     end
     
     it "sets the Graticule Google geocoding API key" do
@@ -28,13 +28,6 @@ describe "Barometer" do
       Barometer.google_geocode_key.should == @key
     end
     
-    it "skips the use of Graticule" do
-      Barometer.respond_to?("skip_graticule").should be_true
-      Barometer.skip_graticule.should be_false
-      Barometer.skip_graticule = true
-      Barometer.skip_graticule.should be_true
-    end
-    
     it "forces the geocoding of queries" do
       Barometer.respond_to?("force_geocode").should be_true
       Barometer.force_geocode.should be_false
@@ -107,41 +100,24 @@ describe "Barometer" do
       FakeWeb.register_uri(:get, 
         "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=#{CGI.escape(query_term)}",
         :string => File.read(File.join(File.dirname(__FILE__), 
-          'fixtures', 
+          'fixtures/services/wunderground', 
           'current_calgary_ab.xml')
         )
       )
       FakeWeb.register_uri(:get, 
         "http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml?query=#{CGI.escape(query_term)}",
         :string => File.read(File.join(File.dirname(__FILE__), 
-          'fixtures', 
+          'fixtures/services/wunderground',
           'forecast_calgary_ab.xml')
         )
       )
       FakeWeb.register_uri(:get, 
         "http://maps.google.com:80/maps/geo?gl=&q=Calgary%2CAB&output=xml&key=#{@key}",
         :string => File.read(File.join(File.dirname(__FILE__), 
-          'fixtures', 
-          'geocode_calgary_ab.xml')
-        )
-      )
-      
-      
-      FakeWeb.register_uri(:get, 
-        "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=51.055149%2C-114.062438",
-        :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=51.055149%2C-114.062438",
-        :string => File.read(File.join(File.dirname(__FILE__), 
-          'fixtures', 
-          'forecast_calgary_ab.xml')
+          'fixtures/geocode',
+          'calgary_ab.xml')
         )
       )
-      
     end
     
     it "responds to measure" do
@@ -153,10 +129,16 @@ describe "Barometer" do
     end
     
     it "raises OutOfSources if no services successful" do
-      Barometer::Base.selection = { 1 => [] }
+      Barometer::Base.config = { 1 => [] }
       lambda { @barometer.measure }.should raise_error(Barometer::OutOfSources)
     end
     
+    it "sets the weight" do
+      Barometer::Base.config = { 1 => {:wunderground => {:weight => 2}} }
+      @barometer.measure
+      @barometer.weather.measurements.first.weight.should == 2
+    end
+    
   end
 
 end