mongo_doc 0.6.12 → 0.6.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongo_doc (0.6.11)
+    mongo_doc (0.6.12)
       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: Hurricane (0.6.12) 2010/07/23
+Version: Hurricane (0.6.13) 2010/07/25
 
 h2. Notes
 

data/VERSION

@@ -1 +1 @@
-0.6.12
+0.6.13

data/lib/mongo_doc/criteria.rb

@@ -44,13 +44,12 @@ module MongoDoc
       :where, :to => :criteria
 
     class CriteriaWrapper < Mongoid::Criteria
-      %w(all and any_in cache enslave excludes extras fuse in limit not_in offset only order_by skip where).each do |method|
+      %w(all and any_in cache enslave excludes extras fuse id in limit not_in offset only order_by skip where).each do |method|
         class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
           def #{method}_with_wrapping(*args, &block)                # def and(*args, &block)
             new_criteria = CriteriaWrapper.new(klass)               #   new_criteria = CriteriaWrapper.new(klass)
             new_criteria.merge(self)                                #   new_criteria.merge(criteria)
             new_criteria.#{method}_without_wrapping(*args, &block)  #   new_criteria.and_without_wrapping(*args, &block)
-            new_criteria                                            #   new_criteria
           end                                                       # end
 
           alias_method_chain :#{method}, :wrapping

data/lib/mongo_doc.rb

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

data/lib/mongoid/criterion/optional.rb

@@ -76,8 +76,12 @@ module Mongoid #:nodoc:
       # Returns: <tt>self</tt>
       def id(*args)
         ids = strings_to_object_ids(args.flatten)
-        (ids.size > 1) ? self.in(:_id => ids) : (@selector[:_id] = ids.first)
-        self
+        if ids.size > 1
+          self.in(:_id => ids)
+        else
+          @selector[:_id] = ids.first
+          self
+        end
       end
 
       # Adds a criterion to the +Criteria+ that specifies the maximum number of

data/mongo_doc.gemspec

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

data/spec/criteria_spec.rb

@@ -25,7 +25,7 @@ describe MongoDoc::Criteria do
       wrapper.klass.should == CriteriaTest
     end
 
-    %w(all and any_in cache enslave excludes fuse in limit offset only order_by skip where).each do |wrapping_method|
+    %w(all and any_in cache enslave excludes fuse id in limit offset only order_by skip where).each do |wrapping_method|
       it "#{wrapping_method} returns a new CriteriaWrapper" do
         wrapper.send(wrapping_method).object_id.should_not == wrapper.object_id
       end
@@ -39,6 +39,13 @@ describe MongoDoc::Criteria do
       wrapper.not_in({}).object_id.should_not == wrapper.object_id
     end
 
+    it "id with mutliple ids returns a new CriteriaWrapper with the id selector set" do
+      id1 = BSON::ObjectID.new
+      id2 = BSON::ObjectID.new
+      returned = wrapper.id(id1, id2)
+      returned.object_id.should_not == wrapper.object_id
+      returned.selector[:_id].should == {'$in' => [id1, id2]}
+    end
   end
 
   context "criteria delegates" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 6
-  - 12
-  version: 0.6.12
+  - 13
+  version: 0.6.13
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -04:00
+date: 2010-07-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency