barometer 0.7.3 → 0.8.0

data/spec/query_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Query" do
-  
+describe Barometer::Query, :vcr => {
+  :cassette_name => "Query"
+} do
   before(:each) do
     @short_zipcode = "90210"
     @zipcode = @short_zipcode
@@ -11,13 +12,13 @@ describe "Query" do
     @coordinates = "40.756054,-73.986951"
     @geocode = "New York, NY"
     @icao = "KSFO"
-    
+
     # actual conversions
     @zipcode_to_coordinates = "34.1030032,-118.4104684"
     @zipcode_to_geocode = "Beverly Hills, CA, United States"
     @zipcode_to_weather_id = "USCA0090"
-    @postalcode_to_coordinates = "53.570516,-113.45784"
-    @geocode_to_coordinates = "40.7143528,-74.00597309999999"
+    @postalcode_to_coordinates = "53.5721719,-113.4551835"
+    @geocode_to_coordinates = "40.7143528,-74.0059731"
     @geocode_to_weather_id = "USNY0996"
     @coordinates_to_geocode = "Manhattan, NY, United States"
     @coordinates_to_weather_id = "USNY0996"
@@ -25,9 +26,8 @@ describe "Query" do
     @icao_to_geocode = "San Francisco, CA, United States"
     @icao_to_weather_id = "USCA0987"
   end
-  
+
   describe "determines the query format" do
-    
     before(:each) do
       @query = Barometer::Query.new
       @query.country_code.should be_nil
@@ -48,7 +48,7 @@ describe "Query" do
       @query.format.to_sym.should == :zipcode
       @query.country_code.should == "US"
     end
-    
+
     it "recognizes a postal code" do
       @query.q = @postal_code
       @query.format.should be_nil
@@ -56,7 +56,7 @@ describe "Query" do
       @query.format.to_sym.should == :postalcode
       @query.country_code.should == "CA"
     end
-    
+
     it "recognizes icao" do
       @query.q = @icao
       @query.format.should be_nil
@@ -64,7 +64,7 @@ describe "Query" do
       @query.format.to_sym.should == :icao
       @query.country_code.should == "US"
     end
-    
+
     it "recognizes weather_id" do
       @query.q = @weather_id
       @query.format.should be_nil
@@ -72,7 +72,7 @@ describe "Query" do
       @query.format.to_sym.should == :weather_id
       @query.country_code.should == "US"
     end
-    
+
     it "recognizes latitude/longitude" do
       @query.q = @coordinates
       @query.format.should be_nil
@@ -80,7 +80,7 @@ describe "Query" do
       @query.format.to_sym.should == :coordinates
       @query.country_code.should be_nil
     end
-    
+
     it "defaults to a general geo_location" do
       @query.q = @geocode
       @query.format.should be_nil
@@ -88,62 +88,60 @@ describe "Query" do
       @query.format.to_sym.should == :geocode
       @query.country_code.should be_nil
     end
-    
   end
-  
+
   describe "when initialized" do
-    
     before(:each) do
       @query = Barometer::Query.new
     end
-    
+
     it "responds to q" 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
-    
+
     it "responds to country_code" do
       @query.country_code.should be_nil
     end
-    
+
     it "sets the query" do
       query = Barometer::Query.new(@geocode)
       query.q.should == @geocode
     end
-    
+
     it "determines the format" do
       query = Barometer::Query.new(@geocode)
       query.format.should_not be_nil
     end
-    
+
     it "responds to geo" do
       @query.geo.should be_nil
     end
-    
+
     it "responds to timezone" do
       @query.timezone.should be_nil
     end
-    
+
     it "responds to conversions" do
       @query.conversions.should be_nil
     end
-    
+
     it "returns latitude for when recognized as coordinates" do
       @query.q = @coordinates
       @query.format.should be_nil
@@ -151,7 +149,7 @@ describe "Query" do
       @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
@@ -159,7 +157,7 @@ describe "Query" do
       @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
@@ -168,348 +166,333 @@ describe "Query" do
       @query.latitude.should be_nil
       @query.longitude.should be_nil
     end
-    
   end
-  
+
   describe "when returning the query to a Weather API" do
-    
     it "raises an error if there are NO acceptable formats" do
       acceptable_formats = nil
       query = Barometer::Query.new
       lambda { query.convert!(acceptable_formats) }.should raise_error
-      
+
       acceptable_formats = []
       lambda { query.convert!(acceptable_formats) }.should raise_error
     end
-    
+
     describe "and the query is already the preferred format" do
-      
       it "returns the short_zipcode untouched" do
         preferred = [:short_zipcode]
         query = Barometer::Query.new(@short_zipcode)
         query.convert!(preferred).q.should == @short_zipcode
         query.country_code.should == "US"
       end
-      
+
       it "returns the long_zipcode untouched" do
         preferred = [:zipcode]
         query = Barometer::Query.new(@long_zipcode)
         query.convert!(preferred).q.should == @long_zipcode
         query.country_code.should == "US"
       end
-      
+
       it "returns the postalcode untouched" do
         preferred = [:postalcode]
         query = Barometer::Query.new(@postal_code)
         query.convert!(preferred).q.should == @postal_code
         query.country_code.should == "CA"
       end
-      
+
       it "returns the icao untouched" do
         preferred = [:icao]
         query = Barometer::Query.new(@icao)
         query.convert!(preferred).q.should == @icao
       end
-      
+
       it "returns the coordinates untouched" do
         preferred = [:coordinates]
         query = Barometer::Query.new(@coordinates)
         query.convert!(preferred).q.should == @coordinates
       end
-      
+
       it "returns the geocode untouched" do
         preferred = [:geocode]
         query = Barometer::Query.new(@geocode)
         query.convert!(preferred).q.should == @geocode
       end
-      
     end
-    
+
     describe "and the query needs converting" do
-      
       describe "with an intial format of :short_zipcode," do
-        
         before(:each) do
           @query = Barometer::Query.new(@short_zipcode)
         end
-        
+
         it "converts to zipcode" do
           acceptable_formats = [:zipcode]
           query = @query.convert!(acceptable_formats)
           query.q.should == @zipcode
           query.country_code.should == "US"
         end
-        
+
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
           query.q.should == @zipcode_to_coordinates
           query.country_code.should == "US"
         end
-        
+
         it "converts to geocode" do
           acceptable_formats = [:geocode]
           query = @query.convert!(acceptable_formats)
           query.q.should == @zipcode_to_geocode
           query.country_code.should == "US"
         end
-        
+
         it "converts to weather_id" do
           acceptable_formats = [:weather_id]
           query = @query.convert!(acceptable_formats)
           query.q.should == @zipcode_to_weather_id
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to icao" do
           acceptable_formats = [:icao]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to postalcode" do
           acceptable_formats = [:postalcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
       end
-      
+
       describe "with an intial format of :zipcode," do
-        
         before(:each) do
           @query = Barometer::Query.new(@zipcode)
           Barometer.force_geocode = false
         end
-        
+
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
           query.q.should == @zipcode_to_coordinates
           query.country_code.should == "US"
         end
-        
+
         it "converts to geocode" do
           acceptable_formats = [:geocode]
           query = @query.convert!(acceptable_formats)
           query.q.should == @zipcode_to_geocode
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to icao" do
           acceptable_formats = [:icao]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to postalcode" do
           acceptable_formats = [:postalcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to short_zipcode" do
           @query = Barometer::Query.new(@long_zipcode)
           acceptable_formats = [:short_zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "converts to weather_id" do
           acceptable_formats = [:weather_id]
           query = @query.convert!(acceptable_formats)
           query.q.should == @zipcode_to_weather_id
           query.country_code.should == "US"
         end
-        
       end
-      
+
       describe "with an intial format of :postalcode," do
-        
         before(:each) do
           @query = Barometer::Query.new(@postal_code)
         end
-        
+
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
           query.q.should == @postalcode_to_coordinates
           query.country_code.should == "CA"
         end
-        
+
         it "skips converting to geocode" do
           acceptable_formats = [:geocode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to icao" do
           acceptable_formats = [:icao]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to short_zipcode" do
           acceptable_formats = [:short_zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to weather_id" do
           acceptable_formats = [:weather_id]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to zipcode" do
           acceptable_formats = [:zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
       end
-      
+
       describe "with an intial format of :icao," do
-        
         before(:each) do
           @query = Barometer::Query.new(@icao)
         end
-        
+
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
           query.q.should == @icao_to_coordinates
           query.country_code.should == "US"
         end
-        
+
         it "converts to geocode" do
           acceptable_formats = [:geocode]
           query = @query.convert!(acceptable_formats)
           query.q.should == @icao_to_geocode
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to postalcode" do
           acceptable_formats = [:postalcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to short_zipcode" do
           acceptable_formats = [:short_zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "converts to weather_id" do
           acceptable_formats = [:weather_id]
           query = @query.convert!(acceptable_formats)
           query.q.should == @icao_to_weather_id
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to zipcode" do
           acceptable_formats = [:zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
       end
-      
+
       describe "with an intial format of :geocode," do
-        
         before(:each) do
           @query = Barometer::Query.new(@geocode)
         end
-        
+
         it "converts to coordinates" do
           acceptable_formats = [:coordinates]
           query = @query.convert!(acceptable_formats)
-          query.q.should == @geocode_to_coordinates
+
+          query_coords = query.q.split(',').map{|c| c.to_f}
+          expected_coords = @geocode_to_coordinates.split(',').map{|c| c.to_f}
+
+          query_coords[0].should be_within(0.00001).of(expected_coords[0])
+          query_coords[1].should be_within(0.00001).of(expected_coords[1])
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to icao" do
           acceptable_formats = [:icao]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to postalcode" do
           acceptable_formats = [:postalcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to short_zipcode" do
           acceptable_formats = [:short_zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "converts to weather_id" do
           acceptable_formats = [:weather_id]
           query = @query.convert!(acceptable_formats)
           query.q.should == @geocode_to_weather_id
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to zipcode" do
           acceptable_formats = [:zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
       end
-      
+
       describe "with an intial format of :coordinates," do
-        
         before(:each) do
           @query = Barometer::Query.new(@coordinates)
         end
-        
+
         it "converts to geocode" do
           acceptable_formats = [:geocode]
           query = @query.convert!(acceptable_formats)
           query.q.should == @coordinates_to_geocode
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to icao" do
           acceptable_formats = [:icao]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to postalcode" do
           acceptable_formats = [:postalcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "skips converting to short_zipcode" do
           acceptable_formats = [:short_zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
+
         it "converts to weather_id" do
           acceptable_formats = [:weather_id]
           query = @query.convert!(acceptable_formats)
           query.q.should == @coordinates_to_weather_id
           query.country_code.should == "US"
         end
-        
+
         it "skips converting to zipcode" do
           acceptable_formats = [:zipcode]
           query = @query.convert!(acceptable_formats)
           query.should be_nil
         end
-        
       end
-      
     end
-    
   end
-  
-end
+end