mongoid_spacial 0.2.8 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.10

data/lib/mongoid_spacial/spacial/geo_near_results.rb

@@ -48,23 +48,27 @@ module Mongoid
         end
       end
 
-      def page(page, options = {})
+      def page(*args)
         new_collection = self.clone
-        original = options.delete(:original)
-        new_collection.opts.merge!(options)
-        new_collection.opts[:paginator] ||= Mongoid::Spacial.paginator
+        new_collection.page!(*args)
+        new_collection
+      end
 
-        start = (new_collection.current_page-1)*new_collection.limit_value # assuming current_page is 1 based.
+      def page!(page, options = {})
+        original = options.delete(:original)
+        self.opts.merge!(options)
+        self.opts[:paginator] ||= Mongoid::Spacial.paginator
+        self.opts[:page] = page
+        start = (self.current_page-1)*self.limit_value # assuming current_page is 1 based.
 
         if original
           @_paginated_array = @_original_array.clone
-          new_collection.replace(@_original_array[new_collection.opts[:skip]+start, new_collection.limit_value] || [])
+          self.replace(@_paginated_array[self.opts[:skip]+start, self.limit_value] || [])
         else
           @_paginated_array ||= self.to_a
-          new_collection.replace(@_paginated_array[new_collection.opts[:skip]+start, new_collection.limit_value])
+          self.replace(@_paginated_array[self.opts[:skip]+start, self.limit_value])
         end
-
-        new_collection
+        true
       end
 
       def per(num)
@@ -90,14 +94,14 @@ module Mongoid
 
       def current_page
         page = (@opts[:page]) ? @opts[:page].to_i.abs : 1
-        (@opts[:page] < 1) ? 1 : page
+        (page < 1) ? 1 : page
       end
 
       def limit_value
         if @opts[:per_page]
           @opts[:per_page] = @opts[:per_page].to_i.abs
         else
-          @opts[:per_page] = case new_collection.opts[:paginator]
+          @opts[:per_page] = case self.opts[:paginator]
                              when :will_paginate
                                @document.per_page
                              when :kaminari

data/mongoid_spacial.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_spacial}
-  s.version = "0.2.8"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ryan Ong}]
-  s.date = %q{2011-07-18}
+  s.date = %q{2011-07-25}
   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 = [

data/spec/functional/mongoid/spacial/geo_near_results_spec.rb

@@ -16,8 +16,12 @@ describe Mongoid::Spacial::GeoNearResults do
   end
 
   context ":paginator :array" do
-    let!(:bars) { Bar.geo_near([1,1]) }
-    let!(:sorted_bars) { Bar.geo_near([1,1]).sort_by {|b| b.name.to_i}}
+    let(:bars) { Bar.geo_near([1,1]) }
+    let(:sorted_bars) {
+      bars = Bar.geo_near([1,1])
+      bars.sort_by! {|b| b.name.to_i}
+      bars
+    }
     [nil,1,2].each do |page|
       it "page=#{page} should have 25" do
         bars.page(page).size.should == 25
@@ -48,6 +52,7 @@ describe Mongoid::Spacial::GeoNearResults do
     it "page=10 per=5" do
       bars.per(5).page(10).should == bars[45..50]
     end
+
   end
 
   context ":paginator :kaminari" do

metadata

@@ -2,7 +2,7 @@
 name: mongoid_spacial
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors: 
 - Ryan Ong
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-07-25 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: -3478690375054845577
+      hash: -4259724242028856304
       segments: 
       - 0
       version: "0"