mongo_doc 0.6.25 → 0.6.26

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: 0.6.25 2010/10/17
+Version: 0.6.26 2010/12/06
 
 h2. Notes
 

data/VERSION

@@ -1 +1 @@
-0.6.25
+0.6.26

data/lib/mongo_doc/document.rb

@@ -114,14 +114,14 @@ module MongoDoc
       self.attributes = attrs
       return save if new_record?
       return false unless valid?
-      _update_attributes(attrs, false)
+      _update_attributes(converted_attributes(attrs), false)
     end
 
     def update_attributes!(attrs)
       self.attributes = attrs
       return save! if new_record?
       raise DocumentInvalidError unless valid?
-      _update_attributes(attrs, true)
+      _update_attributes(converted_attributes(attrs), true)
     end
 
     # Update without checking validations. The +Document+ will be saved without validations if it is a new record.
@@ -131,7 +131,7 @@ module MongoDoc
         _root.send(:_save, safe) if _root
         _save(safe)
       else
-        _update_attributes(attrs, safe)
+        _update_attributes(converted_attributes(attrs), safe)
       end
     end
 
@@ -186,6 +186,14 @@ module MongoDoc
       raise e
     end
 
+    def converted_attributes(attrs)
+      converted = {}
+      attrs.keys.each do |attr|
+        converted[attr] = send(attr)
+      end
+      converted
+    end
+
     def hash_with_modifier_path_keys(hash)
       hash.stringify_keys!
       {}.tap do |dup|

data/lib/mongo_doc.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.25'
+  VERSION = '0.6.26'
 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.6.25"
+  s.version = "0.6.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-10-17}
+  s.date = %q{2010-12-06}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [

data/spec/update_spec.rb

@@ -6,12 +6,14 @@ describe "MongoDoc::Document" do
     include MongoDoc::Document
 
     attr_accessor :child_data
+    attr_accessor :child_int, :type => Integer
   end
 
   class UpdateAttributes
     include MongoDoc::Document
 
     attr_accessor :data
+    attr_accessor :int, :type => Integer
     embed :child
   end
 
@@ -40,33 +42,34 @@ describe "MongoDoc::Document" 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')
+        new_doc.update(:data => 'data', :int => '1')
       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')
+        new_child.update(:child_data => 'data', :child_int => '1')
       end
     end
 
     context "with an existing doc" do
 
-      subject { existing_doc.update(:data => 'data') }
+      subject { existing_doc.update(:data => 'data', :int => '1') }
 
       it "sets the attributes" do
         subject
         existing_doc.data.should == 'data'
+        existing_doc.int.should == 1
       end
 
       it "delegates to collection update" do
-        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => false)
+        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data', :int => 1}}, :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')
+          collection.should_receive(:update).with({'_id' => existing_doc._id, 'child._id' => child._id}, {'$set' => {'child.child_data' => 'data', 'child.child_int' => 1}}, :safe => true)
+          child.update_attributes!(:child_data => 'data', :child_int => '1')
         end
       end
     end
@@ -75,16 +78,17 @@ describe "MongoDoc::Document" do
   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')
+      new_doc.update_attributes(:data => 'data', :int => '1')
     end
 
     context "with an existing doc" do
 
-      subject { existing_doc.update_attributes(:data => 'data') }
+      subject { existing_doc.update_attributes(:data => 'data', :int => '1') }
 
       it "sets the attributes" do
         subject
         existing_doc.data.should == 'data'
+        existing_doc.int.should == 1
       end
 
       it "validates the doc" do
@@ -98,14 +102,14 @@ describe "MongoDoc::Document" do
       end
 
       it "delegates to collection update" do
-        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => false)
+        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data', :int => 1}}, :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')
+          collection.should_receive(:update).with({'_id' => existing_doc._id, 'child._id' => child._id}, {'$set' => {'child.child_data' => 'data', 'child.child_int' => 1}}, :safe => false)
+          child.update_attributes(:child_data => 'data', :child_int => '1')
         end
       end
     end
@@ -114,16 +118,17 @@ describe "MongoDoc::Document" do
   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')
+      new_doc.update_attributes!(:data => 'data', :int => '1')
     end
 
     context "with an existing doc" do
 
-      subject { existing_doc.update_attributes!(:data => 'data') }
+      subject { existing_doc.update_attributes!(:data => 'data', :int => '1') }
 
       it "sets the attributes" do
         subject
         existing_doc.data.should == 'data'
+        existing_doc.int.should == 1
       end
 
       it "validates the doc" do
@@ -139,14 +144,14 @@ describe "MongoDoc::Document" do
       end
 
       it "delegates to collection update" do
-        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data'}}, :safe => true)
+        collection.should_receive(:update).with({'_id' => existing_doc._id}, {'$set' => {:data => 'data', :int => 1}}, :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')
+          collection.should_receive(:update).with({'_id' => existing_doc._id, 'child._id' => child._id}, {'$set' => {'child.child_data' => 'data', 'child.child_int' => 1}}, :safe => true)
+          child.update_attributes!(:child_data => 'data', :child_int => '1')
         end
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 25
-  version: 0.6.25
+  - 26
+  version: 0.6.26
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-12-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency