geokit-rails 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ca6ff9da9db809b5364c5da86253f349dc5aff
-  data.tar.gz: faf83c4907ad40f8c14b1431309d9db0b009fba7
+  metadata.gz: 60cc7291a94e6384a48947ecb040a472b26c0ac6
+  data.tar.gz: e067b31c96bf53bbe4a3be1f6acf9f490e0c2c16
 SHA512:
-  metadata.gz: 7aeacd224c2d14b57a37a1666dc514002d4baf6bf3d20a03f6a212a05bcf9920dc4f5c2cc72fa0798dc42ab6c1912dec185e0616edf41f0070806cfaf04c8060
-  data.tar.gz: ef046a2677870e71be5ecdf2c0bf8e90f979d858efb237bea8ec531644473af9a339f0ec413bfcc37affb19187bdaaaaf7272567a96fff3a32ed062b3ba4c642
+  metadata.gz: 06e80fa935a623e414e484df78abbc3fb8795c59babe7c40acc152a415b0ca12563be5c3bbaca82be6b36701cea934a8d5d9ae79b1a77defd9a5dd7735e71eb3
+  data.tar.gz: 617c4629c9a48b244dbaa9c8afed2cfb7315de6309e11c1d775892174e5d4166c23158d150a506f6f8f7084c0fd1f42e7549baddc8194d83f4c8e62cf40e59b3

data/.travis.yml

@@ -4,15 +4,23 @@ rvm:
   - 2.1
   - 2.2
   - 2.3
+  - 2.4
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
+  - gemfiles/rails5.gemfile
 matrix:
   exclude:
     - rvm: 2.2
       gemfile: gemfiles/rails3.gemfile
     - rvm: 2.3
       gemfile: gemfiles/rails3.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails3.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails5.gemfile
 script: "bundle exec rake coverage"
 before_install:
   - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.1
+
+* Fix Rails 5.2 deprecation warning
+
 ## 2.3.0
 
 * Drop ruby 1.9 and add 2.3 support

data/gemfiles/rails5.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'activerecord', '~> 5.0'
+  gem 'test-unit'
+end
+
+gemspec :path => "../"

data/geokit-rails.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency "mocha", "~> 0.9"
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency "mysql", "~> 2.8"
   spec.add_development_dependency "mysql2", "~> 0.2"
   spec.add_development_dependency "activerecord-mysql2spatial-adapter"
   spec.add_development_dependency "pg", "~> 0.10"

data/lib/geokit-rails/acts_as_mappable.rb

@@ -153,7 +153,9 @@ module Geokit
         units   = extract_units_from_options(options)
         formula = extract_formula_from_options(options)
         distance_column_name = distance_sql(origin, units, formula)
-        with_latlng.order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
+        with_latlng.order(Arel.sql(
+          "#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}"
+        ))
       end
 
       def with_latlng

data/lib/geokit-rails/version.rb

@@ -1,3 +1,3 @@
 module GeokitRails
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/test/boot.rb

@@ -1,7 +1,8 @@
 require 'pathname'
 
-require 'test/unit'
+require "active_support/version"
 require 'active_support/test_case'
+require "active_support/testing/autorun" if ActiveSupport::VERSION::MAJOR >= 4
 
 require 'active_record'
 require 'active_record/fixtures'
@@ -28,4 +29,4 @@ ActiveRecord::Base.logger = Logger.new(logger_file)
 ActiveRecord::Base.establish_connection(db_config[ADAPTER])
 
 ActiveRecord::Migration.verbose = false
-load schema_file
+load schema_file

data/test/test_helper.rb

@@ -34,6 +34,8 @@ require 'geokit-rails'
 ActiveRecord::Base.send(:include, Geokit::ActsAsMappable::Glue)
 ActionController::Base.send(:include, Geokit::GeocoderControl)
 ActionController::Base.send(:include, Geokit::IpGeocodeLookup)
+# Rails >= 4 requires models classes to be loaded before fixtures are created
+Dir[PLUGIN_ROOT + "test/models/*.rb"].each { |file| require file }
 
 class GeokitTestCase < ActiveSupport::TestCase
   begin
@@ -43,7 +45,11 @@ class GeokitTestCase < ActiveSupport::TestCase
   end
   
   self.fixture_path = (PLUGIN_ROOT + 'test/fixtures').to_s
-  self.use_transactional_fixtures = true
+  if Rails::VERSION::MAJOR >= 5
+    self.use_transactional_tests = true
+  else
+    self.use_transactional_fixtures = true
+  end
   self.use_instantiated_fixtures  = false
   
   fixtures :all 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Michael Noack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,20 +139,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +216,7 @@ files:
 - Rakefile
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
+- gemfiles/rails5.gemfile
 - geokit-rails.gemspec
 - lib/generators/geokit_rails/install_generator.rb
 - lib/generators/templates/geokit_config.rb
@@ -293,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Geokit helpers for rails apps.