georgepalmer-couch_foo 0.7.14 → 0.7.15

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 14
+:patch: 15

data/lib/couch_foo/base.rb

@@ -1825,8 +1825,7 @@ module CouchFoo
     # attributes not included in that won't be allowed to be mass-assigned.
     def attributes=(new_attributes, guard_protected_attributes = true)
       return if new_attributes.nil?
-      attributes = new_attributes.dup
-      attributes.stringify_keys!
+      attributes = normalize_attrs(new_attributes)
 
       multi_parameter_attributes = []
       attributes = remove_attributes_protected_from_mass_assignment(attributes) if guard_protected_attributes
@@ -1974,6 +1973,16 @@ module CouchFoo
         write_attribute(self.class.inheritance_column, self.class.name)
       end
     end
+
+    def normalize_attrs(new_attributes)
+      attributes = new_attributes.dup
+      attributes.stringify_keys!
+      id = attributes.delete("id")
+      rev = attributes.delete("rev")
+      attributes["_id"] = id if id
+      attributes["_rev"] = rev if rev
+      attributes
+    end
     
     def remove_attributes_protected_from_mass_assignment(attributes)
       safe_attributes =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: georgepalmer-couch_foo
 version: !ruby/object:Gem::Version 
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors: 
 - George Palmer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency