mongoid_spacial 0.2.6 → 0.2.7

data/README.md

@@ -75,7 +75,7 @@ Mongoid Geo has extended all built in spacial symbol extentions
   * River.where(:source.near => [[-73.98, 40.77],5]) # sets max distance of 5
   * River.where(:source.near => {:point => [-73.98, 40.77], :max => 5}) # sets max distance of 5
   * River.where(:source.near(:sphere) => [[-73.98, 40.77],5]) # sets max distance of 5 radians
-  * River.where(:source.near(:sphere) => {:point => [-73.98, 40.77], :max => 5, :unit => :km}) # sets max distance of 5 km    
+  * River.where(:source.near(:sphere) => {:point => [-73.98, 40.77], :max => 5, :unit => :km}) # sets max distance of 5 km
   * River.where(:source.near(:sphere) => [-73.98, 40.77])
 * within
   * River.where(:source.within(:box) => [[-73.99756,40.73083], [-73.988135,40.741404]])
@@ -94,7 +94,7 @@ River.where(:name=>'hudson').geo_near({:lat => 40.73083, :lng => -73.99756})
 # geo\_near accepts a few parameters besides a point
 # :num = limit
 # :query = where
-# :unit - [:km, :m, :mi, :ft] - converts :max\_distance to appropriate values and automatically sets :distance\_multiplier. accepts 
+# :unit - [:km, :m, :mi, :ft] - converts :max\_distance to appropriate values and automatically sets :distance\_multiplier. accepts
 # :max\_distance - Integer
 # :distance\_multiplier - Integer
 # :spherical - true - To enable spherical calculations
@@ -130,15 +130,18 @@ River.geo_near([-73.99756,40.73083], :page => 1)
 # #page(page\_number, opts = {})
 #  opts:
 #   :per\_page
-#   :paginator 
+#   :paginator
 # #per(per\_page\_number, opts = {})
 #  opts:
 #   :page
 #   :paginator
 #
 # both return a GeoNearResults, which is really just a modified Array
-# #per really just #page but just moves the options around 
-River.geo_near([-73.99756,40.73083]).per(25).page(1)
+# #per really just #page but just moves the options around
+rivers = River.geo_near([-73.99756,40.73083]).sort_by!{|r| r.modified_distance}
+rivers = rivers.per(25).page(1)
+rivers = rivers.page(5, :original => 1) # by adding the original option you can re-paginate to any area.
+rivers.reset! # resets the object to it is original state right after query.
 ```
 
 Thanks

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/mongoid_spacial/contexts/mongo.rb

@@ -62,6 +62,7 @@ module Mongoid #:nodoc:
                               else
                                 Mongoid::Spacial.default_per_page
                               end
+             opts[:per_page] = opts[:per_page].to_i
            end
 
         end

data/lib/mongoid_spacial/spacial/geo_near_results.rb

@@ -50,11 +50,11 @@ module Mongoid
       end
 
       def page(page, options = {})
-        new_collection = self.dup
+        new_collection = self.clone
 
         options = self.opts.merge(options)
 
-        options[:page] = page || 1
+        options[:page] = (page) ? page.to_i : 1
 
         options[:paginator] ||= Mongoid::Spacial.paginator()
 
@@ -67,9 +67,15 @@ module Mongoid
                               Mongoid::Spacial.default_per_page
                             end
 
+        options[:per_page] = options[:per_page].to_i
 
         start = (options[:page]-1)*options[:per_page] # assuming current_page is 1 based.
-        new_collection.replace(@_original_array[@opts[:skip]+start, options[:per_page]] || [])
+
+        if options[:original]
+          new_collection.replace(@_original_array[@opts[:skip]+start, options[:per_page]] || [])
+        else
+          new_collection.slice!(@opts[:skip]+start, options[:per_page])
+        end
 
         new_collection.opts[:page] = options[:page]
         new_collection.opts[:paginator] = options[:paginator]
@@ -82,6 +88,20 @@ module Mongoid
         self.page(current_page, :per_page => num)
       end
 
+      def reset!
+        self.replace(@_original_array)
+        new_collection.opts[:page] = nil
+        new_collection.opts[:paginator] = nil
+        new_collection.opts[:per_page] = nil
+        self
+      end
+
+      def reset
+        clone = self.clone
+        clone.reset!
+        clone
+      end
+
       def total_entries
         @opts[:total_entries]
       end

data/mongoid_spacial.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_spacial}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ryan Ong}]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-07-11}
   s.description = %q{A Mongoid Extention that simplifies and adds support for MongoDB Geo Spacial Calculations.}
   s.email = %q{ryanong@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: mongoid_spacial
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Ryan Ong
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 Z
+date: 2011-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1525314815871723941
+      hash: 2152929037743712871
       segments: 
       - 0
       version: "0"