geocoder 1.1.5 → 1.1.6

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of geocoder might be problematic. Click here for more details.

Files changed (84) hide show
  1. data/.travis.yml +4 -0
  2. data/{CHANGELOG.rdoc → CHANGELOG.md} +90 -37
  3. data/README.md +96 -45
  4. data/examples/autoexpire_cache.rb +1 -3
  5. data/lib/generators/geocoder/config/templates/initializer.rb +18 -22
  6. data/lib/geocoder.rb +2 -4
  7. data/lib/geocoder/cache.rb +2 -1
  8. data/lib/geocoder/calculations.rb +12 -12
  9. data/lib/geocoder/cli.rb +10 -11
  10. data/lib/geocoder/configuration.rb +67 -43
  11. data/lib/geocoder/configuration_hash.rb +11 -0
  12. data/lib/geocoder/exceptions.rb +3 -0
  13. data/lib/geocoder/lookup.rb +1 -1
  14. data/lib/geocoder/lookups/base.rb +59 -16
  15. data/lib/geocoder/lookups/bing.rb +21 -11
  16. data/lib/geocoder/lookups/freegeoip.rb +8 -4
  17. data/lib/geocoder/lookups/geocoder_ca.rb +11 -7
  18. data/lib/geocoder/lookups/google.rb +18 -9
  19. data/lib/geocoder/lookups/google_premier.rb +16 -8
  20. data/lib/geocoder/lookups/mapquest.rb +12 -5
  21. data/lib/geocoder/lookups/maxmind.rb +72 -0
  22. data/lib/geocoder/lookups/nominatim.rb +13 -8
  23. data/lib/geocoder/lookups/test.rb +4 -0
  24. data/lib/geocoder/lookups/yahoo.rb +38 -11
  25. data/lib/geocoder/lookups/yandex.rb +17 -9
  26. data/lib/geocoder/query.rb +17 -8
  27. data/lib/geocoder/request.rb +7 -1
  28. data/lib/geocoder/results/google.rb +6 -0
  29. data/lib/geocoder/results/maxmind.rb +136 -0
  30. data/lib/geocoder/results/nominatim.rb +0 -10
  31. data/lib/geocoder/sql.rb +6 -4
  32. data/lib/geocoder/stores/active_record.rb +5 -5
  33. data/lib/geocoder/stores/base.rb +3 -2
  34. data/lib/geocoder/version.rb +1 -1
  35. data/lib/hash_recursive_merge.rb +74 -0
  36. data/lib/oauth_util.rb +8 -2
  37. data/test/cache_test.rb +2 -2
  38. data/test/calculations_test.rb +4 -4
  39. data/test/configuration_test.rb +26 -51
  40. data/test/error_handling_test.rb +4 -4
  41. data/test/fixtures/bing_invalid_key +1 -0
  42. data/test/fixtures/{bing_madison_square_garden.json → bing_madison_square_garden} +0 -0
  43. data/test/fixtures/{bing_no_results.json → bing_no_results} +0 -0
  44. data/test/fixtures/{bing_reverse.json → bing_reverse} +0 -0
  45. data/test/fixtures/{freegeoip_74_200_247_59.json → freegeoip_74_200_247_59} +0 -0
  46. data/test/fixtures/{freegeoip_no_results.json → freegeoip_no_results} +0 -0
  47. data/test/fixtures/{geocoder_ca_madison_square_garden.json → geocoder_ca_madison_square_garden} +0 -0
  48. data/test/fixtures/{geocoder_ca_no_results.json → geocoder_ca_no_results} +0 -0
  49. data/test/fixtures/{geocoder_ca_reverse.json → geocoder_ca_reverse} +0 -0
  50. data/test/fixtures/{google_garbage.json → google_garbage} +0 -0
  51. data/test/fixtures/{google_madison_square_garden.json → google_madison_square_garden} +0 -0
  52. data/test/fixtures/{google_no_city_data.json → google_no_city_data} +0 -0
  53. data/test/fixtures/{google_no_locality.json → google_no_locality} +0 -0
  54. data/test/fixtures/{google_no_results.json → google_no_results} +0 -0
  55. data/test/fixtures/{mapquest_madison_square_garden.json → mapquest_madison_square_garden} +0 -0
  56. data/test/fixtures/{mapquest_no_results.json → mapquest_no_results} +0 -0
  57. data/test/fixtures/maxmind_24_24_24_21 +1 -0
  58. data/test/fixtures/maxmind_24_24_24_22 +1 -0
  59. data/test/fixtures/maxmind_24_24_24_23 +1 -0
  60. data/test/fixtures/maxmind_24_24_24_24 +1 -0
  61. data/test/fixtures/maxmind_74_200_247_59 +1 -0
  62. data/test/fixtures/maxmind_invalid_key +1 -0
  63. data/test/fixtures/maxmind_no_results +1 -0
  64. data/test/fixtures/{nominatim_madison_square_garden.json → nominatim_madison_square_garden} +0 -0
  65. data/test/fixtures/{nominatim_no_results.json → nominatim_no_results} +0 -0
  66. data/test/fixtures/{yahoo_error.json → yahoo_error} +0 -0
  67. data/test/fixtures/yahoo_invalid_key +2 -0
  68. data/test/fixtures/{yahoo_madison_square_garden.json → yahoo_madison_square_garden} +0 -0
  69. data/test/fixtures/{yahoo_no_results.json → yahoo_no_results} +0 -0
  70. data/test/fixtures/yahoo_over_limit +2 -0
  71. data/test/fixtures/{yandex_invalid_key.json → yandex_invalid_key} +0 -0
  72. data/test/fixtures/{yandex_kremlin.json → yandex_kremlin} +0 -0
  73. data/test/fixtures/{yandex_no_results.json → yandex_no_results} +0 -0
  74. data/test/https_test.rb +3 -3
  75. data/test/integration/smoke_test.rb +2 -2
  76. data/test/lookup_test.rb +82 -5
  77. data/test/oauth_util_test.rb +30 -0
  78. data/test/proxy_test.rb +2 -2
  79. data/test/query_test.rb +3 -0
  80. data/test/result_test.rb +2 -2
  81. data/test/services_test.rb +121 -44
  82. data/test/test_helper.rb +44 -109
  83. data/test/test_mode_test.rb +3 -3
  84. metadata +42 -33
data/test/test_mode_test.rb CHANGED
@@ -3,13 +3,13 @@ require 'test_helper'
3
3
  class TestModeTest < Test::Unit::TestCase
4
4
 
5
5
  def setup
6
- @_original_lookup = Geocoder::Configuration.lookup
7
- Geocoder::Configuration.lookup = :test
6
+ @_original_lookup = Geocoder.config.lookup
7
+ Geocoder.configure(:lookup => :test)
8
8
  end
9
9
 
10
10
  def teardown
11
11
  Geocoder::Lookup::Test.reset
12
- Geocoder::Configuration.lookup = @_original_lookup
12
+ Geocoder.configure(:lookup => @_original_lookup)
13
13
  end
14
14
 
15
15
  def test_search_with_known_stub
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geocoder
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 1.1.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-09 00:00:00.000000000 Z
12
+ date: 2012-12-24 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: Provides object geocoding (by street or IP address), reverse geocoding
15
15
  (coordinates to street address), distance queries for ActiveRecord and Mongoid,
@@ -24,7 +24,7 @@ extra_rdoc_files: []
24
24
  files:
25
25
  - .gitignore
26
26
  - .travis.yml
27
- - CHANGELOG.rdoc
27
+ - CHANGELOG.md
28
28
  - LICENSE
29
29
  - README.md
30
30
  - Rakefile
@@ -38,6 +38,7 @@ files:
38
38
  - lib/geocoder/calculations.rb
39
39
  - lib/geocoder/cli.rb
40
40
  - lib/geocoder/configuration.rb
41
+ - lib/geocoder/configuration_hash.rb
41
42
  - lib/geocoder/exceptions.rb
42
43
  - lib/geocoder/lookup.rb
43
44
  - lib/geocoder/lookups/base.rb
@@ -47,6 +48,7 @@ files:
47
48
  - lib/geocoder/lookups/google.rb
48
49
  - lib/geocoder/lookups/google_premier.rb
49
50
  - lib/geocoder/lookups/mapquest.rb
51
+ - lib/geocoder/lookups/maxmind.rb
50
52
  - lib/geocoder/lookups/nominatim.rb
51
53
  - lib/geocoder/lookups/test.rb
52
54
  - lib/geocoder/lookups/yahoo.rb
@@ -66,6 +68,7 @@ files:
66
68
  - lib/geocoder/results/google.rb
67
69
  - lib/geocoder/results/google_premier.rb
68
70
  - lib/geocoder/results/mapquest.rb
71
+ - lib/geocoder/results/maxmind.rb
69
72
  - lib/geocoder/results/nominatim.rb
70
73
  - lib/geocoder/results/test.rb
71
74
  - lib/geocoder/results/yahoo.rb
@@ -77,6 +80,7 @@ files:
77
80
  - lib/geocoder/stores/mongo_mapper.rb
78
81
  - lib/geocoder/stores/mongoid.rb
79
82
  - lib/geocoder/version.rb
83
+ - lib/hash_recursive_merge.rb
80
84
  - lib/oauth_util.rb
