Merge pull request #134 from flackou/fix_unsafe_raw_sql_warning

Fix unsafe raw SQL warning

lib/geokit-rails/acts_as_mappable.rb

@@ -153,7 +153,9 @@ def by_distance(options = {})
         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

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.establish_connection(db_config[ADAPTER])
 
 ActiveRecord::Migration.verbose = false
-load schema_file
+load schema_file

test/test_helper.rb

@@ -34,6 +34,8 @@
 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