barometer 0.6.4 → 0.6.6

data/README.rdoc

@@ -15,7 +15,7 @@ this.
 
 == version
 
-Version 0.6.4 is the current release of this gem.
+Version 0.6.6 is the current release of this gem.
 The gem is available from github (attack-barometer) or rubyforge (barometer).
 It is fully functional (for five weather service APIs).
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 6
-:patch: 4
+:patch: 6
 :build: 

data/barometer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barometer}
-  s.version = "0.6.4"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark G"]
-  s.date = %q{2010-01-29}
+  s.date = %q{2010-02-02}
   s.default_executable = %q{barometer}
   s.description = %q{A multi API consuming weather forecasting superstar.}
   s.email = %q{barometer@attackcorp.com}
@@ -103,12 +103,19 @@ Gem::Specification.new do |s|
      "spec/fixtures/formats/weather_id/from_USGA0028.xml",
      "spec/fixtures/formats/weather_id/ksfo.xml",
      "spec/fixtures/formats/weather_id/new_york.xml",
+     "spec/fixtures/geocode/40_73.json",
      "spec/fixtures/geocode/40_73.xml",
+     "spec/fixtures/geocode/90210.json",
      "spec/fixtures/geocode/90210.xml",
+     "spec/fixtures/geocode/T5B4M9.json",
      "spec/fixtures/geocode/T5B4M9.xml",
+     "spec/fixtures/geocode/atlanta.json",
      "spec/fixtures/geocode/atlanta.xml",
+     "spec/fixtures/geocode/calgary_ab.json",
      "spec/fixtures/geocode/calgary_ab.xml",
+     "spec/fixtures/geocode/ksfo.json",
      "spec/fixtures/geocode/ksfo.xml",
+     "spec/fixtures/geocode/newyork_ny.json",
      "spec/fixtures/geocode/newyork_ny.xml",
      "spec/fixtures/services/google/calgary_ab.xml",
      "spec/fixtures/services/weather_bug/90210_current.xml",

data/bin/barometer

@@ -66,7 +66,7 @@ require 'yaml'
 
 # file where API keys are stored
 KEY_FILE = File.expand_path(File.join('~', '.barometer'))
-BAROMETER_VERSION = '0.6.3'
+BAROMETER_VERSION = '0.6.6'
 
 class App
   

data/lib/barometer/data/geo.rb

@@ -24,7 +24,7 @@ module Barometer
       
       @query = location["name"]
       placemark = location["Placemark"]
-      placemark = placemark.first if placemark.is_a?(Array)
+      placemark = find_most_accurate(placemark)
       
       if placemark && placemark["Point"] && placemark["Point"]["coordinates"]
         if placemark["Point"]["coordinates"].is_a?(Array)
@@ -62,6 +62,17 @@ module Barometer
       s.delete("")
       s.compact.join(', ')
     end
+    
+    # geocode may return multiple results, use the first one that has the best accuracy
+    #
+    def find_most_accurate(placemark)
+      return placemark unless placemark.is_a?(Array)
+      most_accurate = placemark.first
+      placemark.each do |p|
+        most_accurate = p if p && p["AddressDetails"] && p["AddressDetails"]["Accuracy"] && p["AddressDetails"]["Accuracy"].to_i < most_accurate["AddressDetails"]["Accuracy"].to_i
+      end
+      most_accurate
+    end
 
   end
 end

data/lib/barometer/formats/coordinates.rb

@@ -10,7 +10,7 @@ module Barometer
   class Query::Format::Coordinates < Query::Format
   
     def self.format; :coordinates; end
-    def self.regex; /^[-]?[0-9\.]+[,]{1}[-]?[0-9\.]+$/; end
+    def self.regex; /^[-]?[0-9\.]+[,]{1}\s?[-]?[0-9\.]+$/; end
     def self.convertable_formats
       [:short_zipcode, :zipcode, :postalcode, :weather_id, :coordinates, :icao, :geocode]
     end

data/lib/barometer/query.rb

@@ -104,7 +104,7 @@ module Barometer
       if Barometer.force_geocode && !@geo
         if converted_query && converted_query.geo
           @geo = converted_query.geo
-        else
+        elsif converted_query
           puts "enhance geocode: #{converted_query.q}" if Barometer::debug?
           geo_query = Query::Format::Coordinates.to(converted_query)
           @geo = geo_query.geo if (geo_query && geo_query.geo)

data/spec/barometer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Barometer" do
   
@@ -99,23 +99,30 @@ describe "Barometer" do
       @time = Time.now
       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__), 
+        :body => File.read(File.join(File.dirname(__FILE__), 
           '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__), 
+        :body => File.read(File.join(File.dirname(__FILE__), 
           'fixtures/services/wunderground',
           'forecast_calgary_ab.xml')
         )
       )
+      # FakeWeb.register_uri(:get, 
+      #   "http://maps.google.com/maps/geo?gl=&key=#{@key}&q=Calgary%2CAB&sensor=false&output=xml",
+      #   :body => File.read(File.join(File.dirname(__FILE__), 
+      #     'fixtures/geocode',
+      #     '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__), 
+        "http://maps.google.com/maps/geo?gl=&key=#{@key}&q=Calgary%2CAB&sensor=false&output=json",
+        :body => File.read(File.join(File.dirname(__FILE__), 
           'fixtures/geocode',
-          'calgary_ab.xml')
+          'calgary_ab.json')
         )
       )
     end

data/spec/data/distance_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::Distance" do
   

data/spec/data/geo_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::Geo" do
   

data/spec/data/local_datetime_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::LocalDateTime" do
   

data/spec/data/local_time_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::LocalTime" do
   

data/spec/data/location_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Location" do
   

data/spec/data/pressure_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Pressure" do
   

data/spec/data/speed_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Speed" do
   

data/spec/data/sun_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::Sun" do
   

data/spec/data/temperature_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::Temperature" do
   

data/spec/data/units_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Units" do
   

data/spec/data/zone_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::Zone" do
   
@@ -65,7 +65,7 @@ describe "Data::Zone" do
         zone.code.should be_nil
 
         zone = Data::Zone.new(@timezone)
-        zone.code.should == "CEST"
+        zone.code.should == "CET"
       end
 
       it "responds to dst?" do

data/spec/fixtures/geocode/40_73.json

@@ -0,0 +1,173 @@
+{
+  "name": "40.756054,-73.986951",
+  "Status": {
+    "code": 200,
+    "request": "geocode"
+  },
+  "Placemark": [ {
+    "id": "p1",
+    "address": "Times Sq - 42nd St Station, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 9,
+   "AddressLine" : [ "Times Sq - 42nd St Station" ]
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7591946,
+        "south": 40.7528994,
+        "east": -73.9838014,
+        "west": -73.9900966
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9869490, 40.7560470, 0 ]
+    }
+  }, {
+    "id": "p2",
+    "address": "600-614 7th Ave, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 8,
+   "Country" : {
+      "AdministrativeArea" : {
+         "AdministrativeAreaName" : "NY",
+         "SubAdministrativeArea" : {
+            "Locality" : {
+               "DependentLocality" : {
+                  "DependentLocalityName" : "Manhattan",
+                  "PostalCode" : {
+                     "PostalCodeNumber" : "10036"
+                  },
+                  "Thoroughfare" : {
+                     "ThoroughfareName" : "600-614 7th Ave"
+                  }
+               },
+               "LocalityName" : "New York"
+            },
+            "SubAdministrativeAreaName" : "New York"
+         }
+      },
+      "CountryName" : "USA",
+      "CountryNameCode" : "US"
+   }
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7595131,
+        "south": 40.7532178,
+        "east": -73.9835667,
+        "west": -73.9898620
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9869562, 40.7560561, 0 ]
+    }
+  }, {
+    "id": "p3",
+    "address": "Times Square-42nd Street, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 9,
+   "AddressLine" : [ "Times Square-42nd Street" ]
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7591476,
+        "south": 40.7528524,
+        "east": -73.9838524,
+        "west": -73.9901476
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9870000, 40.7560000, 0 ]
+    }
+  }, {
+    "id": "p4",
+    "address": "W 42 ST at 7 AV, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 9,
+   "AddressLine" : [ "W 42 ST at 7 AV" ]
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7591446,
+        "south": 40.7528494,
+        "east": -73.9839964,
+        "west": -73.9902916
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9871440, 40.7559970, 0 ]
+    }
+  }, {
+    "id": "p5",
+    "address": "W 42 ST at 7 AV, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 9,
+   "AddressLine" : [ "W 42 ST at 7 AV" ]
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7594606,
+        "south": 40.7531654,
+        "east": -73.9842484,
+        "west": -73.9905436
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9873960, 40.7563130, 0 ]
+    }
+  }, {
+    "id": "p6",
+    "address": "W 42 ST at BROADWAY, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 9,
+   "AddressLine" : [ "W 42 ST at BROADWAY" ]
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7588236,
+        "south": 40.7525284,
+        "east": -73.9831654,
+        "west": -73.9894606
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9863130, 40.7556760, 0 ]
+    }
+  }, {
+    "id": "p7",
+    "address": "7 AV at W 41 ST, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 9,
+   "AddressLine" : [ "7 AV at W 41 ST" ]
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7586296,
+        "south": 40.7523344,
+        "east": -73.9843024,
+        "west": -73.9905976
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9874500, 40.7554820, 0 ]
+    }
+  }, {
+    "id": "p8",
+    "address": "7 AV at W 45 ST, New York, NY 10036, USA",
+    "AddressDetails": {
+   "Accuracy" : 9,
+   "AddressLine" : [ "7 AV at W 45 ST" ]
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 40.7610286,
+        "south": 40.7547334,
+        "east": -73.9825394,
+        "west": -73.9888346
+      }
+    },
+    "Point": {
+      "coordinates": [ -73.9856870, 40.7578810, 0 ]
+    }
+  } ]
+}

data/spec/fixtures/geocode/90210.json

@@ -0,0 +1,41 @@
+{
+  "name": "90210",
+  "Status": {
+    "code": 200,
+    "request": "geocode"
+  },
+  "Placemark": [ {
+    "id": "p1",
+    "address": "Beverly Hills, CA 90210, USA",
+    "AddressDetails": {
+   "Accuracy" : 5,
+   "Country" : {
+      "AdministrativeArea" : {
+         "AdministrativeAreaName" : "CA",
+         "SubAdministrativeArea" : {
+            "Locality" : {
+               "LocalityName" : "Beverly Hills",
+               "PostalCode" : {
+                  "PostalCodeNumber" : "90210"
+               }
+            },
+            "SubAdministrativeAreaName" : "Los Angeles"
+         }
+      },
+      "CountryName" : "USA",
+      "CountryNameCode" : "US"
+   }
+},
+    "ExtendedData": {
+      "LatLonBox": {
+        "north": 34.1320070,
+        "south": 34.0644090,
+        "east": -118.3809750,
+        "west": -118.4467140
+      }
+    },
+    "Point": {
+      "coordinates": [ -118.4104684, 34.1030032, 0 ]
+    }
+  } ]
+}