geocoder 1.1.9 → 1.2.0

data/test/{mongoid_test.rb → unit/mongoid_test.rb}

@@ -1,45 +1,46 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'mongoid_test_helper'
 
-class MongoidTest < Test::Unit::TestCase
+class MongoidTest < GeocoderTestCase
   def test_geocoded_check
-    p = Place.new(*venue_params(:msg))
+    p = PlaceUsingMongoid.new(*geocoded_object_params(:msg))
     p.location = [40.750354, -73.993371]
     assert p.geocoded?
   end
 
   def test_distance_to_returns_float
-    p = Place.new(*venue_params(:msg))
+    p = PlaceUsingMongoid.new(*geocoded_object_params(:msg))
     p.location = [40.750354, -73.993371]
     assert p.distance_to([30, -94]).is_a?(Float)
   end
 
   def test_custom_coordinate_field_near_scope
     location = [40.750354, -73.993371]
-    p = Place.near(location)
+    p = PlaceUsingMongoid.near(location)
     key = Mongoid::VERSION >= "3" ? "location" : :location
     assert_equal p.selector[key]['$nearSphere'], location.reverse
   end
 
   def test_model_configuration
-    p = Place.new(*venue_params(:msg))
+    p = PlaceUsingMongoid.new(*geocoded_object_params(:msg))
     p.location = [0, 0]
 
-    Place.geocoded_by :address, :coordinates => :location, :units => :km
+    PlaceUsingMongoid.geocoded_by :address, :coordinates => :location, :units => :km
     assert_equal 111, p.distance_to([0,1]).round
 
-    Place.geocoded_by :address, :coordinates => :location, :units => :mi
+    PlaceUsingMongoid.geocoded_by :address, :coordinates => :location, :units => :mi
     assert_equal 69, p.distance_to([0,1]).round
   end
 
   def test_index_is_skipped_if_skip_option_flag
-    result = PlaceWithoutIndex.index_options.keys.flatten[0] == :coordinates
+    result = PlaceUsingMongoidWithoutIndex.index_options.keys.flatten[0] == :coordinates
     assert !result
   end
 
   def test_nil_radius_omits_max_distance
     location = [40.750354, -73.993371]
-    p = Place.near(location, nil)
+    p = PlaceUsingMongoid.near(location, nil)
     key = Mongoid::VERSION >= "3" ? "location" : :location
     assert_equal nil, p.selector[key]['$maxDistance']
   end

data/test/unit/near_test.rb

@@ -0,0 +1,87 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
+require 'test_helper'
+
+class NearTest < GeocoderTestCase
+
+  def test_near_scope_options_without_sqlite_includes_bounding_box_condition
+    result = PlaceWithCustomResultsHandling.send(:near_scope_options, 1.0, 2.0, 5)
+    assert_match(/test_table_name.latitude BETWEEN 0.9276\d* AND 1.0723\d* AND test_table_name.longitude BETWEEN 1.9276\d* AND 2.0723\d* AND /, result[:conditions][0])
+  end
+
+  def test_near_scope_options_without_sqlite_includes_radius_condition
+    result = Place.send(:near_scope_options, 1.0, 2.0, 5)
+    assert_match(/BETWEEN \? AND \?$/, result[:conditions][0])
+  end
+
+  def test_near_scope_options_without_sqlite_includes_radius_default_min_radius
+    result = Place.send(:near_scope_options, 1.0, 2.0, 5)
+
+    assert_equal(0, result[:conditions][1])
+    assert_equal(5, result[:conditions][2])
+  end
+
+  def test_near_scope_options_without_sqlite_includes_radius_custom_min_radius
+    result = Place.send(:near_scope_options, 1.0, 2.0, 5, :min_radius => 3)
+
+    assert_equal(3, result[:conditions][1])
+    assert_equal(5, result[:conditions][2])
+  end
+
+  def test_near_scope_options_without_sqlite_includes_radius_bogus_min_radius
+    result = Place.send(:near_scope_options, 1.0, 2.0, 5, :min_radius => 'bogus')
+
+    assert_equal(0, result[:conditions][1])
+    assert_equal(5, result[:conditions][2])
+  end
+
+  def test_near_scope_options_with_defaults
+    result = PlaceWithCustomResultsHandling.send(:near_scope_options, 1.0, 2.0, 5)
+
+    assert_match(/AS distance/, result[:select])
+    assert_match(/AS bearing/, result[:select])
+    assert_no_consecutive_comma(result[:select])
+  end
+
+  def test_near_scope_options_with_no_distance
+    result = PlaceWithCustomResultsHandling.send(:near_scope_options, 1.0, 2.0, 5, :select_distance => false)
+
+    assert_no_match(/AS distance/, result[:select])
+    assert_match(/AS bearing/, result[:select])
+    assert_no_match(/distance/, result[:condition])
+    assert_no_match(/distance/, result[:order])
+    assert_no_consecutive_comma(result[:select])
+  end
+
+  def test_near_scope_options_with_no_bearing
+    result = PlaceWithCustomResultsHandling.send(:near_scope_options, 1.0, 2.0, 5, :select_bearing => false)
+
+    assert_match(/AS distance/, result[:select])
+    assert_no_match(/AS bearing/, result[:select])
+    assert_no_consecutive_comma(result[:select])
+  end
+
+  def test_near_scope_options_with_custom_distance_column
+    result = PlaceWithCustomResultsHandling.send(:near_scope_options, 1.0, 2.0, 5, :distance_column => 'calculated_distance')
+
+    assert_no_match(/AS distance/, result[:select])
+    assert_match(/AS calculated_distance/, result[:select])
+    assert_no_match(/\bdistance\b/, result[:order])
+    assert_match(/calculated_distance/, result[:order])
+    assert_no_consecutive_comma(result[:select])
+  end
+
+  def test_near_scope_options_with_custom_bearing_column
+    result = PlaceWithCustomResultsHandling.send(:near_scope_options, 1.0, 2.0, 5, :bearing_column => 'calculated_bearing')
+
+    assert_no_match(/AS bearing/, result[:select])
+    assert_match(/AS calculated_bearing/, result[:select])
+    assert_no_consecutive_comma(result[:select])
+  end
+
+  private
+
+  def assert_no_consecutive_comma(string)
+    assert_no_match(/, *,/, string, "two consecutive commas")
+  end
+end

data/test/{oauth_util_test.rb → unit/oauth_util_test.rb}

@@ -1,9 +1,10 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 require 'cgi'
 require 'uri'
 
-class OauthUtilTest < Test::Unit::TestCase
+class OauthUtilTest < GeocoderTestCase
   def test_query_string_escapes_single_quote
     base_url = "http://example.com?location=d'iberville"
 
@@ -25,6 +26,6 @@ class OauthUtilTest < Test::Unit::TestCase
 
     query_string = o.sign(URI.parse(base_url)).query_string
 
-    assert_match /.*a_param=.*b_param=.*n_param=.*z_param=.*/, query_string
+    assert_match(/.*a_param=.*b_param=.*n_param=.*z_param=.*/, query_string)
   end
 end

data/test/{proxy_test.rb → unit/proxy_test.rb}

@@ -1,7 +1,8 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
-class ProxyTest < Test::Unit::TestCase
+class ProxyTest < GeocoderTestCase
 
   def test_uses_proxy_when_specified
     Geocoder.configure(:http_proxy => 'localhost')

data/test/{query_test.rb → unit/query_test.rb}

@@ -1,16 +1,13 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
-class QueryTest < Test::Unit::TestCase
+class QueryTest < GeocoderTestCase
 
   def test_ip_address_detection
     assert Geocoder::Query.new("232.65.123.94").ip_address?
-    assert Geocoder::Query.new("666.65.123.94").ip_address? # technically invalid
-    assert Geocoder::Query.new("::ffff:12.34.56.78").ip_address?
     assert !Geocoder::Query.new("232.65.123.94.43").ip_address?
-    assert !Geocoder::Query.new("232.65.123").ip_address?
     assert !Geocoder::Query.new("::ffff:123.456.789").ip_address?
-    assert !Geocoder::Query.new("Test\n232.65.123.94").ip_address?
   end
 
   def test_blank_query_detection
@@ -38,15 +35,17 @@ class QueryTest < Test::Unit::TestCase
   end
 
   def test_loopback_ip_address
-    assert Geocoder::Query.new("0.0.0.0").loopback_ip_address?
     assert Geocoder::Query.new("127.0.0.1").loopback_ip_address?
     assert !Geocoder::Query.new("232.65.123.234").loopback_ip_address?
-    assert !Geocoder::Query.new("127 Main St.").loopback_ip_address?
-    assert !Geocoder::Query.new("John Doe\n127 Main St.\nAnywhere, USA").loopback_ip_address?
   end
 
   def test_sanitized_text_with_array
     q = Geocoder::Query.new([43.1313,11.3131])
     assert_equal "43.1313,11.3131", q.sanitized_text
   end
+
+  def test_custom_lookup
+    query = Geocoder::Query.new("address", :lookup => :nominatim)
+    assert_equal Geocoder::Lookup::Nominatim, query.lookup.class
+  end
 end

data/test/unit/rake_task_test.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
+require 'test_helper'
+
+class RakeTaskTest < GeocoderTestCase
+  def setup
+    Rake.application.rake_require "tasks/geocoder"
+    Rake::Task.define_task(:environment)
+  end
+
+  def test_rake_task_geocode_raise_specify_class_message
+    assert_raise(RuntimeError, "Please specify a CLASS (model)") do
+      Rake.application.invoke_task("geocode:all")
+    end
+  end
+
+  def test_rake_task_geocode_specify_class
+    ENV['CLASS'] = 'Place'
+    assert_nil Rake.application.invoke_task("geocode:all")
+  end
+end

data/test/{request_test.rb → unit/request_test.rb}

@@ -1,7 +1,8 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
-class RequestTest < Test::Unit::TestCase
+class RequestTest < GeocoderTestCase
   class MockRequest
     include Geocoder::Request
     attr_accessor :env, :ip
@@ -26,4 +27,9 @@ class RequestTest < Test::Unit::TestCase
     req = MockRequest.new({}, "74.200.247.59")
     assert req.location.is_a?(Geocoder::Result::Freegeoip)
   end
-end
+
+  def test_with_loopback_x_forwarded_for
+    req = MockRequest.new({"HTTP_X_FORWARDED_FOR" => "127.0.0.1"}, "74.200.247.59")
+    assert_equal "US", req.location.country_code
+  end
+end

data/test/{result_test.rb → unit/result_test.rb}

@@ -1,7 +1,8 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
-class ResultTest < Test::Unit::TestCase
+class ResultTest < GeocoderTestCase
 
   def test_result_has_required_attributes
     Geocoder::Lookup.all_services_except_test.each do |l|
@@ -21,6 +22,33 @@ class ResultTest < Test::Unit::TestCase
     end
   end
 
+  def test_yandex_result_new_york
+    assert_nothing_raised do
+      Geocoder.configure(:lookup => :yandex)
+      set_api_key!(:yandex)
+      result = Geocoder.search("new york").first
+      assert_equal "", result.city
+    end
+  end
+
+  def test_yandex_result_kind
+    assert_nothing_raised do
+      Geocoder.configure(:lookup => :yandex)
+      set_api_key!(:yandex)
+      ["new york", [45.423733, -75.676333], "no city and town"].each do |query|
+        Geocoder.search("new york").first.kind
+      end
+    end
+  end
+
+  def test_yandex_result_without_locality_name
+    assert_nothing_raised do
+      Geocoder.configure(:lookup => :yandex)
+      set_api_key!(:yandex)
+      result = Geocoder.search("canada rue dupuis 14")[6]
+      assert_equal "", result.city
+    end
+  end
 
   private # ------------------------------------------------------------------
 

data/test/{test_mode_test.rb → unit/test_mode_test.rb}

@@ -1,6 +1,8 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
-class TestModeTest < Test::Unit::TestCase
+class TestModeTest < GeocoderTestCase
 
   def setup
     @_original_lookup = Geocoder.config.lookup
@@ -42,6 +44,15 @@ class TestModeTest < Test::Unit::TestCase
     end
   end
 
