geokit-rails 2.5.0 → 2.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (100) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +125 -0
  3. data/.gitignore +44 -37
  4. data/CHANGELOG.md +112 -101
  5. data/CONFIG.markdown +67 -67
  6. data/Gemfile +3 -3
  7. data/MIT-LICENSE +19 -19
  8. data/README.markdown +726 -726
  9. data/Rakefile +17 -17
  10. data/gemfiles/rails7.1.gemfile +11 -0
  11. data/gemfiles/{rails5.gemfile → rails7.2.gemfile} +7 -7
  12. data/gemfiles/{rails6.0.gemfile → rails8.0.gemfile} +7 -8
  13. data/gemfiles/{rails6.1.gemfile → rails8.1.gemfile} +7 -8
  14. data/geokit-rails.gemspec +35 -34
  15. data/lib/generators/geokit_rails/install_generator.rb +13 -13
  16. data/lib/generators/templates/geokit_config.rb +100 -100
  17. data/lib/geokit-rails/acts_as_mappable/class_methods.rb +301 -297
  18. data/lib/geokit-rails/acts_as_mappable/glue.rb +54 -54
  19. data/lib/geokit-rails/acts_as_mappable.rb +78 -78
  20. data/lib/geokit-rails/adapters/abstract.rb +30 -30
  21. data/lib/geokit-rails/adapters/mysql.rb +21 -21
  22. data/lib/geokit-rails/adapters/mysql2.rb +8 -8
  23. data/lib/geokit-rails/adapters/mysql2spatial.rb +8 -8
  24. data/lib/geokit-rails/adapters/oracleenhanced.rb +32 -32
  25. data/lib/geokit-rails/adapters/postgresql.rb +21 -21
  26. data/lib/geokit-rails/adapters/sqlite.rb +53 -53
  27. data/lib/geokit-rails/adapters/sqlserver.rb +45 -45
  28. data/lib/geokit-rails/adapters/trilogy.rb +10 -0
  29. data/lib/geokit-rails/distance_collection.rb +8 -8
  30. data/lib/geokit-rails/geocoder_control.rb +19 -19
  31. data/lib/geokit-rails/ip_geocode_lookup.rb +44 -45
  32. data/lib/geokit-rails/railtie.rb +37 -37
  33. data/lib/geokit-rails/version.rb +3 -3
  34. data/lib/geokit-rails.rb +11 -11
  35. data/test/acts_as_mappable_test.rb +491 -478
  36. data/test/adapter_resolution_test.rb +59 -0
  37. data/test/boot.rb +40 -32
  38. data/test/database.yml +36 -28
  39. data/test/distance_collection_test.rb +41 -41
  40. data/test/dummy/Rakefile +6 -6
  41. data/test/dummy/app/assets/stylesheets/application.css +1 -1
  42. data/test/dummy/app/channels/application_cable/channel.rb +4 -4
  43. data/test/dummy/app/channels/application_cable/connection.rb +4 -4
  44. data/test/dummy/app/controllers/application_controller.rb +3 -3
  45. data/test/dummy/app/controllers/location_aware_controller.rb +42 -42
  46. data/test/dummy/app/helpers/application_helper.rb +2 -2
  47. data/test/dummy/app/jobs/application_job.rb +7 -7
  48. data/test/dummy/app/mailers/application_mailer.rb +4 -4
  49. data/test/dummy/app/models/application_record.rb +3 -3
  50. data/test/dummy/app/views/layouts/application.html.erb +15 -15
  51. data/test/dummy/app/views/layouts/mailer.html.erb +13 -13
  52. data/test/dummy/app/views/layouts/mailer.text.erb +1 -1
  53. data/test/dummy/bin/rails +4 -4
  54. data/test/dummy/bin/rake +4 -4
  55. data/test/dummy/bin/setup +33 -33
  56. data/test/dummy/config/application.rb +22 -22
  57. data/test/dummy/config/boot.rb +5 -5
  58. data/test/dummy/config/cable.yml +10 -10
  59. data/test/dummy/config/database.yml +25 -25
  60. data/test/dummy/config/environment.rb +5 -5
  61. data/test/dummy/config/environments/development.rb +68 -68
  62. data/test/dummy/config/environments/production.rb +87 -87
  63. data/test/dummy/config/environments/test.rb +60 -60
  64. data/test/dummy/config/initializers/content_security_policy.rb +25 -25
  65. data/test/dummy/config/initializers/filter_parameter_logging.rb +8 -8
  66. data/test/dummy/config/initializers/inflections.rb +16 -16
  67. data/test/dummy/config/initializers/permissions_policy.rb +11 -11
  68. data/test/dummy/config/locales/en.yml +33 -33
  69. data/test/dummy/config/puma.rb +43 -43
  70. data/test/dummy/config/routes.rb +6 -6
  71. data/test/dummy/config/storage.yml +34 -34
  72. data/test/dummy/config.ru +6 -6
  73. data/test/dummy/public/404.html +67 -67
  74. data/test/dummy/public/422.html +67 -67
  75. data/test/dummy/public/500.html +66 -66
  76. data/test/fixtures/companies.yml +9 -9
  77. data/test/fixtures/custom_locations.yml +61 -61
  78. data/test/fixtures/locations.yml +61 -61
  79. data/test/fixtures/mock_addresses.yml +16 -16
  80. data/test/fixtures/mock_families.yml +2 -2
  81. data/test/fixtures/mock_houses.yml +8 -8
  82. data/test/fixtures/mock_organizations.yml +4 -4
  83. data/test/fixtures/mock_people.yml +4 -4
  84. data/test/ip_geocode_lookup_test.rb +52 -48
  85. data/test/models/company.rb +2 -2
  86. data/test/models/custom_location.rb +11 -11
  87. data/test/models/location.rb +3 -3
  88. data/test/models/mock_address.rb +3 -3
  89. data/test/models/mock_family.rb +4 -4
  90. data/test/models/mock_house.rb +2 -2
  91. data/test/models/mock_organization.rb +5 -5
  92. data/test/models/mock_person.rb +6 -6
  93. data/test/models/store.rb +2 -2
  94. data/test/schema.rb +61 -61
  95. data/test/tasks.rake +39 -37
  96. data/test/test_helper.rb +83 -73
  97. metadata +28 -15
  98. data/.travis.yml +0 -55
  99. data/gemfiles/rails3.gemfile +0 -8
  100. data/gemfiles/rails4.gemfile +0 -8
data/test/tasks.rake CHANGED
@@ -1,37 +1,39 @@
1
- require 'rake/testtask'
2
-
3
- class EnvTestTask < Rake::TestTask
4
- attr_accessor :env
5
-
6
- def ruby(*args)
7
- env.each { |key, value| ENV[key] = value } if env
8
- super
9
- env.keys.each { |key| ENV.delete(key) } if env
10
- end
11
-
12
- end
13
-
14
- desc 'Test the Geokit plugin.'
15
- Rake::TestTask.new(:test) do |test|
16
- test.libs << 'lib' << 'test'
17
- test.pattern = 'test/*_test.rb'
18
- test.verbose = true
19
- end
20
-
21
- %w(mysql postgresql sqlserver sqlite).each do |configuration|
22
- EnvTestTask.new("test_#{configuration}") do |t|
23
- t.pattern = 'test/*_test.rb'
24
- t.verbose = true
25
- t.env = { 'DB' => configuration }
26
- t.libs << 'test'
27
- end
28
- end
29
-
30
- desc 'Test available databases.'
31
- task :test_databases => %w(test_mysql test_postgresql test_sqlserver test_sqlite)
32
-
33
- desc "Generate SimpleCov test coverage and open in your browser"
34
- task :coverage do
35
- ENV['COVERAGE'] = 'true'
36
- Rake::Task['test'].invoke
37
- end
1
+ require 'rake/testtask'
2
+
3
+ class EnvTestTask < Rake::TestTask
4
+ attr_accessor :env
5
+
6
+ def ruby(*args)
7
+ env.each { |key, value| ENV[key] = value } if env
8
+ super
9
+ env.keys.each { |key| ENV.delete(key) } if env
10
+ end
11
+
12
+ end
13
+
14
+ desc 'Test the Geokit plugin.'
15
+ Rake::TestTask.new(:test) do |test|
16
+ test.libs << 'lib' << 'test'
17
+ test.pattern = 'test/*_test.rb'
18
+ test.verbose = true
19
+ end
20
+
21
+ databases = %w[mysql trilogy postgresql sqlserver sqlite]
22
+
23
+ databases.each do |configuration|
24
+ EnvTestTask.new("test_#{configuration}") do |t|
25
+ t.pattern = 'test/*_test.rb'
26
+ t.verbose = true
27
+ t.env = { 'DB' => configuration }
28
+ t.libs << 'test'
29
+ end
30
+ end
31
+
32
+ desc 'Test available databases.'
33
+ task test_databases: databases.map { |database| "test_#{database}" }
34
+
35
+ desc "Generate SimpleCov test coverage and open in your browser"
36
+ task :coverage do
37
+ ENV['COVERAGE'] = 'true'
38
+ Rake::Task['test'].invoke
39
+ end
data/test/test_helper.rb CHANGED
@@ -1,73 +1,83 @@
1
- # Configure Rails Environment
2
- ENV["RAILS_ENV"] = "test"
3
-
4
- require_relative "../test/dummy/config/environment"
5
- ActiveRecord::Migrator.migrations_paths = [File.expand_path("../test/dummy/db/migrate", __dir__)]
6
- require "rails/test_help"
7
-
8
- # Load fixtures from the engine
9
- if ActiveSupport::TestCase.respond_to?(:fixture_path=)
10
- ActiveSupport::TestCase.fixture_path = File.expand_path("fixtures", __dir__)
11
- ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
12
- ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
13
- ActiveSupport::TestCase.fixtures :all
14
- end
15
-
16
-
17
- require 'pathname'
18
-
19
- require 'boot'
20
- require 'mocha/setup'
21
-
22
- unless ENV['COVERAGE'] == 'off'
23
- COVERAGE_THRESHOLD = 35
24
- require 'simplecov'
25
- require 'simplecov-rcov'
26
- gem 'coveralls_reborn', '~> 0.26.0'
27
- require 'coveralls'
28
- Coveralls.wear!
29
-
30
- SimpleCov.formatters = [
31
- SimpleCov::Formatter::RcovFormatter,
32
- Coveralls::SimpleCov::Formatter
33
- ]
34
- SimpleCov.start do
35
- add_filter '/test/'
36
- add_group 'lib', 'lib'
37
- end
38
- SimpleCov.at_exit do
39
- SimpleCov.result.format!
40
- percent = SimpleCov.result.covered_percent
41
- unless percent >= COVERAGE_THRESHOLD
42
- puts "Coverage must be above #{COVERAGE_THRESHOLD}%. It is #{"%.2f" % percent}%"
43
- Kernel.exit(1)
44
- end
45
- end
46
- end
47
-
48
- require 'geokit'
49
- require 'geokit-rails'
50
-
51
- ActiveRecord::Base.send(:include, Geokit::ActsAsMappable::Glue)
52
- ActionController::Base.send(:include, Geokit::GeocoderControl)
53
- ActionController::Base.send(:include, Geokit::IpGeocodeLookup)
54
- # Rails >= 4 requires models classes to be loaded before fixtures are created
55
- Dir[PLUGIN_ROOT + "test/models/*.rb"].each { |file| require file }
56
-
57
- class GeokitTestCase < ActiveSupport::TestCase
58
- begin
59
- include ActiveRecord::TestFixtures
60
- rescue NameError
61
- puts "You appear to be using a pre-2.3 version of Rails. No need to include ActiveRecord::TestFixtures."
62
- end
63
-
64
- self.fixture_path = (PLUGIN_ROOT + 'test/fixtures').to_s
65
- if Rails::VERSION::MAJOR >= 5
66
- self.use_transactional_tests = true
67
- else
68
- self.use_transactional_fixtures = true
69
- end
70
- self.use_instantiated_fixtures = false
71
-
72
- fixtures :all
73
- end
1
+ # frozen_string_literal: true
2
+
3
+ # Start coverage before anything loads the library, or it won't be measured.
4
+ unless ENV['COVERAGE'] == 'off'
5
+ COVERAGE_THRESHOLD = 35
6
+ require 'simplecov'
7
+ require 'simplecov-rcov'
8
+ require 'coveralls'
9
+ Coveralls.wear!
10
+
11
+ SimpleCov.formatters = [
12
+ SimpleCov::Formatter::RcovFormatter,
13
+ Coveralls::SimpleCov::Formatter
14
+ ]
15
+ SimpleCov.start do
16
+ add_filter '/test/'
17
+ add_group 'lib', 'lib'
18
+ end
19
+ SimpleCov.at_exit do
20
+ SimpleCov.result.format!
21
+ percent = SimpleCov.result.covered_percent
22
+ unless percent >= COVERAGE_THRESHOLD
23
+ puts "Coverage must be above #{COVERAGE_THRESHOLD}%. It is #{"%.2f" % percent}%"
24
+ Kernel.exit(1)
25
+ end
26
+ end
27
+ end
28
+
29
+ # Configure Rails Environment
30
+ ENV['RAILS_ENV'] = 'test'
31
+
32
+ require_relative '../test/dummy/config/environment'
33
+ ActiveRecord::Migrator.migrations_paths =
34
+ [File.expand_path('../test/dummy/db/migrate', __dir__)]
35
+ require 'rails/test_help'
36
+
37
+ # Load fixtures from the engine
38
+ if ActiveSupport::TestCase.respond_to?(:fixture_path=)
39
+ ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__)
40
+ ActionDispatch::IntegrationTest.fixture_path =
41
+ ActiveSupport::TestCase.fixture_path
42
+ ActiveSupport::TestCase.file_fixture_path =
43
+ ActiveSupport::TestCase.fixture_path + '/files'
44
+ ActiveSupport::TestCase.fixtures :all
45
+ end
46
+
47
+ require 'pathname'
48
+
49
+ require 'boot'
50
+ require 'mocha/minitest'
51
+
52
+ require 'geokit'
53
+ require 'geokit-rails'
54
+
55
+ ActiveRecord::Base.send(:include, Geokit::ActsAsMappable::Glue)
56
+ ActionController::Base.send(:include, Geokit::GeocoderControl)
57
+ ActionController::Base.send(:include, Geokit::IpGeocodeLookup)
58
+ # Rails >= 4 requires models classes to be loaded before fixtures are created
59
+ Dir[PLUGIN_ROOT + "test/models/*.rb"].each { |file| require file }
60
+
61
+ class GeokitTestCase < ActiveSupport::TestCase
62
+ begin
63
+ include ActiveRecord::TestFixtures
64
+ rescue NameError
65
+ puts "You appear to be using a pre-2.3 version of Rails. No need to include ActiveRecord::TestFixtures."
66
+ end
67
+
68
+ # Rails 7.1+ uses fixture_paths instead of fixture_path
69
+ if respond_to?(:fixture_paths=)
70
+ self.fixture_paths = [(PLUGIN_ROOT + 'test/fixtures').to_s]
71
+ else
72
+ self.fixture_path = (PLUGIN_ROOT + 'test/fixtures').to_s
73
+ end
74
+
75
+ if Rails::VERSION::MAJOR >= 5
76
+ self.use_transactional_tests = true
77
+ else
78
+ self.use_transactional_fixtures = true
79
+ end
80
+ self.use_instantiated_fixtures = false
81
+
82
+ fixtures :all
83
+ end
metadata CHANGED
@@ -1,17 +1,16 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geokit-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0
4
+ version: 2.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Noack
8
8
  - Andre Lewis
9
9
  - Bill Eisenhauer
10
10
  - Jeremy Lecour
11
- autorequire:
12
11
  bindir: bin
13
12
  cert_chain: []
14
- date: 2023-01-21 00:00:00.000000000 Z
13
+ date: 2026-10-22 00:00:00.000000000 Z
15
14
  dependencies:
16
15
  - !ruby/object:Gem::Dependency
17
16
  name: rails
@@ -112,7 +111,7 @@ dependencies:
112
111
  - !ruby/object:Gem::Version
113
112
  version: '0'
114
113
  - !ruby/object:Gem::Dependency
115
- name: test-unit
114
+ name: rexml
116
115
  requirement: !ruby/object:Gem::Requirement
117
116
  requirements:
118
117
  - - ">="
@@ -131,14 +130,14 @@ dependencies:
131
130
  requirements:
132
131
  - - "~>"
133
132
  - !ruby/object:Gem::Version
134
- version: '0.9'
133
+ version: '2.0'
135
134
  type: :development
136
135
  prerelease: false
137
136
  version_requirements: !ruby/object:Gem::Requirement
138
137
  requirements:
139
138
  - - "~>"
140
139
  - !ruby/object:Gem::Version
141
- version: '0.9'
140
+ version: '2.0'
142
141
  - !ruby/object:Gem::Dependency
143
142
  name: coveralls_reborn
144
143
  requirement: !ruby/object:Gem::Requirement
@@ -167,6 +166,20 @@ dependencies:
167
166
  - - ">="
168
167
  - !ruby/object:Gem::Version
169
168
  version: '0.2'
169
+ - !ruby/object:Gem::Dependency
170
+ name: trilogy
171
+ requirement: !ruby/object:Gem::Requirement
172
+ requirements:
173
+ - - ">="
174
+ - !ruby/object:Gem::Version
175
+ version: '0'
176
+ type: :development
177
+ prerelease: false
178
+ version_requirements: !ruby/object:Gem::Requirement
179
+ requirements:
180
+ - - ">="
181
+ - !ruby/object:Gem::Version
182
+ version: '0'
170
183
  - !ruby/object:Gem::Dependency
171
184
  name: pg
172
185
  requirement: !ruby/object:Gem::Requirement
@@ -206,19 +219,18 @@ executables: []
206
219
  extensions: []
207
220
  extra_rdoc_files: []
208
221
  files:
222
+ - ".github/workflows/ci.yml"
209
223
  - ".gitignore"
210
- - ".travis.yml"
211
224
  - CHANGELOG.md
212
225
  - CONFIG.markdown
213
226
  - Gemfile
214
227
  - MIT-LICENSE
215
228
  - README.markdown
216
229
  - Rakefile
217
- - gemfiles/rails3.gemfile
218
- - gemfiles/rails4.gemfile
219
- - gemfiles/rails5.gemfile
220
- - gemfiles/rails6.0.gemfile
221
- - gemfiles/rails6.1.gemfile
230
+ - gemfiles/rails7.1.gemfile
231
+ - gemfiles/rails7.2.gemfile
232
+ - gemfiles/rails8.0.gemfile
233
+ - gemfiles/rails8.1.gemfile
222
234
  - geokit-rails.gemspec
223
235
  - lib/generators/geokit_rails/install_generator.rb
224
236
  - lib/generators/templates/geokit_config.rb
@@ -234,12 +246,14 @@ files:
234
246
  - lib/geokit-rails/adapters/postgresql.rb
235
247
  - lib/geokit-rails/adapters/sqlite.rb
236
248
  - lib/geokit-rails/adapters/sqlserver.rb
249
+ - lib/geokit-rails/adapters/trilogy.rb
237
250
  - lib/geokit-rails/distance_collection.rb
238
251
  - lib/geokit-rails/geocoder_control.rb
239
252
  - lib/geokit-rails/ip_geocode_lookup.rb
240
253
  - lib/geokit-rails/railtie.rb
241
254
  - lib/geokit-rails/version.rb
242
255
  - test/acts_as_mappable_test.rb
256
+ - test/adapter_resolution_test.rb
243
257
  - test/boot.rb
244
258
  - test/database.yml
245
259
  - test/distance_collection_test.rb
@@ -317,7 +331,6 @@ homepage: http://github.com/geokit/geokit-rails
317
331
  licenses:
318
332
  - MIT
319
333
  metadata: {}
320
- post_install_message:
321
334
  rdoc_options: []
322
335
  require_paths:
323
336
  - lib
@@ -332,12 +345,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
332
345
  - !ruby/object:Gem::Version
333
346
  version: '0'
334
347
  requirements: []
335
- rubygems_version: 3.1.2
336
- signing_key:
348
+ rubygems_version: 3.6.4
337
349
  specification_version: 4
338
350
  summary: Geokit helpers for rails apps.
339
351
  test_files:
340
352
  - test/acts_as_mappable_test.rb
353
+ - test/adapter_resolution_test.rb
341
354
  - test/boot.rb
342
355
  - test/database.yml
343
356
  - test/distance_collection_test.rb
data/.travis.yml DELETED
@@ -1,55 +0,0 @@
1
- language: ruby
2
- rvm:
3
- - 2.0
4
- - 2.1
5
- - 2.2
6
- - 2.3
7
- - 2.4
8
- - 2.5
9
- - 2.6
10
- - ruby-head
11
- gemfile:
12
- - gemfiles/rails3.gemfile
13
- - gemfiles/rails4.gemfile
14
- - gemfiles/rails5.gemfile
15
- - gemfiles/rails6.0.gemfile
16
- - gemfiles/rails6.1.gemfile
17
- matrix:
18
- exclude:
19
- - rvm: 2.2
20
- gemfile: gemfiles/rails3.gemfile
21
- - rvm: 2.3
22
- gemfile: gemfiles/rails3.gemfile
23
- - rvm: 2.4
24
- gemfile: gemfiles/rails3.gemfile
25
- - rvm: 2.0
26
- gemfile: gemfiles/rails5.gemfile
27
- - rvm: 2.1
28
- gemfile: gemfiles/rails5.gemfile
29
- - rvm: 2.6
30
- gemfile: gemfiles/rails5.gemfile
31
- - rvm: ruby-head
32
- gemfile: gemfiles/rails5.gemfile
33
- - rvm: 2.0
34
- gemfile: gemfiles/rails6.0.gemfile
35
- - rvm: 2.0
36
- gemfile: gemfiles/rails6.1.gemfile
37
- - rvm: 2.1
38
- gemfile: gemfiles/rails6.0.gemfile
39
- - rvm: 2.1
40
- gemfile: gemfiles/rails6.1.gemfile
41
- - rvm: 2.2
42
- gemfile: gemfiles/rails6.0.gemfile
43
- - rvm: 2.2
44
- gemfile: gemfiles/rails6.1.gemfile
45
- - rvm: 2.3
46
- gemfile: gemfiles/rails6.0.gemfile
47
- - rvm: 2.3
48
- gemfile: gemfiles/rails6.1.gemfile
49
- - rvm: 2.4
50
- gemfile: gemfiles/rails6.0.gemfile
51
- - rvm: 2.4
52
- gemfile: gemfiles/rails6.1.gemfile
53
- script: "bundle exec rake coverage"
54
- bundler_args: --retry 5
55
- cache: bundler
@@ -1,8 +0,0 @@
1
- source 'https://rubygems.org'
2
-
3
- group :development, :test do
4
- gem 'activerecord', '~> 3.2.0'
5
- gem 'sqlite3', '~> 1.3.5'
6
- end
7
-
8
- gemspec :path => "../"
@@ -1,8 +0,0 @@
1
- source 'https://rubygems.org'
2
-
3
- group :development, :test do
4
- gem 'activerecord', '~> 4.0'
5
- gem 'sqlite3', '1.3.7'
6
- end
7
-
8
- gemspec :path => "../"