mongoid-geospatial 5.1.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c947554ea1c07198ca1c8b7c649ed93464fd1a08c6c71a2b2752e826344f049
-  data.tar.gz: 49d2636d235a0b91671564db6807241a4600d40070089e3d2729dd598151b2d2
+  metadata.gz: c175628dbf99da911bb81c3c25b2665b3547506f910366a53d43eaabea99e410
+  data.tar.gz: 8e38f228cc16e9a17cbe44dd2be01bd06e989d5e91d968a9b50a1885cc12eb8e
 SHA512:
-  metadata.gz: 8da975f59a71106fc991043f1438f5c7c910e1e7c2cc78f7e112062bee9fc34a966ecf80a39ec423230805aa6756f0c01e5882085fb5e701618b0ec7d4d6b6f5
-  data.tar.gz: 8c8c89eec0397d1a0e3bcae04ca972ef5b3aa82094d76b4b060c53c2bb6dbc4eb058bc80cfb0d9c5b5fbb7b217aaed973212b98193247c3cfe079fb5de67a489
+  metadata.gz: a09b65028e7d0b27a88383dac691372e6b456ad0d72b3ef0159e8e9e33d7f6da78cb250038c6d592bbb667d9a6f6f864ac1ae8278eaed41b69277d0290a47399
+  data.tar.gz: 843567a6bbe62c5551cd962c70a927e2dd8e19968c741ea014e384cf942b99aa75fa382969fe139cc07c835249fb7d864421713cb5e324e0495615fc14b7d30e

data/.rubocop.yml

@@ -1,6 +1,8 @@
-AllCops:
-  Exclude:
-    - vendor/**/*
-    - bin/**/*
+# Omakase Ruby styling for Rails
+inherit_gem: { rubocop-rails-omakase: rubocop.yml }
 
-inherit_from: .rubocop_todo.yml
+# Overwrite or add rules to create your own house style
+#
+# # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`
+# Layout/SpaceInsideArrayLiteralBrackets:
+#   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.1.1 (Next)
+
+* Your contribution here.
+
 ## 5.1.0 (2018/11/09)
 
 * [#61](https://github.com/mongoid/mongoid-geospatial/pull/64): Add global configuration for switching between LngLat and LatLng - [@dblock](https://github.com/dblock).

data/Gemfile

@@ -1,37 +1,17 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-case version = ENV['MONGOID_VERSION'] || '7'
-when 'HEAD'
-  gem 'mongoid', github: 'mongodb/mongoid'
-when /^7/
-  gem 'mongoid', '~> 7.0.0'
-when /^6/
-  gem 'mongoid', '~> 6.0.0'
-when /^5/
-  gem 'mongoid', '~> 5.0'
-else
-  gem 'mongoid', version
-end
+gem 'mongoid'
 
 gemspec
 
 group :development, :test do
   gem 'fuubar'
+  gem 'rake'
   gem 'guard'
   gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'pry'
-  gem 'rake'
-  gem 'yard'
+  gem 'rubocop'
 end
 
 group :test do
   gem 'coveralls', require: false if ENV['CI']
-  gem 'dbf'
-  gem 'georuby'
-  gem 'mongoid-danger', '~> 0.1.0', require: false
-  gem 'nokogiri'
-  gem 'rgeo'
-  gem 'rspec'
-  gem 'rubocop', '0.60.0'
 end

data/README.md

@@ -1,5 +1,4 @@
-Mongoid Geospatial
-==================
+# Mongoid Geospatial
 
 A Mongoid Extension that simplifies the use of MongoDB spatial features.
 
@@ -8,8 +7,7 @@ A Mongoid Extension that simplifies the use of MongoDB spatial features.
 [![Coverage Status](https://coveralls.io/repos/github/mongoid/mongoid-geospatial/badge.svg?branch=master)](https://coveralls.io/github/mongoid/mongoid-geospatial?branch=master)
 [![Build Status](https://travis-ci.org/mongoid/mongoid-geospatial.svg?branch=master)](https://travis-ci.org/mongoid/mongoid-geospatial)
 
-Quick Start
------------
+## Quick Start
 
 This gem focuses on (making helpers for) MongoDB's spatial features using Mongoid 5, 6 and 7.
 
@@ -60,17 +58,16 @@ Or programatically:
 Place.create_indexes
 ```
 
-Points
-------
+## Points
 
 This gem defines a specific `Point` class under the Mongoid::Geospatial namespace. Make sure to use `type: ::Mongoid::Geospatial::Point` to avoid name errors or collisions with other `Point` classes you might already have defined `NameError`s.
 
 Currently, MongoDB supports query operations on 2D points only, so that's what this lib does. All geometries apart from points are just arrays in the database. Here's is how you can input a point as:
 
-* longitude latitude array in that order - [long,lat] ([x, y])
-* an unordered hash with latitude key(:lat, :latitude) and a longitude key(:lon, :long, :lng, :longitude)
-* an ordered hash with longitude as the first item and latitude as the second item; this hash does not have include the latitude and longitude keys
-* anything with the a method #to_xy or #to_lng_lat that converts itself to  [long, lat] array
+- longitude latitude array in that order - [long,lat] ([x, y])
+- an unordered hash with latitude key(:lat, :latitude) and a longitude key(:lon, :long, :lng, :longitude)
+- an ordered hash with longitude as the first item and latitude as the second item; this hash does not have include the latitude and longitude keys
+- anything with the a method #to_xy or #to_lng_lat that converts itself to [long, lat] array
 
 _Note: the convention of having longitude as the first coordinate may vary for other libraries. For instance, Google Maps often refer to "LatLng". Make sure you keep those differences in mind. See below for how to configure this library for LatLng._
 
@@ -131,8 +128,7 @@ house.area.bbox    # Returns polygon bounding_box (envelope)
 house.area.center  # Returns calculate middle point
 ```
 
-Model Setup
------------
+## Model Setup
 
 You can create Point, Line, Circle, Box and Polygon on your models:
 
@@ -157,8 +153,7 @@ class CrazyGeom
 end
 ```
 
-Helpers
--------
+## Helpers
 
 You can use `spatial: true` to add a '2d' index automatically,
 No need for `spatial_index :location`:
@@ -181,8 +176,7 @@ field :location,  type: Point, delegate: true
 
 Now instead of `instance.location.x` you may call `instance.x`.
 
-Nearby
-------
+## Nearby
 
 You can add a `spatial_scope` on your models. So you can query:
 
@@ -202,8 +196,7 @@ Good when you're drunk. Just add to your model:
 spatial_scope :<field>
 ```
 
-Geometry
---------
+## Geometry
 
 You can also store Circle, Box, Line (LineString) and Polygons.
 Some helper methods are available to them:
@@ -224,8 +217,7 @@ polygon.radius(5)        # [[1.0, 1.0], 5]
 polygon.radius_sphere(5) # [[1.0, 1.0], 0.00048..]
 ```
 
-Query
------
+## Query
 
 Before you proceed, make sure you have read this:
 
@@ -237,21 +229,21 @@ http://www.rubydoc.info/github/mongoid/origin/Origin/Selectable
 
 You can use Geometry instance directly on any query:
 
-* near
+- near
 
 ```ruby
 Bar.near(location: person.house)
 Bar.where(:location.near => person.house)
 ```
 
-* near_sphere
+- near_sphere
 
 ```ruby
 Bar.near_sphere(location: person.house)
 Bar.where(:location.near_sphere => person.house)
 ```
 
-* within_polygon
+- within_polygon
 
 ```ruby
 Bar.within_polygon(location: [[[x,y],...[x,y]]])
@@ -259,13 +251,11 @@ Bar.within_polygon(location: [[[x,y],...[x,y]]])
 Bar.within_polygon(location: street.bbox)
 ```
 
-* intersects_line
-* intersects_point
-* intersects_polygon
+- intersects_line
+- intersects_point
+- intersects_polygon
 
-
-External Libraries
-------------------
+## External Libraries
 
 We currently support GeoRuby and RGeo.
 If you require one of those, a #to_geo and #to_rgeo, respectivelly,
@@ -338,8 +328,7 @@ end
 
 You will need to manually migrate any existing `Point` data if you change configuration in an existing system.
 
-This Fork
----------
+## This Fork
 
 This fork is not backwards compatible with 'mongoid_spacial'.
 This fork delegates calculations to external libs.
@@ -370,8 +359,7 @@ field :source,  type: Point,    spatial: true # or sphere: true
 
 Beware the 't' and 'c' issue. It's spaTial.
 
-Troubleshooting
----------------
+## Troubleshooting
 
 **Mongo::OperationFailure: can't find special index: 2d**
 
@@ -387,15 +375,12 @@ Programatically
 Model.create_indexes
 ```
 
-Contributing
-------------
+## Contributing
 
 See [CONTRIBUTING](CONTRIBUTING.md).
 
-License
--------
+## License
 
 Copyright (c) 2009-2017 Mongoid Geospatial Authors
 
 MIT License, see [MIT-LICENSE](MIT-LICENSE).
-

data/lib/mongoid/geospatial/fields/point.rb

@@ -49,7 +49,7 @@ module Mongoid
       # @return [Array] with [self, radius]
       #
       def radius(r = 1)
-        [mongoize, r]
+        [ mongoize, r ]
       end
 
       #
@@ -85,6 +85,18 @@ module Mongoid
         "#{x}, #{y}"
       end
 
+      #
+      # Point definition as GeoJSON
+      #
+      # "x, y"
+      #
+      # @return [String] Point as comma separated String
+      #
+      def to_geo_json
+        # Return a GeoJSON point hash that MongoDB can use
+        { type: "Point", coordinates: [x, y] }
+      end
+
       #
       # Point inverse/reverse
       #

data/lib/mongoid/geospatial/helpers/sphere.rb

@@ -11,6 +11,6 @@ Mongoid::Fields.option :sphere do |model, field, _options|
     spatial_fields_indexed << field.name.to_sym
 
     # Create 2Dsphere index
-    sphere_index field.name
+    spherical_index field.name
   end
 end

data/lib/mongoid/geospatial/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   # Mongoid Geospatial version
   module Geospatial
-    VERSION = '5.1.0'.freeze
+    VERSION = '7.0.0'.freeze
   end
 end

data/lib/mongoid/geospatial.rb

@@ -1,6 +1,5 @@
 require 'mongoid'
-# require 'active_support/core_ext/string/inflections'
-# require 'active_support/concern'
+require 'active_support/concern' # Explicitly require for `extend ActiveSupport::Concern`
 require 'mongoid/geospatial/helpers/spatial'
 require 'mongoid/geospatial/helpers/sphere'
 require 'mongoid/geospatial/helpers/delegate'
@@ -55,7 +54,6 @@ module Mongoid
     @@earth_radius = EARTH_RADIUS.dup
 
     included do
-      # attr_accessor :geo
       cattr_accessor :spatial_fields, :spatial_fields_indexed
       self.spatial_fields = []
       self.spatial_fields_indexed = []
@@ -72,14 +70,10 @@ module Mongoid
     # Methods applied to Document's class
     module ClassMethods
       #
-      # Create Spatial index for given field
+      # Creates a 2d spatial index for the given field.
       #
-      #
-      # @param [String,Symbol] name
-      # @param [Hash] options options for spatial_index
-      #
-      # http://www.mongodb.org/display/DOCS/Geospatial+Indexing
-      # #GeospatialIndexing-geoNearCommand
+      # @param name [String, Symbol] The name of the field to index.
+      # @param options [Hash] Additional options for the index.
       #
       def spatial_index(name, options = {})
         spatial_fields_indexed << name
@@ -87,36 +81,117 @@ module Mongoid
       end
 
       #
-      # Creates Sphere index for given field
-      #
+      # Creates a 2dsphere index for the given field, suitable for spherical geometry calculations.
       #
-      # @param [String,Symbol] name
-      # @param [Hash] options options for spatial_index
+      # @param name [String, Symbol] The name of the field to index.
+      # @param options [Hash] Additional options for the index.
       #
-      # http://www.mongodb.org/display/DOCS/Geospatial+Indexing
-      # #GeospatialIndexing-geoNearCommand
-      def sphere_index(name, options = {})
+      def spherical_index(name, options = {})
         spatial_fields_indexed << name
         index({ name => '2dsphere' }, options)
       end
 
       #
-      # Creates Sphere index for given field
+      # Defines a class method to find the closest document to a given point
+      # using the specified spatial field via the `geoNear` command.
       #
+      # @param field_name [String, Symbol] The name of the spatial field to query.
+      # @param default_geo_near_options [Hash] Default options for the geoNear command
+      #        (e.g., `{ spherical: true, max_distance: 1000 }`).
+      #        The `key` option will be automatically set to `field_name`.
       #
-      # @param [String,Symbol] name
-      # @param [Hash] options options for spatial_index
+      # Example:
+      #   class Place
+      #     include Mongoid::Document
+      #     include Mongoid::Geospatial
+      #     field :location, type: Array
+      #     spherical_index :location # Assumes a 2dsphere index for spherical queries
+      #     spatial_scope :location, spherical: true # Default to spherical for this scope
+      #   end
       #
-      # http://www.mongodb.org/display/DOCS/Geospatial+Indexing
-      # #GeospatialIndexing-geoNearCommand
-      def spatial_scope(field, _opts = {})
+      #   Place.closest_to_location([lon, lat]) # Finds the single closest place
+      #   Place.closest_to_location([lon, lat], max_distance: 500) # Override/add options
+      #
+      def spatial_scope(field_name, default_geo_near_options = {})
+        method_name    = :"closest_to_#{field_name}"
+        field_name_sym = field_name.to_sym
+        # key_name       = field_name.to_s # Original geoNear used 'key' for field name
+
         singleton_class.class_eval do
-          # define_method(:close) do |args|
-          define_method(:nearby) do |args|
-            queryable.where(field.near_sphere => args)
+          define_method(method_name) do |coordinates, additional_options = {}|
+            # `coordinates` should be [lon, lat] or a GeoJSON Point hash
+            # `self` here is the class (e.g., Bar)
+
+            merged_options = default_geo_near_options.merge(additional_options)
+
+            # Determine if spherical based on options or field definition
+            is_spherical = if merged_options.key?(:spherical)
+                             merged_options[:spherical]
+                           else
+                             # self.fields uses string keys for field names
+                             field_def = self.fields[field_name.to_s]
+                             field_def && field_def.options[:sphere]
+                           end
+            query_operator = is_spherical ? :near_sphere : :near
+
+            # Prepare the value for the geospatial operator
+            # Mongoid::Geospatial::Point.mongoize ensures coordinates are in [lng, lat] array format
+            # from various input types (Point object, array, string, hash).
+            mongoized_coords = Mongoid::Geospatial::Point.mongoize(coordinates)
+
+            geo_query_value = if merged_options[:max_distance]
+                                {
+                                  # Using $geometry for clarity when $maxDistance is used,
+                                  # which is standard for $near/$nearSphere operators.
+                                  "$geometry"    => { type: "Point", coordinates: mongoized_coords },
+                                  "$maxDistance" => merged_options[:max_distance].to_f
+                                }
+                              else
+                                mongoized_coords # Simple array [lng, lat] for the operator
+                              end
+
+            # Start with a base criteria, applying an optional filter query
+            current_criteria = merged_options[:query] ? self.where(merged_options[:query]) : self.all
+
+            # Apply the geospatial query. $near and $nearSphere queries return sorted results.
+            current_criteria.where(field_name_sym.send(query_operator) => geo_query_value)
           end
         end
       end
+
+      #
+      # Provides a convenient way to find documents near a given set of coordinates.
+      # It automatically uses the first spatial field defined in the model and
+      # determines whether to use a planar (.near) or spherical (.near_sphere)
+      # query based on the field's definition options (`spatial: true` vs `sphere: true`).
+      #
+      # @param coordinates [Array, Mongoid::Geospatial::Point] The coordinates (e.g., [lon, lat])
+      #   or a Point object to find documents near to.
+      # @param _options [Hash] Optional hash for future extensions (currently unused).
+      #
+      # @return [Mongoid::Criteria] A criteria object for the query.
+      #
+      # Example:
+      #   Bar.nearby([10, 20])
+      #   Alarm.nearby(my_point_object)
+      #
+      def nearby(coordinates, _options = {})
+        if self.spatial_fields.empty?
+          raise "No spatial fields defined for #{self.name} to use with .nearby. " \
+                "Mark a field with 'spatial: true' or 'sphere: true'."
+        end
+
+        field_name_sym = self.spatial_fields.first.to_sym
+        field_definition = self.fields[field_name_sym.to_s]
+
+        unless field_definition
+          raise "Could not find field definition for spatial field: #{field_name_sym}"
+        end
+
+        query_operator = field_definition.options[:sphere] ? :near_sphere : :near
+
+        criteria.where(field_name_sym.send(query_operator) => coordinates)
+      end
     end
   end
 end

data/spec/models/bar.rb

@@ -9,5 +9,6 @@ class Bar
 
   has_one :rating, as: :ratable
 
+  spherical_index :location
   spatial_scope :location
 end

data/spec/models/person.rb

@@ -60,11 +60,6 @@ class Person
   scope :minor, -> { where(:age.lt => 18) }
   scope :without_ssn, -> { without(:ssn) }
 
-  def score_with_rescoring=(score)
-    @rescored = score.to_i + 20
-    self.score_without_rescoring = score
-  end
-
   def update_addresses
     addresses.each do |address|
       address.street = 'Updated Address'

data/spec/models/river.rb

@@ -3,14 +3,14 @@ class River
   include Mongoid::Document
   include Mongoid::Geospatial
 
-  field :name,       type: String
-  field :length,     type: Integer
-  field :discharge,  type: Integer
-  field :course,     type: LineString,   spatial: true
+  field :name,        type: String
+  field :length,      type: Integer
+  field :discharge,   type: Integer
+  field :course,      type: LineString,   spatial: true
   # set return_array to true if you do not want a hash returned all the time
-  field :source,     type: Point,        spatial: true
-  field :mouth,      type: Point, spatial: { lat: 'latitude', lng: 'longitude' }
-  field :mouth_array, type: Array, spatial: { return_array: true }
+  field :source,      type: Point,        spatial: true
+  field :mouth,       type: Point,        spatial: { lat: 'latitude', lng: 'longitude' }
+  field :mouth_array, type: Array,        spatial: { return_array: true }
 
   # simplified spatial indexing
   # you can only index one field in mongodb < 1.9

data/spec/mongoid/geospatial/fields/line_string_spec.rb

@@ -22,12 +22,11 @@ describe Mongoid::Geospatial::LineString do
       expect(River.first.course).to eq([[1, 1], [9, 9], [10, 10]])
     end
 
-    it 'should parent.line_string << point nicely' do
-      pending 'Mongoid Issue #...'
+    it 'should NOT parent.line_string << point nicely (mongoid doesnt track <<)' do
       river = River.create!(name: 'Amazonas', course: [[1, 1], [9, 9]])
-      river.course.push [10, 10]
+      river.course << [10, 10]
       river.save
-      expect(River.first.course).to eq([[1, 1], [9, 9], [10, 10]])
+      expect(River.first.course).to eq([[1, 1], [9, 9]])
     end
 
     it 'should have same obj id' do

data/spec/mongoid/geospatial/fields/point_spec.rb

@@ -53,6 +53,28 @@ describe Mongoid::Geospatial::Point do
     end
   end
 
+  it "should have a to_s method" do
+    bar = Bar.create!(name: "Moe's", location: [1, 2])
+    expect(bar.location.to_s).to eq('1.0, 2.0')
+  end
+
+  it "should have a to_s method" do
+    bar = Bar.create!(name: "Moe's", location: [1.0009, 21.009])
+    expect(bar.location.to_s).to eq('1.0009, 21.009')
+  end
+
+  it "should have a to_geo_json method" do
+    bar = Bar.create!(name: "Moe's", location: [1.0009, 21.009])
+    expect(bar.location.to_geo_json).to eq({
+      type: "Point", coordinates: [1.0009, 21.009]
+    })
+  end
+
+  it "should have a to_json method" do
+    bar = Bar.create!(name: "Moe's", location: [1.0009, 21.009])
+    expect(bar.location.to_json).to eq("[1.0009,21.009]")
+  end
+
   it 'should have #reverse to get lat, lon' do
     bar = Bar.create!(name: "Moe's", location: [1, 2])
     expect(bar.location.reverse).to eq([2, 1])
@@ -147,7 +169,12 @@ describe Mongoid::Geospatial::Point do
       end
 
       it 'returns the documents sorted closest to furthest' do
-        expect(Bar.where(:location.near => jim.location))
+        expect(Bar.closest_to_location(jim.location).to_a)
+          .to eq([paris, prague, berlin])
+      end
+
+      it 'returns the documents sorted closest to furthest' do
+        expect(Bar.where(:location.near => jim.location).to_a)
           .to eq([paris, prague, berlin])
       end
 
@@ -258,7 +285,7 @@ describe Mongoid::Geospatial::Point do
 
     describe 'with rgeo' do
       describe 'instantiated' do
-        let(:bar) { Bar.create!(name: 'Vitinho', location: [10, 10]) }
+        let(:bar) { Bar.new(name: 'Vitinho', location: [10, 10]) }
 
         it 'should demongoize to rgeo' do
           expect(bar.location.class).to eql(Mongoid::Geospatial::Point)

data/spec/mongoid/geospatial/fields/polygon_spec.rb

@@ -49,20 +49,20 @@ describe Mongoid::Geospatial::Polygon do
         Farm.create_indexes
       end
 
-      let!(:ranch) do
+      let(:ranch) do
         Farm.create!(name: 'Ranch',
                      area: [[1, 1], [3, 3], [3, 1], [1, 1]],
                      geom: [2, 2])
       end
 
-      let!(:farm) do
+      let(:farm) do
         Farm.create!(name: 'Farm',
                      area: [[47, 1], [48, 1.5], [49, 3], [49, 1], [47, 1]],
                      geom: [48, 1.28])
       end
 
       it 'returns the documents within a box' do
-        query = Farm.geo_spacial(:geom.within_polygon => [ranch.area])
+        query = Farm.geo_spatial(:geom.within_polygon => [ranch.area])
         expect(query.to_a).to eq([ranch])
       end
 

data/spec/mongoid/geospatial/geospatial_spec.rb

@@ -29,25 +29,97 @@ describe Mongoid::Geospatial do
     before do
       Bar.create_indexes
     end
+    after do
+      Bar.collection.indexes.drop_all
+    end
 
-    let!(:jfk) do
-      Bar.create(name: 'jfk', location: [-73.77694444, 40.63861111])
+    let!(:moes) do
+      Bar.create!(name: "Moe's", location: [-73.77694444, 40.63861111])
     end
 
-    let!(:lax) do
-      Bar.create(name: 'lax', location: [-118.40, 33.94])
+    let!(:rose) do
+      Bar.create!(name: 'Rosa', location: [-118.40, 33.94])
+    end
+
+    let!(:jane) do
+      Bar.create!(name: "Jane's", location: [1, 1])
+    end
+
+    let!(:foo) do
+      Bar.create!(name: "Foo", location: [3, 3])
+    end
+
+    it 'should work specifing center and different location foo' do
+      expect(Bar.nearby(foo.location)).to be_a Mongoid::Criteria
+      expect(Bar.nearby(foo.location).selector).to eq({"location" => {"$near" => [3.0, 3.0]}})
+    end
+
+    it 'should work specifing center and different location moes' do
+      expect(Bar.nearby(moes.location).limit(2)).to eq([moes, rose])
+    end
+
+    it 'should work finding first' do
+      expect(Bar.nearby(moes.location).first).to eq(moes)
+    end
+
+    it 'really should work find first nearby' do
+      expect(Bar.count).to eq(4)
+      expect(Bar.nearby([1, 1]).to_a).to eq([jane, foo, moes, rose])
+      expect(Bar.nearby([2, 2]).to_a.first).to eq(jane)
+      # THIS WILL FAIL MONGOID ISSUE
+      # expect(Bar.nearby(rose.location).first).to eq(rose)
+    end
+
+    it 'should work specifing first' do
+      bars = Bar.nearby(rose.location).to_a
+      expect(bars.first).to eq(rose)
     end
 
-    it 'should work specifing center and different location' do
-      expect(Bar.nearby(lax.location)).to eq([lax, jfk])
+    it 'should work specifing first' do
+      expect(Bar.nearby(rose.location).to_a.first).to eq(rose)
     end
+
+    it 'should work specifing first' do
+      expect(Bar.nearby(rose.location).to_a.first).to eq(rose)
+    end
+
+    it 'should work specifing first' do
+      expect(Bar.nearby(rose.location).first).to eq(rose)
+    end
+
+    it 'returns the documents sorted closest to furthest' do
+      expect(Bar.closest_to_location(rose.location).to_a)
+        .to eq([rose, moes, jane, foo])
+    end
+
+    it 'returns the documents sorted closest to furthest' do
+      expect(Bar.closest_to_location(rose.location).limit(2))
+        .to eq([rose, moes])
+    end
+
+    it 'returns the documents sorted closest to furthest' do
+      expect(Bar.closest_to_location(rose.location).first).to eq(rose)
+    end
+
+    it 'returns the documents sorted closest to furthest' do
+      expect(Bar.closest_to_location(rose.location).to_a)
+        .to eq([rose, moes, jane, foo])
+    end
+
+    it 'should work specifing center and different location foo' do
+      expect(Bar.closest_to_location(foo.location)).to be_a Mongoid::Criteria
+      expect(Bar.closest_to_location(foo.location).selector).to eq({"location" => {"$near" => [3.0, 3.0]}})
+    end
+
   end
 
   context '#nearby 2dsphere' do
     before do
       Alarm.create_indexes
     end
-
+    after do
+      Alarm.collection.indexes.drop_all
+    end
     let!(:jfk) do
       Alarm.create(name: 'jfk', spot: [-73.77694444, 40.63861111])
     end

data/spec/mongoid/geospatial/helpers/spatial_spec.rb

@@ -12,9 +12,10 @@ describe Mongoid::Fields do
 
     it 'should create correct indexes' do
       expect(Bar.collection.indexes.get(location: '2d'))
-        .to include('key' => { 'location' => '2d' },
-                    'name' => 'location_2d',
-                    'ns' => 'mongoid_geo_test.bars')
+        .to eq('background' => false,
+               'key' => { 'location' => '2d' },
+               'name' => 'location_2d',
+               'v' => 2)
     end
 
     it 'should set spatial fields' do

data/spec/mongoid/geospatial/helpers/sphere_spec.rb

@@ -12,9 +12,11 @@ describe Mongoid::Fields do
 
     it 'should create correct indexes' do
       expect(Alarm.collection.indexes.get(spot: '2dsphere'))
-        .to include('key' => { 'spot' => '2dsphere' },
+        .to include('2dsphereIndexVersion' => 3,
+                    'background' => false,
+                    'key' => { 'spot' => '2dsphere' },
                     'name' => 'spot_2dsphere',
-                    'ns' => 'mongoid_geo_test.alarms')
+                    'v' => 2)
     end
 
     it 'should set spatial fields' do

data/spec/mongoid.yml

@@ -0,0 +1,298 @@
+development:
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
+    default:
+      # Mongoid can connect to a URI accepted by the driver:
+      # uri: mongodb://user:password@mongodb.domain.com:27017/queroir_development
+
+      # Otherwise define the parameters separately.
+      # This defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: mongoid_geospatial_dev
+      # Provides the hosts the default client can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        - localhost:28017
+      options:
+        # Note that all options listed below are Ruby driver client options (the mongo gem).
+        # Please refer to the driver documentation of the version of the mongo gem you are using
+        # for the most up-to-date list of options.
+
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        #   w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        # read:
+        #   mode: :secondary_preferred
+        #   tag_sets:
+        #     - use: web
+
+        # The name of the user for authentication.
+        # user: 'user'
+
+        # The password of the user for authentication.
+        # password: 'password'
+
+        # The user's database roles.
+        # roles:
+        #   - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options include:
+        # :scram, :scram256, :mongodb_cr, :mongodb_x509, :gssapi, :aws, :plain.
+        # MongoDB Server defaults to :scram, which will use "SCRAM-SHA-256" if available,
+        # otherwise fallback to "SCRAM-SHA-1" (:scram256 will always use "SCRAM-SHA-256".)
+        # This setting is handled by the MongoDB Ruby Driver. Please refer to:
+        # https://mongodb.com/docs/ruby-driver/current/reference/authentication/
+        # auth_mech: :scram
+
+        # The database or source to authenticate the user against.
+        # (default: the database specified above or admin)
+        # auth_source: admin
+
+        # Force the driver cluster to behave in a certain manner instead of auto-discovering.
+        # Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        # connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via hello commands. (default: 10)
+        # heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 0.015)
+        # local_threshold: 0.015
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        # server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        # max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        # min_pool_size: 1
+
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        # wait_queue_timeout: 5
+
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 10)
+        # connect_timeout: 10
+
+        # How long to wait for a response for each operation sent to the
+        # server. This timeout should be set to a value larger than the
+        # processing time for the longest operation that will be executed
+        # by the application. Note that this is a client-side timeout;
+        # the server may continue executing an operation after the client
+        # aborts it with the SocketTimeout exception.
+        # (default: nil, meaning no timeout)
+        # socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        # replica_set: name
+
+        # Compressors to use for wire protocol compression. (default is to not use compression)
+        # "zstd" requires zstd-ruby gem. "snappy" requires snappy gem.
+        # Refer to: https://www.mongodb.com/docs/ruby-driver/current/reference/create-client/#compression
+        # compressors: ["zstd", "snappy", "zlib"]
+
+        # Whether to connect to the servers via ssl. (default: false)
+        # ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        # ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        # ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        # ssl_key_pass_phrase: password
+
+        # Whether to do peer certification validation. (default: true)
+        # ssl_verify: true
+
+        # The file containing concatenated certificate authority certificates
+        # used to validate certs passed from the other end of the connection.
+        # ssl_ca_cert: /path/to/ca.cert
+
+        # Whether to truncate long log lines. (default: true)
+        # truncate_logs: true
+
+  # Configure Mongoid-specific options. (optional)
+  options:
+    # Allow BSON::Decimal128 to be parsed and returned directly in
+    # field values. When BSON 5 is present and the this option is set to false
+    # (the default), BSON::Decimal128 values in the database will be returned
+    # as BigDecimal.
+    #
+    # @note this option only has effect when BSON 5+ is present. Otherwise,
+    #   the setting is ignored.
+    # allow_bson5_decimal128: false
+
+    # When this flag is false, named scopes cannot unset a default scope.
+    # This is the traditional (and default) behavior in Mongoid 9 and earlier.
+    #
+    # Setting this flag to true will allow named scopes to unset the default
+    # scope. This will be the default in Mongoid 10.
+    #
+    # See https://jira.mongodb.org/browse/MONGOID-5785 for more details.
+    # allow_scopes_to_unset_default_scope: false
+
+    # Application name that is printed to the MongoDB logs upon establishing
+    # a connection. Note that the name cannot exceed 128 bytes in length.
+    # It is also used as the database name if the database name is not
+    # explicitly defined.
+    app_name: mongoid_geospatial
+
+    # When this flag is false, callbacks for embedded documents will not be
+    # called. This is the default in 9.0.
+    #
+    # Setting this flag to true restores the pre-9.0 behavior, where callbacks
+    # for embedded documents are called. This may lead to stack overflow errors
+    # if there are more than cicrca 1000 embedded documents in the root
+    # document's dependencies graph.
+    # See https://jira.mongodb.org/browse/MONGOID-5658 for more details.
+    # around_callbacks_for_embeds: false
+
+    # Sets the async_query_executor for the application. By default the thread pool executor
+    #   is set to `:immediate. Options are:
+    #
+    #   - :immediate - Initializes a single +Concurrent::ImmediateExecutor+
+    #   - :global_thread_pool - Initializes a single +Concurrent::ThreadPoolExecutor+
+    #      that uses the +async_query_concurrency+ for the +max_threads+ value.
+    # async_query_executor: :immediate
+
+    # Mark belongs_to associations as required by default, so that saving a
+    # model with a missing belongs_to association will trigger a validation
+    # error.
+    # belongs_to_required_by_default: true
+
+    # Set the global discriminator key.
+    # discriminator_key: "_type"
+
+    # Raise an exception when a field is redefined.
+    # duplicate_fields_exception: false
+
+    # Defines how many asynchronous queries can be executed concurrently.
+    # This option should be set only if `async_query_executor` is set
+    # to `:global_thread_pool`.
+    # global_executor_concurrency: nil
+
+    # When this flag is true, any attempt to change the _id of a persisted
+    # document will raise an exception (`Errors::ImmutableAttribute`).
+    # This is the default in 9.0. Setting this flag to false restores the
+    # pre-9.0 behavior, where changing the _id of a persisted
+    # document might be ignored, or it might work, depending on the situation.
+    # immutable_ids: true
+
+    # Include the root model name in json serialization.
+    # include_root_in_json: false
+
+    # # Include the _type field in serialization.
+    # include_type_for_serialization: false
+
+    # Whether to join nested persistence contexts for atomic operations
+    # to parent contexts by default.
+    # join_contexts: false
+
+    # When this flag is false (the default as of Mongoid 9.0), a document that
+    # is created or loaded will remember the storage options that were active
+    # when it was loaded, and will use those same options by default when
+    # saving or reloading itself.
+    #
+    # When this flag is true you'll get pre-9.0 behavior, where a document will
+    # not remember the storage options from when it was loaded/created, and
+    # subsequent updates will need to explicitly set up those options each time.
+    #
+    # For example:
+    #
+    #    record = Model.with(collection: 'other_collection') { Model.first }
+    #
+    # This will try to load the first document from 'other_collection' and
+    # instantiate it as a Model instance. Pre-9.0, the record object would
+    # not remember that it came from 'other_collection', and attempts to
+    # update it or reload it would fail unless you first remembered to
+    # explicitly specify the collection every time.
+    #
+    # As of Mongoid 9.0, the record will remember that it came from
+    # 'other_collection', and updates and reloads will automatically default
+    # to that collection, for that record object.
+    # legacy_persistence_context_behavior: false
+
+    # When this flag is false, a document will become read-only only once the
+    # #readonly! method is called, and an error will be raised on attempting
+    # to save or update such documents, instead of just on delete. When this
+    # flag is true, a document is only read-only if it has been projected
+    # using #only or #without, and read-only documents will not be
+    # deletable/destroyable, but they will be savable/updatable.
+    # When this feature flag is turned on, the read-only state will be reset on
+    # reload, but when it is turned off, it won't be.
+    # legacy_readonly: false
+
+    # The log level.
+    #
+    # It must be set prior to referencing clients or Mongo.logger,
+    # changes to this option are not be propagated to any clients and
+    # loggers that already exist.
+    #
+    # Additionally, only when the clients are configured via the
+    # configuration file is the log level given by this option honored.
+    # log_level: :info
+
+    # Store BigDecimals as Decimal128s instead of strings in the db.
+    # map_big_decimal_to_decimal128: true
+
+    # Preload all models in development, needed when models use inheritance.
+    # preload_models: false
+
+    # When this flag is true, callbacks for every embedded document will be
+    # called only once, even if the embedded document is embedded in multiple
+    # documents in the root document's dependencies graph.
+    # This is the default in 9.0. Setting this flag to false restores the
+    # pre-9.0 behavior, where callbacks are called for every occurrence of an
+    # embedded document. The pre-9.0 behavior leads to a problem that for multi
+    # level nested documents callbacks are called multiple times.
+    # See https://jira.mongodb.org/browse/MONGOID-5542
+    # prevent_multiple_calls_of_embedded_callbacks: true
+
+    # Raise an error when performing a #find and the document is not found.
+    # raise_not_found_error: true
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method.
+    # scope_overwrite_exception: false
+
+    # Return stored times as UTC.
+    use_utc: true
+
+  # Configure Driver-specific options. (optional)
+  driver_options:
+    # When this flag is off, an aggregation done on a view will be executed over
+    # the documents included in that view, instead of all documents in the
+    # collection. When this flag is on, the view fiter is ignored.
+    # broken_view_aggregate: true
+
+    # When this flag is set to false, the view options will be correctly
+    # propagated to readable methods.
+    # broken_view_options: true
+
+    # When this flag is set to true, the update and replace methods will
+    # validate the paramters and raise an error if they are invalid.
+    # validate_update_replace: false
+
+test:
+  clients:
+    default:
+      database: mongoid_geospatial_test
+      hosts:
+        - localhost:28017
+      options:
+        read:
+          mode: :primary
+        max_pool_size: 1

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# require 'pry'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
@@ -13,15 +12,16 @@ if ENV['CI']
 end
 
 require 'rspec'
-# require 'mongoid'
-# require "mocha"
 require 'mongoid/geospatial'
 
-LOGGER = Logger.new($stdout)
+Mongoid.load!(File.expand_path('../mongoid.yml', __FILE__), :test)
 
-Mongoid.configure do |config|
-  config.connect_to('mongoid_geo_test')
+if ENV['DEBUG'] == 'true'
+  Mongo::Logger.logger.level = Logger::DEBUG
+else
+  Mongo::Logger.logger.level = Logger::INFO
 end
+# Mongo::Logger.logger.level = Logger::DEBUG
 
 # Autoload every model for the test suite that sits in spec/app/models.
 Dir[File.join(MODELS, '*.rb')].sort.each do |file|
@@ -29,19 +29,14 @@ Dir[File.join(MODELS, '*.rb')].sort.each do |file|
   autoload name.camelize.to_sym, name
 end
 
-Dir[File.join(SUPPORT, '*.rb')].each { |file| require File.basename(file) }
+# Require all support files.
+Dir[File.join(SUPPORT, '*.rb')].sort.each { |file| require file }
 
 RSpec.configure do |config|
-  # config.mock_with(:mocha)
-
   config.before(:each) do
     Mongoid.purge!
     Mongoid::Geospatial::Config.reset!
   end
 end
 
-Mongo::Logger.logger.level = Logger::INFO if Mongoid::VERSION >= '5'
-
-# Mongoid.load!(File.expand_path('../support/mongoid.yml', __FILE__), :test)
-
 puts "Running with Mongoid v#{Mongoid::VERSION}"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-geospatial
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Ryan Ong
 - Marcos Piccinini
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -38,18 +37,15 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dangerfile
 - Gemfile
 - Guardfile
 - MIT-LICENSE
 - README.md
 - RELEASING.md
 - Rakefile
-- bench/bench
 - lib/mongoid/geospatial.rb
 - lib/mongoid/geospatial/config.rb
 - lib/mongoid/geospatial/config/point.rb
@@ -67,6 +63,7 @@ files:
 - lib/mongoid/geospatial/wrappers/georuby.rb
 - lib/mongoid/geospatial/wrappers/rgeo.rb
 - mongoid-geospatial.gemspec
+- spec/bench
 - spec/models/address.rb
 - spec/models/alarm.rb
 - spec/models/bar.rb
@@ -77,6 +74,7 @@ files:
 - spec/models/phone.rb
 - spec/models/place.rb
 - spec/models/river.rb
+- spec/mongoid.yml
 - spec/mongoid/geospatial/config_spec.rb
 - spec/mongoid/geospatial/fields/box_spec.rb
 - spec/mongoid/geospatial/fields/circle_spec.rb
@@ -98,7 +96,6 @@ homepage: https://github.com/mongoid/mongoid-geospatial
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -113,12 +110,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Mongoid Extension that simplifies MongoDB Geospatial Operations.
 test_files:
+- spec/bench
 - spec/models/address.rb
 - spec/models/alarm.rb
 - spec/models/bar.rb
@@ -129,6 +125,7 @@ test_files:
 - spec/models/phone.rb
 - spec/models/place.rb
 - spec/models/river.rb
+- spec/mongoid.yml
 - spec/mongoid/geospatial/config_spec.rb
 - spec/mongoid/geospatial/fields/box_spec.rb
 - spec/mongoid/geospatial/fields/circle_spec.rb

data/.rubocop_todo.yml

@@ -1,93 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2018-11-09 16:09:41 -0500 using RuboCop version 0.60.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 4
-# Configuration parameters: Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/DuplicatedGem:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 2
-Lint/DuplicateMethods:
-  Exclude:
-    - 'lib/mongoid/geospatial/fields/circle.rb'
-
-# Offense count: 3
-Metrics/AbcSize:
-  Max: 22
-
-# Offense count: 21
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 216
-
-# Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 11
-
-# Offense count: 1
-Naming/AccessorMethodName:
-  Exclude:
-    - 'spec/models/address.rb'
-
-# Offense count: 9
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
-  Exclude:
-    - 'lib/mongoid/geospatial/fields/point.rb'
-    - 'lib/mongoid/geospatial/geometry_field.rb'
-
-# Offense count: 3
-Style/ClassVars:
-  Exclude:
-    - 'lib/mongoid/geospatial.rb'
-
-# Offense count: 4
-Style/CommentedKeyword:
-  Exclude:
-    - 'lib/mongoid/geospatial/fields/point.rb'
-
-# Offense count: 6
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'bench/bench'
-    - 'lib/mongoid/geospatial/config.rb'
-    - 'lib/mongoid/geospatial/config/point.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: module_function, extend_self
-Style/ModuleFunction:
-  Exclude:
-    - 'lib/mongoid/geospatial/config.rb'
-    - 'lib/mongoid/geospatial/config/point.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'Guardfile'
-
-# Offense count: 15
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 113

data/Dangerfile

@@ -1 +0,0 @@
-danger.import_dangerfile(gem: 'mongoid-danger')