+  def test_search_with_custom_attributes
+    custom_attributes = mock_attributes.merge(:custom => 'NY, NY')
+    Geocoder::Lookup::Test.add_stub("New York, NY", [custom_attributes])
+
+    result = Geocoder.search("New York, NY").first
+
+    assert_equal 'NY, NY', result.custom
+  end
+
   private
   def mock_attributes
     coordinates = [40.7143528, -74.0059731]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-04-16 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,
@@ -21,8 +21,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - LICENSE
 - README.md
@@ -34,6 +34,10 @@ files:
 - gemfiles/Gemfile.mongoid-2.4.x
 - lib/generators/geocoder/config/config_generator.rb
 - lib/generators/geocoder/config/templates/initializer.rb
+- lib/generators/geocoder/maxmind/geolite_city_generator.rb
+- lib/generators/geocoder/maxmind/geolite_country_generator.rb
+- lib/generators/geocoder/maxmind/templates/migration/geolite_city.rb
+- lib/generators/geocoder/maxmind/templates/migration/geolite_country.rb
 - lib/geocoder.rb
 - lib/geocoder/cache.rb
 - lib/geocoder/calculations.rb
@@ -41,21 +45,28 @@ files:
 - lib/geocoder/configuration.rb
 - lib/geocoder/configuration_hash.rb
 - lib/geocoder/exceptions.rb
+- lib/geocoder/ip_address.rb
 - lib/geocoder/lookup.rb
 - lib/geocoder/lookups/baidu.rb
+- lib/geocoder/lookups/baidu_ip.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
+- lib/geocoder/lookups/cloudmade.rb
 - lib/geocoder/lookups/dstk.rb
 - lib/geocoder/lookups/esri.rb
 - lib/geocoder/lookups/freegeoip.rb
 - lib/geocoder/lookups/geocoder_ca.rb
 - lib/geocoder/lookups/geocoder_us.rb
+- lib/geocoder/lookups/geocodio.rb
 - lib/geocoder/lookups/google.rb
 - lib/geocoder/lookups/google_premier.rb
+- lib/geocoder/lookups/here.rb
 - lib/geocoder/lookups/mapquest.rb
 - lib/geocoder/lookups/maxmind.rb
+- lib/geocoder/lookups/maxmind_local.rb
 - lib/geocoder/lookups/nominatim.rb
 - lib/geocoder/lookups/ovi.rb
+- lib/geocoder/lookups/smarty_streets.rb
 - lib/geocoder/lookups/test.rb
 - lib/geocoder/lookups/yahoo.rb
 - lib/geocoder/lookups/yandex.rb
@@ -68,19 +79,25 @@ files:
 - lib/geocoder/railtie.rb
 - lib/geocoder/request.rb
 - lib/geocoder/results/baidu.rb
+- lib/geocoder/results/baidu_ip.rb
 - lib/geocoder/results/base.rb
 - lib/geocoder/results/bing.rb
+- lib/geocoder/results/cloudmade.rb
 - lib/geocoder/results/dstk.rb
 - lib/geocoder/results/esri.rb
 - lib/geocoder/results/freegeoip.rb
 - lib/geocoder/results/geocoder_ca.rb
 - lib/geocoder/results/geocoder_us.rb
+- lib/geocoder/results/geocodio.rb
 - lib/geocoder/results/google.rb
 - lib/geocoder/results/google_premier.rb
+- lib/geocoder/results/here.rb
 - lib/geocoder/results/mapquest.rb
 - lib/geocoder/results/maxmind.rb
+- lib/geocoder/results/maxmind_local.rb
 - lib/geocoder/results/nominatim.rb
 - lib/geocoder/results/ovi.rb
+- lib/geocoder/results/smarty_streets.rb
 - lib/geocoder/results/test.rb
 - lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
@@ -92,15 +109,14 @@ files:
 - lib/geocoder/stores/mongoid.rb
 - lib/geocoder/version.rb
 - lib/hash_recursive_merge.rb
+- lib/maxmind_database.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
+- lib/tasks/maxmind.rake
 - test/fixtures/baidu_invalid_key
+- test/fixtures/baidu_ip_202_198_16_3
+- test/fixtures/baidu_ip_invalid_key
+- test/fixtures/baidu_ip_no_results
 - test/fixtures/baidu_no_results
 - test/fixtures/baidu_reverse
 - test/fixtures/baidu_shanghai_pearl_tower
@@ -108,6 +124,9 @@ files:
 - test/fixtures/bing_madison_square_garden
 - test/fixtures/bing_no_results
 - test/fixtures/bing_reverse
+- test/fixtures/cloudmade_invalid_key
+- test/fixtures/cloudmade_madison_square_garden
+- test/fixtures/cloudmade_no_results
 - test/fixtures/esri_madison_square_garden
 - test/fixtures/esri_no_results
 - test/fixtures/esri_reverse
@@ -118,12 +137,19 @@ files:
 - test/fixtures/geocoder_ca_reverse
 - test/fixtures/geocoder_us_madison_square_garden
 - test/fixtures/geocoder_us_no_results
+- test/fixtures/geocodio_1101_pennsylvania_ave
+- test/fixtures/geocodio_bad_api_key
+- test/fixtures/geocodio_invalid
+- test/fixtures/geocodio_no_results
+- test/fixtures/geocodio_over_query_limit
 - 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/google_over_limit
+- test/fixtures/here_madison_square_garden
+- test/fixtures/here_no_results
 - test/fixtures/mapquest_error
 - test/fixtures/mapquest_invalid_api_key
 - test/fixtures/mapquest_invalid_request
@@ -138,33 +164,60 @@ files:
 - test/fixtures/maxmind_no_results
 - test/fixtures/nominatim_madison_square_garden
 - test/fixtures/nominatim_no_results
+- test/fixtures/nominatim_over_limit
 - test/fixtures/ovi_madison_square_garden
 - test/fixtures/ovi_no_results
+- test/fixtures/smarty_streets_11211
+- test/fixtures/smarty_streets_madison_square_garden
+- test/fixtures/smarty_streets_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_canada_rue_dupuis_14
 - test/fixtures/yandex_invalid_key
 - test/fixtures/yandex_kremlin
+- test/fixtures/yandex_new_york
 - test/fixtures/yandex_no_city_and_town
 - test/fixtures/yandex_no_results
-- test/geocoder_test.rb
-- test/https_test.rb
-- test/integration/smoke_test.rb
-- test/lookup_test.rb
-- test/method_aliases_test.rb
-- test/mongoid_test.rb
+- test/integration/http_client_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/request_test.rb
-- test/result_test.rb
-- test/services_test.rb
 - test/test_helper.rb
-- test/test_mode_test.rb
+- test/unit/active_record_test.rb
+- test/unit/cache_test.rb
+- test/unit/calculations_test.rb
+- test/unit/configuration_test.rb
+- test/unit/error_handling_test.rb
+- test/unit/geocoder_test.rb
+- test/unit/https_test.rb
+- test/unit/ip_address_test.rb
+- test/unit/lookup_test.rb
+- test/unit/lookups/bing_test.rb
+- test/unit/lookups/dstk_test.rb
+- test/unit/lookups/esri_test.rb
+- test/unit/lookups/freegeoip_test.rb
+- test/unit/lookups/geocoder_ca_test.rb
+- test/unit/lookups/geocodio_test.rb
+- test/unit/lookups/google_premier_test.rb
+- test/unit/lookups/google_test.rb
+- test/unit/lookups/mapquest_test.rb
+- test/unit/lookups/maxmind_local_test.rb
+- test/unit/lookups/maxmind_test.rb
+- test/unit/lookups/nominatim_test.rb
+- test/unit/lookups/smarty_streets_test.rb
+- test/unit/lookups/yahoo_test.rb
+- test/unit/method_aliases_test.rb
+- test/unit/model_test.rb
+- test/unit/mongoid_test.rb
+- test/unit/near_test.rb
+- test/unit/oauth_util_test.rb
+- test/unit/proxy_test.rb
+- test/unit/query_test.rb
+- test/unit/rake_task_test.rb
+- test/unit/request_test.rb
+- test/unit/result_test.rb
+- test/unit/test_mode_test.rb
 homepage: http://www.rubygeocoder.com
 licenses: []
 metadata: {}
@@ -174,17 +227,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Complete geocoding solution for Ruby.