drifter 0.1.2 → 0.2.0

data/README.rdoc

@@ -81,16 +81,6 @@ and sent as a query string parameter e.g. Yahoo's service returns a timezone if
   >> paris.data["timezone"]
   => "Europe/paris"
 
-Finally, Drifter::Location objects have a distance_to() method
-
-  >> london.distance_to(bh)
-  => 5438.60013996461
-
-Distances are returned in miles by default. You can change this per request or change the default
-
-  >> Drifter.default_units = :km
-  >> london.distance_to(bh, :units => :miles)
-
 Drifter.geocode() always returns an array if the request was processed successfully by the
 geocoding service. An empty array indicates that the service returned no results.
 

data/lib/drifter.rb

@@ -1,12 +1,10 @@
 require 'rubygems'
-require 'drifter/distance/haversine'
 require 'drifter/geocoders'
 require 'drifter/location'
 
 module Drifter
 
   @@default_geocoder = :google
-  @@default_units = :miles
   @@last_error = nil
 
 
@@ -24,19 +22,6 @@ module Drifter
   end
 
 
-  # Returns the default units for distance calculations
-  def self.default_units
-    @@default_units
-  end
-
-
-  # Sets the default units for distance calculations.
-  # Supported values are :miles and :kms
-  def self.default_units=(value)
-    @@default_units=value
-  end
-
-
   # Helper method to extract the lat and lng from an array or from any object
   # that responds to lat() and lng(). Returns nil if neither of those apply
   def self.extract_latlng(loc)

data/lib/drifter/location.rb

@@ -1,4 +1,3 @@
-require 'drifter/location/locatable'
 module Drifter
   # Drifter.geocode() returns an array of Drifter::Location objects
   # Depending on the geocoder used, Location objects are populated
@@ -11,7 +10,6 @@ module Drifter
   # Additional data returned by the geocoder can be accessed via the
   # data() method
   class Location
-    include Drifter::Location::Locatable
 
     attr_accessor :raw_data
     attr_accessor :raw_data_format

data/lib/drifter/version.rb

@@ -1,3 +1,3 @@
 module Drifter
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: drifter
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ahmed Adam
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +00:00
+date: 2011-03-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 4
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -60,17 +63,14 @@ files:
 - Rakefile
 - drifter.gemspec
 - lib/drifter.rb
-- lib/drifter/distance/haversine.rb
 - lib/drifter/geocoders.rb
 - lib/drifter/geocoders/base.rb
 - lib/drifter/geocoders/google.rb
 - lib/drifter/geocoders/hostip.rb
 - lib/drifter/geocoders/yahoo.rb
 - lib/drifter/location.rb
-- lib/drifter/location/locatable.rb
 - lib/drifter/version.rb
 - test/google_geocoder_test.rb
-- test/locatable_test.rb
 - test/location_test.rb
 - test/responses/google_error
 - test/responses/google_many_results
@@ -96,6 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -104,13 +105,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: drifter
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Simple geocoding library for ruby

data/lib/drifter/distance/haversine.rb

@@ -1,69 +0,0 @@
-module Drifter
-  module Distance
-    class Haversine
-
-      EarthRadiusInMiles = 3956
-      EarthRadiusInKms = 6371
-      RAD_PER_DEG = 0.017453293  #  PI/180
-
-
-      # this method is from Landon Cox's haversine.rb (GNU Affero GPL v3):
-      # http://www.esawdust.com/blog/gps/files/HaversineFormulaInRuby.html:
-      # http://www.esawdust.com (Landon Cox)
-      # http://www.esawdust.com/blog/businesscard/businesscard.html
-      def self.between(point1, point2, options={})
-        lat1, lon1 = Drifter.extract_latlng!(point1)
-        lat2, lon2 = Drifter.extract_latlng!(point2)
-
-        dlon = lon2 - lon1
-        dlat = lat2 - lat1
-
-        dlon_rad = dlon * RAD_PER_DEG 
-        dlat_rad = dlat * RAD_PER_DEG
-
-        lat1_rad = lat1 * RAD_PER_DEG
-        lon1_rad = lon1 * RAD_PER_DEG
-
-        lat2_rad = lat2 * RAD_PER_DEG
-        lon2_rad = lon2 * RAD_PER_DEG
-
-        a = (Math.sin(dlat_rad/2))**2 + Math.cos(lat1_rad) * Math.cos(lat2_rad) * (Math.sin(dlon_rad/2))**2
-        c = 2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
-
-        units = options.delete(:units) || Drifter.default_units
-        return EarthRadiusInKms * c if units == :km
-        return EarthRadiusInMiles * c
-      end
-
-
-      # haversine sql based on http://code.google.com/apis/maps/articles/phpsqlsearch.html
-      # you will need to add 'select' and 'AS distance' if required
-      def self.to_postgresql(options)
-        origin = options[:origin]
-        lat, lng = Drifter.extract_latlng!(origin)
-        lat_column = options[:lat_column] || :lat
-        lng_column = options[:lng_column] || :lng
-        units = options[:units] || Drifter.default_units
-        multiplier = EarthRadiusInMiles
-        multiplier = EarthRadiusInKms if units == :km
-
-        postgres = <<-EOS
-          #{multiplier} * ACOS(
-            COS( RADIANS(#{lat}) ) *
-            COS( RADIANS( #{lat_column} ) ) *
-            COS( RADIANS( #{lng_column} ) -
-            RADIANS(#{lng}) ) +
-            SIN( RADIANS(#{lat}) ) *
-            SIN( RADIANS( #{lat_column} ) )
-          )
-        EOS
-      end
-
-      # postgresql code seems to work fine fo sql
-      def self.to_mysql(options)
-        to_postgresql(options)
-      end
-
-    end
-  end
-end

data/lib/drifter/location/locatable.rb

@@ -1,15 +0,0 @@
-# classes including this module must repond to lat(), lat=(), lng() and lng=()
-module Drifter
-  class Location
-    module Locatable
-
-
-      # nodoc
-      def distance_to(loc, options={})
-        Drifter::Distance::Haversine.between(self, loc, options)
-      end
-
-
-    end
-  end
-end

data/test/locatable_test.rb

@@ -1,101 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Widget
-  include Drifter::Location::Locatable
-  attr_accessor :lat, :lng
-end
-
-
-class LocatableTest < Test::Unit::TestCase
-
-  def setup
-    @widget = Widget.new
-  end
-
-
-  # nodoc
-  def floats_equal?(f1, f2)
-    f1.to_s == f2.to_s
-  end
-
-
-  # nodoc
-  def dont_test_location
-    @widget.lat = 10
-    @widget.lng = 20
-    loc = @widget.location
-    assert_equal 10, loc.lat
-    assert_equal 20, loc.lng
-
-    @widget.lat = nil
-    @widget.lng = nil
-    assert_equal nil, @widget.location.lat
-    assert_equal nil, @widget.location.lng
-  end
-
-
-  # nodoc
-  def dont_test_location_setter
-    loc = Drifter::Location.new
-    loc.lat = 10
-    loc.lng = 20
-    @widget.location = loc
-    assert_equal 10, @widget.lat
-    assert_equal 20, @widget.lng
-
-    @widget.location = nil
-    assert_nil @widget.lat
-    assert_nil @widget.lng
-
-    @widget.location = [3,4]
-    assert_equal 3, @widget.lat
-    assert_equal 4, @widget.lng
-  end
-
-
-  def test_distance_to
-    assert_raise(ArgumentError) { @widget.distance_to nil }
-    assert_raise(ArgumentError) { @widget.distance_to "" }
-    assert_raise(ArgumentError) { @widget.distance_to 1 }
-
-    # london
-    @widget.lat = 51.5001524
-    @widget.lng = -0.1262362
-
-    # manchester
-    lat = 53.4807125
-    lng = -2.2343765
-
-    manchester = Widget.new
-    manchester.lat = lat
-    manchester.lng = lng
-
-    distance_in_miles = 162.941138493485
-    distance_in_km = 262.411019550554
-
-    # pass an array, default units
-    distance = @widget.distance_to [lat, lng]
-    assert floats_equal?(distance_in_miles, distance)
-
-    # location as array, units in miles
-    distance = @widget.distance_to [lat, lng], :units => :miles
-    assert floats_equal?(distance_in_miles, distance)
-
-    # location as array, units in km
-    distance = @widget.distance_to [lat, lng], :units => :km
-    assert floats_equal?(distance_in_km, distance)
-
-    # location as Locatable object, default units
-    distance = @widget.distance_to manchester
-    assert floats_equal?(distance_in_miles, distance)
-
-    # location as Locatable object, units in miles
-    distance = @widget.distance_to manchester, :units => :miles
-    assert floats_equal?(distance_in_miles, distance)
-
-    # location as Locatable object, units in km
-    distance = @widget.distance_to manchester, :units => :km
-    assert floats_equal?(distance_in_km, distance)
-  end
-
-end