geokit-rails 2.0.1 → 2.1.0

data/Rakefile

@@ -0,0 +1,17 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "geokit-rails #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+load 'test/tasks.rake'
+
+desc 'Default: run unit tests.'
+task :default => :test

data/gemfiles/rails3.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+gemspec :path => "../"
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'simplecov'
+  gem 'simplecov-rcov'
+  gem 'sqlite3'
+  gem 'activerecord', '~> 3.2.0'
+end

data/gemfiles/rails4.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+gemspec :path => "../"
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'simplecov'
+  gem 'simplecov-rcov'
+  gem 'sqlite3'
+  gem 'activerecord', '~> 4.0.0'
+end

data/geokit-rails.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/geokit-rails/version", __FILE__)
+
+Gem::Specification.new do |spec|
+  spec.name          = "geokit-rails"
+  spec.version       = GeokitRails::VERSION
+  spec.authors       = ["Michael Noack", "Andre Lewis", "Bill Eisenhauer", "Jeremy Lecour"]
+  spec.email         = ["michael+geokit@noack.com.au", "andre@earthcode.com", "bill_eisenhauer@yahoo.com", "jeremy.lecour@gmail.com"]
+  spec.summary       = "Integrate Geokit with Rails"
+  spec.description   = "Official Geokit plugin for Rails/ActiveRecord. Provides location-based goodness for your Rails app. Requires the Geokit gem."
+  spec.summary       = "Geokit helpers for rails apps."
+  spec.homepage      = "http://github.com/geokit/geokit-rails"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'rails', '>= 3.0'
+  spec.add_dependency 'geokit', '~> 1.5'
+  spec.add_development_dependency "bundler", "> 1.0"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-rcov"
+  spec.add_development_dependency 'rake'
+  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"
+  spec.add_development_dependency "sqlite3"
+end

data/lib/geokit-rails/acts_as_mappable.rb

@@ -93,7 +93,7 @@ module Geokit
       # A proxy to an instance of a finder adapter, inferred from the connection's adapter.
       def adapter
         @adapter ||= begin
-          require File.join(File.dirname(__FILE__), 'adapters', connection.adapter_name.downcase)
+          require File.join('geokit-rails', 'adapters', connection.adapter_name.downcase)
           klass = Adapters.const_get(connection.adapter_name.camelcase)
           klass.load(self) unless klass.loaded
           klass.new(self)
@@ -137,16 +137,16 @@ module Geokit
         bounds  = extract_bounds_from_options(options)
         distance_column_name = distance_sql(origin, units, formula)
         #geo_scope(options).order("#{distance_column_name} asc")
-        order("#{distance_column_name} asc")
+        order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
       end
 
       def closest(options = {})
-        by_distance(options).first(1)
+        by_distance(options).limit(1)
       end
       alias nearest closest
 
       def farthest(options = {})
-        by_distance(options).last(1)
+        by_distance({:reverse => true}.merge(options)).limit(1)
       end
 
       #def geo_scope(options = {})
@@ -162,9 +162,9 @@ module Geokit
 
       #    if origin
       #      arel.distance_formula = distance_sql(origin, units, formula)
-      #      
+      #
       #      if arel.select_values.blank?
-      #        star_select = Arel::SqlLiteral.new(arel.quoted_table_name + '.*')
+      #        star_select = Arel::Nodes::SqlLiteral.new(arel.quoted_table_name + '.*')
       #        arel = arel.select(star_select)
       #      end
       #    end
@@ -234,14 +234,14 @@ module Geokit
         elsif options.has_key?(:range)
           "#{distance_column_name} >= #{options[:range].first} AND #{distance_column_name} <#{'=' unless options[:range].exclude_end?} #{options[:range].last}"
         end
-        Arel::SqlLiteral.new("(#{res})") if res.present?
+        Arel::Nodes::SqlLiteral.new("(#{res})") if res.present?
       end
 
       def bound_conditions(bounds)
         sw,ne = bounds.sw, bounds.ne
         lng_sql = bounds.crosses_meridian? ? "(#{qualified_lng_column_name}<#{ne.lng} OR #{qualified_lng_column_name}>#{sw.lng})" : "#{qualified_lng_column_name}>#{sw.lng} AND #{qualified_lng_column_name}<#{ne.lng}"
         res = "#{qualified_lat_column_name}>#{sw.lat} AND #{qualified_lat_column_name}<#{ne.lat} AND #{lng_sql}"
-        #Arel::SqlLiteral.new("(#{res})") if res.present?
+        #Arel::Nodes::SqlLiteral.new("(#{res})") if res.present?
         res if res.present?
       end
 
@@ -315,10 +315,12 @@ module Geokit
       # Returns the distance SQL using the spherical world formula (Haversine).  The SQL is tuned
       # to the database in use.
       def sphere_distance_sql(origin, units)
-        lat = deg2rad(origin.lat)
-        lng = deg2rad(origin.lng)
+        # "origin" can be a Geokit::LatLng (with :lat and :lng methods), e.g.
+        # when using geo_scope or it can be an ActsAsMappable with customized
+        # latitude and longitude methods, e.g. when using distance_sql.
+        lat = deg2rad(get_lat(origin))
+        lng = deg2rad(get_lng(origin))
         multiplier = units_sphere_multiplier(units)
-
         adapter.sphere_distance_sql(lat, lng, multiplier) if adapter
       end
 
@@ -326,11 +328,20 @@ module Geokit
       # to the database in use.
       def flat_distance_sql(origin, units)
         lat_degree_units = units_per_latitude_degree(units)
-        lng_degree_units = units_per_longitude_degree(origin.lat, units)
-
+        lng_degree_units = units_per_longitude_degree(get_lat(origin), units)
         adapter.flat_distance_sql(origin, lat_degree_units, lng_degree_units)
       end
 
+      def get_lat(origin)
+        origin.respond_to?(:lat) ? origin.lat \
+                                 : origin.send(:"#{lat_column_name}")
+      end
+
+      def get_lng(origin)
+        origin.respond_to?(:lng) ? origin.lng \
+                                 : origin.send(:"#{lng_column_name}")
+      end
+
     end # ClassMethods
 
     # this is the callback for auto_geocoding
@@ -339,8 +350,8 @@ module Geokit
       geo=Geokit::Geocoders::MultiGeocoder.geocode(address)
 
       if geo.success
-        self.send("#{lat_column_name}=", geo.lat)
-        self.send("#{lng_column_name}=", geo.lng)
+        self.send("#{lat_column_name}=", geo.send(:"#{lat_column_name}"))
+        self.send("#{lng_column_name}=", geo.send(:"#{lng_column_name}"))
       else
         errors.add(auto_geocode_field, auto_geocode_error_message)
       end

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

@@ -0,0 +1,32 @@
+module Geokit
+  module Adapters
+    class OracleEnhanced < Abstract
+      TO_DEGREES = Math::PI / 180
+      def sphere_distance_sql(lat, lng, multiplier)
+        %{
+(
+  ACOS(
+    COS(#{lat}) * COS(#{lng}) *
+    COS(#{TO_DEGREES} * #{qualified_lat_column_name}) *
+    COS(#{TO_DEGREES} * #{qualified_lng_column_name}) +
+    COS(#{lat}) * SIN(#{lng}) *
+    COS(#{TO_DEGREES} * #{qualified_lat_column_name}) *
+    SIN(#{TO_DEGREES} * #{qualified_lng_column_name}) +
+    SIN(#{lat}) *
+    SIN(#{TO_DEGREES} * #{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

data/lib/geokit-rails/version.rb

@@ -1,3 +1,3 @@
 module GeokitRails
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/test/acts_as_mappable_test.rb

@@ -175,6 +175,10 @@ class ActsAsMappableTest < GeokitTestCase
     assert_equal @loc_a, Location.nearest(:origin =>[@loc_a.lat, @loc_a.lng]).first
   end
 
+  def test_find_nearest_is_scope
+    assert Location.nearest(:origin => @loc_a).respond_to? :where
+  end
+
   def test_find_farthest
     assert_equal @loc_e, Location.farthest(:origin => @loc_a).first
   end
@@ -183,6 +187,10 @@ class ActsAsMappableTest < GeokitTestCase
     assert_equal @loc_e, Location.farthest(:origin =>[@loc_a.lat, @loc_a.lng]).first
   end
 
+  def test_find_farthest_is_scope
+    assert Location.farthest(:origin => @loc_a).respond_to? :where
+  end
+
   def test_scoped_distance_column_in_select
     #locations = @starbucks.locations.geo_scope(:origin => @loc_a).order("distance ASC")
     locations = @starbucks.locations.by_distance(:origin => @loc_a)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Noack
@@ -11,166 +11,194 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: geokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: simplecov-rcov
   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
+    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: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: 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
     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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !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
   name: sqlite3
   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'
 description: Official Geokit plugin for Rails/ActiveRecord. Provides location-based
   goodness for your Rails app. Requires the Geokit gem.
 email:
-- michael@noack.com.au
+- michael+geokit@noack.com.au
 - andre@earthcode.com
 - bill_eisenhauer@yahoo.com
 - jeremy.lecour@gmail.com
@@ -178,55 +206,61 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
+- CONFIG.markdown
+- Gemfile
+- MIT-LICENSE
+- README.markdown
+- Rakefile
+- gemfiles/rails3.gemfile
+- gemfiles/rails4.gemfile
+- geokit-rails.gemspec
 - lib/geokit-rails.rb
-- lib/geokit-rails/adapters/sqlite.rb
-- lib/geokit-rails/adapters/mysql2spatial.rb
-- lib/geokit-rails/adapters/mysql.rb
+- lib/geokit-rails/acts_as_mappable.rb
 - lib/geokit-rails/adapters/abstract.rb
-- lib/geokit-rails/adapters/sqlserver.rb
+- lib/geokit-rails/adapters/mysql.rb
 - lib/geokit-rails/adapters/mysql2.rb
+- lib/geokit-rails/adapters/mysql2spatial.rb
+- lib/geokit-rails/adapters/oracleenhanced.rb
 - lib/geokit-rails/adapters/postgresql.rb
-- lib/geokit-rails/defaults.rb
+- lib/geokit-rails/adapters/sqlite.rb
+- lib/geokit-rails/adapters/sqlserver.rb
 - lib/geokit-rails/core_extensions.rb
-- lib/geokit-rails/version.rb
-- lib/geokit-rails/acts_as_mappable.rb
-- lib/geokit-rails/ip_geocode_lookup.rb
+- lib/geokit-rails/defaults.rb
 - lib/geokit-rails/geocoder_control.rb
+- lib/geokit-rails/ip_geocode_lookup.rb
 - lib/geokit-rails/railtie.rb
+- lib/geokit-rails/version.rb
+- test/acts_as_mappable_test.rb
+- test/boot.rb
+- test/database.yml
+- test/fixtures/companies.yml
+- test/fixtures/custom_locations.yml
+- test/fixtures/locations.yml
+- test/fixtures/mock_addresses.yml
+- test/fixtures/mock_families.yml
+- test/fixtures/mock_houses.yml
+- test/fixtures/mock_organizations.yml
+- test/fixtures/mock_people.yml
+- test/fixtures/stores.yml
+- test/ip_geocode_lookup_test.disabled.rb
+- test/models/company.rb
 - test/models/custom_location.rb
 - test/models/location.rb
-- test/models/store.rb
-- test/models/mock_organization.rb
 - test/models/mock_address.rb
-- test/models/mock_person.rb
-- test/models/company.rb
 - test/models/mock_family.rb
 - test/models/mock_house.rb
-- test/mysql2-debug.log
-- test/database.yml
-- test/test.sqlite3
-- test/mysql-debug.log
+- test/models/mock_organization.rb
+- test/models/mock_person.rb
+- test/models/store.rb
 - test/schema.rb
 - test/tasks.rake
-- test/ip_geocode_lookup_test.disabled.rb
-- test/sqlite-debug.log
-- test/postgresql-debug.log
-- test/fixtures/mock_families.yml
-- test/fixtures/companies.yml
-- test/fixtures/stores.yml
-- test/fixtures/mock_addresses.yml
-- test/fixtures/mock_people.yml
-- test/fixtures/custom_locations.yml
-- test/fixtures/mock_houses.yml
-- test/fixtures/locations.yml
-- test/fixtures/mock_organizations.yml
-- test/postgres-debug.log
-- test/boot.rb
 - test/test_helper.rb
-- test/acts_as_mappable_test.rb
-- test/mysql2spatial-debug.log
 homepage: http://github.com/geokit/geokit-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -234,50 +268,43 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Integrate Geokit with Rails
+summary: Geokit helpers for rails apps.
 test_files:
+- test/acts_as_mappable_test.rb
+- test/boot.rb
+- test/database.yml
+- test/fixtures/companies.yml
+- test/fixtures/custom_locations.yml
+- test/fixtures/locations.yml
+- test/fixtures/mock_addresses.yml
+- test/fixtures/mock_families.yml
+- test/fixtures/mock_houses.yml
+- test/fixtures/mock_organizations.yml
+- test/fixtures/mock_people.yml
+- test/fixtures/stores.yml
+- test/ip_geocode_lookup_test.disabled.rb
+- test/models/company.rb
 - test/models/custom_location.rb
 - test/models/location.rb
-- test/models/store.rb
-- test/models/mock_organization.rb
 - test/models/mock_address.rb
-- test/models/mock_person.rb
-- test/models/company.rb
 - test/models/mock_family.rb
 - test/models/mock_house.rb
-- test/mysql2-debug.log
-- test/database.yml
-- test/test.sqlite3
-- test/mysql-debug.log
+- test/models/mock_organization.rb
+- test/models/mock_person.rb
+- test/models/store.rb
 - test/schema.rb
 - test/tasks.rake
-- test/ip_geocode_lookup_test.disabled.rb
-- test/sqlite-debug.log
-- test/postgresql-debug.log
-- test/fixtures/mock_families.yml
-- test/fixtures/companies.yml
-- test/fixtures/stores.yml
-- test/fixtures/mock_addresses.yml
-- test/fixtures/mock_people.yml
-- test/fixtures/custom_locations.yml
-- test/fixtures/mock_houses.yml
-- test/fixtures/locations.yml
-- test/fixtures/mock_organizations.yml
-- test/postgres-debug.log
-- test/boot.rb
 - test/test_helper.rb
-- test/acts_as_mappable_test.rb
-- test/mysql2spatial-debug.log