barometer 0.6.7 → 0.7.0

data/spec/query_spec.rb

@@ -104,6 +104,19 @@ describe "Query" do
       @query.q.should be_nil
     end
     
+    it "attempts query conversion when reading q (if format known)" do
+      query = Barometer::Query.new(@geocode)
+      query.format.should == :geocode
+      Barometer::Query::Format::Geocode.should_receive(:convert_query).once.with(@geocode).and_return(@geocode)
+      query.q.should == @geocode
+    end
+    
+    it "does not attempt query conversion when reading q (if format unknown)" do
+      @query.format.should be_nil
+      Barometer::Query::Format.should_not_receive(:convert_query)
+      @query.q.should be_nil
+    end
+    
     it "responds to format" do
       @query.format.should be_nil
     end
@@ -144,6 +157,31 @@ describe "Query" do
       @query.conversions.should be_nil
     end
     
+    it "returns latitude for when recognized as coordinates" do
+      @query.q = @coordinates
+      @query.format.should be_nil
+      @query.analyze!
+      @query.format.to_sym.should == :coordinates
+      @query.latitude.should == @coordinates.split(',')[0]
+    end
+    
+    it "returns longitude for when recognized as coordinates" do
+      @query.q = @coordinates
+      @query.format.should be_nil
+      @query.analyze!
+      @query.format.to_sym.should == :coordinates
+      @query.longitude.should == @coordinates.split(',')[1]
+    end
+    
+    it "returns nothing for latitude/longitude when not coordinates" do
+      @query.q = @geocode
+      @query.format.should be_nil
+      @query.analyze!
+      @query.format.to_sym.should == :geocode
+      @query.latitude.should be_nil
+      @query.longitude.should be_nil
+    end
+    
   end
   
   describe "when returning the query to a Weather API" do

data/spec/spec_helper.rb

@@ -1,170 +1,17 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'mocha'
-require 'fakeweb'
 require 'cgi'
-require 'yaml'
 
-#$LOAD_PATH.unshift(File.dirname(__FILE__))
-#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.expand_path(File.dirname(__FILE__) + '/fakeweb_helper')
+
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
 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 "google: geocode: YOUR_KEY_KERE"
-  puts
-end
-
-if File.exists?(KEY_FILE)
-	keys = YAML.load_file(KEY_FILE)
-	if keys["google"]
-	  KEY = keys["google"]["geocode"]
-  else
-    geocode_google_key_message
-    exit
-  end
-  if keys["weather"]
-  	WEATHER_PARTNER_KEY = keys["weather"]["partner"]
-  	WEATHER_LICENSE_KEY = keys["weather"]["license"]
-	end
-  if keys["weather_bug"]
-  	WEATHERBUG_CODE = keys["weather_bug"]["code"]
-	end
-    
-else
-  File.open(KEY_FILE, 'w') {|f| f << "google: geocode: YOUR_KEY_KERE" }
-  geocode_google_key_message
-  exit
-end
-
-  #
-  # for geocoding
-  #
-  geo_url = "http://maps.google.com/maps/geo?"
-  FakeWeb.register_uri(:get, 
-    "#{geo_url}gl=US&key=#{KEY}&sensor=false&q=90210&output=json",
-    :body => File.read(File.join(File.dirname(__FILE__),  
-      'fixtures/geocode',
-      '90210.json')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "#{geo_url}gl=&q=#{CGI.escape("40.756054,-73.986951")}&output=json&key=#{KEY}&sensor=false",
-    :body => File.read(File.join(File.dirname(__FILE__),  
-      'fixtures/geocode',
-      '40_73.json')
-    )
-  )
-  
-  FakeWeb.register_uri(:get, 
-    "#{geo_url}gl=&q=New%20York%2C%20NY&output=json&key=#{KEY}&sensor=false",
-    :body => File.read(File.join(File.dirname(__FILE__),  
-      'fixtures/geocode',
-      'newyork_ny.json')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "#{geo_url}gl=CA&key=#{KEY}&output=json&q=T5B%204M9&sensor=false",
-    :body => File.read(File.join(File.dirname(__FILE__),  
-      'fixtures/geocode',
-      'T5B4M9.json')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "#{geo_url}gl=US&q=KSFO&output=json&key=#{KEY}&sensor=false",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/geocode',
-      'ksfo.json')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "#{geo_url}gl=&q=Atlanta%2C%20GA%2C%20US&output=json&key=#{KEY}&sensor=false",
-    :body => File.read(File.join(File.dirname(__FILE__),  
-      'fixtures/geocode',
-      'atlanta.json')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "#{geo_url}output=xml&q=Atlanta%2C%20GA%2C%20US&gl=US&key=#{KEY}",
-    :body => File.read(File.join(File.dirname(__FILE__),  
-      'fixtures/geocode',
-      'atlanta.xml')
-    )
-  )
-  #
-  # for weather.com searches
-  #
-  FakeWeb.register_uri(:get, 
-    "http://xoap.weather.com:80/search/search?where=Beverly%20Hills%2C%20CA%2C%20USA",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/formats/weather_id', 
-      '90210.xml')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "http://xoap.weather.com:80/search/search?where=New%20York%2C%20NY",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/formats/weather_id',
-      'new_york.xml')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "http://xoap.weather.com:80/search/search?where=New%20York%2C%20NY%2C%20USA",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/formats/weather_id',
-      'new_york.xml')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "http://xoap.weather.com:80/search/search?where=90210",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/formats/weather_id',
-      '90210.xml')
-    )
-  )
-  FakeWeb.register_uri(:get, 
-    "http://xoap.weather.com:80/search/search?where=Millbrae%2C%20CA%2C%20USA",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/formats/weather_id',
-      'ksfo.xml')
-    )
-  )
-  #
-  # for yahoo.com searches
-  #
-  FakeWeb.register_uri(:get, 
-    "http://weather.yahooapis.com:80/forecastrss?p=USGA0028",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/formats/weather_id', 
-      'from_USGA0028.xml')
-    )
-  )
-  
-  #
-  # For wunderground weather
-  #
-  FakeWeb.register_uri(:get, 
-    "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=51.055149%2C-114.062438",
-    :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=51.055149%2C-114.062438",
-    :body => File.read(File.join(File.dirname(__FILE__), 
-      'fixtures/services/wunderground',
-      'forecast_calgary_ab.xml')
-    )
-  )
+#Barometer.debug!
+Barometer.google_geocode_key = "ABC123"
+Barometer.yahoo_placemaker_app_id = "YAHOO"
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
 end

data/spec/weather_services/google_spec.rb

@@ -102,14 +102,6 @@ describe "Google" do
     before(:each) do
       @query = Barometer::Query.new("Calgary,AB")
       @measurement = Barometer::Measurement.new
-      
-      FakeWeb.register_uri(:get, 
-        "http://google.com/ig/api?weather=#{CGI.escape(@query.q)}&hl=en-GB",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/google', 
-          'calgary_ab.xml')
-        )
-      )  
     end
     
     describe "all" do

data/spec/weather_services/services_spec.rb

@@ -31,7 +31,7 @@ describe "WeatherServices" do
       end
       
       it "returns the corresponding Service object" do
-        Barometer::WeatherService.source(:wunderground).should == WeatherService::Wunderground
+        Barometer::WeatherService.source(:wunderground).should == Barometer::WeatherService::Wunderground
         Barometer::WeatherService.source(:wunderground).superclass.should == Barometer::WeatherService
       end
       

data/spec/weather_services/weather_bug_spec.rb

@@ -138,24 +138,6 @@ describe "WeatherBug" do
     before(:each) do
       @query = Barometer::Query.new("90210")
       @measurement = Barometer::Measurement.new
-      
-      url = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getLiveWeatherRSS.aspx?"
-      FakeWeb.register_uri(:get, 
-        "#{url}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/weather_bug', 
-          '90210_current.xml')
-        )
-      )
-      
-      url2 = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getForecastRSS.aspx?"
-      FakeWeb.register_uri(:get, 
-        "#{url2}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/weather_bug', 
-          '90210_forecast.xml')
-        )
-      )
     end
   
     describe "all" do
@@ -194,24 +176,6 @@ describe "WeatherBug" do
     before(:each) do
       @query = Barometer::Query.new("90210")
       @measurement = Barometer::Measurement.new
-
-      url = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getLiveWeatherRSS.aspx?"
-      FakeWeb.register_uri(:get, 
-        "#{url}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/weather_bug', 
-          '90210_current.xml')
-        )
-      )
-      
-      url2 = "http://#{WEATHERBUG_CODE}.api.wxbug.net:80/getForecastRSS.aspx?"
-      FakeWeb.register_uri(:get, 
-        "#{url2}ACode=#{WEATHERBUG_CODE}&OutputType=1&UnitType=1&zipCode=90210",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/weather_bug', 
-          '90210_forecast.xml')
-        )
-      )
     end
 
     it "should correctly build the data" do

data/spec/weather_services/weather_dot_com_spec.rb

@@ -118,16 +118,6 @@ describe "WeatherDotCom" do
     before(:each) do
       @query = Barometer::Query.new("90210")
       @measurement = Barometer::Measurement.new
-      
-      url = "http://xoap.weather.com:80/weather/local/"
-  
-      FakeWeb.register_uri(:get, 
-         "#{url}90210?dayf=5&unit=m&link=xoap&par=#{WEATHER_PARTNER_KEY}&prod=xoap&key=#{WEATHER_LICENSE_KEY}&cc=*",
-         :body => File.read(File.join(File.dirname(__FILE__), 
-           '../fixtures/services/weather_dot_com', 
-           '90210.xml')
-         )
-       )  
     end
 
     describe "all" do
@@ -166,16 +156,6 @@ describe "WeatherDotCom" do
     before(:each) do
       @query = Barometer::Query.new("90210")
       @measurement = Barometer::Measurement.new
-      
-      url = "http://xoap.weather.com:80/weather/local/"
-  
-      FakeWeb.register_uri(:get, 
-         "#{url}90210?dayf=5&unit=m&link=xoap&par=#{WEATHER_PARTNER_KEY}&prod=xoap&key=#{WEATHER_LICENSE_KEY}&cc=*",
-         :body => File.read(File.join(File.dirname(__FILE__), 
-           '../fixtures/services/weather_dot_com', 
-           '90210.xml')
-         )
-       )
     end
     
     it "should correctly build the data" do

data/spec/weather_services/wunderground_spec.rb

@@ -142,21 +142,6 @@ describe "Wunderground" do
     before(:each) do
       @query = Barometer::Query.new("Calgary,AB")
       @measurement = Barometer::Measurement.new
-      
-      FakeWeb.register_uri(:get, 
-        "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=#{CGI.escape(@query.q)}",
-        :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.q)}",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/wunderground',
-          'forecast_calgary_ab.xml')
-        )
-      )
     end
     
     describe "all" do
@@ -195,21 +180,6 @@ describe "Wunderground" do
     before(:each) do
       @query = Barometer::Query.new("Calgary,AB")
       @measurement = Barometer::Measurement.new
-      
-      FakeWeb.register_uri(:get, 
-        "http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query=#{CGI.escape(@query.q)}",
-        :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.q)}",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/wunderground',
-          'forecast_calgary_ab.xml')
-        )
-      )
     end
 
    # TODO: complete this

data/spec/weather_services/yahoo_spec.rb

@@ -4,7 +4,7 @@ include Barometer
 describe "Yahoo" do
   
   before(:each) do
-    @accepted_formats = [:zipcode, :weather_id]
+    @accepted_formats = [:zipcode, :weather_id, :woe_id]
     #@base_uri = "http://google.com"
   end
   
@@ -89,14 +89,6 @@ describe "Yahoo" do
     before(:each) do
       @query = Barometer::Query.new("90210")
       @measurement = Barometer::Measurement.new
-      
-      FakeWeb.register_uri(:get, 
-        "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.q)}",
-        :body => File.read(File.join(File.dirname(__FILE__),  
-          '../fixtures/services/yahoo',
-          '90210.xml')
-        )
-      )  
     end
     
     describe "all" do
@@ -135,14 +127,6 @@ describe "Yahoo" do
     before(:each) do
       @query = Barometer::Query.new("90210")
       @measurement = Barometer::Measurement.new
-
-      FakeWeb.register_uri(:get, 
-        "http://weather.yahooapis.com:80/forecastrss?u=c&p=#{CGI.escape(@query.q)}",
-        :body => File.read(File.join(File.dirname(__FILE__), 
-          '../fixtures/services/yahoo',
-          '90210.xml')
-        )
-      )  
     end
 
     # TODO: complete this

data/spec/web_services/placemaker_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "WebService::Placemaker" do
+  
+  before(:each) do
+    @coordinates = "40.756054,-73.986951"
+    @geocode = "New York, NY"
+  end
+  
+  describe "and the class methods" do
+    
+    describe "fetch," do
+      
+      it "requires a Query object" do
+        lambda { Barometer::WebService::Placemaker.fetch }.should raise_error(ArgumentError)
+        lambda { Barometer::WebService::Placemaker.fetch("invalid") }.should raise_error(ArgumentError)
+        query = Barometer::Query.new(@coordinates)
+        query.is_a?(Barometer::Query).should be_true
+        lambda { Barometer::WebService::Placemaker.fetch(query) }.should_not raise_error(ArgumentError)
+      end
+      
+      # it "detects the key" do
+      #   query = Barometer::Query.new(@zipcode)
+      #   Barometer.google_geocode_key = nil
+      #   Barometer::WebService::Geocode.fetch(query).should be_nil
+      #   Barometer.google_geocode_key = KEY
+      #   Barometer::WebService::Geocode.fetch(query).should_not be_nil
+      # end
+      # 
+      # it "returns a Geo object" do
+      #   query = Barometer::Query.new(@zipcode)
+      #   Barometer::WebService::Geocode.fetch(query).is_a?(Data::Geo).should be_true
+      # end
+      
+    end
+    
+    # it "detects the Google Geocode Key" do
+    #   Barometer.google_geocode_key = nil
+    #   Barometer::WebService::Geocode.send("_has_geocode_key?").should be_false
+    #   Barometer.google_geocode_key = KEY
+    #   Barometer::WebService::Geocode.send("_has_geocode_key?").should be_true
+    # end
+    
+  end
+  
+end