mongoid_geo 0.3.2 → 0.4.0

data/lib/mongoid/geo/fields.rb

@@ -4,7 +4,11 @@ module Mongoid #:nodoc
     module ClassMethods #:nodoc
       def create_accessors(name, meth, options = {})
         generated_field_methods.module_eval do
-          define_method(meth) { read_attribute(name) }
+          if [ Time, DateTime ].include?(options[:type])
+            define_method(meth) { Time.get(read_attribute(name)) }
+          else
+            define_method(meth) { read_attribute(name) }
+          end
 
           if options[:type] == Array && options[:geo]            
             lat_meth = options[:lat] || "lat"

data/lib/mongoid/geo/geo_near.rb

@@ -19,7 +19,7 @@ module Mongoid
 
     module Model
       def to_model
-        m = clazz.where(:_id => _id).first.extend(Mongoid::Geo::Distance)
+        m = klass.where(:_id => _id).first.extend(Mongoid::Geo::Distance)
         m.set_distance distance
         m
       end
@@ -27,21 +27,20 @@ module Mongoid
 
     module Models
       def to_models
-        distance_hash = self.inject({}) do |result, item|
-          result[item._id] = item.distance
-          result
-        end
+        distance_hash = Hash[ self.map {|item| [item._id, item.distance] } ]
+
         ret = to_criteria.to_a.map do |m|
           m.extend(Mongoid::Geo::Distance)
           m.set_distance distance_hash[m._id.to_s]
           m
         end
-        ret.sort! {|a,b| a.distance <=> b.distance}
+
+        ret.sort {|a,b| a.distance <=> b.distance}
       end
       
       def to_criteria
         ids = map(&:_id)
-        first.clazz.where(:_id.in => ids)
+        first.klass.where(:_id.in => ids)
       end
     end
 
@@ -54,7 +53,7 @@ module Mongoid
 
       protected
 
-      def create_query clazz, center, options = {}
+      def create_query klass, center, options = {}
         num                 = options[:num]
         maxDistance         = options[:maxDistance]
         query               = options[:query]
@@ -62,7 +61,7 @@ module Mongoid
         mode                = options[:mode] || :plane
 
         nq = BSON::OrderedHash.new.tap do |near_query|
-          near_query["geoNear"]      = clazz.to_s.tableize
+          near_query["geoNear"]      = klass.to_s.tableize
           near_query["near"]         = center
           near_query["num"]          = num if num
           near_query["maxDistance"]  = maxDistance if maxDistance
@@ -77,25 +76,25 @@ module Mongoid
         nq
       end
 
-      def query_result clazz, query, center, location_attribute, options = {}
+      def query_result klass, query, center, location_attribute, options = {}
         distanceMultiplier  = options[:distanceMultiplier]
         lon,lat = center
-        query_result = clazz.collection.db.command(query)['results'].sort_by do |r|
+        query_result = klass.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]) if Mongoid::Geo.mongo_db_version < 1.7
           # Calculate distance in KM or Miles if mongodb < 1.7
           r['distance'] = r['distance'] * distanceMultiplier if distanceMultiplier && Mongoid::Geo.mongo_db_version < 1.7
-          r['clazz'] = clazz
+          r['klass'] = klass
         end
       end
 
       def create_result query_result
-        query_result.inject([]) do |result, qr|
+        query_result.map do |qr|
           res = Hashie::Mash.new(qr['obj'].to_hash).extend(Mongoid::Geo::Model)
-          res.clazz = qr['clazz']
+          res.klass = qr['klass']
           res.distance = qr['distance']
           res._id = qr['obj']['_id'].to_s
-          result.push(res)
+          res
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-28 00:00:00.000000000 +02:00
+date: 2011-04-07 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153347880 !ruby/object:Gem::Requirement
+  requirement: &2153871480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,32 +22,32 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2153347880
+  version_requirements: *2153871480
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2153347420 !ruby/object:Gem::Requirement
+  requirement: &2153871020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc.6
+        version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153347420
+  version_requirements: *2153871020
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2153346960 !ruby/object:Gem::Requirement
+  requirement: &2153870560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153346960
+  version_requirements: *2153870560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153346500 !ruby/object:Gem::Requirement
+  requirement: &2153870100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153346500
+  version_requirements: *2153870100
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2153346040 !ruby/object:Gem::Requirement
+  requirement: &2153869640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153346040
+  version_requirements: *2153869640
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
 email:
 - kmandrup@gmail.com