geocoder 1.1.6 → 1.1.7

data/lib/geocoder/stores/mongo_base.rb

@@ -24,7 +24,8 @@ module Geocoder::Store
 
           # Use BSON::OrderedHash if Ruby's hashes are unordered.
           # Conditions must be in order required by indexes (see mongo gem).
-          empty = RUBY_VERSION.split('.')[1].to_i < 9 ? BSON::OrderedHash.new : {}
+          version = RUBY_VERSION.split('.').map { |i| i.to_i }
+          empty = version[0] < 2 && version[1] < 9 ? BSON::OrderedHash.new : {}
 
           conds = empty.clone
           field = geocoder_options[:coordinates]

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/test/calculations_test.rb

@@ -38,6 +38,12 @@ class CalculationsTest < Test::Unit::TestCase
     assert (la_to_ny - 3942).abs < 10
   end
 
+  def test_distance_between_in_nautical_miles
+    assert_equal 60, Geocoder::Calculations.distance_between([0,0], [0,1], :units => :nm).round
+    la_to_ny = Geocoder::Calculations.distance_between([34.05,-118.25], [40.72,-74], :units => :nm).round
+    assert (la_to_ny - 2124).abs < 10
+  end
+
 
   # --- geographic center ---
 

data/test/fixtures/esri_madison_square_garden

@@ -0,0 +1,59 @@
+{
+ "spatialReference": {
+  "wkid": 4326,
+  "latestWkid": 4326
+ },
+ "locations": [
+  {
+   "name": "Madison Square Garden",
+   "extent": {
+    "xmin": -74.000241000000003,
+    "ymin": 40.744050000000001,
+    "xmax": -73.988241000000002,
+    "ymax": 40.756050000000002
+   },
+   "feature": {
+    "geometry": {
+     "x": -73.994238897999651,
+     "y": 40.750049813000487
+    },
+    "attributes": {
+     "Loc_name": "Gaz.WorldGazetteer.POI2",
+     "Score": 100,
+     "Match_addr": "Madison Square Garden",
+     "Addr_type": "POI",
+     "Type": "Sports Complex",
+     "PlaceName": "Madison Square Garden",
+     "Rank": "18",
+     "AddBldg": "",
+     "AddNum": "",
+     "AddNumFrom": "",
+     "AddNumTo": "",
+     "Side": "",
+     "StPreDir": "",
+     "StPreType": "",
+     "StName": "",
+     "StType": "",
+     "StDir": "",
+     "Nbrhd": "",
+     "City": "New York",
+     "Subregion": "New York",
+     "Region": "New York",
+     "Postal": "10001",
+     "PostalExt": "",
+     "Country": "USA",
+     "LangCode": "",
+     "Distance": 0,
+     "X": -73.994240000000005,
+     "Y": 40.750050000000002,
+     "DisplayX": -73.994240000000005,
+     "DisplayY": 40.750050000000002,
+     "Xmin": -74.000241000000003,
+     "Xmax": -73.988241000000002,
+     "Ymin": 40.744050000000001,
+     "Ymax": 40.756050000000002
+    }
+   }
+  }
+ ]
+}

data/test/fixtures/esri_no_results

@@ -0,0 +1,8 @@
+{
+ "spatialReference": {
+  "wkid": 4326,
+  "latestWkid": 4326
+ },
+ "locations": [
+  ]
+}

data/test/fixtures/esri_reverse

@@ -0,0 +1,21 @@
+{
+ "address": {
+  "Address": "4 Avenue Gustave Eiffel",
+  "Neighborhood": "7e Arrondissement",
+  "City": "Paris",
+  "Subregion": "Paris",
+  "Region": "Île-de-France",
+  "Postal": "75007",
+  "PostalExt": null,
+  "CountryCode": "FRA",
+  "Loc_name": "FRA.PointAddress"
+ },
+ "location": {
+  "x": 2.2956200048981574,
+  "y": 48.858129997357558,
+  "spatialReference": {
+   "wkid": 4326,
+   "latestWkid": 4326
+  }
+ }
+}

data/test/fixtures/maxmind_24_24_24_21

@@ -1 +1 @@
-US,
+US

data/test/fixtures/maxmind_24_24_24_22

@@ -1 +1 @@
-US,NY,Jamaica,40.6915,-73.8057,
+US,NY,Jamaica,40.6915,-73.8057

data/test/fixtures/maxmind_24_24_24_23

@@ -1 +1 @@
-US,NY,Jamaica,,40.6915,-73.8057,501,718,"Road Runner","Road Runner",
+US,NY,Jamaica,,40.6915,-73.8057,501,718,"Road Runner","Road Runner"

data/test/fixtures/maxmind_24_24_24_24

@@ -1 +1 @@
-US,"United States",NY,"New York",Jamaica,40.6915,-73.8057,501,718,America/New_York,NA,,"Road Runner","Road Runner",rr.com,"AS11351 Road Runner HoldCo LLC",Cable/DSL,residential,779,99,37,76,,
+US,"United States",NY,"New York",Jamaica,40.6915,-73.8057,501,718,America/New_York,NA,,"Road Runner","Road Runner",rr.com,"AS11351 Road Runner HoldCo LLC",Cable/DSL,residential,779,99,37,76,35

data/test/fixtures/ovi_madison_square_garden

@@ -0,0 +1,72 @@
+{
+  "Response": {
+    "MetaInfo": {
+      "Timestamp": "2013-02-08T16:26:39.382+0000"
+    },
+    "View": [
+      {
+        "_type": "SearchResultsViewType",
+        "ViewId": 0,
+        "Result": [
+          {
+            "Relevance": 1.0,
+            "MatchLevel": "houseNumber",
+            "MatchQuality": {
+              "State": 1.0,
+              "City": 1.0,
+              "Street": [
+                1.0
+              ],
+              "HouseNumber": 1.0
+            },
+            "MatchType": "pointAddress",
+            "Location": {
+              "LocationId": "NT_ArsGdYbpo6dqjPQel9gTID_4",
+              "LocationType": "point",
+              "DisplayPosition": {
+                "Latitude": 40.7504692,
+                "Longitude": -73.9933777
+              },
+              "NavigationPosition": [
+                {
+                  "Latitude": 40.7500305,
+                  "Longitude": -73.9942398
+                }
+              ],
+              "MapView": {
+                "TopLeft": {
+                  "Latitude": 40.7515934,
+                  "Longitude": -73.9948616
+                },
+                "BottomRight": {
+                  "Latitude": 40.7493451,
+                  "Longitude": -73.9918938
+                }
+              },
+              "Address": {
+                "Label": "4 Penn Plz, New York, NY 10001, United States",
+                "Country": "USA",
+                "State": "NY",
+                "County": "New York",
+                "City": "New York",
+                "Street": "Penn Plz",
+                "HouseNumber": "4",
+                "PostalCode": "10001",
+                "AdditionalData": [
+                  {
+                    "value": "United States",
+                    "key": "CountryName"
+                  },
+                  {
+                    "value": "New York",
+                    "key": "StateName"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    ]
+  }
+}

data/test/fixtures/ovi_no_results

@@ -0,0 +1,8 @@
+{
+  "Response": {
+    "MetaInfo": {
+      "Timestamp": "2013-02-08T16:41:16.723+0000"
+    },
+    "View": []
+  }
+}

data/test/fixtures/yandex_no_city_and_town

@@ -0,0 +1,112 @@
+{
+   "response":{
+      "GeoObjectCollection":{
+         "metaDataProperty":{
+            "GeocoderResponseMetaData":{
+               "request":"57.423359,55.892596",
+               "found":"3",
+               "results":"10",
+               "Point":{
+                  "pos":"57.423359 55.892596"
+               }
+            }
+         },
+         "featureMember":[
+            {
+               "GeoObject":{
+                  "metaDataProperty":{
+                     "GeocoderMetaData":{
+                        "kind":"area",
+                        "text":"Россия, республика Башкортостан, Караидельский район",
+                        "precision":"other",
+                        "AddressDetails":{
+                           "Country":{
+                              "AddressLine":"республика Башкортостан, Караидельский район",
+                              "CountryNameCode":"RU",
+                              "CountryName":"Россия",
+                              "AdministrativeArea":{
+                                 "AdministrativeAreaName":"республика Башкортостан",
+                                 "SubAdministrativeArea":{
+                                    "SubAdministrativeAreaName":"Караидельский район"
+                                 }
+                              }
+                           }
+                        }
+                     }
+                  },
+                  "description":"республика Башкортостан, Россия",
+                  "name":"Караидельский район",
+                  "boundedBy":{
+                     "Envelope":{
+                        "lowerCorner":"56.231384 55.462814",
+                        "upperCorner":"57.705348 56.076117"
+                     }
+                  },
+                  "Point":{
+                     "pos":"57.423359 55.892596"
+                  }
+               }
+            },
+            {
+               "GeoObject":{
+                  "metaDataProperty":{
+                     "GeocoderMetaData":{
+                        "kind":"province",
+                        "text":"Россия, республика Башкортостан",
+                        "precision":"other",
+                        "AddressDetails":{
+                           "Country":{
+                              "AddressLine":"республика Башкортостан",
+                              "CountryNameCode":"RU",
+                              "CountryName":"Россия",
+                              "AdministrativeArea":{
+                                 "AdministrativeAreaName":"республика Башкортостан"
+                              }
+                           }
+                        }
+                     }
+                  },
+                  "description":"Россия",
+                  "name":"республика Башкортостан",
+                  "boundedBy":{
+                     "Envelope":{
+                        "lowerCorner":"53.157475 51.571991",
+                        "upperCorner":"60.001577 56.533651"
+                     }
+                  },
+                  "Point":{
+                     "pos":"56.579526 54.127354"
+                  }
+               }
+            },
+            {
+               "GeoObject":{
+                  "metaDataProperty":{
+                     "GeocoderMetaData":{
+                        "kind":"country",
+                        "text":"Россия",
+                        "precision":"other",
+                        "AddressDetails":{
+                           "Country":{
+                              "CountryNameCode":"RU",
+                              "CountryName":"Россия"
+                           }
+                        }
+                     }
+                  },
+                  "name":"Россия",
+                  "boundedBy":{
+                     "Envelope":{
+                        "lowerCorner":"19.641673 36.84312",
+                        "upperCorner":"179.999997 81.848739"
+                     }
+                  },
+                  "Point":{
+                     "pos":"37.617761 55.755773"
+                  }
+               }
+            }
+         ]
+      }
+   }
+}

data/test/lookup_test.rb

@@ -34,6 +34,7 @@ class LookupTest < Test::Unit::TestCase
   end
 
   {
+    :esri => :l,
     :bing => :key,
     :geocoder_ca => :auth,
     :google => :language,

data/test/near_test.rb

@@ -8,4 +8,36 @@ class NearTest < Test::Unit::TestCase
     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_with_defaults
+    result = Event.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 = Event.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 = Event.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
+
+  private
+
+  def assert_no_consecutive_comma(string)
+    assert_no_match /, *,/, string, "two consecutive commas"
+  end
 end

data/test/query_test.rb

@@ -10,6 +10,7 @@ class QueryTest < Test::Unit::TestCase
     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
@@ -18,6 +19,7 @@ class QueryTest < Test::Unit::TestCase
     assert Geocoder::Query.new("\t  ").blank?
     assert !Geocoder::Query.new("a").blank?
     assert !Geocoder::Query.new("Москва").blank? # no ASCII characters
+    assert !Geocoder::Query.new("\na").blank?
 
     assert Geocoder::Query.new(nil, :params => {}).blank?
     assert !Geocoder::Query.new(nil, :params => {:woeid => 1234567}).blank?
@@ -32,11 +34,14 @@ class QueryTest < Test::Unit::TestCase
     assert Geocoder::Query.new("51.178844,5").coordinates?
     assert Geocoder::Query.new("51.178844, -1.826189").coordinates?
     assert !Geocoder::Query.new("232.65.123").coordinates?
+    assert !Geocoder::Query.new("Test\n51.178844, -1.826189").coordinates?
   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
 end

data/test/request_test.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require 'test_helper'
+
+class RequestTest < Test::Unit::TestCase
+  class MockRequest
+    include Geocoder::Request
+    attr_accessor :env, :ip
+    def initialize(env={}, ip="")
+      @env = env
+      @ip  = ip
+    end
+  end
+  def test_http_x_real_ip
+    req = MockRequest.new({"HTTP_X_REAL_IP" => "74.200.247.59"})
+    assert req.location.is_a?(Geocoder::Result::Freegeoip)
+  end
+  def test_http_x_forwarded_for_without_proxy
+    req = MockRequest.new({"HTTP_X_FORWARDED_FOR" => "74.200.247.59"})
+    assert req.location.is_a?(Geocoder::Result::Freegeoip)
+  end
+  def test_http_x_forwarded_for_with_proxy
+    req = MockRequest.new({"HTTP_X_FORWARDED_FOR" => "74.200.247.59, 74.200.247.59"})
+    assert req.location.is_a?(Geocoder::Result::Freegeoip)
+  end
+  def test_with_request_ip
+    req = MockRequest.new({}, "74.200.247.59")
+    assert req.location.is_a?(Geocoder::Result::Freegeoip)
+  end
+end