mongoid_geo 0.5.2 → 0.5.3

data/lib/mongoid/geo/fields.rb

@@ -18,9 +18,11 @@ module Mongoid #:nodoc
             define_method(lng_meth) { read_attribute(name).try(:[], Mongoid::Geo.lng_index) }
                         
             define_method "#{lat_meth}=" do |value|
+              write_attribute(name, [nil,nil]) if !read_attribute(name).present?
               send(name)[Mongoid::Geo.lat_index] = value
             end            
             define_method "#{lng_meth}=" do |value|
+              write_attribute(name, [nil,nil]) if !read_attribute(name).present?
               send(name)[Mongoid::Geo.lng_index] = value
             end            
           end

data/lib/mongoid/geo/geo_near.rb

@@ -39,9 +39,9 @@ module Mongoid
         from_hash = Hash[ self.map { |item| [item._id, item.fromPoint] } ]
 
         ret = to_criteria.to_a.map do |m|
-          m.distance = distance_hash[m._id.to_s]
-          m.fromPoint = from_hash[m._id.to_s]
-          m.fromHash = from_hash[m._id.to_s].hash
+          m[:distance] = distance_hash[m._id.to_s]
+          m[:fromPoint] = from_hash[m._id.to_s]
+          m[:fromHash] = from_hash[m._id.to_s].hash
           m.save if mode == :save
           m
         end
@@ -64,7 +64,7 @@ module Mongoid
 
     module Near
       def geoNear(center, location_attribute, options = {})
-        center = center.respond_to?(:collection) ? center.send(location_attribute) : center
+        center = center.respond_to?(:collection) ? eval("center.#{location_attribute}") : center
         query = create_query(self, center, options)
         create_result(query_result(self, query, center, location_attribute, options)).extend(Mongoid::Geo::Models).as_criteria(options[:dist_order])
       end
@@ -134,9 +134,10 @@ module Mongoid
         klass.collection.db.command(query)
       end
 
-      def calc_distance r, center, location_attribute, options        
+      def calc_distance r, center, location_attribute, options     
         distanceMultiplier = distance_multiplier(options)
-        loc     = r['obj'][location_attribute.to_s].extend(Mongoid::Geo::Point).to_points
+        loc     = location_attribute.to_s.split('.').inject(r['obj']) { |node,attribute| node[attribute] }.extend(Mongoid::Geo::Point).to_points
+        
         center  = center.extend(Mongoid::Geo::Point).to_points
         dist    = Mongoid::Geo::Haversine.distance(center.first, center.last, loc.first, loc.last) 
         dist    *= distanceMultiplier if distanceMultiplier

data/lib/mongoid/geo/point.rb

@@ -11,6 +11,7 @@ module Mongoid::Geo
       when Hash
         return [self[:lat], self[:lng]] if self[:lat]
         return [self[:latitude], self[:longitude]] if self[:latitude]
+        return [self['0'].to_f, self['1'].to_f] if self['0']
         raise "Hash must contain either :lat, :lng or :latitude, :longitude keys to be converted to a geo point"
       when nil
         nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-05-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152549140 !ruby/object:Gem::Requirement
+  requirement: &2152535520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2152549140
+  version_requirements: *2152535520
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2152548680 !ruby/object:Gem::Requirement
+  requirement: &2152535060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152548680
+  version_requirements: *2152535060
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2152548220 !ruby/object:Gem::Requirement
+  requirement: &2152534600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152548220
+  version_requirements: *2152534600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152547760 !ruby/object:Gem::Requirement
+  requirement: &2152534140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152547760
+  version_requirements: *2152534140
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2152547300 !ruby/object:Gem::Requirement
+  requirement: &2152533680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152547300
+  version_requirements: *2152533680
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com