geokit-rails 2.3.2 → 2.5.0

data/test/ip_geocode_lookup_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class IpGeocodeLookupTest < ActionDispatch::IntegrationTest#ActiveSupport::TestCase#ActionController::TestCase
+  # tests LocationAwareController
+  
+  def setup
+    # @controller = LocationAwareController
+    @success = Geokit::GeoLoc.new
+    @success.provider = "hostip"
+    @success.lat = 41.7696
+    @success.lng = -88.4588
+    @success.city = "Sugar Grove"
+    @success.state = "IL"
+    @success.country_code = "US"
+    @success.success = true
+    
+    @failure = Geokit::GeoLoc.new
+    @failure.provider = "hostip"
+    @failure.city = "(Private Address)"
+    @failure.success = false
+  end
+
+  def test_no_location_in_cookie_or_session
+    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with("good ip").returns(@success)
+    get '/'
+    assert_response :success
+    assert_equal @success, @request.session[:geo_location]
+    assert_not_nil cookies[:geo_location]
+    assert_equal @success.to_json, cookies[:geo_location]
+  end
+  
+  def test_location_in_cookie
+    get '/cookietest'
+    assert_not_nil cookies[:geo_location]
+    assert_equal @success.to_json, cookies[:geo_location]
+  end
+
+  def test_location_in_session
+    get '/sessiontest'
+    assert_response :success
+    assert_equal @success, Geokit::GeoLoc.new(JSON.parse(session[:geo_location]).transform_keys(&:to_sym))
+  end
+
+  def test_ip_not_located
+    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with("bad ip").returns(@failure)
+    get '/failtest'
+    assert_nil @request.session[:geo_location]
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,19 @@
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+
+require_relative "../test/dummy/config/environment"
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../test/dummy/db/migrate", __dir__)]
+require "rails/test_help"
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.respond_to?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("fixtures", __dir__)
+  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
+  ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
+  ActiveSupport::TestCase.fixtures :all
+end
+
+
 require 'pathname'
 
 require 'boot'
@@ -7,6 +23,7 @@ unless ENV['COVERAGE'] == 'off'
   COVERAGE_THRESHOLD = 35
   require 'simplecov'
   require 'simplecov-rcov'
+  gem 'coveralls_reborn', '~> 0.26.0'
   require 'coveralls'
   Coveralls.wear!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Michael Noack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2023-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,14 +59,14 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.1
 - !ruby/object:Gem::Dependency
@@ -83,6 +83,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,44 +155,30 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: activerecord-mysql2spatial-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
@@ -217,11 +217,15 @@ files:
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - gemfiles/rails5.gemfile
+- gemfiles/rails6.0.gemfile
+- gemfiles/rails6.1.gemfile
 - geokit-rails.gemspec
 - lib/generators/geokit_rails/install_generator.rb
 - lib/generators/templates/geokit_config.rb
 - lib/geokit-rails.rb
 - lib/geokit-rails/acts_as_mappable.rb
+- lib/geokit-rails/acts_as_mappable/class_methods.rb
+- lib/geokit-rails/acts_as_mappable/glue.rb
 - lib/geokit-rails/adapters/abstract.rb
 - lib/geokit-rails/adapters/mysql.rb
 - lib/geokit-rails/adapters/mysql2.rb
@@ -230,7 +234,7 @@ files:
 - lib/geokit-rails/adapters/postgresql.rb
 - lib/geokit-rails/adapters/sqlite.rb
 - lib/geokit-rails/adapters/sqlserver.rb
-- lib/geokit-rails/core_extensions.rb
+- lib/geokit-rails/distance_collection.rb
 - lib/geokit-rails/geocoder_control.rb
 - lib/geokit-rails/ip_geocode_lookup.rb
 - lib/geokit-rails/railtie.rb
@@ -238,6 +242,55 @@ files:
 - test/acts_as_mappable_test.rb
 - test/boot.rb
 - test/database.yml
+- test/distance_collection_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/assets/images/.keep
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/channels/application_cable/channel.rb
+- test/dummy/app/channels/application_cable/connection.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/concerns/.keep
+- test/dummy/app/controllers/location_aware_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/jobs/application_job.rb
+- test/dummy/app/mailers/application_mailer.rb
+- test/dummy/app/models/application_record.rb
+- test/dummy/app/models/concerns/.keep
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/mailer.html.erb
+- test/dummy/app/views/layouts/mailer.text.erb
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/cable.yml
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/content_security_policy.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/permissions_policy.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/puma.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/storage.yml
+- test/dummy/lib/assets/.keep
+- test/dummy/log/.keep
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/apple-touch-icon-precomposed.png
+- test/dummy/public/apple-touch-icon.png
+- test/dummy/public/favicon.ico
+- test/dummy/storage/.keep
+- test/dummy/tmp/.keep
+- test/dummy/tmp/pids/.keep
+- test/dummy/tmp/storage/.keep
 - test/fixtures/companies.yml
 - test/fixtures/custom_locations.yml
 - test/fixtures/locations.yml
@@ -247,7 +300,7 @@ files:
 - test/fixtures/mock_organizations.yml
 - test/fixtures/mock_people.yml
 - test/fixtures/stores.yml
-- test/ip_geocode_lookup_test.disabled.rb
+- test/ip_geocode_lookup_test.rb
 - test/models/company.rb
 - test/models/custom_location.rb
 - test/models/location.rb
@@ -279,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Geokit helpers for rails apps.
@@ -287,6 +340,55 @@ test_files:
 - test/acts_as_mappable_test.rb
 - test/boot.rb
 - test/database.yml
+- test/distance_collection_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/assets/images/.keep
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/channels/application_cable/channel.rb
+- test/dummy/app/channels/application_cable/connection.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/concerns/.keep
+- test/dummy/app/controllers/location_aware_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/jobs/application_job.rb
+- test/dummy/app/mailers/application_mailer.rb
+- test/dummy/app/models/application_record.rb
+- test/dummy/app/models/concerns/.keep
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/mailer.html.erb
+- test/dummy/app/views/layouts/mailer.text.erb
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/cable.yml
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/content_security_policy.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/permissions_policy.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/puma.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/storage.yml
+- test/dummy/lib/assets/.keep
+- test/dummy/log/.keep
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/apple-touch-icon-precomposed.png
+- test/dummy/public/apple-touch-icon.png
+- test/dummy/public/favicon.ico
+- test/dummy/storage/.keep
+- test/dummy/tmp/.keep
+- test/dummy/tmp/pids/.keep
+- test/dummy/tmp/storage/.keep
 - test/fixtures/companies.yml
 - test/fixtures/custom_locations.yml
 - test/fixtures/locations.yml
@@ -296,7 +398,7 @@ test_files:
 - test/fixtures/mock_organizations.yml
 - test/fixtures/mock_people.yml
 - test/fixtures/stores.yml
-- test/ip_geocode_lookup_test.disabled.rb
+- test/ip_geocode_lookup_test.rb
 - test/models/company.rb
 - test/models/custom_location.rb
 - test/models/location.rb

data/test/ip_geocode_lookup_test.disabled.rb

@@ -1,82 +0,0 @@
-require 'test_helper'
-
-module TestApp
-  class Application < Rails::Application
-  end
-end
-
-TestApp::Application.routes.draw do
-  match ':controller(/:action(/:id(.:format)))'
-end
-
-class LocationAwareController < ActionController::Base #:nodoc: all
-  geocode_ip_address
-  
-  def index
-    render :nothing => true
-  end
-  
-  def rescue_action(e) raise e end; 
-end
-
-class ActionController::TestRequest #:nodoc: all
-  attr_accessor :remote_ip
-end
-
-class IpGeocodeLookupTest < ActionController::TestCase
-  tests LocationAwareController
-  
-  def setup
-    @success = Geokit::GeoLoc.new
-    @success.provider = "hostip"
-    @success.lat = 41.7696
-    @success.lng = -88.4588
-    @success.city = "Sugar Grove"
-    @success.state = "IL"
-    @success.country_code = "US"
-    @success.success = true
-    
-    @failure = Geokit::GeoLoc.new
-    @failure.provider = "hostip"
-    @failure.city = "(Private Address)"
-    @failure.success = false
-  end
-
-  def test_no_location_in_cookie_or_session
-    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with("good ip").returns(@success)
-    @request.remote_ip = "good ip"
-    get :index
-    verify
-  end
-  
-  def test_location_in_cookie
-    @request.remote_ip = "good ip"
-    @request.cookies['geo_location'] = @success.to_yaml
-    get :index
-    verify
-  end
-  
-  def test_location_in_session
-    @request.remote_ip = "good ip"
-    @request.session[:geo_location] = @success
-    @request.cookies['geo_location'] = CGI::Cookie.new('geo_location', @success.to_yaml)
-    get :index
-    verify
-  end
-  
-  def test_ip_not_located
-    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with("bad ip").returns(@failure)
-    @request.remote_ip = "bad ip"
-    get :index
-    assert_nil @request.session[:geo_location]
-  end
-  
-  private
-  
-  def verify
-    assert_response :success    
-    assert_equal @success, @request.session[:geo_location]
-    assert_not_nil cookies['geo_location']
-    assert_equal @success, YAML.load(cookies['geo_location'])
-  end
-end