81
85
  - lib/tasks/geocoder.rake
82
86
  - test/active_record_test.rb
@@ -85,29 +89,39 @@ files:
85
89
  - test/configuration_test.rb
86
90
  - test/custom_block_test.rb
87
91
  - test/error_handling_test.rb
88
- - test/fixtures/bing_madison_square_garden.json
89
- - test/fixtures/bing_no_results.json
90
- - test/fixtures/bing_reverse.json
91
- - test/fixtures/freegeoip_74_200_247_59.json
92
- - test/fixtures/freegeoip_no_results.json
93
- - test/fixtures/geocoder_ca_madison_square_garden.json
94
- - test/fixtures/geocoder_ca_no_results.json
95
- - test/fixtures/geocoder_ca_reverse.json
96
- - test/fixtures/google_garbage.json
97
- - test/fixtures/google_madison_square_garden.json
98
- - test/fixtures/google_no_city_data.json
99
- - test/fixtures/google_no_locality.json
100
- - test/fixtures/google_no_results.json
101
- - test/fixtures/mapquest_madison_square_garden.json
102
- - test/fixtures/mapquest_no_results.json
103
- - test/fixtures/nominatim_madison_square_garden.json
104
- - test/fixtures/nominatim_no_results.json
105
- - test/fixtures/yahoo_error.json
106
- - test/fixtures/yahoo_madison_square_garden.json
107
- - test/fixtures/yahoo_no_results.json
108
- - test/fixtures/yandex_invalid_key.json
109
- - test/fixtures/yandex_kremlin.json
110
- - test/fixtures/yandex_no_results.json
92
+ - test/fixtures/bing_invalid_key
93
+ - test/fixtures/bing_madison_square_garden
94
+ - test/fixtures/bing_no_results
95
+ - test/fixtures/bing_reverse
96
+ - test/fixtures/freegeoip_74_200_247_59
97
+ - test/fixtures/freegeoip_no_results
98
+ - test/fixtures/geocoder_ca_madison_square_garden
99
+ - test/fixtures/geocoder_ca_no_results
100
+ - test/fixtures/geocoder_ca_reverse
101
+ - test/fixtures/google_garbage
102
+ - test/fixtures/google_madison_square_garden
103
+ - test/fixtures/google_no_city_data
104
+ - test/fixtures/google_no_locality
105
+ - test/fixtures/google_no_results
106
+ - test/fixtures/mapquest_madison_square_garden
107
+ - test/fixtures/mapquest_no_results
108
+ - test/fixtures/maxmind_24_24_24_21
109
+ - test/fixtures/maxmind_24_24_24_22
110
+ - test/fixtures/maxmind_24_24_24_23
111
+ - test/fixtures/maxmind_24_24_24_24
112
+ - test/fixtures/maxmind_74_200_247_59
113
+ - test/fixtures/maxmind_invalid_key
114
+ - test/fixtures/maxmind_no_results
115
+ - test/fixtures/nominatim_madison_square_garden
116
+ - test/fixtures/nominatim_no_results
117
+ - test/fixtures/yahoo_error
118
+ - test/fixtures/yahoo_invalid_key
119
+ - test/fixtures/yahoo_madison_square_garden
120
+ - test/fixtures/yahoo_no_results
121
+ - test/fixtures/yahoo_over_limit
122
+ - test/fixtures/yandex_invalid_key
123
+ - test/fixtures/yandex_kremlin
124
+ - test/fixtures/yandex_no_results
111
125
  - test/geocoder_test.rb
112
126
  - test/https_test.rb
113
127
  - test/integration/smoke_test.rb
@@ -116,6 +130,7 @@ files:
116
130
  - test/mongoid_test.rb
117
131
  - test/mongoid_test_helper.rb
118
132
  - test/near_test.rb
133
+ - test/oauth_util_test.rb
119
134
  - test/proxy_test.rb
120
135
  - test/query_test.rb
121
136
  - test/result_test.rb
@@ -134,21 +149,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
134
149
  - - ! '>='
135
150
  - !ruby/object:Gem::Version
136
151
  version: '0'
137
- segments:
138
- - 0
139
- hash: -57977969
140
152
  required_rubygems_version: !ruby/object:Gem::Requirement
141
153
  none: false
142
154
  requirements:
143
155
  - - ! '>='
144
156
  - !ruby/object:Gem::Version
145
157
  version: '0'
146
- segments:
147
- - 0
148
- hash: -57977969
149
158
  requirements: []
150
159
  rubyforge_project:
151
- rubygems_version: 1.8.24
160
+ rubygems_version: 1.8.23
152
161
  signing_key:
153
162
  specification_version: 3
154
163
  summary: Complete geocoding solution for Ruby.