mongoo 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/mongoo/core.rb

@@ -44,6 +44,11 @@ module Mongoo
     end
     protected :init_from_hash
 
+    def reset_persisted_mongohash
+      @persisted = true
+      set_persisted_mongohash(mongohash)
+    end
+
     def set_mongohash(mongohash)
       @mongohash = mongohash
     end

data/lib/mongoo/modifiers.rb

@@ -27,7 +27,11 @@ module Mongoo
     def cast_value(v)
       if v.is_a?(Mongoo::Embedded::Base)
         return v.to_hash
-      end; v
+      elsif v.is_a?(Array)
+        v.collect { |e| e.is_a?(Mongoo::Embedded::Base) ? e.to_hash : e }
+      else
+        v
+      end
     end
 
     def inc(k, v=1)
@@ -106,6 +110,7 @@ module Mongoo
         if !ret.is_a?(Hash) || (ret["err"] == nil && ret["n"] == 1)
           @queue.each do |op, op_queue|
             op_queue.each do |k, v|
+              duped_v = Marshal.load(Marshal.dump(v))
               case op
               when "$inc" then
                 new_val = @doc.persisted_mongohash.dot_get(k).to_i + v
@@ -113,7 +118,7 @@ module Mongoo
                 @doc.persisted_mongohash.dot_set( k, new_val )
               when "$set" then
                 @doc.mongohash.dot_set( k, v )
-                @doc.persisted_mongohash.dot_set( k, v )
+                @doc.persisted_mongohash.dot_set( k, duped_v )
               when "$unset" then
                 @doc.mongohash.dot_delete( k )
                 @doc.persisted_mongohash.dot_delete( k )
@@ -125,7 +130,7 @@ module Mongoo
                   @doc.mongohash.dot_set(k, [])
                 end
 
-                @doc.persisted_mongohash.dot_get(k) << v
+                @doc.persisted_mongohash.dot_get(k) << duped_v
                 @doc.mongohash.dot_get(k) << v
               when "$pushAll" then
                 unless @doc.persisted_mongohash.dot_get(k)
@@ -135,7 +140,7 @@ module Mongoo
                   @doc.mongohash.dot_set(k, [])
                 end
 
-                @doc.persisted_mongohash.dot_get(k).concat(v)
+                @doc.persisted_mongohash.dot_get(k).concat(duped_v)
                 @doc.mongohash.dot_get(k).concat(v)
               when "$addToSet" then
                 unless @doc.persisted_mongohash.dot_get(k)
@@ -146,7 +151,7 @@ module Mongoo
                 end
 
                 unless @doc.persisted_mongohash.dot_get(k).include?(v)
-                  @doc.persisted_mongohash.dot_get(k) << v
+                  @doc.persisted_mongohash.dot_get(k) << duped_v
                 end
                 unless @doc.mongohash.dot_get(k).include?(v)
                   @doc.mongohash.dot_get(k) << v

data/lib/mongoo/persistence.rb

@@ -12,6 +12,33 @@ module Mongoo
 
   module Persistence
 
+    class RawUpdate
+      attr_accessor :criteria, :updates, :opts
+
+      def initialize(doc)
+        @doc = doc
+        @criteria ||= {}
+        @updates  ||= {}
+        @opts     ||= {}
+      end
+
+      def will_change(&block)
+        @will_change_block = block
+      end
+
+      def run
+        @criteria.stringify_keys!
+        @criteria["_id"] = @doc.id
+        ret = @doc.collection.update(self.criteria, self.updates, self.opts)
+        if !ret.is_a?(Hash) || (ret["updatedExisting"] && ret["n"] == 1)
+          if @will_change_block
+            @will_change_block.call(@doc, ret)
+          end
+        end
+        ret
+      end
+    end
+
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -210,6 +237,12 @@ module Mongoo
       insert(opts.merge(:safe => true))
     end
 
+    def raw_update(&block)
+      raw = RawUpdate.new(self)
+      block.call(raw)
+      raw.run
+    end
+
     def update(opts={})
       _run_update_callbacks do
         unless persisted?
@@ -240,8 +273,7 @@ module Mongoo
         else
           ret = self.collection.update(update_query_hash, update_hash, opts)
           if !ret.is_a?(Hash) || (ret["updatedExisting"] && ret["n"] == 1)
-            set_persisted_mongohash(mongohash)
-            @persisted = true
+            reset_persisted_mongohash
             true
           else
             if opts[:only_if_current]

data/mongoo.gemspec

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

data/test/test_embedded.rb

@@ -240,4 +240,58 @@ class TestEmbedded < Test::Unit::TestCase
     assert_equal 1, c.addresses.size
     assert_equal [address], c.addresses.to_a
   end
+
+  should "be able to change an element in an embedded array doc" do
+    c = Customer.new(name: "Ben")
+    c.insert!
+
+    address = c.addresses.build(street: "123 Street", city: "Metropolis")
+    c.mod! do |m|
+      m.push 'addresses', address
+    end
+
+    assert_equal address, c.addresses.first
+    assert_equal address, c.addresses[0]
+    assert_equal 1, c.addresses.size
+
+    addr = c.addresses[0]
+    addr.street = "456 Street"
+
+    assert_equal [[:set, "addresses", [{"street"=>"456 Street", "city"=>"Metropolis"}]]], c.changelog
+  end
+
+  should "be able to do a custom update with modifiers" do
+    c = Customer.new(name: "Ben")
+    c.insert!
+
+    addresses = []
+    %w(123 456 789).each do |s|
+      addresses << c.addresses.build(street: "123 Street", city: "Metropolis")
+    end
+    c.mod! do |m|
+      m.push_all 'addresses', addresses
+    end
+
+    2.times do
+      assert_equal addresses[0], c.addresses.first
+      assert_equal addresses[2], c.addresses.last
+      assert_equal 3, c.addresses.size
+      c = Customer.find_one(c.id)
+    end
+
+    resp = c.raw_update do |u|
+      u.updates  = { "$push" => { "addresses" => { "street" => "1 E Main St", "city" => "NY" } } }
+      u.opts     = { safe: true }
+      u.will_change do |doc, res|
+        doc.addresses.raw << { "street" => "1 E Main St", "city" => "NY" }
+        doc.persisted_mongohash["addresses"] = doc.addresses.raw
+      end
+    end
+
+    2.times do
+      assert_equal 4, c.addresses.size
+      assert_equal "NY", c.addresses.last.city
+      c = Customer.find_one(c.id)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoo
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-16 00:00:00.000000000 -07:00
+date: 2011-06-20 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151899320 !ruby/object:Gem::Requirement
+  requirement: &2151897000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151899320
+  version_requirements: *2151897000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151897440 !ruby/object:Gem::Requirement
+  requirement: &2151895180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151897440
+  version_requirements: *2151895180
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2151896040 !ruby/object:Gem::Requirement
+  requirement: &2151893580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151896040
+  version_requirements: *2151893580
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2151893780 !ruby/object:Gem::Requirement
+  requirement: &2151891620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151893780
+  version_requirements: *2151891620
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2151891820 !ruby/object:Gem::Requirement
+  requirement: &2151889100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151891820
+  version_requirements: *2151889100
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151889020 !ruby/object:Gem::Requirement
+  requirement: &2151887680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151889020
+  version_requirements: *2151887680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151887240 !ruby/object:Gem::Requirement
+  requirement: &2151885300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151887240
+  version_requirements: *2151885300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151885260 !ruby/object:Gem::Requirement
+  requirement: &2151882720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2151885260
+  version_requirements: *2151882720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151882160 !ruby/object:Gem::Requirement
+  requirement: &2151880160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151882160
+  version_requirements: *2151880160
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2151880020 !ruby/object:Gem::Requirement
+  requirement: &2151877020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151880020
+  version_requirements: *2151877020
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2151877880 !ruby/object:Gem::Requirement
+  requirement: &2151876040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151877880
+  version_requirements: *2151876040
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2334518242117856164
+      hash: -2464241099549832500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: