mongoid_geo 0.1.5 → 0.1.6

data/README.textile

@@ -94,6 +94,9 @@ With the new @:geo@ option supplied by _mongoid-geo_ :
    assert([45.1, -3.4], p.location)   
 </pre>
 
+h2. News update
+
+Added support for setting location attribute using object with either #location or #position attribute that has lat/lng attributes within (see fields spec).
 
 h2. Mongoid Geo extra inclusions
 

data/lib/mongoid/geo/fields.rb

@@ -14,9 +14,9 @@ module Mongoid #:nodoc
                 value.compact.extend(Mongoid::Geo::Point).to_points
               else
                 !value.nil? ? value.extend(Mongoid::Geo::Point).to_point : value
-              end
+              end 
               value = value[0..1] if !value.nil?
-            end            
+            end
             write_attribute(name, value) 
           end
           define_method("#{meth}?") do

data/lib/mongoid/geo/point.rb

@@ -17,12 +17,20 @@ module Mongoid::Geo
       when Array
         self.map(&:to_f)
       else
-        return [self.lat, self.lng] if self.respond_to? :lat
-        return [self.latitude, self.longitude] if self.respond_to? :latitude
-        self.to_f
-        # raise 'Object must contain either #lat, #lng or #latitude, #longitude methods to be converted to a geo point'
+        obj   = self.send(:location) if respond_to? :location
+        obj ||= self.send(:position) if self.respond_to? :position
+        obj ||= self
+        get_the_location obj        
       end
     end
+
+    private
+    
+    def get_the_location obj
+      return [obj.lat, obj.lng] if obj.respond_to? :lat
+      return [obj.latitude, obj.longitude] if obj.respond_to? :latitude
+      obj.to_f
+    end
   end
 end
          

data/lib/mongoid/geo.rb

@@ -5,4 +5,5 @@ end
 
 require 'mongoid/geo/point'
 require 'mongoid/geo/criteria'
-require 'mongoid/geo/index'
+require 'mongoid/geo/index'
+require 'mongoid/geo/point'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-18 00:00:00.000000000 +01:00
+date: 2011-02-22 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153030660 !ruby/object:Gem::Requirement
+  requirement: &2156988560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153030660
+  version_requirements: *2156988560
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2153030120 !ruby/object:Gem::Requirement
+  requirement: &2156988020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153030120
+  version_requirements: *2156988020
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153029620 !ruby/object:Gem::Requirement
+  requirement: &2156987520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153029620
+  version_requirements: *2156987520
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com