barometer 0.7.1 → 0.7.2

data/README.rdoc

@@ -15,7 +15,7 @@ this.
 
 == version
 
-Version 0.7.1 is the current release of this gem. The gem is available from
+Version 0.7.2 is the current release of this gem. The gem is available from
 gemcutter (barometer: http://gemcutter.org/gems/barometer).
 Older version are available through rubyforge (barometer) and github
 (attack-barometer).
@@ -34,25 +34,15 @@ Features to be added in the future:
 
 = dependencies
 
-== Google API key
+== Google API key [UPDATED]
 
-In most cases you will need to have a free google geocode api key.
-Get one here: http://code.google.com/apis/maps/signup.html
-Then put it in the file '~/.barometer' by adding the lines:
-
-  google:
-    geocode: YOUR_KEY_HERE
-
-You will need this for:
-- 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't
-  require any geocoding)
-- running the Barometer binary
-- running the Barometer Web Demo
+As stated on the Google Geocoding API website
+(http://code.google.com/apis/maps/documentation/geocoding/), Google no longer
+requires an API key.  Therefore Barometer no longer requires a Google API key.
 
 === other keys
 
-The same file can hold all your weather service API keys.
+The '~/.barometer' file can hold all your weather service API keys.
 
 eg. weather.com
 
@@ -131,12 +121,8 @@ You can use barometer right out of the box, as it is configured to use one
 register-less (no API key required) international weather service
 (wunderground.com).
 
-For better results, signup for a google-map key and enhance your barometer
-with geo-coding.
-
   require 'barometer'
   
-  Barometer.google_geocode_key = "THE_GOOGLE_API_KEY"
   barometer = Barometer.new("Paris")
   weather = barometer.measure
   
@@ -149,8 +135,8 @@ The available sources are:
   Wunderground.com (:wunderground) [default]
   Yahoo! Weather (:yahoo)
   Google Weather (:google)
-  Weather.com (:weather_dot_com)
-  WeatherBug.com (:weather_bug)
+  Weather.com (:weather_dot_com) [requires key]
+  WeatherBug.com (:weather_bug) [requires key]
   
 == source configuration
 
@@ -179,7 +165,6 @@ Weather services, one with keys.
 
   require 'barometer'
   
-  Barometer.google_geocode_key = "THE_GOOGLE_API_KEY"
   # use yahoo and google, if they both fail, use wunderground
   Barometer.config = { 1 => [:yahoo, :google], 2 => :wunderground }
 

data/TODO

@@ -1,16 +1,18 @@
 == now
+- use Yahoo placemaker for geocoding (as exclusive, or as priority for supported conversions)
+- remove use of google api key
+
+== very soon
 
 - google geocoding terms of service indicate that "a map must be shown" ... what to do?
 - driver: hamweather
 - driver: meter
 - improve code based on metrics
-- ability to use Placemaker for geocoding (instead of Google)
 - use Geomojo to convert coords to woe_id (when no yahoo key)
 - remove use of HTTParty, use Net:HTTP and Nokogiri instead
 
 == soon
 
-- style the demo app results
 - refactor: data-zone
 - methods to use service_specific icons/images
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 1
+:patch: 2
 :build: 

data/barometer.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barometer}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = %q{1.3.5}
 
   s.authors = ["Mark G"]
   s.email = %q{barometer@attackcorp.com}
-  s.date = %q{2011-06-01}
+  s.date = %q{2011-06-02}
 
   s.summary = %q{A multi API consuming weather forecasting superstar.}
   s.description = %q{A multi API consuming weather forecasting superstar.}

data/bin/barometer

@@ -53,7 +53,7 @@ require 'yaml'
 
 # file where API keys are stored
 KEY_FILE = File.expand_path(File.join('~', '.barometer'))
-BAROMETER_VERSION = '0.7.1'
+BAROMETER_VERSION = '0.7.2'
 
 class App
   
@@ -449,17 +449,6 @@ def pretty_output(barometer)
   end
 end
 
-def geocode_google_key_message
-  puts
-  puts "MISSING KEYS !!!"
-  puts "Please update the key_file '#{KEY_FILE}' with your google api key"
-  puts "Get it here: http://code.google.com/apis/maps/signup.html"
-  puts "Then, add this line to the file:"
-  puts "google:"
-  puts "  geocode: YOUR_KEY_KERE"
-  puts
-end
-
 def weather_key_message
   puts
   puts "MISSING KEYS !!!"
@@ -488,16 +477,9 @@ if File.exists?(KEY_FILE)
 	keys = YAML.load_file(KEY_FILE)
 	if keys["yahoo"] && keys["yahoo"]["app_id"]
 	  Barometer.yahoo_placemaker_app_id = keys["yahoo"]["app_id"]
-  end
-	if keys["google"] && keys["google"]["geocode"]
-	  Barometer.google_geocode_key = keys["google"]["geocode"]
-  else
-    geocode_google_key_message
-    exit
   end
 else
-  File.open(KEY_FILE, 'w') {|f| f << "google: geocode: YOUR_KEY_KERE" }
-  geocode_google_key_message
+  File.open(KEY_FILE, 'w') {|f| f << "yahoo: app_id: YOUR_KEY_KERE" }
   exit
 end
 

data/lib/barometer.rb

@@ -15,10 +15,6 @@ module Barometer
   def self.debug!; @@debug_mode = true; end;
   def self.debug?; @@debug_mode; end;
   
-  @@google_geocode_key = nil
-  def self.google_geocode_key; @@google_geocode_key; end;
-  def self.google_geocode_key=(google_key); @@google_geocode_key = google_key; end;
-  
   @@yahoo_placemaker_app_id = nil
   def self.yahoo_placemaker_app_id; @@yahoo_placemaker_app_id; end;
   def self.yahoo_placemaker_app_id=(yahoo_key); @@yahoo_placemaker_app_id = yahoo_key; end;

data/lib/barometer/data/geo.rb

@@ -36,20 +36,23 @@ module Barometer
         end
       end
       if placemark && placemark["AddressDetails"] && placemark["AddressDetails"]["Country"]
-        if placemark["AddressDetails"]["Country"]["AdministrativeArea"]
-          if placemark["AddressDetails"]["Country"]["AdministrativeArea"]["SubAdministrativeArea"]
-            locality = placemark["AddressDetails"]["Country"]["AdministrativeArea"]["SubAdministrativeArea"]["Locality"]
+        country = placemark["AddressDetails"]["Country"]
+        if country["AdministrativeArea"]
+          ad_area = country["AdministrativeArea"]
+          if ad_area["SubAdministrativeArea"]
+            @locality = ad_area["SubAdministrativeArea"]["Locality"]["LocalityName"]
+          elsif ad_area["DependentLocality"] && ad_area["DependentLocality"]["DependentLocalityName"]
+            @locality = ad_area["DependentLocality"]["DependentLocalityName"]
+          elsif ad_area["Locality"] && ad_area["Locality"]["LocalityName"]
+            @locality = ad_area["Locality"]["LocalityName"]
           else
-            locality = placemark["AddressDetails"]["Country"]["AdministrativeArea"]["Locality"]
+            @locality = ""
           end
-          if locality
-            @locality = locality["LocalityName"]
-          end
-          @region = placemark["AddressDetails"]["Country"]["AdministrativeArea"]["AdministrativeAreaName"]
+          @region = ad_area["AdministrativeAreaName"]
         end
-        @country = placemark["AddressDetails"]["Country"]["CountryName"]
-        @country_code = placemark["AddressDetails"]["Country"]["CountryNameCode"]
-        @address = placemark["AddressDetails"]["Country"]["AddressLine"]
+        @country = country["CountryName"]
+        @country_code = country["CountryNameCode"]
+        @address = country["AddressLine"]
       end
     end
 

data/lib/barometer/weather_services/google.rb

@@ -131,7 +131,7 @@ module Barometer
       return unless query
       puts "fetch google: #{query.q}" if Barometer::debug?
       self.get(
-        "http://google.com/ig/api",
+        "http://www.google.com/ig/api",
         :query => {:weather => query.q, :hl => (metric ? "en-GB" : "en-US")},
         :format => :xml,
         :timeout => Barometer.timeout

data/lib/barometer/web_services/geocode.rb

@@ -9,24 +9,19 @@ module Barometer
     def self.fetch(query)
       raise ArgumentError unless _is_a_query?(query)
       puts "geocoding: #{query.q}" if Barometer::debug?
-      return nil unless _has_geocode_key?
       location = self.get(
         "http://maps.google.com/maps/geo",
         :query => {
-          :gl => query.country_code, :key => Barometer.google_geocode_key,
-          :output => "json", :q => query.q, :sensor => "false"
+          :gl => query.country_code,
+          :output => "json",
+          :q => query.q,
+          :sensor => "false"
         },
         :format => :json, :timeout => Barometer.timeout
       )
       location = location['kml']['Response'] if (location && location['kml'])
       location ? (geo = Data::Geo.new(location)) : nil
     end
-
-    private
-    
-    def self._has_geocode_key?
-      !Barometer.google_geocode_key.nil?
-    end
     
   end
 end

data/lib/barometer/web_services/placemaker.rb

@@ -5,6 +5,8 @@ module Barometer
   # Yahoo! Placemaker is a geoparsing web service,
   # this uses Placemaker to obtain a WOEID, as only Yahoo knows them
   #
+  # accepts: city name, coords, postal code, NOT zip code, NOT icao
+  #
   class WebService::Placemaker < WebService
     
     # get the woe_id for a given query

data/spec/barometer_spec.rb

@@ -4,7 +4,6 @@ describe "Barometer" do
   
   before(:each) do
     @config_hash = { 1 => [:wunderground] }
-    @google_key = KEY
     @yahoo_key = YAHOO_KEY
   end
   
@@ -22,14 +21,6 @@ describe "Barometer" do
       Barometer.source(:wunderground).should == Barometer::WeatherService::Wunderground
     end
     
-    it "sets the Graticule Google geocoding API key" do
-      Barometer.respond_to?("google_geocode_key").should be_true
-      Barometer.google_geocode_key = nil
-      Barometer.google_geocode_key.should be_nil
-      Barometer.google_geocode_key = @google_key
-      Barometer.google_geocode_key.should == @google_key
-    end
-    
     it "sets the Placemaker Yahoo! app ID" do
       Barometer.respond_to?("yahoo_placemaker_app_id").should be_true
       Barometer.yahoo_placemaker_app_id = nil
@@ -103,7 +94,6 @@ describe "Barometer" do
   describe "when measuring" do
     
     before(:each) do
-      Barometer.google_geocode_key = @google_key
       query_term = "Calgary,AB"
       @barometer = Barometer::Base.new(query_term)
       @time = Time.now

data/spec/fakeweb_helper.rb

@@ -4,7 +4,6 @@ FakeWeb.allow_net_connect = false
 #
 # Set random test keys
 #
-KEY = "ABC123"
 WEATHER_PARTNER_KEY = "1234"
 WEATHER_LICENSE_KEY = "12345"
 WEATHERBUG_CODE = "A9999"
@@ -14,66 +13,79 @@ YAHOO_KEY = "YAHOO"
 # for geocoding
 #
 geo_url = "http://maps.google.com/maps/geo?"
+
+# http://maps.google.com/maps/geo?gl=US&sensor=false&q=90210&output=json
 FakeWeb.register_uri(:get, 
-  "#{geo_url}gl=US&key=#{KEY}&sensor=false&q=90210&output=json",
+  "#{geo_url}gl=US&sensor=false&q=90210&output=json",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/90210.json')
 )
-
+# http://maps.google.com/maps/geo?gl=&q=40.756054%2C-73.986951&output=json&sensor=false
 FakeWeb.register_uri(:get, 
-  "#{geo_url}gl=&q=#{CGI.escape("40.756054,-73.986951")}&output=json&key=#{KEY}&sensor=false",
+  "#{geo_url}gl=&q=#{CGI.escape("40.756054,-73.986951")}&output=json&sensor=false",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/40_73.json')
 )
-
+# http://maps.google.com/maps/geo?gl=&q=New%20York%2C%20NY&output=json&sensor=false
 FakeWeb.register_uri(:get, 
-  "#{geo_url}gl=&q=New%20York%2C%20NY&output=json&key=#{KEY}&sensor=false",
+  "#{geo_url}gl=&q=New%20York%2C%20NY&output=json&sensor=false",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/newyork_ny.json')
 )
+# http://maps.google.com/maps/geo?gl=CA&output=json&q=T5B%204M9&sensor=false
 FakeWeb.register_uri(:get, 
-  "#{geo_url}gl=CA&key=#{KEY}&output=json&q=T5B%204M9&sensor=false",
+  "#{geo_url}gl=CA&output=json&q=T5B%204M9&sensor=false",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/T5B4M9.json')
 )
+# http://maps.google.com/maps/geo?gl=US&q=KSFO&output=json&sensor=false
 FakeWeb.register_uri(:get, 
-  "#{geo_url}gl=US&q=KSFO&output=json&key=#{KEY}&sensor=false",
+  "#{geo_url}gl=US&q=KSFO&output=json&sensor=false",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/ksfo.json')
 )
+# http://maps.google.com/maps/geo?gl=&q=Atlanta%2C%20GA%2C%20US&output=json&sensor=false
 FakeWeb.register_uri(:get, 
-  "#{geo_url}gl=&q=Atlanta%2C%20GA%2C%20US&output=json&key=#{KEY}&sensor=false",
+  "#{geo_url}gl=&q=Atlanta%2C%20GA%2C%20US&output=json&sensor=false",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/atlanta.json')
 )
+# http://maps.google.com/maps/geo?gl=&q=Calgary%2CAB&sensor=false&output=json
 FakeWeb.register_uri(:get, 
-  "#{geo_url}output=xml&q=Atlanta%2C%20GA%2C%20US&gl=US&key=#{KEY}",
-  :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/atlanta.xml')
-)  
-FakeWeb.register_uri(:get, 
-  "#{geo_url}gl=&key=#{KEY}&q=Calgary%2CAB&sensor=false&output=json",
+  "#{geo_url}gl=&q=Calgary%2CAB&sensor=false&output=json",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/geocode/calgary_ab.json')
 )
 #
 # for weather.com searches
 #
+# http://xoap.weather.com:80/search/search?where=Beverly%20Hills%2C%20CA%2C%20USA
 FakeWeb.register_uri(:get, 
   "http://xoap.weather.com:80/search/search?where=Beverly%20Hills%2C%20CA%2C%20USA",
-  :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/90210.xml')
+  :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/the_hills.xml')
 )
+# http://xoap.weather.com:80/search/search?where=New%20York%2C%20NY
 FakeWeb.register_uri(:get, 
   "http://xoap.weather.com:80/search/search?where=New%20York%2C%20NY",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/new_york.xml')
 )
+# http://xoap.weather.com:80/search/search?where=Manhattan%2C%20NY%2C%20USA
+FakeWeb.register_uri(:get, 
+  "http://xoap.weather.com:80/search/search?where=Manhattan%2C%20NY%2C%20USA",
+  :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/manhattan.xml')
+)
+# http://xoap.weather.com:80/search/search?where=New%20York%2C%20NY%2C%20USA
 FakeWeb.register_uri(:get, 
   "http://xoap.weather.com:80/search/search?where=New%20York%2C%20NY%2C%20USA",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/new_york.xml')
 )
+# http://xoap.weather.com:80/search/search?where=90210
 FakeWeb.register_uri(:get, 
   "http://xoap.weather.com:80/search/search?where=90210",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/90210.xml')
 )
+# http://xoap.weather.com:80/search/search?where=San%20Francisco%2C%20CA%2C%20USA
 FakeWeb.register_uri(:get, 
-  "http://xoap.weather.com:80/search/search?where=Millbrae%2C%20CA%2C%20USA",
+  "http://xoap.weather.com:80/search/search?where=San%20Francisco%2C%20CA%2C%20USA",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/ksfo.xml')
 )
 #
 # for yahoo.com searches
 #
+# http://weather.yahooapis.com:80/forecastrss?p=USGA0028
 FakeWeb.register_uri(:get, 
   "http://weather.yahooapis.com:80/forecastrss?p=USGA0028",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/formats/weather_id/from_USGA0028.xml')
@@ -81,27 +93,29 @@ FakeWeb.register_uri(:get,
 #
 # for Google weather
 #
+# http://www.google.com/ig/api?weather=Calgary%2CAB&hl=en-GB
 FakeWeb.register_uri(:get, 
-  "http://google.com/ig/api?weather=#{CGI.escape('Calgary,AB')}&hl=en-GB",
+  "http://www.google.com/ig/api?weather=#{CGI.escape('Calgary,AB')}&hl=en-GB",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/services/google/calgary_ab.xml')
 )
 #
 # for WeatherBug weather
 #
-bug_url_current = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getLiveWeatherRSS.aspx?"
-FakeWeb.register_uri(:get, 
-  "#{bug_url_current}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
-  :body => File.read(File.dirname(__FILE__) + '/fixtures/services/weather_bug/90210_current.xml')
-)
+  bug_url_current = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getLiveWeatherRSS.aspx?"
+  FakeWeb.register_uri(:get, 
+    "#{bug_url_current}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
+    :body => File.read(File.dirname(__FILE__) + '/fixtures/services/weather_bug/90210_current.xml')
+  )
 
-bug_url_future = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getForecastRSS.aspx?"
-FakeWeb.register_uri(:get, 
-  "#{bug_url_future}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
-  :body => File.read(File.dirname(__FILE__) + '/fixtures/services/weather_bug/90210_forecast.xml')
-)
+  bug_url_future = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getForecastRSS.aspx?"
+  FakeWeb.register_uri(:get, 
+    "#{bug_url_future}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
+    :body => File.read(File.dirname(__FILE__) + '/fixtures/services/weather_bug/90210_forecast.xml')
+  )
 #
 # for weather.com weather
 #
+# http://xoap.weather.com:80/weather/local/90210?dayf=5&unit=m&link=xoap&par=PKEY&prod=xoap&key=LKEY&cc=*
 weather_com_url = "http://xoap.weather.com:80/weather/local/"
 FakeWeb.register_uri(:get, 
   "#{weather_com_url}90210?dayf=5&unit=m&link=xoap&par=#{WEATHER_PARTNER_KEY}&prod=xoap&key=#{WEATHER_LICENSE_KEY}&cc=*",
@@ -110,6 +124,7 @@ FakeWeb.register_uri(:get,
 #
 # for yahoo weather
 #
+# http://weather.yahooapis.com:80/forecastrss?u=c&p=90210
 FakeWeb.register_uri(:get, 
   "http://weather.yahooapis.com:80/forecastrss?u=c&p=90210",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/services/yahoo/90210.xml')
@@ -118,12 +133,14 @@ FakeWeb.register_uri(:get,
 #
 # For wunderground weather
 #
+# http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=51.045%2C-114.0572222
 FakeWeb.register_uri(:get, 
-  "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=51.055149%2C-114.062438",
+  "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=51.045%2C-114.0572222",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/services/wunderground/current_calgary_ab.xml')
-)  
+)
+# http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml?query=51.045%2C-114.0572222
 FakeWeb.register_uri(:get, 
-  "http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml?query=51.055149%2C-114.062438",
+  "http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml?query=51.045%2C-114.0572222",
   :body => File.read(File.dirname(__FILE__) + '/fixtures/services/wunderground/forecast_calgary_ab.xml')
 )  
 FakeWeb.register_uri(:get, 
@@ -138,6 +155,9 @@ FakeWeb.register_uri(:get,
 #
 # For Placemaker
 #
+# curl -d "documentType=text%2Fhtml&outputType=xml&documentContent=<html><body><div class=\"geo\"><span class=\"latitude\">40.756054</span><span class=\"longitude\">-73.986951</span></div></body></html>" http://wherein.yahooapis.com/v1/document
+# curl -d "documentType=text%2Fhtml&outputType=xml&documentContent=Chicago" http://wherein.yahooapis.com/v1/document
+#
 FakeWeb.register_uri(:post, 
   "http://wherein.yahooapis.com/v1/document",
   [