mongoid_geo 0.2.5 → 0.2.6

data/README.textile

@@ -155,7 +155,11 @@ You can also use a #to_model method on an individual query result like this:
 
 # the model returned also has a distance accessor populated with the distance calculated by running the geoNear query 
 
-@nearest_distance = Position.geoNear(another_address.location, :pos).first.to_model.distance@
+@nearest_distance = Position.geoNear(another_address.location, :pos).first.to_model.distance@  
+
+You can now explicitly set/configure the Mongo DB version used. This will affect whether built-in Mongo DB distance calculation will be used or using standalone Ruby Haversine algorithm. By default the version is set to 1.5. See _geo_near_ specs for more details/info on this.
+
+@Mongoid::Geo.mongo_db_version = 1.7@
 
 h2. Mongoid Geo extra inclusions
 

data/lib/mongoid/geo/geo_near.rb

@@ -5,6 +5,10 @@ require 'mongoid/geo/haversine'
 
 module Mongoid
   module Geo
+    class << self
+      attr_accessor :mongo_db_version
+    end
+    
     module Distance      
       attr_reader :distance
       
@@ -25,12 +29,13 @@ module Mongoid
       def to_models
         clazz = first.clazz
         ids = map(&:_id)
-        distances = map(&:distance)
-        i = 0
+        distance_hash = self.inject({}) do |result, item| 
+          result[item._id] = item.distance
+          result
+        end
         clazz.where(:_id.in => ids).to_a.map do |m| 
           m.extend(Mongoid::Geo::Distance)
-          m.set_distance distances[i]
-          i += 1
+          m.set_distance distance_hash[m._id]
           m
         end
       end
@@ -70,7 +75,7 @@ module Mongoid
         lon,lat = center    
         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['distance'] = Mongoid::Geo::Haversine.distance(lat, lon, loc[1], loc[0]) if Mongoid::Geo.mongo_db_version < 1.7
           r['clazz'] = clazz
         end
       end

data/lib/mongoid_geo.rb

@@ -1 +1,3 @@
-require 'mongoid/geo'
+require 'mongoid/geo'
+
+Mongoid::Geo.mongo_db_version = 1.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157384840 !ruby/object:Gem::Requirement
+  requirement: &2156534080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2157384840
+  version_requirements: *2156534080
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2157384380 !ruby/object:Gem::Requirement
+  requirement: &2156533620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157384380
+  version_requirements: *2156533620
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2157383920 !ruby/object:Gem::Requirement
+  requirement: &2156533160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157383920
+  version_requirements: *2156533160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157383460 !ruby/object:Gem::Requirement
+  requirement: &2156532700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2157383460
+  version_requirements: *2156532700
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2157383000 !ruby/object:Gem::Requirement
+  requirement: &2156532240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157383000
+  version_requirements: *2156532240
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Adds extra convenience methods for geo-spatial operations etc.