mongo_doc 0.4.1 → 0.4.2

data/HISTORY.md

@@ -0,0 +1,4 @@
+## 0.4.2
+
+* 'Document#update_attributes' uses $ positional operator when used from within an embed_many association
+* Require MongoDB 1.3.4 or greater

data/README.textile

@@ -1,6 +1,10 @@
 h1. MongoDoc
 
-Version: Turbulence (0.4.1) 2010/03/17
+Version: Turbulence (0.4.2) 2010/03/23
+
+h2. What's New in Turbulence (0.4.2)
+
+Support for the $ positional operator for in-place array updates. This requires MongoDB version 1.3.4 or higher.
 
 h2. What's New in Turbulence (0.4.1)
 

data/Rakefile

@@ -10,8 +10,8 @@ begin
     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 "mongo", "= 0.19.1"
+    gem.add_dependency "mongo_ext", "= 0.19.1"
     gem.add_dependency "durran-validatable", "= 2.0.1"
     gem.add_dependency "leshill-will_paginate", "= 2.3.11"
     gem.add_development_dependency "rspec", "= 1.3.0"

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/features/partial_updates.feature

@@ -59,47 +59,37 @@ Feature: Partial Updates
       | 1 Main St.             | Jacksonville       | FL    | 32218    |
     And I save the document 'hashrocket_hq'
 
-  Scenario: Naive Update
+  Scenario: Update
     When I update the 'note' for 'contractor' to 'Knows MongoDB and MongoDoc'
-    Then the document 'contractor' roundtrips
+    Then the last return value is true
+    And the document 'contractor' roundtrips
 
-  Scenario: Naive Update on a has one
+  Scenario: Update on a has one
     When I update the 'street' for 'hq_address' to '320 1st Street North'
-    Then the document 'hashrocket_hq' roundtrips
+    Then the last return value is true
+    And the document 'hashrocket_hq' roundtrips
 
-  Scenario: Naive Update on a has many
+  Scenario: Update on a has many
     When 'hq_address' is the first address of 'hashrocket'
     And I update the 'street' for 'hq_address' to '320 1st Street North'
-    Then the document 'hashrocket' roundtrips
+    Then the last return value is true
+    And the document 'hashrocket' roundtrips
 
-  Scenario: Strict Update
-    When I strict update the 'note' for 'contractor' to 'Knows MongoDB and MongoDoc'
-    Then the document 'contractor' roundtrips
-
-  Scenario: Strict Update on a has one
-    When I strict update the 'street' for 'hq_address' to '320 1st Street North'
-    Then the document 'hashrocket_hq' roundtrips
-
-  Scenario: Strict Update on a has many
-    When 'hq_address' is the first address of 'hashrocket'
-    And I strict update the 'street' for 'hq_address' to '320 1st Street North'
-    Then the document 'hashrocket' roundtrips
-
-  Scenario: Failing Strict Update on a has one
+  Scenario: Failing Update on a has one
     When someone else changes the Address 'address' of 'hashrocket_hq' to 
       | Street                 | City               | State | Zip Code |
       | 1 Ocean Blvd.          | Jacksonville       | FL    | 32218    |
-    And I strict update the 'street' for 'hq_address' to '320 1st Street North'
+    And I update the 'street' for 'hq_address' to '320 1st Street North'
     Then the last return value is false
     And the document 'hashrocket_hq' does not roundtrip
 
-  Scenario: Failing Strict Update on a has many
+  Scenario: Failing Update on a has many
     When 'hq_address' is the first address of 'hashrocket'
     And someone else changes the addresses of 'hashrocket':
       | Street                 | City               | State | Zip Code |
       | 320 1st N, #712        | Jacksonville Beach | FL    | 32250    |
       | 1001 Mulligan Street   | Chicago            | IL    | 60611    |
       | 345 Avenida Grande     | Santiago           | Chile |          |
-    And I strict update the 'street' for 'hq_address' to '320 1st Street North'
+    And I update the 'street' for 'hq_address' to '320 1st Street North'
     Then the last return value is false
     And the document 'hashrocket' does not roundtrip

data/features/step_definitions/partial_update_steps.rb

@@ -1,7 +1,6 @@
-When /^I(\sstrict\s|\s)update the '(.+)' for '(.+)' to '(.+)'$/ do |strict, attr, doc_name, value|
+When /^I update the '(.+)' for '(.+)' to '(.+)'$/ do |attr, doc_name, value|
   doc = instance_variable_get("@#{doc_name}")
   attrs = {attr => value}
-  attrs.merge!(:__strict__ => true) unless strict.blank?
   @last_return = doc.update_attributes(attrs)
 end
 

data/lib/mongo_doc/associations/collection_proxy.rb

@@ -92,8 +92,8 @@ module MongoDoc
 
       protected
 
-      def annotated_keys(src, attrs)
-        assoc_path = "#{assoc_name}.#{index(src)}"
+      def annotated_keys(src, attrs, selector = false)
+        assoc_path = "#{assoc_name}" + (selector ? "" : ".$")
         annotated = {}
         attrs.each do |(key, value)|
           annotated["#{assoc_path}.#{key}"] = value

data/lib/mongo_doc/associations/hash_proxy.rb

@@ -81,7 +81,7 @@ module MongoDoc
 
       protected
 
-      def annotated_keys(src, attrs)
+      def annotated_keys(src, attrs, selector = false)
         assoc_path = "#{assoc_name}.#{index(src)}"
         annotated = {}
         attrs.each do |(key, value)|

data/lib/mongo_doc/associations/proxy_base.rb

@@ -11,8 +11,8 @@ module MongoDoc
         @_parent = parent
       end
 
-      def _path_to_root(src, attrs)
-        _parent._path_to_root(src, annotated_keys(src, attrs))
+      def _path_to_root(src, attrs, selector = false)
+        _parent._path_to_root(src, annotated_keys(src, attrs, selector), selector)
       end
 
       def _root=(root)
@@ -37,7 +37,7 @@ module MongoDoc
 
       protected
 
-      def annotated_keys(src, hash)
+      def annotated_keys(src, hash, selector = false)
         annotated = {}
         hash.each do |(key, value)|
           annotated["#{assoc_name}.#{key}"] = value

data/lib/mongo_doc/attributes.rb

@@ -40,9 +40,9 @@ module MongoDoc
       end
     end
 
-    def _path_to_root(src, attrs)
+    def _path_to_root(src, attrs, selector = false)
       return attrs unless _parent
-      _parent._path_to_root(self, attrs)
+      _parent._path_to_root(self, attrs, selector)
     end
 
     module ClassMethods

data/lib/mongo_doc/connection.rb

@@ -82,7 +82,7 @@ module MongoDoc
     end
 
     def verify_server_version(connection)
-      raise UnsupportedServerVersionError.new('MongoDoc requires at least mongoDB version 1.3.2') unless connection.server_version >= "1.3.2"
+      raise UnsupportedServerVersionError.new('MongoDoc requires at least mongoDB version 1.3.2') unless connection.server_version >= "1.3.4"
     end
   end
 end

data/lib/mongo_doc/document.rb

@@ -80,15 +80,10 @@ module MongoDoc
     end
 
     def update_attributes(attrs)
-      strict = attrs.delete(:__strict__)
       self.attributes = attrs
       return save if new_record?
       return false unless valid?
-      if strict
-        _strict_update_attributes(_path_to_root(self, attrs), false)
-      else
-        _naive_update_attributes(_path_to_root(self, attrs), false)
-      end
+      _update({}, attrs, false)
     end
 
     def update_attributes!(attrs)
@@ -96,11 +91,7 @@ module MongoDoc
       self.attributes = attrs
       return save! if new_record?
       raise DocumentInvalidError unless valid?
-      if strict
-        _strict_update_attributes(_path_to_root(self, attrs), true)
-      else
-        _naive_update_attributes(_path_to_root(self, attrs), true)
-      end
+      _update({}, attrs, true)
     end
 
     module ClassMethods
@@ -139,21 +130,12 @@ module MongoDoc
       self.class.collection
     end
 
-    def _naive_update_attributes(attrs, safe)
-      return _root.send(:_naive_update_attributes, attrs, safe) if _root
-      _update({}, attrs, safe)
-    end
-
     def _remove
       _collection.remove({'_id' => _id})
     end
 
-    def _strict_update_attributes(attrs, safe, selector = {})
-      return _root.send(:_strict_update_attributes, attrs, safe, _path_to_root(self, '_id' => _id)) if _root
-      _update(selector, attrs, safe)
-    end
-
     def _update(selector, data, safe)
+      return _root.send(:_update, _path_to_root(self, {'_id' => _id}, true), _path_to_root(self, data), safe) if _root
       _collection.update({'_id' => _id}.merge(selector), MongoDoc::Query.set_modifier(data), :safe => safe)
     end
 

data/lib/mongo_doc.rb

@@ -4,7 +4,7 @@ require 'validatable'
 require 'will_paginate/collection'
 
 module MongoDoc
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 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.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-03-23}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "HISTORY.md",
      "LICENSE",
      "README.textile",
      "Rakefile",
@@ -120,6 +121,7 @@ Gem::Specification.new do |s|
      "perf/mongo_doc_runner.rb",
      "perf/ruby_driver_runner.rb",
      "script/console",
+     "spec/array_including_argument_matcher.rb",
      "spec/associations/collection_proxy_spec.rb",
      "spec/associations/document_proxy_spec.rb",
      "spec/associations/hash_proxy_spec.rb",
@@ -157,7 +159,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{ODM for MongoDB}
   s.test_files = [
-    "spec/associations/collection_proxy_spec.rb",
+    "spec/array_including_argument_matcher.rb",
+     "spec/associations/collection_proxy_spec.rb",
      "spec/associations/document_proxy_spec.rb",
      "spec/associations/hash_proxy_spec.rb",
      "spec/associations_spec.rb",
@@ -194,16 +197,16 @@ Gem::Specification.new do |s|
 
     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<mongo>, ["= 0.19.1"])
+      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.19.1"])
       s.add_runtime_dependency(%q<durran-validatable>, ["= 2.0.1"])
       s.add_runtime_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
       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<mongo>, ["= 0.19.1"])
+      s.add_dependency(%q<mongo_ext>, ["= 0.19.1"])
       s.add_dependency(%q<durran-validatable>, ["= 2.0.1"])
       s.add_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
@@ -211,8 +214,8 @@ Gem::Specification.new do |s|
     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<mongo>, ["= 0.19.1"])
+    s.add_dependency(%q<mongo_ext>, ["= 0.19.1"])
     s.add_dependency(%q<durran-validatable>, ["= 2.0.1"])
     s.add_dependency(%q<leshill-will_paginate>, ["= 2.3.11"])
     s.add_dependency(%q<rspec>, ["= 1.3.0"])

data/spec/array_including_argument_matcher.rb

@@ -0,0 +1,62 @@
+# From http://gist.github.com/62943
+# Author http://github.com/trotter
+module Spec
+  module Mocks
+    module ArgumentMatchers
+
+      class ArrayIncludingMatcher
+        # We'll allow an array of arguments to be passed in, so that you can do
+        # things like obj.should_receive(:blah).with(array_including('a', 'b'))
+        def initialize(*expected)
+          @expected = expected
+        end
+
+        # actual is the array (hopefully) passed to the method by the user.
+        # We'll check that it includes all the expected values, and return false
+        # if it doesn't or if we blow up because #include? is not defined.
+        def ==(actual)
+          @expected.each do |expected|
+            return false unless actual.include?(expected)
+          end
+          true
+        rescue NoMethodError => ex
+          return false
+        end
+
+        def description
+          "array_including(#{@expected.join(', ')})"
+        end
+      end
+
+      class ArrayNotIncludingMatcher
+        def initialize(*expected)
+          @expected = expected
+        end
+
+        def ==(actual)
+          @expected.each do |expected|
+            return false if actual.include?(expected)
+          end
+          true
+        rescue NoMethodError => ex
+          return false
+        end
+
+        def description
+          "array_not_including(#{@expected.join(', ')})"
+        end
+      end
+
+      # array_including is a helpful wrapper that allows us to actually type
+      # #with(array_including(...)) instead of ArrayIncludingMatcher.new(...)
+      def array_including(*args)
+        ArrayIncludingMatcher.new(*args)
+      end
+
+      def array_not_including(*args)
+        ArrayNotIncludingMatcher.new(*args)
+      end
+
+    end
+  end
+end

data/spec/associations/collection_proxy_spec.rb

@@ -7,10 +7,20 @@ describe MongoDoc::Associations::CollectionProxy do
     attr_accessor :name
   end
 
-  let(:root) { stub('root', :register_save_observer => nil) }
+  let(:root) { CollectionProxyTest.new }
   let(:proxy) { MongoDoc::Associations::CollectionProxy.new(:assoc_name => 'embed_many_name', :assoc_class => CollectionProxyTest, :root => root, :parent => root) }
   let(:item) { CollectionProxyTest.new }
 
+  describe "#_path_to_root" do
+    it "inserts the association name and '$' when not a selector" do
+      proxy._path_to_root(CollectionProxyTest.new, 'name' => 'value').should == {"embed_many_name.$.name" => 'value'}
+    end
+
+    it "inserts the association name when a selector" do
+      proxy._path_to_root(CollectionProxyTest.new, {'name' => 'value'}, true).should == {"embed_many_name.name" => 'value'}
+    end
+  end
+
   context "#<<" do
     it "appends the item to the collection" do
       (proxy << item).should include(item)

data/spec/associations/hash_proxy_spec.rb

@@ -7,11 +7,16 @@ describe MongoDoc::Associations::HashProxy do
     attr_accessor :name
   end
 
-  let(:root) { stub('root', :register_save_observer => nil) }
+  let(:root) { HashProxyTest.new }
   let(:proxy) { MongoDoc::Associations::HashProxy.new(:assoc_name => 'embed_hash_name', :assoc_class => HashProxyTest, :root => root, :parent => root) }
   let(:item) { HashProxyTest.new }
   let(:other_item) {[1,2]}
 
+  it "inserts the association name and key into the _path_to_root" do
+    proxy.stub(:index).and_return('key')
+    proxy._path_to_root(HashProxyTest.new, 'name' => 'value').should == {"embed_hash_name.key.name" => 'value'}
+  end
+
   context "#[]=" do
     it "adds the item to the hash" do
       proxy['new'] = item

data/spec/connection_spec.rb

@@ -105,12 +105,12 @@ describe "MongoDoc::Connection.Connections" do
     let(:connection) { stub('connection') }
 
     it "raises when the server version is unsupported" do
-      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.1'))
+      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.2'))
       lambda { MongoDoc::Connection.send(:verify_server_version, connection) }.should raise_error(MongoDoc::UnsupportedServerVersionError)
     end
 
     it "returns when the server version is supported" do
-      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.2'))
+      connection.stub(:server_version).and_return(Mongo::ServerVersion.new('1.3.4'))
       lambda { MongoDoc::Connection.send(:verify_server_version, connection) }.should_not raise_error(MongoDoc::UnsupportedServerVersionError)
     end
   end

data/spec/document_spec.rb

@@ -258,219 +258,114 @@ describe "MongoDoc::Document" do
   end
 
   context "updating attributes" do
-    class UpdateAttributesRoot
+    class UpdateAttributesChild
       include MongoDoc::Document
 
-      embed :update_attributes_child
+      attr_accessor :child_data
     end
 
-    class UpdateAttributesChild
+    class UpdateAttributes
       include MongoDoc::Document
 
       attr_accessor :data
+      embed :child
     end
 
-    let(:data) {'data'}
+    let(:collection) { stub(:update => nil) }
 
-    let(:attrs) {{:data => data}}
+    let(:new_doc) { UpdateAttributes.new }
 
-    let(:path_attrs) {{'update_attributes_child.data' => data}}
-
-    let(:doc) do
-      doc = UpdateAttributesChild.new
-      doc._id = 'id'
-      doc.stub(:_naive_update_attributes)
+    let(:existing_doc) do
+      doc = UpdateAttributes.new
+      doc._id = 'exists'
+      doc.stub(:_collection).and_return(collection)
       doc
     end
 
-    before do
-      root = UpdateAttributesRoot.new
-      root.update_attributes_child = doc
-      root._id = 'id'
+    let(:child) do
+      child = UpdateAttributesChild.new
+      child._id = 'child exists'
+      existing_doc.child = child
+      child
     end
 
-    context "#update_attributes" do
-      it "delegates to save if the object is a new record" do
-        check = 'check'
-        doc.stub(:new_record?).and_return(true)
-        doc.should_receive(:save).and_return(check)
-        doc.update_attributes(attrs).should == check
+    describe "#update_attributes" do
+      it "delegates to save if the doc is a new record" do
+        new_doc.should_receive(:save)
+        new_doc.update_attributes(:data => 'data')
       end
 
-      it "sets the attributes" do
-        doc.update_attributes(attrs)
-        doc.data.should == data
-      end
+      context "with an existing doc" do
 
-      it "normalizes the attributes to the parent" do
-        doc.should_receive(:_path_to_root)
-        doc.update_attributes(attrs)
-      end
+        subject { existing_doc.update_attributes(:data => 'data') }
 
-      it "validates" do
-        doc.should_receive(:valid?)
-        doc.update_attributes(attrs)
-      end
+        it "sets the attributes" do
+          subject
+          existing_doc.data.should == 'data'
+        end
 
-      it "returns false if the object is not valid" do
-        doc.stub(:valid?).and_return(false)
-        doc.update_attributes(attrs).should be_false
-      end
+        it "validates the doc" do
+          existing_doc.should_receive(:valid?)
+          subject
+        end
 
-      context "if valid" do
-        context "and strict" do
-          it "delegates to _strict_update_attributes" do
-            strict_attrs = attrs.merge(:__strict__ => true)
-            doc.should_receive(:_strict_update_attributes).with(path_attrs, false)
-            doc.update_attributes(strict_attrs)
-          end
+        it "returns false if the doc is not valid" do
+          existing_doc.stub(:valid?).and_return(false)
+          should be_false
         end
 
-        context "and naive" do
-          it "delegates to _naive_update_attributes" do
-            doc.should_receive(:_naive_update_attributes).with(path_attrs, false)
-            doc.update_attributes(attrs)
-          end
+        it "delegates to collection update" do
+          collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => false)
+          subject
         end
 
-        it "returns the result of _naive_update_attributes" do
-          result = 'check'
-          doc.stub(:_naive_update_attributes).and_return(result)
-          doc.update_attributes(attrs).should == result
+        context "that is embedded" do
+          it "delegates to the root's collection update" do
+            collection.should_receive(:update).with({'_id' => existing_doc._id, 'child._id' => child._id}, {'$set' => {'child.child_data' => 'data'}}, :safe => false)
+            child.update_attributes(:child_data => 'data')
+          end
         end
       end
     end
 
-    context "#update_attributes!" do
-      it "delegates to save! if the object is a new record" do
-        check = 'check'
-        doc.stub(:new_record?).and_return(true)
-        doc.should_receive(:save!).and_return(check)
-        doc.update_attributes!(attrs).should == check
-      end
-
-      it "sets the attributes" do
-        doc.update_attributes!(attrs)
-        doc.data.should == data
+    describe "#update_attributes!" do
+      it "delegates to save! if the doc is a new record" do
+        new_doc.should_receive(:save!)
+        new_doc.update_attributes!(:data => 'data')
       end
 
-      it "normalizes the attributes to the parent" do
-        doc.should_receive(:_path_to_root)
-        doc.update_attributes!(attrs)
-      end
-
-      it "validates" do
-        doc.should_receive(:valid?).and_return(true)
-        doc.update_attributes!(attrs)
-      end
+      context "with an existing doc" do
 
-      it "raises if not valid" do
-        doc.stub(:valid?).and_return(false)
-        expect do
-          doc.update_attributes!(attrs)
-        end.should raise_error(MongoDoc::DocumentInvalidError)
-      end
+        subject { existing_doc.update_attributes!(:data => 'data') }
 
-      context "if valid" do
-        context "and strict" do
-          it "delegates to _strict_update_attributes with safe == true" do
-            strict_attrs = attrs.merge(:__strict__ => true)
-            doc.should_receive(:_strict_update_attributes).with(path_attrs, true)
-            doc.update_attributes!(strict_attrs)
-          end
+        it "sets the attributes" do
+          subject
+          existing_doc.data.should == 'data'
         end
 
-        context "and naive" do
-          it "delegates to _naive_update_attributes with safe == true" do
-            doc.should_receive(:_naive_update_attributes).with(path_attrs, true)
-            doc.update_attributes!(attrs)
-          end
+        it "validates the doc" do
+          existing_doc.should_receive(:valid?).and_return(true)
+          subject
         end
 
-        it "returns the result of _naive_update_attributes" do
-          result = 'check'
-          doc.stub(:_naive_update_attributes).and_return(result)
-          doc.update_attributes!(attrs).should == result
+        it "raises if not valid" do
+          existing_doc.stub(:valid?).and_return(false)
+          expect do
+            subject
+          end.should raise_error(MongoDoc::DocumentInvalidError)
         end
-      end
-    end
-  end
-
-  context "#_naive_update_attributes" do
-    class NaiveUpdateAttributes
-      include MongoDoc::Document
-    end
-
 
-    let(:id) { 'id' }
-
-    let(:attrs) { {:data => 'data'} }
-
-    let(:safe) { false }
-
-    let(:doc) do
-      doc = NaiveUpdateAttributes.new
-      doc.stub(:_id).and_return(id)
-      doc
-    end
-
-    it "without a root delegates to _update" do
-      doc.should_receive(:_update).with({}, attrs, safe)
-      doc.send(:_naive_update_attributes, attrs, safe)
-    end
-
-    it "with a root, calls _naive_update_attributes on the root" do
-      root = NaiveUpdateAttributes.new
-      doc.stub(:_root).and_return(root)
-      root.should_receive(:_naive_update_attributes).with(attrs, safe)
-      doc.send(:_naive_update_attributes, attrs, safe)
-    end
-  end
-
-  context "#_strict_update_attributes" do
-    class StrictUpdateAttributes
-      include MongoDoc::Document
-    end
-
-    let(:id) { 'id' }
-
-    let(:attrs) { {:data => 'data'} }
-
-    let(:selector) { {:selector => 'selector'} }
-
-    let(:safe) { false }
-
-    let(:doc) do
-      doc = StrictUpdateAttributes.new
-      doc.stub(:_id).and_return(id)
-      doc
-    end
-
-    context "without a root" do
-      it "without a root delegates to _update" do
-        doc.should_receive(:_update).with(selector, attrs, safe)
-        doc.send(:_strict_update_attributes, attrs, safe, selector)
-      end
-    end
-
-    context "with a root" do
-      let(:root) { StrictUpdateAttributes.new }
-
-      before do
-        doc.stub(:_root).and_return(root)
-      end
-
-      it "calls _path_to_root on our id" do
-        root.stub(:_strict_update_attributes)
-        doc.should_receive(:_path_to_root).with(doc, '_id' => id)
-        doc.send(:_strict_update_attributes, attrs, safe)
-      end
+        it "delegates to collection update" do
+          collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => true)
+          subject
+        end
 
-      it "calls _strict_update_attributes on the root with our selector" do
-        selector = {'path._id' => id}
-        doc.stub(:_path_to_root).with(doc, '_id' => id).and_return(selector)
-        root.should_receive(:_strict_update_attributes).with(attrs, safe, selector)
-        doc.send(:_strict_update_attributes, attrs, safe)
+        context "that is embedded" do
+          it "delegates to the root's collection update" do
+            collection.should_receive(:update).with({'_id' => existing_doc._id, 'child._id' => child._id}, {'$set' => {'child.child_data' => 'data'}}, :safe => true)
+            child.update_attributes!(:child_data => 'data')
+          end
+        end
       end
     end
   end

data/spec/embedded_save_spec.rb

@@ -41,17 +41,17 @@ describe "Saving embedded documents" do
     end
   end
 
-  context "update_attributes naive" do
+  context "update_attributes" do
     context "with no embed_many, update_attributes" do
       let(:root) { NestedChild.new(:leaf => leaf) }
 
-      it "calls the root document's _naive_update_attributes with a full attribute path and not safe" do
-        root.should_receive(:_naive_update_attributes).with({'leaf.data' => data}, false)
+      it "calls the root document's _update with a full attribute path and not safe" do
+        root.should_receive(:_update).with({"leaf._id"=>"id"}, {'leaf.data' => data}, false)
         leaf.update_attributes(:data => data)
       end
 
-      it "(with bang!) calls the root document's _naive_update_attributes with a full attribute path and safe" do
-        root.should_receive(:_naive_update_attributes).with({'leaf.data' => data}, true)
+      it "(with bang!) calls the root document's _update with a full attribute path and safe" do
+        root.should_receive(:_update).with({"leaf._id"=>"id"}, {'leaf.data' => data}, true)
         leaf.update_attributes!(:data => data)
       end
     end
@@ -59,51 +59,15 @@ describe "Saving embedded documents" do
     context "with embed_many, update_attributes" do
       let(:root) { NestedDocsRoot.new(:nested_children => [NestedChild.new(:leaf => leaf)]) }
 
-      it "calls the root document's _naive_update_attributes with a full attribute path and not safe" do
-        root.should_receive(:_naive_update_attributes).with({'nested_children.0.leaf.data' => data}, false)
+      it "calls the root document's _update with a full attribute path and not safe" do
+        root.should_receive(:_update).with({"nested_children.leaf._id"=>"id"}, {'nested_children.$.leaf.data' => data}, false)
         leaf.update_attributes(:data => data)
       end
 
-      it "(with bang!) calls the root document's _naive_update_attributes with a full attribute path and safe" do
-        root.should_receive(:_naive_update_attributes).with({'nested_children.0.leaf.data' => data}, true)
+      it "(with bang!) calls the root document's _update with a full attribute path and safe" do
+        root.should_receive(:_update).with({"nested_children.leaf._id"=>"id"}, {'nested_children.$.leaf.data' => data}, true)
         leaf.update_attributes!(:data => data)
       end
     end
   end
-
-  context "update_attributes strict" do
-    let(:leaf_id) { 'leaf_id' }
-
-    before do
-      leaf.stub(:_id).and_return(leaf_id)
-    end
-
-    context "with no embed_many, update_attributes" do
-      let(:root) { NestedChild.new(:leaf => leaf) }
-
-      it "calls the root document's _strict_update_attributes with a full attribute path and not safe" do
-        root.should_receive(:_strict_update_attributes).with({'leaf.data' => data}, false, 'leaf._id' => leaf_id)
-        leaf.update_attributes(:data => data, :__strict__ => true)
-      end
-
-      it "(with bang!) calls the root document's _naive_update_attributes with a full attribute path and safe" do
-        root.should_receive(:_strict_update_attributes).with({'leaf.data' => data}, true, 'leaf._id' => leaf_id)
-        leaf.update_attributes!(:data => data, :__strict__ => true)
-      end
-    end
-
-    context "with embed_many, update_attributes" do
-      let(:root) { NestedDocsRoot.new(:nested_children => [NestedChild.new(:leaf => leaf)]) }
-
-      it "calls the root document's _naive_update_attributes with a full attribute path and not safe" do
-        root.should_receive(:_strict_update_attributes).with({'nested_children.0.leaf.data' => data}, false, 'nested_children.0.leaf._id' => leaf_id)
-        leaf.update_attributes(:data => data, :__strict__ => true)
-      end
-
-      it "(with bang!) calls the root document's _naive_update_attributes with a full attribute path and safe" do
-        root.should_receive(:_strict_update_attributes).with({'nested_children.0.leaf.data' => data}, true, 'nested_children.0.leaf._id' => leaf_id)
-        leaf.update_attributes!(:data => data, :__strict__ => true)
-      end
-    end
-  end
 end

data/spec/index_spec.rb

@@ -51,12 +51,12 @@ describe MongoDoc::Index do
   context "Compound index" do
 
     it "creates a compound index" do
-      collection.should_receive(:create_index).with([[:first_name, Mongo::ASCENDING], [:last_name, Mongo::ASCENDING]], false)
+      collection.should_receive(:create_index).with(array_including([:first_name, Mongo::ASCENDING], [:last_name, Mongo::ASCENDING]), false)
       IndexTest.index(:first_name => :asc, :last_name => :asc)
     end
 
     it "creates a unique compound index" do
-      collection.should_receive(:create_index).with([[:first_name, Mongo::ASCENDING], [:last_name, Mongo::ASCENDING]], true)
+      collection.should_receive(:create_index).with(array_including([:first_name, Mongo::ASCENDING], [:last_name, Mongo::ASCENDING]), true)
       IndexTest.index(:first_name => :asc, :last_name => :asc, :unique => true)
     end
   end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'spec'
 require 'spec/autorun'
 require 'bson_matchers'
 require 'hash_matchers'
+require 'array_including_argument_matcher'
 require 'document_ext'
 
 Spec::Runner.configure do |config|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -04:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,8 @@ dependencies:
         segments: 
         - 0
         - 19
-        version: "0.19"
+        - 1
+        version: 0.19.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,7 +55,8 @@ dependencies:
         segments: 
         - 0
         - 19
-        version: "0.19"
+        - 1
+        version: 0.19.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -126,6 +128,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- HISTORY.md
 - LICENSE
 - README.textile
 - Rakefile
@@ -226,6 +229,7 @@ files:
 - perf/mongo_doc_runner.rb
 - perf/ruby_driver_runner.rb
 - script/console
+- spec/array_including_argument_matcher.rb
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb
@@ -287,6 +291,7 @@ signing_key:
 specification_version: 3
 summary: ODM for MongoDB
 test_files: 
+- spec/array_including_argument_matcher.rb
 - spec/associations/collection_proxy_spec.rb
 - spec/associations/document_proxy_spec.rb
 - spec/associations/hash_proxy_spec.rb