barometer 0.1.0 → 0.2.1

data/lib/webometer/webometer.rb

@@ -0,0 +1,34 @@
+require 'rubygems'
+require 'sinatra'
+
+require 'barometer'
+Barometer.google_geocode_key ||= "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
+
+class Webometer < Sinatra::Default
+
+  get '/' do
+    erb :index
+  end
+  
+  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)
+    
+    if params[:query] && !params[:query][:q].empty?
+      @barometer = Barometer.new(params[:query][:q])
+      @weather = @barometer.measure(metric)
+    end
+    erb :index
+  end
+
+  get '/contributing.html' do
+    erb :contributing
+  end
+  
+  get '/readme.html' do
+    erb :readme
+  end
+
+end

data/spec/barometer_spec.rb

@@ -4,7 +4,7 @@ describe "Barometer" do
   
   before(:each) do
     @preference_hash = { 1 => [:wunderground] }
-    @key = "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
+    @key = KEY
   end
   
   describe "and class methods" do

data/spec/data_geo_spec.rb

@@ -35,6 +35,10 @@ describe "Geo" do
       @geo.country.should be_nil
     end
     
+    it "responds to address" do
+      @geo.address.should be_nil
+    end
+    
     it "responds to coordinates" do
       @geo.longitude = "99.99"
       @geo.latitude = "88.88"

data/spec/fixtures/geocode_ksfo.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" ?> <kml xmlns="http://earth.google.com/kml/2.0"><Response> <name>KSFO</name> <Status> <code>200</code> <request>geocode</request> </Status> <Placemark id="p1"> <address>San Francisco Airport, United States</address> <AddressDetails Accuracy="9" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><CountryName>USA</CountryName><AddressLine>San Francisco Airport</AddressLine></Country></AddressDetails> <ExtendedData> <LatLonBox north="37.6401700" south="37.6041790" east="-122.3548940" west="-122.4015610" /> </ExtendedData> <Point><coordinates>-122.3899790,37.6152230,0</coordinates></Point> </Placemark> </Response></kml>

data/spec/query_spec.rb

@@ -7,6 +7,7 @@ describe "Query" do
     @postal_code = "T5B 4M9"
     @coordinates = "40.756054,-73.986951"
     @geocode = "New York, NY"
+    @icao = "KSFO"
     
     # actual conversions
     @zipcode_to_coordinates = "34.1030032,-118.4104684"
@@ -26,18 +27,28 @@ describe "Query" do
       Barometer::Query.is_us_zipcode?(@zipcode).should be_true
       Barometer::Query.is_us_zipcode?(@postal_code).should be_false
       Barometer::Query.is_us_zipcode?(@coordinates).should be_false
+      Barometer::Query.is_coordinates?(@icao).should be_false
     end
     
     it "detects a postalcode" do
       Barometer::Query.is_canadian_postcode?(@postal_code).should be_true
       Barometer::Query.is_canadian_postcode?(@zipcode).should be_false
       Barometer::Query.is_canadian_postcode?(@coordinates).should be_false
+      Barometer::Query.is_coordinates?(@icao).should be_false
     end
     
     it "detects a coordinates" do
       Barometer::Query.is_coordinates?(@coordinates).should be_true
       Barometer::Query.is_coordinates?(@zipcode).should be_false
       Barometer::Query.is_coordinates?(@postal_code).should be_false
+      Barometer::Query.is_coordinates?(@icao).should be_false
+    end
+    
+    it "detects an ICAO" do
+      Barometer::Query.is_icao?(@coordinates).should be_false
+      Barometer::Query.is_icao?(@zipcode).should be_false
+      Barometer::Query.is_icao?(@postal_code).should be_false
+      Barometer::Query.is_icao?(@icao).should be_true
     end
     
   end
@@ -58,6 +69,7 @@ describe "Query" do
       @query.country_code.should == "US"
       @query.zipcode?.should be_true
       @query.postalcode?.should be_false
+      @query.icao?.should be_false
       @query.coordinates?.should be_false
       @query.geocode?.should be_false
     end
@@ -71,6 +83,21 @@ describe "Query" do
       @query.country_code.should == "CA"
       @query.zipcode?.should be_false
       @query.postalcode?.should be_true
+      @query.icao?.should be_false
+      @query.coordinates?.should be_false
+      @query.geocode?.should be_false
+    end
+    
+    it "recognizes icao" do
+      @query.q = @icao
+      @query.format.should be_nil
+      @query.analyze!
+      @query.format.to_sym.should == :icao
+      
+      @query.country_code.should be_nil
+      @query.zipcode?.should be_false
+      @query.postalcode?.should be_false
+      @query.icao?.should be_true
       @query.coordinates?.should be_false
       @query.geocode?.should be_false
     end
@@ -84,6 +111,7 @@ describe "Query" do
       @query.country_code.should be_nil
       @query.zipcode?.should be_false
       @query.postalcode?.should be_false
+      @query.icao?.should be_false
       @query.coordinates?.should be_true
       @query.geocode?.should be_false
     end
@@ -97,6 +125,7 @@ describe "Query" do
       @query.country_code.should be_nil
       @query.zipcode?.should be_false
       @query.postalcode?.should be_false
+      @query.icao?.should be_false
       @query.coordinates?.should be_false
       @query.geocode?.should be_true
     end
@@ -168,7 +197,7 @@ describe "Query" do
   describe "when converting queries" do
     
     before(:each) do
-      @key = "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
+      @key = KEY
       url_start = "http://maps.google.com/maps/geo?"
       #
       # for Graticule and/or HTTParty geocoding
@@ -221,6 +250,13 @@ describe "Query" do
           'geocode_40_73.xml')
         )
       )
+      FakeWeb.register_uri(:get, 
+        "#{url_start}output=xml&q=KSFO&gl=&key=#{@key}",
+        :string => File.read(File.join(File.dirname(__FILE__), 
+          'fixtures', 
+          'geocode_ksfo.xml')
+        )
+      )
     end
 
     describe "to coordinates," do
@@ -253,6 +289,10 @@ describe "Query" do
         Barometer::Query.to_coordinates(@postal_code, :postalcode).first.should == "53.570447,-113.456083"
       end
       
+      it "converts from icao" do
+        Barometer::Query.to_coordinates(@icao, :icao).first.should == "37.615223,-122.389979"
+      end
+      
     end
     
     describe "to geocode" do
@@ -275,6 +315,10 @@ describe "Query" do
           Barometer::Query.to_geocode(@postal_code, :postalcode).first.should == @postal_code
         end
         
+        it "converts from icao" do
+          Barometer::Query.to_geocode(@icao, :icao).first.should == "San Francisco Airport, USA"
+        end
+
       end
       
       describe "when Graticule disabled," do
@@ -357,7 +401,7 @@ describe "Query" do
         
         before(:each) do
           @query = Barometer::Query.new(@zipcode)
-          Barometer::Query.google_geocode_key = "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
+          Barometer::Query.google_geocode_key = KEY
         end
         
         it "converts to coordinates" do
@@ -384,7 +428,7 @@ describe "Query" do
         
         before(:each) do
           @query = Barometer::Query.new(@postal_code)
-          Barometer::Query.google_geocode_key = "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
+          Barometer::Query.google_geocode_key = KEY
         end
         
         it "converts to coordinates" do
@@ -411,7 +455,7 @@ describe "Query" do
         
         before(:each) do
           @query = Barometer::Query.new(@geocode)
-          Barometer::Query.google_geocode_key = "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
+          Barometer::Query.google_geocode_key = KEY
         end
         
         it "converts to coordinates" do
@@ -438,7 +482,7 @@ describe "Query" do
         
         before(:each) do
           @query = Barometer::Query.new(@coordinates)
-          Barometer::Query.google_geocode_key = "ABQIAAAAq8TH4offRcGrok8JVY_MyxRi_j0U6kJrkFvY4-OX2XYmEAa76BSFwMlSow1YgX8BOPUeve_shMG7xw"
+          Barometer::Query.google_geocode_key = KEY
         end
         
         it "converts to geocode" do

data/spec/service_wunderground_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Wunderground" do
   
   before(:each) do
-    @accepted_formats = [:zipcode, :postalcode, :coordinates, :geocode]
+    @accepted_formats = [:zipcode, :postalcode, :icao, :coordinates, :geocode]
     @base_uri = "http://api.wunderground.com/auto/wui/geo"
   end
   

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'spec'
 require 'fakeweb'
 require 'cgi'
+require 'yaml'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -9,6 +10,30 @@ require 'barometer'
 
 FakeWeb.allow_net_connect = false
 
+KEY_FILE = File.expand_path(File.join('~', '.barometer'))
+
+def geocode_google_key_message
+  puts
+  puts "Please update the key_file '#{KEY_FILE}' with your google api key"
+  puts "example:"
+  puts "geocode_google: YOUR_KEY_KERE"
+  puts
+end
+
+if File.exists?(KEY_FILE)
+	keys = YAML.load_file(KEY_FILE)
+	if keys["geocode_google"]
+	  KEY = keys["geocode_google"]
+  else
+    geocode_google_key_message
+    exit
+  end
+else
+  File.open(KEY_FILE, 'w') {|f| f << "geocode_google: YOUR_KEY_KERE" }
+  geocode_google_key_message
+  exit
+end
+
 Spec::Runner.configure do |config|
   
 end

data/spec/weather_spec.rb

@@ -78,6 +78,174 @@ describe "Weather" do
     
   end
   
+  describe "when calculating averages" do
+    
+    before(:each) do
+      @weather = Barometer::Weather.new
+      @wunderground = Barometer::Measurement.new(:wunderground)
+      @wunderground.current = Barometer::CurrentMeasurement.new
+      @wunderground.success = true
+      @yahoo = Barometer::Measurement.new(:yahoo)
+      @yahoo.current = Barometer::CurrentMeasurement.new
+      @yahoo.success = true
+      @google = Barometer::Measurement.new(:google)
+      @weather.measurements << @wunderground
+      @weather.measurements << @yahoo
+      @weather.measurements << @google
+    end
+    
+    describe "for temperature" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.temperature = Barometer::Temperature.new
+        @weather.source(:wunderground).current.temperature.c = 10
+        @weather.source(:yahoo).current.temperature = Barometer::Temperature.new
+        @weather.source(:yahoo).current.temperature.c = 6
+      end
+
+      it "returns averages" do
+        @weather.temperature.c.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.temperature(false).c.should == 10
+      end
+      
+    end
+    
+    describe "for wind" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.wind = Barometer::Speed.new
+        @weather.source(:wunderground).current.wind.kph = 10
+        @weather.source(:yahoo).current.wind = Barometer::Speed.new
+        @weather.source(:yahoo).current.wind.kph = 6
+      end
+
+      it "returns averages" do
+        @weather.wind.kph.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.wind(false).kph.should == 10
+      end
+      
+    end
+    
+    describe "for humidity" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.humidity = 10
+        @weather.source(:yahoo).current.humidity = 6
+      end
+
+      it "returns averages" do
+        @weather.humidity.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.humidity(false).should == 10
+      end
+      
+    end
+    
+    describe "for pressure" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.pressure = Barometer::Pressure.new
+        @weather.source(:wunderground).current.pressure.mb = 10
+        @weather.source(:yahoo).current.pressure = Barometer::Pressure.new
+        @weather.source(:yahoo).current.pressure.mb = 6
+      end
+
+      it "returns averages" do
+        @weather.pressure.mb.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.pressure(false).mb.should == 10
+      end
+      
+    end
+    
+    describe "for dew_point" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.dew_point = Barometer::Temperature.new
+        @weather.source(:wunderground).current.dew_point.c = 10
+        @weather.source(:yahoo).current.dew_point = Barometer::Temperature.new
+        @weather.source(:yahoo).current.dew_point.c = 6
+      end
+
+      it "returns averages" do
+        @weather.dew_point.c.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.dew_point(false).c.should == 10
+      end
+      
+    end
+    
+    describe "for heat_index" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.heat_index = Barometer::Temperature.new
+        @weather.source(:wunderground).current.heat_index.c = 10
+        @weather.source(:yahoo).current.heat_index = Barometer::Temperature.new
+        @weather.source(:yahoo).current.heat_index.c = 6
+      end
+
+      it "returns averages" do
+        @weather.heat_index.c.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.heat_index(false).c.should == 10
+      end
+      
+    end
+    
+    describe "for wind_chill" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.wind_chill = Barometer::Temperature.new
+        @weather.source(:wunderground).current.wind_chill.c = 10
+        @weather.source(:yahoo).current.wind_chill = Barometer::Temperature.new
+        @weather.source(:yahoo).current.wind_chill.c = 6
+      end
+
+      it "returns averages" do
+        @weather.wind_chill.c.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.wind_chill(false).c.should == 10
+      end
+      
+    end
+    
+    describe "for visibility" do
+      
+      before(:each) do
+        @weather.source(:wunderground).current.visibility = Barometer::Distance.new
+        @weather.source(:wunderground).current.visibility.km = 10
+        @weather.source(:yahoo).current.visibility = Barometer::Distance.new
+        @weather.source(:yahoo).current.visibility.km = 6
+      end
+
+      it "returns averages" do
+        @weather.visibility.km.should == 8
+      end
+      
+      it "returns default when disabled" do
+        @weather.visibility(false).km.should == 10
+      end
+      
+    end
+    
+  end
+  
   describe "when answering the simple questions," do
     
     before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barometer
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mark G
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -06:00
+date: 2009-05-02 00:00:00 -06:00
 default_executable: barometer
 dependencies: []
 
@@ -57,6 +57,23 @@ files:
 - lib/barometer/services.rb
 - lib/barometer/weather.rb
 - lib/barometer.rb
+- lib/webometer
+- lib/webometer/public
+- lib/webometer/public/css
+- lib/webometer/public/css/master.css
+- lib/webometer/public/css/print.css
+- lib/webometer/public/css/syntax.css
+- lib/webometer/public/images
+- lib/webometer/public/images/go.png
+- lib/webometer/public/images/link-out.gif
+- lib/webometer/views
+- lib/webometer/views/contributing.erb
+- lib/webometer/views/forecast.erb
+- lib/webometer/views/index.erb
+- lib/webometer/views/layout.erb
+- lib/webometer/views/measurement.erb
+- lib/webometer/views/readme.erb
+- lib/webometer/webometer.rb
 - spec/barometer_spec.rb
 - spec/data_current_spec.rb
 - spec/data_distance_spec.rb
@@ -75,6 +92,7 @@ files:
 - spec/fixtures/geocode_40_73.xml
 - spec/fixtures/geocode_90210.xml
 - spec/fixtures/geocode_calgary_ab.xml
+- spec/fixtures/geocode_ksfo.xml
 - spec/fixtures/geocode_newyork_ny.xml
 - spec/fixtures/geocode_T5B4M9.xml
 - spec/fixtures/google_calgary_ab.xml