mongoo 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/mongoo/modifiers.rb

@@ -77,6 +77,8 @@ module Mongoo
       end
 
       update_query = { "_id" => @doc.id }
+      update_query.merge!(@opts[:q]) if @opts[:q]
+
       if @opts[:only_if_current] == true
         @queue.each do |op, op_queue|
           op_queue.each do |k,v|

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-06-14}
+  s.date = %q{2011-06-15}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [

data/test/test_mongoo.rb

@@ -468,5 +468,25 @@ class TestMongoo < Test::Unit::TestCase
     assert_equal "Benjamin", Person.find_one(p.id).name
   end
 
+  should "be able to specify a query for a modifier" do
+    p = Person.new(name: "Ben", interests: ["skydiving", "coding"], misc: { foo: { bar: 1, zar: 2 } })
+    p.insert!
+
+    assert p.mod! { |m| m.push('interests', 'reading') }
+    assert p.mod!(q: { 'interests' => { '$size' => 3 } }) { |m| m.push("interests", "swimming") }
+    assert_equal ["skydiving", "coding", "reading", "swimming"], p.interests
+
+    assert_raise(Mongoo::ModifierUpdateError) do
+      p.mod!(q: { 'interests' => { '$size' => 3 } }) { |m| m.push("interests", "base jumping") }
+    end
+    assert_equal ["skydiving", "coding", "reading", "swimming"], p.interests
+
+    p.mod!(q: { 'interests' => { '$size' => 4 } }) { |m| m.push("interests", "base jumping") }
+    assert_equal ["skydiving", "coding", "reading", "swimming", "base jumping"], p.interests
+
+    p = Person.find_one(p.id)
+    assert_equal ["skydiving", "coding", "reading", "swimming", "base jumping"], p.interests
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-14 00:00:00.000000000 -07:00
+date: 2011-06-15 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151902940 !ruby/object:Gem::Requirement
+  requirement: &2151903140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151902940
+  version_requirements: *2151903140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151899720 !ruby/object:Gem::Requirement
+  requirement: &2151900000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151899720
+  version_requirements: *2151900000
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2151897600 !ruby/object:Gem::Requirement
+  requirement: &2151898100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151897600
+  version_requirements: *2151898100
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2151896060 !ruby/object:Gem::Requirement
+  requirement: &2151896120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151896060
+  version_requirements: *2151896120
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2151894340 !ruby/object:Gem::Requirement
+  requirement: &2151894800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151894340
+  version_requirements: *2151894800
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151892460 !ruby/object:Gem::Requirement
+  requirement: &2151893220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151892460
+  version_requirements: *2151893220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151889480 !ruby/object:Gem::Requirement
+  requirement: &2151890660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151889480
+  version_requirements: *2151890660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151887720 !ruby/object:Gem::Requirement
+  requirement: &2151888260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2151887720
+  version_requirements: *2151888260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151885620 !ruby/object:Gem::Requirement
+  requirement: &2151886260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151885620
+  version_requirements: *2151886260
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2151883900 !ruby/object:Gem::Requirement
+  requirement: &2151884580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151883900
+  version_requirements: *2151884580
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2151881620 !ruby/object:Gem::Requirement
+  requirement: &2151882580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151881620
+  version_requirements: *2151882580
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4063205949799076691
+      hash: -1842464465711727650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: