graticule 0.2.4 → 0.2.5

data/lib/graticule.rb

@@ -10,6 +10,7 @@ require 'graticule/geocoder/bogus'
 require 'graticule/geocoder/rest'
 require 'graticule/geocoder/google'
 require 'graticule/geocoder/host_ip'
+require 'graticule/geocoder/multi'
 require 'graticule/geocoder/yahoo'
 require 'graticule/geocoder/geocoder_ca'
 require 'graticule/geocoder/geocoder_us'

data/lib/graticule/version.rb

@@ -2,7 +2,7 @@ module Graticule #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY = 4
+    TINY = 5
   
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ require 'yaml'
 require 'test/unit'
 require 'breakpoint'
 require 'graticule'
+require 'mocha'
 
 TEST_RESPONSE_PATH = File.dirname(__FILE__) + '/fixtures/responses'
 

data/test/unit/graticule/geocoder/multi_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Graticule
+  module Geocoder
+    class MultiTest < Test::Unit::TestCase
+
+      def setup
+        @mock_geocoders = [mock("geocoder 1"), mock("geocoder 2")]
+        @mock_geocoders.each {|g| g.stubs(:locate) }
+        @geocoder = Multi.new *@mock_geocoders
+      end
+
+      def test_locate_calls_each_geocoder_and_raises_error
+        @mock_geocoders.each do |g|
+          g.expects(:locate).with('test').raises(Graticule::AddressError)
+        end
+        assert_raises(Graticule::AddressError) { @geocoder.locate 'test' }
+      end
+
+      def test_locate_returns_first_result_without_calling_others
+        result = mock("result")
+        @mock_geocoders.first.expects(:locate).returns(result)
+        @mock_geocoders.last.expects(:locate).never
+        assert_equal result, @geocoder.locate('test')
+      end
+      
+      def test_locate_with_custom_block
+        @mock_geocoders.first.expects(:locate).returns(1)
+        @mock_geocoders.last.expects(:locate).returns(2)
+        @geocoder = Multi.new(*@mock_geocoders) {|r| r == 2 }
+        assert_equal 2, @geocoder.locate('test')
+      end
+
+      def test_locate_with_custom_block_and_no_match
+        @mock_geocoders.first.expects(:locate).returns(1)
+        @mock_geocoders.last.expects(:locate).returns(2)
+        @geocoder = Multi.new(*@mock_geocoders) {|r| r == 3 }
+        assert_raises(Graticule::AddressError) { @geocoder.locate('test') }
+      end
+
+    end
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: graticule
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
-date: 2007-05-15 00:00:00 -04:00
+  version: 0.2.5
+date: 2007-09-12 00:00:00 -04:00
 summary: API for using all the popular geocoding services.
 require_paths: 
 - lib
@@ -100,19 +100,30 @@ files:
 - test/unit/graticule/location_test.rb
 test_files: 
 - test/unit/graticule/distance_test.rb
-- test/unit/graticule/geocoder_test.rb
-- test/unit/graticule/location_test.rb
 - test/unit/graticule/geocoder/geocoder_us_test.rb
 - test/unit/graticule/geocoder/google_test.rb
 - test/unit/graticule/geocoder/host_ip_test.rb
 - test/unit/graticule/geocoder/local_search_maps_test.rb
 - test/unit/graticule/geocoder/meta_carta_test.rb
+- test/unit/graticule/geocoder/multi_test.rb
 - test/unit/graticule/geocoder/postcode_anywhere_test.rb
 - test/unit/graticule/geocoder/yahoo_test.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+- test/unit/graticule/geocoder_test.rb
+- test/unit/graticule/location_test.rb
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- CHANGELOG.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
+- test/fixtures/responses/host_ip/private.txt
+- test/fixtures/responses/host_ip/success.txt
+- test/fixtures/responses/host_ip/unknown.txt
+- test/fixtures/responses/local_search_maps/empty.txt
+- test/fixtures/responses/local_search_maps/not_found.txt
+- test/fixtures/responses/local_search_maps/success.txt
 executables: 
 - geocode
 extensions: []
@@ -136,5 +147,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.3.0
     version: