mongo_doc 0.3.0 → 0.3.1

data/README.textile

@@ -105,7 +105,7 @@ h2. Installation
 
 MongoDoc *requires* mongoDB v1.3.2 or later.
 
-bc. sudo gem install mongodoc
+bc. sudo gem install mongo_doc
 
 h2. Connecting
 

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rake'
 
 begin
@@ -10,6 +9,7 @@ begin
     gem.email = "leshill@gmail.com"
     gem.homepage = "http://github.com/leshill/mongodoc"
     gem.authors = ["Les Hill"]
+    gem.add_dependency "activesupport", ">= 2.3.4"
     gem.add_dependency "mongo", "= 0.19"
     gem.add_dependency "mongo_ext", "= 0.19"
     gem.add_dependency "durran-validatable", "= 2.0.1"

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/features/step_definitions/query_steps.rb

@@ -52,3 +52,6 @@ Then /^the query result is the document '(.*)'$/ do |name|
   end
 end
 
+Then /^the query (is|is not) (empty|blank)$/ do |is, empty|
+  query.send("#{empty}?").should == (is == 'is')
+end

data/features/using_criteria.feature

@@ -126,3 +126,11 @@ Feature: MongoDoc::Base
   Scenario: Using skip on results
     When I query contacts with criteria all('interests' => ['ruby', 'rails']).skip(1)
     Then the size of the query result is 2
+
+  Scenario: Is a criteria blank?
+    When I query contacts with criteria all('interests' => ['wii'])
+    Then the query is blank
+
+  Scenario: Is a criteria empty?
+    When I query contacts with criteria all('interests' => ['ruby'])
+    Then the query is not empty

data/lib/mongo_doc.rb

@@ -1,17 +1,10 @@
-require 'rubygems'
-
-gem 'mongo', '0.19'
-gem 'mongo_ext', '0.19'
-gem 'durran-validatable', '2.0.1'
-gem 'leshill-will_paginate', '2.3.11'
-
 require 'mongo'
 require 'active_support'
 require 'validatable'
 require 'will_paginate/collection'
 
 module MongoDoc
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end
 
 require 'mongo_doc/connection'

data/lib/mongo_doc/contexts/mongo.rb

@@ -39,6 +39,17 @@ module MongoDoc
         @count ||= collection.find(selector, options).count
       end
 
+      # Determine if the context is empty or blank given the criteria. Will
+      # perform a quick has_one asking only for the id.
+      #
+      # Example:
+      #
+      # <tt>context.blank?</tt>
+      def empty?
+        collection.find_one(selector, options).nil?
+      end
+      alias blank? empty?
+
       # Execute the context. This will take the selector and options
       # and pass them on to the Ruby driver's +find()+ method on the collection. The
       # collection itself will be retrieved from the class provided, and once the

data/lib/mongoid/criteria.rb

@@ -31,7 +31,9 @@ module Mongoid #:nodoc:
 
     delegate \
       :aggregate,
+      :blank?,
       :count,
+      :empty?,
       :execute,
       :first,
       :group,
@@ -76,17 +78,6 @@ module Mongoid #:nodoc:
       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,

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-03-02}
+  s.date = %q{2010-03-06}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -179,6 +179,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.19"])
       s.add_runtime_dependency(%q<mongo_ext>, ["= 0.19"])
       s.add_runtime_dependency(%q<durran-validatable>, ["= 2.0.1"])
@@ -186,6 +187,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_development_dependency(%q<cucumber>, ["= 0.6.2"])
     else
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<mongo>, ["= 0.19"])
       s.add_dependency(%q<mongo_ext>, ["= 0.19"])
       s.add_dependency(%q<durran-validatable>, ["= 2.0.1"])
@@ -194,6 +196,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cucumber>, ["= 0.6.2"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<mongo>, ["= 0.19"])
     s.add_dependency(%q<mongo_ext>, ["= 0.19"])
     s.add_dependency(%q<durran-validatable>, ["= 2.0.1"])

data/spec/contexts/mongo_spec.rb

@@ -194,5 +194,22 @@ describe "MongoDoc::Contexts::MongoDoc" do
         context.send(:grouped, op, field, reduce)
       end
     end
+
+    context "#empty? or #blank?" do
+      it "delegates to find_one" do
+        collection.should_receive(:find_one).with({}, {})
+        context.empty?
+      end
+
+      it "returns true if find_one returns no result" do
+        collection.stub(:find_one).and_return(nil)
+        context.should be_blank
+      end
+
+      it "returns false if find_one returns any result" do
+        collection.stub(:find_one).and_return(stub('result'))
+        context.should_not be_empty
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Les Hill
@@ -14,13 +14,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
+date: 2010-03-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mongo
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -29,11 +43,11 @@ dependencies:
         - 19
         version: "0.19"
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo_ext
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -42,11 +56,11 @@ dependencies:
         - 19
         version: "0.19"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: durran-validatable
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -56,11 +70,11 @@ dependencies:
         - 1
         version: 2.0.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: leshill-will_paginate
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -70,11 +84,11 @@ dependencies:
         - 11
         version: 2.3.11
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -84,11 +98,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -98,7 +112,7 @@ dependencies:
         - 2
         version: 0.6.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: ODM for MongoDB
 email: leshill@gmail.com
 executables: []