geocoder 1.1.3 → 1.1.6

data/test/test_helper.rb

@@ -4,6 +4,12 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+class MysqlConnection
+  def adapter_name
+    "mysql"
+  end
+end
+
 ##
 # Simulate enough of ActiveRecord::Base that objects can be used for testing.
 #
@@ -28,6 +34,10 @@ module ActiveRecord
 
     def self.scope(*args); end
 
+    def self.connection
+      MysqlConnection.new
+    end
+
     def method_missing(name, *args, &block)
       if name.to_s[-1..-1] == "="
         write_attribute name.to_s[0...-1], *args
@@ -35,6 +45,17 @@ module ActiveRecord
         read_attribute name
       end
     end
+
+    class << self
+      def table_name
+        'test_table_name'
+      end
+
+      def primary_key
+        :id
+      end
+    end
+
   end
 end
 
@@ -52,127 +73,70 @@ require "geocoder/lookups/base"
 module Geocoder
   module Lookup
     class Base
-      private #-----------------------------------------------------------------
-      def read_fixture(file)
-        File.read(File.join("test", "fixtures", file)).strip.gsub(/\n\s*/, "")
+      private
+      def fixture_exists?(filename)
+        File.exist?(File.join("test", "fixtures", filename))
       end
-    end
 
-    class Google < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        file = case query
-          when "no results";   :no_results
-          when "no locality";  :no_locality
-          when "no city data"; :no_city_data
-          else                 :madison_square_garden
+      def read_fixture(file)
+        filepath = File.join("test", "fixtures", file)
+        s = File.read(filepath).strip.gsub(/\n\s*/, "")
+        s.instance_eval do
+          def body; self; end
+          def code; "200"; end
         end
-        read_fixture "google_#{file}.json"
+        s
       end
-    end
 
-    class GooglePremier < Google
-    end
+      ##
+      # Fixture to use if none match the given query.
+      #
+      def default_fixture_filename
+        "#{fixture_prefix}_madison_square_garden"
+      end
 
-    class Yahoo < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        file = case query
-          when "no results";  :no_results
-          else                :madison_square_garden
-        end
-        read_fixture "yahoo_#{file}.json"
+      def fixture_prefix
+        handle
       end
-    end
 
-    class Yandex < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        file = case query
-          when "no results";  :no_results
-          when "invalid key"; :invalid_key
-          else                :kremlin
-        end
-        read_fixture "yandex_#{file}.json"
+      def fixture_for_query(query)
+        label = query.reverse_geocode? ? "reverse" : query.text.gsub(/[ \.]/, "_")
+        filename = "#{fixture_prefix}_#{label}"
+        fixture_exists?(filename) ? filename : default_fixture_filename
       end
-    end
 
-    class GeocoderCa < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        if reverse
-          read_fixture "geocoder_ca_reverse.json"
-        else
-          file = case query
-            when "no results";  :no_results
-            else                :madison_square_garden
-          end
-          read_fixture "geocoder_ca_#{file}.json"
-        end
+      def make_api_request(query)
+        raise TimeoutError if query.text == "timeout"
+        raise SocketError if query.text == "socket_error"
+        read_fixture fixture_for_query(query)
       end
     end
 
-    class Freegeoip < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        file = case query
-          when "no results";  :no_results
-          else                "74_200_247_59"
-        end
-        read_fixture "freegeoip_#{file}.json"
+    class GooglePremier
+      private
+      def fixture_prefix
+        "google"
       end
     end
 
-    class Bing < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        if reverse
-          read_fixture "bing_reverse.json"
-        else
-          file = case query
-            when "no results";  :no_results
-            else                :madison_square_garden
-          end
-          read_fixture "bing_#{file}.json"
-        end
+    class Yandex
+      private
+      def default_fixture_filename
+        "yandex_kremlin"
       end
     end
 
-    class Nominatim < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        file = case query
-          when "no results";  :no_results
-          else                :madison_square_garden
-        end
-        read_fixture "nominatim_#{file}.json"
+    class Freegeoip
+      private
+      def default_fixture_filename
+        "freegeoip_74_200_247_59"
       end
     end
 
-    class Mapquest < Base
-      private #-----------------------------------------------------------------
-      def fetch_raw_data(query, reverse = false)
-        raise TimeoutError if query == "timeout"
-        raise SocketError if query == "socket_error"
-        file = case query
-          when "no results";  :no_results
-          else                :madison_square_garden
-        end
-        read_fixture "mapquest_#{file}.json"
+    class Maxmind
+      private
+      def default_fixture_filename
+        "maxmind_74_200_247_59"
       end
     end
 
@@ -192,6 +156,20 @@ class Venue < ActiveRecord::Base
   end
 end
 
+##
+# Geocoded model.
+# - Has user-defined primary key (not just 'id')
+#
+class VenuePlus < Venue
+
+  class << self
+    def primary_key
+      :custom_primary_key_id
+    end
+  end
+
+end
+
 ##
 # Reverse geocoded model.
 #
@@ -260,6 +238,10 @@ end
 
 class Test::Unit::TestCase
 
+  def setup
+    Geocoder.configure(:maxmind => {:service => :omni})
+  end
+
   def teardown
     Geocoder.send(:remove_const, :Configuration)
     load "geocoder/configuration.rb"
@@ -277,22 +259,21 @@ class Test::Unit::TestCase
     }[abbrev]
   end
 
-  def all_lookups
-    Geocoder.valid_lookups
-  end
-
-  def all_lookups_except_test
-    Geocoder.valid_lookups - [:test]
-  end
-
-  def street_lookups
-    all_lookups - [:freegeoip]
-  end
-
   def is_nan_coordinates?(coordinates)
     return false unless coordinates.respond_to? :size # Should be an array
     return false unless coordinates.size == 2 # Should have dimension 2
     coordinates[0].nan? && coordinates[1].nan? # Both coordinates should be NaN
   end
-end
 
+  def set_api_key!(lookup_name)
+    lookup = Geocoder::Lookup.get(lookup_name)
+    if lookup.required_api_key_parts.size == 1
+      key = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+    elsif lookup.required_api_key_parts.size > 1
+      key = lookup.required_api_key_parts
+    else
+      key = nil
+    end
+    Geocoder.configure(:api_key => key)
+  end
+end

data/test/test_mode_test.rb

@@ -1,16 +1,15 @@
 require 'test_helper'
-require 'geocoder/lookups/test'
 
 class TestModeTest < Test::Unit::TestCase
 
   def setup
-    @_original_lookup = Geocoder::Configuration.lookup
-    Geocoder::Configuration.lookup = :test
+    @_original_lookup = Geocoder.config.lookup
+    Geocoder.configure(:lookup => :test)
   end
 
   def teardown
     Geocoder::Lookup::Test.reset
-    Geocoder::Configuration.lookup = @_original_lookup
+    Geocoder.configure(:lookup => @_original_lookup)
   end
 
   def test_search_with_known_stub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies: []
 description: Provides object geocoding (by street or IP address), reverse geocoding
   (coordinates to street address), distance queries for ActiveRecord and Mongoid,
@@ -24,11 +24,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- CHANGELOG.rdoc
+- CHANGELOG.md
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bin/geocode
+- examples/autoexpire_cache.rb
 - gemfiles/Gemfile.mongoid-2.4.x
 - lib/generators/geocoder/config/config_generator.rb
 - lib/generators/geocoder/config/templates/initializer.rb
@@ -37,7 +38,9 @@ files:
 - lib/geocoder/calculations.rb
 - lib/geocoder/cli.rb
 - lib/geocoder/configuration.rb
+- lib/geocoder/configuration_hash.rb
 - lib/geocoder/exceptions.rb
+- lib/geocoder/lookup.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
 - lib/geocoder/lookups/freegeoip.rb
@@ -45,6 +48,7 @@ files:
 - lib/geocoder/lookups/google.rb
 - lib/geocoder/lookups/google_premier.rb
 - lib/geocoder/lookups/mapquest.rb
+- lib/geocoder/lookups/maxmind.rb
 - lib/geocoder/lookups/nominatim.rb
 - lib/geocoder/lookups/test.rb
 - lib/geocoder/lookups/yahoo.rb
@@ -54,6 +58,7 @@ files:
 - lib/geocoder/models/mongo_base.rb
 - lib/geocoder/models/mongo_mapper.rb
 - lib/geocoder/models/mongoid.rb
+- lib/geocoder/query.rb
 - lib/geocoder/railtie.rb
 - lib/geocoder/request.rb
 - lib/geocoder/results/base.rb
@@ -63,53 +68,71 @@ files:
 - lib/geocoder/results/google.rb
 - lib/geocoder/results/google_premier.rb
 - lib/geocoder/results/mapquest.rb
+- lib/geocoder/results/maxmind.rb
 - lib/geocoder/results/nominatim.rb
 - lib/geocoder/results/test.rb
 - lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
+- lib/geocoder/sql.rb
 - lib/geocoder/stores/active_record.rb
 - lib/geocoder/stores/base.rb
 - lib/geocoder/stores/mongo_base.rb
 - lib/geocoder/stores/mongo_mapper.rb
 - lib/geocoder/stores/mongoid.rb
 - lib/geocoder/version.rb
+- lib/hash_recursive_merge.rb
+- lib/oauth_util.rb
 - lib/tasks/geocoder.rake
+- test/active_record_test.rb
+- test/cache_test.rb
 - test/calculations_test.rb
 - test/configuration_test.rb
 - test/custom_block_test.rb
 - test/error_handling_test.rb
-- test/fixtures/bing_madison_square_garden.json
-- test/fixtures/bing_no_results.json
-- test/fixtures/bing_reverse.json
-- test/fixtures/freegeoip_74_200_247_59.json
-- test/fixtures/freegeoip_no_results.json
-- test/fixtures/geocoder_ca_madison_square_garden.json
-- test/fixtures/geocoder_ca_no_results.json
-- test/fixtures/geocoder_ca_reverse.json
-- test/fixtures/google_garbage.json
-- test/fixtures/google_madison_square_garden.json
-- test/fixtures/google_no_city_data.json
-- test/fixtures/google_no_locality.json
-- test/fixtures/google_no_results.json
-- test/fixtures/mapquest_madison_square_garden.json
-- test/fixtures/mapquest_no_results.json
-- test/fixtures/nominatim_madison_square_garden.json
-- test/fixtures/nominatim_no_results.json
-- test/fixtures/yahoo_garbage.json
-- test/fixtures/yahoo_madison_square_garden.json
-- test/fixtures/yahoo_no_results.json
-- test/fixtures/yandex_invalid_key.json
-- test/fixtures/yandex_kremlin.json
-- test/fixtures/yandex_no_results.json
+- test/fixtures/bing_invalid_key
+- test/fixtures/bing_madison_square_garden
+- test/fixtures/bing_no_results
+- test/fixtures/bing_reverse
+- test/fixtures/freegeoip_74_200_247_59
+- test/fixtures/freegeoip_no_results
+- test/fixtures/geocoder_ca_madison_square_garden
+- test/fixtures/geocoder_ca_no_results
+- test/fixtures/geocoder_ca_reverse
+- test/fixtures/google_garbage
+- test/fixtures/google_madison_square_garden
+- test/fixtures/google_no_city_data
+- test/fixtures/google_no_locality
+- test/fixtures/google_no_results
+- test/fixtures/mapquest_madison_square_garden
+- test/fixtures/mapquest_no_results
+- test/fixtures/maxmind_24_24_24_21
+- test/fixtures/maxmind_24_24_24_22
+- test/fixtures/maxmind_24_24_24_23
+- test/fixtures/maxmind_24_24_24_24
+- test/fixtures/maxmind_74_200_247_59
+- test/fixtures/maxmind_invalid_key
+- test/fixtures/maxmind_no_results
+- test/fixtures/nominatim_madison_square_garden
+- test/fixtures/nominatim_no_results
+- test/fixtures/yahoo_error
+- test/fixtures/yahoo_invalid_key
+- test/fixtures/yahoo_madison_square_garden
+- test/fixtures/yahoo_no_results
+- test/fixtures/yahoo_over_limit
+- test/fixtures/yandex_invalid_key
+- test/fixtures/yandex_kremlin
+- test/fixtures/yandex_no_results
 - test/geocoder_test.rb
 - test/https_test.rb
-- test/input_handling_test.rb
 - test/integration/smoke_test.rb
 - test/lookup_test.rb
 - test/method_aliases_test.rb
 - test/mongoid_test.rb
 - test/mongoid_test_helper.rb
+- test/near_test.rb
+- test/oauth_util_test.rb
 - test/proxy_test.rb
+- test/query_test.rb
 - test/result_test.rb
 - test/services_test.rb
 - test/test_helper.rb
@@ -126,21 +149,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 585705263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 585705263
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Complete geocoding solution for Ruby.