mongo_doc 0.6.4 → 0.6.5

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: Hurricane (0.6.4) 2010/07/07
+Version: Hurricane (0.6.5) 2010/07/07
 
 h2. Notes
 

data/Rakefile

@@ -9,6 +9,7 @@ begin
     gem.email = "leshill@gmail.com"
     gem.homepage = "http://github.com/leshill/mongodoc"
     gem.authors = ["Les Hill"]
+    gem.files.include('lib/**/*.task')
     gem.add_dependency "activesupport", ">= 3.0.0.beta.4"
     gem.add_dependency "activemodel", ">=3.0.0.beta.4"
     gem.add_dependency "mongo", ">= 1.0.0"

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/lib/mongo_doc/document.rb

@@ -101,14 +101,25 @@ module MongoDoc
       self.attributes = attrs
       return save if new_record?
       return false unless valid?
-      _update({}, attrs, false)
+      _update_attributes(attrs, false)
     end
 
     def update_attributes!(attrs)
       self.attributes = attrs
       return save! if new_record?
       raise DocumentInvalidError unless valid?
-      _update({}, attrs, true)
+      _update_attributes(attrs, true)
+    end
+
+    # Update without checking validations. The +Document+ will be saved without validations if it is a new record.
+    def update(attrs, safe = false)
+      self.attributes = attrs
+      if new_record?
+        _root.send(:_save, safe) if _root
+        _save(safe)
+      else
+        _update_attributes(attrs, safe)
+      end
     end
 
     module ClassMethods
@@ -143,12 +154,16 @@ module MongoDoc
 
     protected
 
+    def _update_attributes(attrs, safe)
+      return _root.send(:_update, {_selector_path + '._id' => _id}, hash_with_modifier_path_keys(attrs), safe) if _root
+      _update({}, attrs, safe)
+    end
+
     def _remove
       _collection.remove({'_id' => _id})
     end
 
     def _update(selector, data, safe)
-      return _root.send(:_update, {_selector_path + '._id' => _id}, hash_with_modifier_path_keys(data), safe) if _root
       _collection.update({'_id' => _id}.merge(selector), {'$set' => data}, :safe => safe)
     end
 

data/lib/mongo_doc/railtie.rb

@@ -7,5 +7,9 @@ module MongoDoc
     initializer "mongo_doc db configuration" do |app|
       MongoDoc::Railties::Config.config(app)
     end
+
+    rake_tasks do
+      load File.dirname(__FILE__) + "/railties/db_prepare.task"
+    end
   end
 end

data/lib/mongo_doc/railties/db_prepare.task

@@ -0,0 +1,9 @@
+if not Rake::Task.task_defined?("db:test:prepare")
+  namespace :db do
+    namespace :test do
+      task :prepare do
+        # noop
+      end
+    end
+  end
+end

data/lib/mongo_doc.rb

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

data/mongo_doc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
@@ -102,6 +102,7 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/matchers.rb",
      "lib/mongo_doc/railtie.rb",
      "lib/mongo_doc/railties/config.rb",
+     "lib/mongo_doc/railties/db_prepare.task",
      "lib/mongo_doc/root.rb",
      "lib/mongo_doc/scope.rb",
      "lib/mongo_doc/timestamps.rb",
@@ -166,6 +167,7 @@ Gem::Specification.new do |s|
      "spec/scope_spec.rb",
      "spec/spec_helper.rb",
      "spec/timestamps_spec.rb",
+     "spec/update_spec.rb",
      "spec/validations_spec.rb"
   ]
   s.homepage = %q{http://github.com/leshill/mongodoc}
@@ -205,6 +207,7 @@ Gem::Specification.new do |s|
      "spec/scope_spec.rb",
      "spec/spec_helper.rb",
      "spec/timestamps_spec.rb",
+     "spec/update_spec.rb",
      "spec/validations_spec.rb",
      "examples/simple_document.rb",
      "examples/simple_object.rb"

data/spec/document_spec.rb

@@ -259,126 +259,6 @@ describe "MongoDoc::Document" do
     end
   end
 
-  context "updating attributes" do
-    class UpdateAttributesChild
-      include MongoDoc::Document
-
-      attr_accessor :child_data
-    end
-
-    class UpdateAttributes
-      include MongoDoc::Document
-
-      attr_accessor :data
-      embed :child
-    end
-
-    let(:collection) { stub(:update => nil) }
-
-    let(:new_doc) { UpdateAttributes.new }
-
-    let(:existing_doc) do
-      doc = UpdateAttributes.new
-      doc._id = 'exists'
-      doc.stub(:_collection).and_return(collection)
-      doc
-    end
-
-    let(:child) do
-      child = UpdateAttributesChild.new
-      child._id = 'child exists'
-      existing_doc.child = child
-      child
-    end
-
-    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
-
-      context "with an existing doc" do
-
-        subject { existing_doc.update_attributes(:data => 'data') }
-
-        it "sets the attributes" do
-          subject
-          existing_doc.data.should == 'data'
-        end
-
-        it "validates the doc" do
-          existing_doc.should_receive(:valid?)
-          subject
-        end
-
-        it "returns false if the doc is not valid" do
-          existing_doc.stub(:valid?).and_return(false)
-          should be_false
-        end
-
-        it "delegates to collection update" do
-          collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => false)
-          subject
-        end
-
-        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
-
-    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
-
-      context "with an existing doc" do
-
-        subject { existing_doc.update_attributes!(:data => 'data') }
-
-        it "sets the attributes" do
-          subject
-          existing_doc.data.should == 'data'
-        end
-
-        it "validates the doc" do
-          existing_doc.should_receive(:valid?).and_return(true)
-          subject
-        end
-
-        it "raises if not valid" do
-          existing_doc.stub(:valid?).and_return(false)
-          expect do
-            subject
-          end.should raise_error(MongoDoc::DocumentInvalidError)
-        end
-
-        it "delegates to collection update" do
-          collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => true)
-          subject
-        end
-
-        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
-
-    describe "#hash_with_modifier_path_keys" do
-      it "returns a hash with the keys prepended with the modifier path" do
-        new_doc.stub(:_modifier_path).and_return('path.to.root')
-        new_doc.send(:hash_with_modifier_path_keys, :name => 1).should == {'path.to.root.name' => 1}
-      end
-    end
-  end
-
   describe "bson" do
     class BSONTest
       include MongoDoc::Document

data/spec/update_spec.rb

@@ -0,0 +1,162 @@
+require 'spec_helper'
+
+describe "MongoDoc::Document" do
+
+  class UpdateAttributesChild
+    include MongoDoc::Document
+
+    attr_accessor :child_data
+  end
+
+  class UpdateAttributes
+    include MongoDoc::Document
+
+    attr_accessor :data
+    embed :child
+  end
+
+  let(:collection) { stub(:save => nil, :update => nil) }
+  let(:child) do
+    child = UpdateAttributesChild.new
+    child._id = 'child exists'
+    existing_doc.child = child
+    child
+  end
+  let(:existing_doc) do
+    doc = UpdateAttributes.new
+    doc._id = 'exists'
+    doc.stub(:_collection).and_return(collection)
+    doc
+  end
+  let(:new_child) do
+    child = UpdateAttributesChild.new
+    existing_doc.child = child
+    child
+  end
+
+  let(:new_doc) { UpdateAttributes.new }
+
+  describe "#update" do
+    context "with a new doc" do
+      it "delegates to save! if the doc is a new record" do
+        new_doc.should_receive(:_save)
+        new_doc.update(:data => 'data')
+      end
+
+      it "delegates to the root's save if the child is a new record" do
+        existing_doc.should_receive(:_save)
+        new_child.update(:child_data => 'data')
+      end
+    end
+
+    context "with an existing doc" do
+
+      subject { existing_doc.update(:data => 'data') }
+
+      it "sets the attributes" do
+        subject
+        existing_doc.data.should == 'data'
+      end
+
+      it "delegates to collection update" do
+        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => false)
+        subject
+      end
+
+      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
+
+  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
+
+    context "with an existing doc" do
+
+      subject { existing_doc.update_attributes(:data => 'data') }
+
+      it "sets the attributes" do
+        subject
+        existing_doc.data.should == 'data'
+      end
+
+      it "validates the doc" do
+        existing_doc.should_receive(:valid?)
+        subject
+      end
+
+      it "returns false if the doc is not valid" do
+        existing_doc.stub(:valid?).and_return(false)
+        should be_false
+      end
+
+      it "delegates to collection update" do
+        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => false)
+        subject
+      end
+
+      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
+
+  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
+
+    context "with an existing doc" do
+
+      subject { existing_doc.update_attributes!(:data => 'data') }
+
+      it "sets the attributes" do
+        subject
+        existing_doc.data.should == 'data'
+      end
+
+      it "validates the doc" do
+        existing_doc.should_receive(:valid?).and_return(true)
+        subject
+      end
+
+      it "raises if not valid" do
+        existing_doc.stub(:valid?).and_return(false)
+        expect do
+          subject
+        end.should raise_error(MongoDoc::DocumentInvalidError)
+      end
+
+      it "delegates to collection update" do
+        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => true)
+        subject
+      end
+
+      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
+
+  describe "#hash_with_modifier_path_keys" do
+    it "returns a hash with the keys prepended with the modifier path" do
+      new_doc.stub(:_modifier_path).and_return('path.to.root')
+      new_doc.send(:hash_with_modifier_path_keys, :name => 1).should == {'path.to.root.name' => 1}
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Les Hill
@@ -231,6 +231,7 @@ files:
 - lib/mongo_doc/matchers.rb
 - lib/mongo_doc/railtie.rb
 - lib/mongo_doc/railties/config.rb
+- lib/mongo_doc/railties/db_prepare.task
 - lib/mongo_doc/root.rb
 - lib/mongo_doc/scope.rb
 - lib/mongo_doc/timestamps.rb
@@ -295,6 +296,7 @@ files:
 - spec/scope_spec.rb
 - spec/spec_helper.rb
 - spec/timestamps_spec.rb
+- spec/update_spec.rb
 - spec/validations_spec.rb
 has_rdoc: true
 homepage: http://github.com/leshill/mongodoc
@@ -362,6 +364,7 @@ test_files:
 - spec/scope_spec.rb
 - spec/spec_helper.rb
 - spec/timestamps_spec.rb
+- spec/update_spec.rb
 - spec/validations_spec.rb
 - examples/simple_document.rb
 - examples/simple_object.rb