geokit-rails 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea862dfaa5a3d928db10ab95a7c65c5fce23491c
-  data.tar.gz: 6ffd65c47a279ed164c7d875078dc44d5d28ff78
+  metadata.gz: 48ca6ff9da9db809b5364c5da86253f349dc5aff
+  data.tar.gz: faf83c4907ad40f8c14b1431309d9db0b009fba7
 SHA512:
-  metadata.gz: 6f6b87d14fc319e5331327953f683201a08c164529ff2b5d2a52ed1ca266af0878b22453901405da5cb79576319b7f2bc40c2e8d6d66efbbd43abccde3069497
-  data.tar.gz: c60c6c131318bd68e34388250fb41a3c2934fd79e84a971c8946a6dc26e48dd1769928c4edba763d15e5c8b4251ae206321ceb671809319c8279735a8874186e
+  metadata.gz: 7aeacd224c2d14b57a37a1666dc514002d4baf6bf3d20a03f6a212a05bcf9920dc4f5c2cc72fa0798dc42ab6c1912dec185e0616edf41f0070806cfaf04c8060
+  data.tar.gz: ef046a2677870e71be5ecdf2c0bf8e90f979d858efb237bea8ec531644473af9a339f0ec413bfcc37affb19187bdaaaaf7272567a96fff3a32ed062b3ba4c642

data/.travis.yml

@@ -1,21 +1,21 @@
 language: ruby
 rvm:
-  - 1.9
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
 matrix:
   exclude:
-    - rvm: 1.9
-      gemfile: gemfiles/rails4.gemfile
     - rvm: 2.2
       gemfile: gemfiles/rails3.gemfile
+    - rvm: 2.3
+      gemfile: gemfiles/rails3.gemfile
 script: "bundle exec rake coverage"
 before_install:
   - gem install bundler
-
 bundler_args: --retry 5
+sudo: false
 cache: bundler

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 2.3.0
+
+* Drop ruby 1.9 and add 2.3 support
+* Add an option to skip loading
+* Remove excessive debug statement
+
+## 2.2.0
+
+* Add rails config aenerator
+* Add NOT NULL checks for latitude and longitude, otherwise nonsense
+  values are being returned for distance calculations involving such
+  objects.
+* Fix inconsistent case where retrieve_location_from_cookie_or_services
+  returned a Hash instead of a GeoLoc
+* Speed up SQL with bounding box
+* Tests against rails 4 & 5
+
+## 2.1.0
+
+* Add OracleEnhanced adapter
+* Fix bug with custom latitude/longitude names
+* BREAKING: Nearest and fathest return scopes not arrays
+* Drop support for ruby 1.8/1.9
+
 ## 2.0.1
 
 * Fix GeoKit naming compatibility

data/README.markdown

@@ -32,8 +32,15 @@ Then tell bundler to update the gems :
 ```sh
 $ bundle install
 ```
+Generate the configuration initializer:
+
+```sh
+$ rails g geokit_rails:install
+```
+
+Now, if you wish to use the various geocoding services, you can add your keys to the new initializer.
+
 
-Last, consult the `important post-installation notes` section at the end of this document.
 
 If you want to use geokit-rails in a Rails 2 application, just use the good old plugin ([geokit-rails](https://github.com/andre/geokit-rails)).
 
@@ -113,27 +120,21 @@ Once you've specified `acts_as_mappable`, a few scopes are available :
 * `closest` and `farthest` find the closest or farthest record from the origin point
 * `by_distance` finds records ordered by distance from the origin point
 
-All these scopes are the porcelain for a lower level scope named `geo_scope` that take a hash of options.
-Their first parameter is simply one of  the possible options, without the name
+All of these scopes take a hash of options where the first parameter is simply
+one of  the possible options, without the name.
 
 A few examples :
 
 ```ruby
 Location.within(5, :origin => @somewhere)
-# is the same as
-Location.geo_scope(:within => 5, :origin => @somewhere)
 ```
 
 ```ruby
 Location.in_range(2..5, :origin => @somewhere)
-# is the same as
-Location.geo_scope(:range => 2..5, :origin => @somewhere)
 ```
 
 ```ruby
 Location.in_bounds([@south_west_point, @north_east_point], :origin => @somewhere)
-# is the same as
-Location.geo_scope(:bounds => [@south_west_point, @north_east_point], :origin => @somewhere)
 ```
 
 The options can be :
@@ -141,13 +142,13 @@ The options can be :
 `:origin` as a two-element array of latitude/longitude:
 
 ```ruby
-Location.geo_scope(:origin => [37.792,-122.393])
+Location.by_distance(:origin => [37.792,-122.393])
 ```
 
 `:origin` as a geocodeable string:
 
 ```ruby
-Location.geo_scope(:origin => '100 Spear st, San Francisco, CA')
+Location.by_distance(:origin => '100 Spear st, San Francisco, CA')
 ```
 
 `:origin` as an object which responds to `lat` and `lng` methods,
@@ -174,7 +175,7 @@ Location.within(5, :units => :kms, :origin => @somewhere)
 @sw = Geokit::LatLng.new(32.91663,-96.982841)
 @ne = Geokit::LatLng.new(32.96302,-96.919495)
 @somewhere = Location.find(123456)
-Location.geo_scope(:bounds => [@sw, @ne], :origin => @somewhere)
+Location.within(:bounds => [@sw, @ne], :origin => @somewhere)
 ```
 
 `:bounds` as a Geokit::Bounds object
@@ -182,7 +183,7 @@ Location.geo_scope(:bounds => [@sw, @ne], :origin => @somewhere)
 ```ruby
 @bounds = Geokit::Bounds.new([32.91663,-96.982841], [32.96302,-96.919495])
 @somewhere = Location.find(123456)
-Location.geo_scope(:bounds => [@sw, @ne], :origin => @somewhere)
+Location.within(:bounds => [@sw, @ne], :origin => @somewhere)
 ```
 
 When using a point of reference or bounds, you leverage the power of Geokit
@@ -207,7 +208,7 @@ You can then chain these scope with any other or use a "calling" method like `fi
 ```ruby
 Location.within(5, :origin => @somewhere).all
 Location.within(5, :origin => @somewhere).count
-Location.geo_scope(:origin => [37.792,-122.393]).first
+Location.by_distance(:origin => [37.792,-122.393]).first
 ```
 
 You can add `order` clauses in the chain as for any ActiveRecord query
@@ -226,10 +227,10 @@ Idem for the `limit` clause. In fact, `closest` and `farthest` are defined like
 
 ```ruby
 def closest(options = {})
-  geo_scope(options).order("#{distance_column_name} asc").limit(1)
+  by_distance(options).limit(1)
 end
 def farthest(options = {})
-  geo_scope(options).order("#{distance_column_name} desc").limit(1)
+  by_distance({:reverse => true}.merge(options)).limit(1)
 end
 ```
 
@@ -241,7 +242,7 @@ using the _distance_ column. I've tried many different ways to do this and didn'
 One would expect to build a query like this :
 
 ```ruby
-scoped  = Location.geo_scope(:origin => @somewhere)
+scoped  = Location.by_distance(:origin => @somewhere)
 scoped  = scoped.where('distance <= 5')
 results = scoped.all
 ```
@@ -717,11 +718,3 @@ GeoLoc represents an address or location which
 has been geocoded. You can get the city, zipcode, street address, etc.
 from a GeoLoc object. GeoLoc extends LatLng, so you also get lat/lng
 AND the Mappable module goodness for free.
-
-## IMPORTANT POST-INSTALLATION NOTES:
-
-*1. The configuration file*: Geokit for Rails uses a configuration file in config/initializers.
-You *must* add your own keys for the various geocoding services if you want to use geocoding. You can generate a sample initializer file by run:
-```sh
-$ rails g geokit_rails:install
-```

data/lib/geokit-rails/acts_as_mappable.rb

@@ -11,6 +11,8 @@ module Geokit
       extend ActiveSupport::Concern
 
       module ClassMethods # :nodoc:
+        OPTION_SYMBOLS = [ :distance_column_name, :default_units, :default_formula, :lat_column_name, :lng_column_name, :qualified_lat_column_name, :qualified_lng_column_name, :skip_loading ]
+
         def acts_as_mappable(options = {})
           metaclass = (class << self; self; end)
 
@@ -21,20 +23,21 @@ module Geokit
 
           if reflection = Geokit::ActsAsMappable.end_of_reflection_chain(self.through, self)
             metaclass.instance_eval do
-              [ :distance_column_name, :default_units, :default_formula, :lat_column_name, :lng_column_name, :qualified_lat_column_name, :qualified_lng_column_name ].each do |method_name|
+              OPTION_SYMBOLS.each do |method_name|
                 define_method method_name do
                   reflection.klass.send(method_name)
                 end
               end
             end
           else
-            cattr_accessor :distance_column_name, :default_units, :default_formula, :lat_column_name, :lng_column_name, :qualified_lat_column_name, :qualified_lng_column_name
+            cattr_accessor *OPTION_SYMBOLS
 
             self.distance_column_name = options[:distance_column_name]  || 'distance'
             self.default_units = options[:default_units] || Geokit::default_units
             self.default_formula = options[:default_formula] || Geokit::default_formula
             self.lat_column_name = options[:lat_column_name] || 'lat'
             self.lng_column_name = options[:lng_column_name] || 'lng'
+            self.skip_loading = options[:skip_loading]
             self.qualified_lat_column_name = "#{table_name}.#{lat_column_name}"
             self.qualified_lng_column_name = "#{table_name}.#{lng_column_name}"
 
@@ -105,7 +108,7 @@ module Geokit
             # Re-init the klass after require
             klass = Adapters.const_get(connection.adapter_name.camelcase)
           end
-          klass.load(self) unless klass.loaded
+          klass.load(self) unless klass.loaded || skip_loading
           klass.new(self)
         rescue LoadError
           raise UnsupportedAdapter, "`#{connection.adapter_name.downcase}` is not a supported adapter."
@@ -117,7 +120,7 @@ module Geokit
         # Add bounding box to speed up SQL request.
         bounds = formulate_bounds_from_distance(
           options,
-          normalize_point_to_lat_lng(options[:origin]), 
+          normalize_point_to_lat_lng(options[:origin]),
           options[:units] || default_units)
         with_latlng.where(bound_conditions(bounds)).
           where(distance_conditions(options))

data/lib/geokit-rails/adapters/sqlserver.rb

@@ -1,28 +1,30 @@
 module Geokit
   module Adapters
     class SQLServer < Abstract
-      
+
       class << self
-        
+
         def load(klass)
-          klass.connection.execute <<-EOS
-            if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[geokit_least]') and xtype in (N'FN', N'IF', N'TF'))
-            drop function [dbo].[geokit_least]
-          EOS
-
-          klass.connection.execute <<-EOS
-            CREATE FUNCTION [dbo].geokit_least (@value1 float,@value2 float) RETURNS float AS BEGIN
-            return (SELECT CASE WHEN @value1 < @value2 THEN  @value1 ELSE @value2 END) END
-          EOS
+          klass.transaction do
+            klass.connection.execute <<-EOS
+              if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[geokit_least]') and xtype in (N'FN', N'IF', N'TF'))
+              drop function [dbo].[geokit_least]
+            EOS
+
+            klass.connection.execute <<-EOS
+              CREATE FUNCTION [dbo].geokit_least (@value1 float,@value2 float) RETURNS float AS BEGIN
+              return (SELECT CASE WHEN @value1 < @value2 THEN  @value1 ELSE @value2 END) END
+            EOS
+          end
           self.loaded = true
         end
-        
+
       end
-      
+
       def initialize(*args)
         super(*args)
       end
-      
+
       def sphere_distance_sql(lat, lng, multiplier)
         %|
           (ACOS([dbo].geokit_least(1,COS(#{lat})*COS(#{lng})*COS(RADIANS(#{qualified_lat_column_name}))*COS(RADIANS(#{qualified_lng_column_name}))+
@@ -30,14 +32,14 @@ module Geokit
           SIN(#{lat})*SIN(RADIANS(#{qualified_lat_column_name}))))*#{multiplier})
          |
       end
-      
+
       def flat_distance_sql(origin, lat_degree_units, lng_degree_units)
         %|
           SQRT(POWER(#{lat_degree_units}*(#{origin.lat}-#{qualified_lat_column_name}),2)+
           POWER(#{lng_degree_units}*(#{origin.lng}-#{qualified_lng_column_name}),2))
          |
       end
-      
+
     end
   end
-end
+end

data/lib/geokit-rails/geocoder_control.rb

@@ -3,18 +3,17 @@ require 'active_support/concern'
 module Geokit
   module GeocoderControl
     extend ActiveSupport::Concern
-  
+
     included do
-      if self.respond_to? :before_action
-        self.send :before_action, :set_geokit_domain
-      elsif self.respond_to? :before_filter
-        self.send :before_filter, :set_geokit_domain
+      if respond_to? :before_action
+        send :before_action, :set_geokit_domain
+      elsif respond_to? :before_filter
+        send :before_filter, :set_geokit_domain
       end
     end
-    
+
     def set_geokit_domain
       Geokit::Geocoders::domain = request.domain
-      logger.debug("Geokit is using the domain: #{Geokit::Geocoders::domain}")
     end
   end
 end

data/lib/geokit-rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Michael Noack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Geokit helpers for rails apps.