mongoid 1.2.0 → 1.2.1

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.add_dependency("activesupport", "<= 2.3.5")
     gem.add_dependency("mongo", ">= 0.18.2")
     gem.add_dependency("durran-validatable", ">= 2.0.1")
-    gem.add_dependency("will_paginate", ">= 2.3.11")
+    gem.add_dependency("will_paginate", "< 3.0.pre")
 
     gem.add_development_dependency("rspec", ">= 1.2.9")
     gem.add_development_dependency("mocha", ">= 0.9.8")

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/mongoid.rb

@@ -24,7 +24,7 @@ require "rubygems"
 gem "activesupport", ">= 2.2.2", "<3.0.pre"
 gem "mongo", ">= 0.18.2"
 gem "durran-validatable", ">= 2.0.1"
-gem "will_paginate", ">= 2.3.11"
+gem "will_paginate", ">= 2.3.11", "<3.0.pre"
 
 require "delegate"
 require "observer"

data/lib/mongoid/criteria.rb

@@ -70,12 +70,23 @@ module Mongoid #:nodoc:
         self.selector == other.selector && self.options == other.options
       when Enumerable
         @collection ||= execute
-        return (@collection.collect == other)
+        return (@collection.entries == other)
       else
         return false
       end
     end
 
+    # Returns true if the criteria is empty.
+    #
+    # Example:
+    #
+    # <tt>criteria.blank?</tt>
+    def blank?
+      count < 1
+    end
+
+    alias :empty? :blank?
+
     # Return or create the context in which this criteria should be executed.
     #
     # This will return an Enumerable context if the class is embedded,
@@ -110,8 +121,7 @@ module Mongoid #:nodoc:
     def each(&block)
       @collection ||= execute
       if block_given?
-        docs = []
-        @collection.each { |doc| docs << doc; yield doc }
+        @collection.each { |doc| yield doc }
       end
       self
     end
@@ -156,26 +166,6 @@ module Mongoid #:nodoc:
     # name: The name of the class method on the +Document+ to chain.
     # args: The arguments passed to the method.
     #
-    # Example:
-    #
-    #   class Person
-    #     include Mongoid::Document
-    #     field :title
-    #     field :terms, :type => Boolean, :default => false
-    #
-    #     class << self
-    #       def knights
-    #         all(:conditions => { :title => "Sir" })
-    #       end
-    #
-    #       def accepted
-    #         all(:conditions => { :terms => true })
-    #       end
-    #     end
-    #   end
-    #
-    #   Person.accepted.knights #returns a merged criteria of the 2 scopes.
-    #
     # Returns: <tt>Criteria</tt>
     def method_missing(name, *args)
       if @klass.respond_to?(name)

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-02-07}
+  s.date = %q{2010-02-08}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -345,14 +345,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, ["<= 2.3.5"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.2"])
       s.add_runtime_dependency(%q<durran-validatable>, [">= 2.0.1"])
-      s.add_runtime_dependency(%q<will_paginate>, [">= 2.3.11"])
+      s.add_runtime_dependency(%q<will_paginate>, ["< 3.0.pre"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
       s.add_dependency(%q<mongo>, [">= 0.18.2"])
       s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
-      s.add_dependency(%q<will_paginate>, [">= 2.3.11"])
+      s.add_dependency(%q<will_paginate>, ["< 3.0.pre"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
     end
@@ -360,7 +360,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
     s.add_dependency(%q<mongo>, [">= 0.18.2"])
     s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
-    s.add_dependency(%q<will_paginate>, [">= 2.3.11"])
+    s.add_dependency(%q<will_paginate>, ["< 3.0.pre"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
   end

data/spec/unit/mongoid/criteria_spec.rb

@@ -152,6 +152,36 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#blank?" do
+
+    before do
+      @context = stub.quacks_like(Mongoid::Contexts::Mongo.allocate)
+      @criteria.instance_variable_set(:@context, @context)
+    end
+
+    context "when the count is 0" do
+
+      before do
+        @context.expects(:count).returns(0)
+      end
+
+      it "returns true" do
+        @criteria.blank?.should be_true
+      end
+    end
+
+    context "when the count is greater than 0" do
+
+      before do
+        @context.expects(:count).returns(10)
+      end
+
+      it "returns false" do
+        @criteria.blank?.should be_false
+      end
+    end
+  end
+
   describe "#context" do
 
     context "when the context has been set" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 -05:00
+date: 2010-02-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        version: 2.3.11
+        version: 3.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec