mongo_doc 0.6.16 → 0.6.17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongo_doc (0.6.16)
+    mongo_doc (0.6.17)
       activemodel (>= 3.0.0.beta.4)
       activesupport (>= 3.0.0.beta.4)
       bson (>= 1.0.0)

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: 0.6.16 2010/08/10
+Version: 0.6.17 2010/08/11
 
 h2. Notes
 

data/VERSION

@@ -1 +1 @@
-0.6.16
+0.6.17

data/lib/mongo_doc/scope.rb

@@ -21,6 +21,8 @@ module MongoDoc
     end
 
     class CriteriaProxy
+      undef id
+
       attr_accessor :criteria, :klass, :parent_scope
 
       delegate :scopes, :to => :parent_scope

data/lib/mongo_doc.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.16'
+  VERSION = '0.6.17'
 end
 
 require 'mongo_doc/connection'

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.16"
+  s.version = "0.6.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-08-11}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [

data/spec/hash_matchers.rb

@@ -24,4 +24,6 @@ module HashMatchers
     HasEntry.new(expected)
   end
   alias :has_entries :has_entry
+  alias :have_entries :has_entry
+  alias :have_entry :has_entry
 end

data/spec/scope_spec.rb

@@ -72,7 +72,16 @@ describe MongoDoc::Scope do
     end
 
     it "merges the criteria" do
-      ScopeTest.active.count_gt_one.selector.should has_entry(:count => {'$gt' => 1}, :active => true)
+      ScopeTest.active.count_gt_one.selector.should have_entries(:count => {'$gt' => 1}, :active => true)
+    end
+
+    it "chains with other criteria" do
+      ScopeTest.active.where(:count => 1).selector.should have_entries(:count => 1, :active => true)
+    end
+
+    let(:id) { BSON::ObjectID.new }
+    it "chains with id" do
+      ScopeTest.active.id(id).selector.should have_entries(:active => true, :_id => id)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 6
-  - 16
-  version: 0.6.16
+  - 17
+  version: 0.6.17
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -04:00
+date: 2010-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency