mongoid_geo 0.2.1.1 → 0.2.2

data/README.textile

@@ -138,9 +138,17 @@ end
 nearest_positions = Position.geoNear(another_address.location, :pos)
 
 # perform distance locations in Speherical mode inside Mongo DB (default is :plane)
-nearest_positions = Position.geoNear(another_address.location, :pos, :sphere)
+nearest_positions = Position.geoNear(another_address.location, :pos, :mode => :sphere)
+
+# other options supported are: :num, :maxDistance, distanceMultiplier, :query
+
 </pre>
 
+# if you need to operate on the Mongoid models referenced by the query result, simply call #to_models on it
+# Fx to get the city of the first model instance from the query result:
+
+@nearest_city = Position.geoNear(another_address.location, :pos).to_models.first.city@
+
 h2. Mongoid Geo extra inclusions
 
 Find addresses near a point using spherical distance calculation

data/lib/mongoid/geo/geo_near.rb

@@ -5,22 +5,48 @@ require 'mongoid/geo/haversine'
 
 module Mongoid
   module Geo
+    module Model
+      def to_model
+        clazz.where(:_id => _id).first
+      end
+    end
+    
+    module Models
+      def to_models
+        map do |m|
+          m.to_model
+        end
+      end
+    end
+    
     module Near
-      def geoNear(center, location_attribute, mode = :plane)
+      def geoNear(center, location_attribute, options = {})
         center = center.respond_to?(:collection) ? center.send(location_attribute) : center
-        query = create_query(self, center, mode)
-        create_result(query_result(self, query, center, location_attribute))
+        query = create_query(self, center, options)
+        create_result(query_result(self, query, center, location_attribute)).extend(Mongoid::Geo::Models)
       end
 
       protected
     
-      def create_query clazz, center, mode = :plane
-        BSON::OrderedHash.new.tap do |query|
-          query["geoNear"]    = clazz.to_s.tableize
-          query["near"]       = center
+      def create_query clazz, center, options = {}
+        num                 = options[:num]
+        maxDistance         = options[:maxDistance]
+        query               = options[:query]
+        distanceMultiplier  = options[:distanceMultiplier]        
+        mode                = options[:mode] || :plane
+
+        nq = BSON::OrderedHash.new.tap do |near_query|
+          near_query["geoNear"]      = clazz.to_s.tableize
+          near_query["near"]         = center
+          near_query["num"]          = num if num
+          near_query["maxDistance"]  = maxDistance if maxDistance
+          near_query["distanceMultiplier"]  = distanceMultiplier if distanceMultiplier
+          near_query["query"]        = query if query
+
           # works in mongodb 1.7 but still in beta and not supported by mongodb
-          query["spherical"]  = true if mode == :sphere
+          near_query["spherical"]  = true if mode == :sphere
         end
+        nq
       end      
 
       def query_result clazz, query, center, location_attribute
@@ -28,13 +54,15 @@ module Mongoid
         query_result = clazz.collection.db.command(query)['results'].sort_by do |r|
           loc = r['obj'][location_attribute.to_s]
           r['distance'] = Mongoid::Geo::Haversine.distance(lat, lon, loc[1], loc[0])
+          r['clazz'] = clazz
         end
       end
 
       def create_result query_result
         query_result.inject([]) do |result, qr|
-          res = Hashie::Mash.new(qr['obj'].to_hash)
-          res.dis = qr['distance']
+          res = Hashie::Mash.new(qr['obj'].to_hash).extend(Mongoid::Geo::Model)
+          res.clazz = qr['clazz']
+          res.distance = qr['distance']
           res._id = qr['obj']['_id'].to_s
           result.push(res)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.2.1.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154072780 !ruby/object:Gem::Requirement
+  requirement: &2153931280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2154072780
+  version_requirements: *2153931280
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2154072100 !ruby/object:Gem::Requirement
+  requirement: &2153930800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154072100
+  version_requirements: *2153930800
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2154071400 !ruby/object:Gem::Requirement
+  requirement: &2153930340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154071400
+  version_requirements: *2153930340
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &2154070740 !ruby/object:Gem::Requirement
+  requirement: &2153929860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2154070740
+  version_requirements: *2153929860
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2154070040 !ruby/object:Gem::Requirement
+  requirement: &2153929280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154070040
+  version_requirements: *2153929280
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com