barometer 0.7.3 → 0.8.0

data/spec/data/zone_spec.rb

@@ -1,36 +1,36 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Data::Zone" do
-  
+
   # describe "and class methods" do
-  #   
+  #
   #   it "responds to now and returns Time object" do
   #     Data::Zone.respond_to?("now").should be_true
   #     Data::Zone.now.is_a?(Time).should be_true
   #   end
-  # 
+  #
   #   it "responds to today and returns Date object" do
   #     Data::Zone.respond_to?("today").should be_true
   #     Data::Zone.today.is_a?(Date).should be_true
   #   end
-  #   
+  #
   # end
-  
+
   describe "when initialized" do
-    
+
     describe "with a full zone" do
-    
+
       before(:each) do
         @utc = Time.now.utc
         @timezone = "Europe/Paris"
         @zone = Data::Zone.new(@timezone)
       end
-    
+
       it "responds to zone_full" do
         @zone.zone_full.should_not be_nil
         @zone.zone_full.should == @timezone
       end
-    
+
       it "responds to zone_code" do
         @zone.zone_code.should be_nil
       end
@@ -41,22 +41,22 @@ describe "Data::Zone" do
 
       it "responds to tz" do
         lambda { Data::Zone.new("invalid timezone") }.should raise_error(ArgumentError)
-      
+
         zone = Data::Zone.new(@timezone)
         zone.tz.should_not be_nil
       end
-    
+
       it "responds to full" do
         @zone.respond_to?("full").should be_true
         zone = Data::Zone.new(@timezone)
         zone.tz = nil
         zone.tz.should be_nil
         zone.full.should == @timezone
-      
+
         zone = Data::Zone.new(@timezone)
         zone.full.should == @timezone
       end
-    
+
       it "responds to code" do
         @zone.respond_to?("code").should be_true
         zone = Data::Zone.new(@timezone)
@@ -78,14 +78,14 @@ describe "Data::Zone" do
         zone.tz.should be_nil
         zone.dst?.should be_nil
       end
-    
+
       it "responds to now" do
         @zone.respond_to?("now").should be_true
         @zone.now.is_a?(Time).should be_true
-        
+
         period = @zone.tz.period_for_utc(Time.now)
         actual_now = Time.now.utc + period.utc_total_offset
-        
+
         now = @zone.now
         now.hour.should == actual_now.hour
         now.min.should == actual_now.min
@@ -94,40 +94,40 @@ describe "Data::Zone" do
         now.month.should == actual_now.month
         now.day.should == actual_now.day
       end
-    
+
       it "responds to today" do
         @zone.respond_to?("today").should be_true
         @zone.today.is_a?(Date).should be_true
-        
+
         period = @zone.tz.period_for_utc(Time.now)
         actual_now = Time.now.utc + period.utc_total_offset
-        
+
         now = @zone.today
         now.year.should == actual_now.year
         now.month.should == actual_now.month
         now.day.should == actual_now.day
       end
-    
+
       it "converts local_time to utc" do
         local_time = Time.now.utc
         utc_time = @zone.local_to_utc(local_time)
-      
+
         offset =  @zone.tz.period_for_utc(local_time).utc_total_offset
         utc_time.should == (local_time - offset)
       end
-    
+
       it "converts utc to local_time" do
         utc_time = Time.now.utc
         local_time = @zone.utc_to_local(utc_time)
-      
+
         offset =  @zone.tz.period_for_utc(local_time).utc_total_offset
         utc_time.should == (local_time - offset)
       end
-      
+
     end
-    
+
     describe "with a zone code" do
-      
+
       before(:each) do
         @utc = Time.now.utc
         @timezone = "EAST"
@@ -226,9 +226,9 @@ describe "Data::Zone" do
       end
 
     end
-    
+
     describe "with a zone offset" do
-      
+
       before(:each) do
         @utc = Time.now.utc
         @timezone = 8.5
@@ -338,29 +338,29 @@ describe "Data::Zone" do
       end
 
     end
-    
+
   end
-  
+
   describe "when detecting zones" do
-    
+
     it "recognozes a full time zone format" do
       Data::Zone.is_zone_full?("invalid").should be_false
       Data::Zone.is_zone_full?("America/New York").should be_true
     end
-    
+
     it "matches a zone offset" do
       Data::Zone.is_zone_offset?("invalid").should be_false
       Data::Zone.is_zone_offset?("MST").should be_false
       Data::Zone.is_zone_offset?("10").should be_false
       Data::Zone.is_zone_offset?(-10).should be_true
     end
-      
+
     it "matches a zone code" do
       Data::Zone.is_zone_code?("invalid").should be_false
       Data::Zone.is_zone_code?("MST").should be_true
       Data::Zone.is_zone_code?("EAST").should be_true
     end
-    
+
   end
-  
+
 end

data/spec/formats/coordinates_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "Query::Coordinates" do
-  
+describe Barometer::Query::Format::Coordinates, :vcr => {
+  :cassette_name => "Query::Format::Coordinates"
+} do
   before(:each) do
     @short_zipcode = "90210"
     @zipcode = @short_zipcode
@@ -12,22 +13,21 @@ describe "Query::Coordinates" do
     @geocode = "New York, NY"
     @icao = "KSFO"
   end
-  
+
   describe "and class methods" do
-    
     it "returns a format" do
       Barometer::Query::Format::Coordinates.format.should == :coordinates
     end
-    
+
     it "returns a country" do
       Barometer::Query::Format::Coordinates.country_code.should be_nil
     end
-    
+
     it "returns a regex" do
       Barometer::Query::Format::Coordinates.regex.should_not be_nil
       Barometer::Query::Format::Coordinates.regex.is_a?(Regexp).should be_true
     end
-    
+
     it "returns the convertable_formats" do
       Barometer::Query::Format::Coordinates.convertable_formats.should_not be_nil
       Barometer::Query::Format::Coordinates.convertable_formats.is_a?(Array).should be_true
@@ -39,26 +39,23 @@ describe "Query::Coordinates" do
       Barometer::Query::Format::Coordinates.convertable_formats.include?(:icao).should be_true
       Barometer::Query::Format::Coordinates.convertable_formats.include?(:geocode).should be_true
     end
-    
+
     describe "is?," do
-      
       before(:each) do
         @valid = "40.756054,-73.986951"
         @invalid = "invalid"
       end
-      
+
       it "recognizes a valid format" do
         Barometer::Query::Format::Coordinates.is?(@valid).should be_true
       end
-      
+
       it "recognizes non-valid format" do
         Barometer::Query::Format::Coordinates.is?(@invalid).should be_false
       end
-      
     end
-  
+
     describe "when converting using 'to'," do
-      
       it "requires a Query::Format object" do
         lambda { Barometer::Query::Format::Coordinates.to }.should raise_error(ArgumentError)
         lambda { Barometer::Query::Format::Coordinates.to("invalid") }.should raise_error(ArgumentError)
@@ -66,7 +63,7 @@ describe "Query::Coordinates" do
         query.is_a?(Barometer::Query).should be_true
         lambda { Barometer::Query::Format::Coordinates.to(original_query) }.should_not raise_error(ArgumentError)
       end
-      
+
       it "returns a Barometer::Query" do
         query = Barometer::Query.new(@short_zipcode)
         Barometer::Query::Format::Coordinates.to(query).is_a?(Barometer::Query).should be_true
@@ -107,7 +104,11 @@ describe "Query::Coordinates" do
         query = Barometer::Query.new(@geocode)
         query.format.should == :geocode
         new_query = Barometer::Query::Format::Coordinates.to(query)
-        new_query.q.should == "40.7143528,-74.00597309999999"
+
+        new_query_coords = new_query.q.split(',').map{|c| c.to_f}
+        new_query_coords[0].should be_within(0.00001).of(40.7143528)
+        new_query_coords[1].should be_within(0.00001).of(-74.0059731)
+
         new_query.country_code.should == "US"
         new_query.format.should == :coordinates
         new_query.geo.should_not be_nil
@@ -117,7 +118,7 @@ describe "Query::Coordinates" do
         query = Barometer::Query.new(@postal_code)
         query.format.should == :postalcode
         new_query = Barometer::Query::Format::Coordinates.to(query)
-        new_query.q.should == "53.570516,-113.45784"
+        new_query.q.should == "53.5721719,-113.4551835"
         new_query.country_code.should == "CA"
         new_query.format.should == :coordinates
         new_query.geo.should_not be_nil
@@ -137,30 +138,29 @@ describe "Query::Coordinates" do
         query = Barometer::Query.new(@coordinates)
         query.format.should == :coordinates
         new_query = Barometer::Query::Format::Coordinates.to(query)
-        new_query.q.should == "40.7560395,-73.9869147"
+
+        new_query_coords = new_query.q.split(',').map{|c| c.to_f}
+        new_query_coords[0].should be_within(0.00001).of(40.7560413)
+        new_query_coords[1].should be_within(0.00001).of(-73.9869192)
+
         new_query.country_code.should == "US"
         new_query.format.should == :coordinates
         new_query.geo.should_not be_nil
       end
-
     end
-    
+
     describe "parsing" do
-      
       it "returns the latitude" do
         Barometer::Query::Format::Coordinates.parse_latitude(@coordinates).should == "40.756054"
       end
-      
+
       it "returns the longitude" do
         Barometer::Query::Format::Coordinates.parse_longitude(@coordinates).should == "-73.986951"
       end
-      
+
       it "returns nil when unknown" do
         Barometer::Query::Format::Coordinates.parse_longitude(@short_zipcode).should be_nil
       end
-      
     end
-    
   end
-  
-end
+end

data/spec/formats/format_spec.rb

@@ -1,44 +1,38 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "Query::Format" do
-  
+describe Barometer::Query::Format do
   describe "and class methods" do
-    
     describe "is?," do
-      
       it "requires a String" do
         invalid = 1
         lambda { Barometer::Query::Format.is?(invalid) }.should raise_error(ArgumentError)
-        
+
         valid = "string"
         valid.is_a?(String).should be_true
         lambda { Barometer::Query::Format.is?(valid) }.should_not raise_error(ArgumentError)
       end
-      
+
       it "calls a stubbed undefined method" do
         lambda { Barometer::Query::Format.is?("valid") }.should raise_error(NotImplementedError)
-      end 
-      
+      end
     end
-    
+
     describe "converts?," do
-      
       it "requires a Query object" do
         invalid = 1
         Barometer::Query::Format.converts?(invalid).should be_false
-        
+
         valid = Barometer::Query.new
         valid.is_a?(Barometer::Query).should be_true
         lambda { Barometer::Query::Format.converts?(valid) }.should_not raise_error(ArgumentError)
       end
-      
+
       it "returns false" do
         valid = Barometer::Query.new
         Barometer::Query::Format.converts?(valid).should be_false
-      end 
-      
+      end
     end
-    
+
     it "detects a Query object" do
       invalid = 1
       Barometer::Query::Format.is_a_query?.should be_false
@@ -47,36 +41,34 @@ describe "Query::Format" do
       valid.is_a?(Barometer::Query).should be_true
       Barometer::Query::Format.is_a_query?(valid).should be_true
     end
-    
+
     it "stubs regex" do
       lambda { Barometer::Query::Format.regex }.should raise_error(NotImplementedError)
     end
-    
+
     it "stubs format" do
       lambda { Barometer::Query::Format.format }.should raise_error(NotImplementedError)
     end
-    
+
     it "stubs to" do
       Barometer::Query::Format.to.should be_nil
     end
-    
+
     it "stubs country_code" do
       Barometer::Query::Format.country_code.should be_nil
     end
-    
+
     it "stubs convertable_formats" do
       Barometer::Query::Format.convertable_formats.should == []
     end
-    
+
     it "stubs convert_query" do
       Barometer::Query::Format.respond_to?(:convert_query).should be_true
     end
-    
+
     it "normally does nothing when converting a query" do
       text = "this is a query"
       Barometer::Query::Format.convert_query(text).should == text
     end
-    
   end
-  
-end
+end

data/spec/formats/geocode_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "Query::Geocode" do
-  
+describe Barometer::Query::Format::Geocode, :vcr => {
+  :cassette_name => "Query::Format::Geocode"
+} do
   before(:each) do
     @short_zipcode = "90210"
     @zipcode = @short_zipcode
@@ -12,17 +13,16 @@ describe "Query::Geocode" do
     @geocode = "New York, NY"
     @icao = "KSFO"
   end
-  
+
   describe "and class methods" do
-    
     it "returns a format" do
       Barometer::Query::Format::Geocode.format.should == :geocode
     end
-    
+
     it "returns a country" do
       Barometer::Query::Format::Geocode.country_code.should be_nil
     end
-    
+
     it "returns the convertable_formats" do
       Barometer::Query::Format::Geocode.convertable_formats.should_not be_nil
       Barometer::Query::Format::Geocode.convertable_formats.is_a?(Array).should be_true
@@ -32,26 +32,23 @@ describe "Query::Geocode" do
       Barometer::Query::Format::Geocode.convertable_formats.include?(:weather_id).should be_true
       Barometer::Query::Format::Geocode.convertable_formats.include?(:icao).should be_true
     end
-    
+
     describe "is?," do
-      
       before(:each) do
         @valid = "New York, NY"
       end
-      
+
       it "recognizes a valid format" do
         Barometer::Query::Format::Geocode.is?(@valid).should be_true
         Barometer::Query::Format::Geocode.is?.should be_false
       end
-      
     end
-  
+
     describe "when converting using 'to'," do
-      
       before(:each) do
         Barometer.force_geocode = false
       end
-      
+
       it "requires a Barometer::Query object" do
         lambda { Barometer::Query::Format::Geocode.to }.should raise_error(ArgumentError)
         lambda { Barometer::Query::Format::Geocode.to("invalid") }.should raise_error(ArgumentError)
@@ -59,12 +56,12 @@ describe "Query::Geocode" do
         query.is_a?(Barometer::Query).should be_true
         lambda { Barometer::Query::Format::Geocode.to(query) }.should_not raise_error(ArgumentError)
       end
-      
+
       it "returns a Barometer::Query" do
         query = Barometer::Query.new(@short_zipcode)
         Barometer::Query::Format::Geocode.to(query).is_a?(Barometer::Query).should be_true
       end
-      
+
       it "converts from short_zipcode" do
         query = Barometer::Query.new(@short_zipcode)
         query.format.should == :short_zipcode
@@ -74,7 +71,7 @@ describe "Query::Geocode" do
         new_query.format.should == :geocode
         new_query.geo.should_not be_nil
       end
-      
+
       it "converts from zipcode" do
         query = Barometer::Query.new(@zipcode)
         query.format = :zipcode
@@ -85,7 +82,7 @@ describe "Query::Geocode" do
         new_query.format.should == :geocode
         new_query.geo.should_not be_nil
       end
-      
+
       it "converts from weather_id" do
         query = Barometer::Query.new(@weather_id)
         query.format.should == :weather_id
@@ -95,7 +92,7 @@ describe "Query::Geocode" do
         new_query.format.should == :geocode
         new_query.geo.should be_nil
       end
-      
+
       it "converts from coordinates" do
         query = Barometer::Query.new(@coordinates)
         query.format.should == :coordinates
@@ -105,7 +102,7 @@ describe "Query::Geocode" do
         new_query.format.should == :geocode
         new_query.geo.should_not be_nil
       end
-      
+
       it "converts from icao" do
         query = Barometer::Query.new(@icao)
         query.format.should == :icao
@@ -115,14 +112,14 @@ describe "Query::Geocode" do
         new_query.format.should == :geocode
         new_query.geo.should_not be_nil
       end
-      
+
       it "does not convert postalcode" do
         query = Barometer::Query.new(@postal_code)
         query.format.should == :postalcode
         new_query = Barometer::Query::Format::Geocode.to(query)
         new_query.should be_nil
       end
-      
+
       it "leaves geocode untouched" do
         query = Barometer::Query.new(@geocode)
         query.format.should == :geocode
@@ -132,11 +129,9 @@ describe "Query::Geocode" do
         new_query.format.should == :geocode
         new_query.geo.should be_nil
       end
-
     end
-    
+
     describe "when geocoding" do
-      
       it "requires a Barometer::Query object" do
         lambda { Barometer::Query::Format::Geocode.geocode }.should raise_error(ArgumentError)
         lambda { Barometer::Query::Format::Geocode.geocode("invalid") }.should raise_error(ArgumentError)
@@ -144,12 +139,12 @@ describe "Query::Geocode" do
         query.is_a?(Barometer::Query).should be_true
         lambda { Barometer::Query::Format::Geocode.geocode(original_query) }.should_not raise_error(ArgumentError)
       end
-      
+
       it "returns a Barometer::Query" do
         query = Barometer::Query.new(@short_zipcode)
         Barometer::Query::Format::Geocode.geocode(query).is_a?(Barometer::Query).should be_true
       end
-      
+
       it "converts from short_zipcode" do
         query = Barometer::Query.new(@short_zipcode)
         query.format.should == :short_zipcode
@@ -159,13 +154,10 @@ describe "Query::Geocode" do
         new_query.format.should == :geocode
         new_query.geo.should_not be_nil
       end
-    
     end
-    
+
     it "doesn't define a regex" do
       lambda { Barometer::Query::Format::Geocode.regex }.should raise_error(NotImplementedError)
     end
-    
   end
-  
-end
+end