mongoid 0.7.4 → 0.7.5

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/lib/mongoid/criteria.rb

@@ -100,6 +100,7 @@ module Mongoid #:nodoc:
     # objects of the type of class provided.
     def execute(klass = nil)
       @klass = klass if klass
+      filter_options
       if type == :first
         attributes = klass.collection.find_one(@selector, @options)
         attributes ? @klass.instantiate(attributes) : nil
@@ -233,7 +234,8 @@ module Mongoid #:nodoc:
     # will replace it with a skip parameter and return the same value. Defaults
     # to 20 if nothing was provided.
     def offset
-      offset = @options.delete(:per_page) || 20
+      per_page = @options[:per_page] || 20
+      offset = (page * per_page) - per_page
       @options[:skip] ||= offset
     end
 
@@ -256,7 +258,15 @@ module Mongoid #:nodoc:
     # Either returns the page option and removes it from the options, or
     # returns a default value of 1.
     def page
-      @options.delete(:page) || 1
+      @options[:page] || 1
+    end
+
+    # Returns the number of results per page or the default of 20.
+    def per_page
+      num = @options[:per_page] || 20
+      skip = (page * num) - num
+      @options[:skip] = skip
+      num
     end
 
     # Adds a criterion to the +Criteria+ that specifies the fields that will
@@ -339,5 +349,11 @@ module Mongoid #:nodoc:
       @selector = selector; self
     end
 
+    protected
+    def filter_options
+      @options.delete(:page)
+      @options.delete(:per_page)
+    end
+
   end
 end

data/lib/mongoid/document.rb

@@ -126,10 +126,15 @@ module Mongoid #:nodoc:
       end
 
       # Instantiate a new object, only when loaded from the database.
-      def instantiate(attributes = {})
-        document = allocate
-        document.instance_variable_set(:@attributes, attributes.with_indifferent_access)
-        document
+      def instantiate(attrs = {})
+        attributes = attrs.with_indifferent_access
+        if attributes[:_id]
+          document = allocate
+          document.instance_variable_set(:@attributes, attributes)
+          return document
+        else
+          return new(attributes)
+        end
       end
 
       # Defines the field that will be used for the id of this +Document+. This
@@ -167,7 +172,7 @@ module Mongoid #:nodoc:
       # Returns paginated array of docs.
       def paginate(params = {})
         criteria = Criteria.translate(:all, params)
-        WillPaginate::Collection.create(criteria.page, criteria.offset, 0) do |pager|
+        WillPaginate::Collection.create(criteria.page, criteria.per_page, 0) do |pager|
           results = criteria.execute(self)
           pager.total_entries = results.size
           pager.replace(results)

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-14}
+  s.date = %q{2009-11-15}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"

data/spec/unit/mongoid/criteria_spec.rb

@@ -88,6 +88,23 @@ describe Mongoid::Criteria do
 
   describe "#execute" do
 
+    context "filtering" do
+
+      before do
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+        @collection.expects(:find).with(@criteria.selector, @criteria.options).returns([])
+        @criteria = Mongoid::Criteria.new(:all).extras(:page => 1, :per_page => 20)
+      end
+
+      it "filters out unused params" do
+        @criteria.execute(Person)
+        @criteria.options[:page].should be_nil
+        @criteria.options[:per_page].should be_nil
+      end
+
+    end
+
     context "when type is :first" do
 
       context "when documents exist" do
@@ -260,17 +277,11 @@ describe Mongoid::Criteria do
     context "when the per_page option exists" do
 
       before do
-        @criteria = Mongoid::Criteria.new(:all).extras({ :per_page => 20 })
+        @criteria = Mongoid::Criteria.new(:all).extras({ :per_page => 20, :page => 3 })
       end
 
       it "returns the per_page option" do
-        @criteria.offset.should == 20
-      end
-
-      it "replaces per_page with skip in the options" do
-        @criteria.offset
-        @criteria.options[:per_page].should be_nil
-        @criteria.options[:skip].should == 20
+        @criteria.offset.should == 40
       end
 
     end
@@ -289,13 +300,30 @@ describe Mongoid::Criteria do
 
     context "when no option exists" do
 
-      before do
-        @criteria = Mongoid::Criteria.new(:all)
+      context "when page option exists" do
+
+        before do
+          @criteria = Mongoid::Criteria.new(:all).extras({ :page => 2 })
+        end
+
+        it "adds the skip option to the options and returns it" do
+          @criteria.offset.should == 20
+          @criteria.options[:skip].should == 20
+        end
+
       end
 
-      it "adds the skip option to the options and returns it" do
-        @criteria.offset.should == 20
-        @criteria.options[:skip].should == 20
+      context "when page option does not exist" do
+
+        before do
+          @criteria = Mongoid::Criteria.new(:all)
+        end
+
+        it "adds the skip option to the options and returns it" do
+          @criteria.offset.should == 0
+          @criteria.options[:skip].should == 0
+        end
+
       end
 
     end
@@ -331,11 +359,6 @@ describe Mongoid::Criteria do
         @criteria.page.should == 5
       end
 
-      it "deletes the page option from the options" do
-        @criteria.page.should == 5
-        @criteria.options[:page].should be_nil
-      end
-
     end
 
     context "when the page option does not exist" do
@@ -352,6 +375,34 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#per_page" do
+
+    context "when the per_page option exists" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(:all).extras({ :per_page => 10 })
+      end
+
+      it "returns the per_page option" do
+        @criteria.per_page.should == 10
+      end
+
+    end
+
+    context "when the per_page option does not exist" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(:all)
+      end
+
+      it "returns 1" do
+        @criteria.per_page.should == 20
+      end
+
+    end
+
+  end
+
   describe "#select" do
 
     context "when args are provided" do

data/spec/unit/mongoid/document_spec.rb

@@ -371,13 +371,30 @@ describe Mongoid::Document do
 
   describe "#instantiate" do
 
-    before do
-      @attributes = { :_id => "1", :title => "Sir", :age => 30 }
-      @person = Person.new(@attributes)
+    context "when document is new" do
+
+      before do
+        @attributes = { :_id => "1", :title => "Sir", :age => 30 }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the attributes directly" do
+        Person.instantiate(@attributes).should == @person
+      end
+
     end
 
-    it "sets the attributes directly" do
-      Person.instantiate(@attributes).should == @person
+    context "when document is not new" do
+
+      before do
+        @attributes = { :title => "Sir", :age => 30 }
+        @person = Person.new(@attributes)
+      end
+
+      it "instantiates normally" do
+        Person.instantiate(@attributes).id.should_not be_nil
+      end
+
     end
 
   end
@@ -519,7 +536,7 @@ describe Mongoid::Document do
   describe "#paginate" do
 
     before do
-      @criteria = stub(:page => 1, :offset => "20")
+      @criteria = stub(:page => 1, :per_page => "20")
     end
 
     context "when pagination parameters are passed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 -05:00
+date: 2009-11-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency