json_record 1.0.3 → 1.0.4

data/CHANGE_LOG

@@ -11,3 +11,7 @@
 1.0.3
   - Added before and after validation callbacks on EmbeddedDocument
   - Fixed bug where fields couldn't be set to false
+
+1.0.4
+  - Fixed bug with tracking changes when initializing an EmbeddedDocument.
+  - Removed tracking changes of keys that are EmbeddedDocuments

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/json_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json_record}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2010-02-20}
+  s.date = %q{2010-02-22}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
     "README.rdoc"

data/lib/json_record/attribute_methods.rb

@@ -22,8 +22,8 @@ module JsonRecord
     end
 
     # Write a field. The field param must be a FieldDefinition and the context should be the record
-    # which is being read from. Track_changes indicates if changes to the object should be tracked.
-    def write_attribute (field, val, track_changes, context)
+    # which is being read from.
+    def write_attribute (field, val, context)
       if field.multivalued?
         val = val.values if val.is_a?(Hash)
         json_attributes[field.name] = EmbeddedDocumentArray.new(field.type, context, val)
@@ -32,7 +32,7 @@ module JsonRecord
         converted_value = field.convert(val)
         converted_value.parent = context if converted_value.is_a?(EmbeddedDocument)
         unless old_value == converted_value
-          if track_changes
+          unless field.type.include?(EmbeddedDocument) or Thread.current[:do_not_track_json_field_changes]
             changes = changed_attributes
             if changes.include?(field.name)
               changes.delete(field.name) if converted_value == changes[field.name]

data/lib/json_record/embedded_document.rb

@@ -84,7 +84,7 @@ module JsonRecord
       @json_attributes = {}
       attrs.each_pair do |name, value|
         field = schema.fields[name.to_s] || FieldDefinition.new(name, :type => value.class)
-        write_attribute(field, value, false, self)
+        write_attribute(field, value, self)
       end
     end
     
@@ -156,8 +156,8 @@ module JsonRecord
       read_attribute(field, self)
     end
     
-    def write_json_attribute (json_field_name, field, value, track_changes)
-      write_attribute(field, value, track_changes, self)
+    def write_json_attribute (json_field_name, field, value)
+      write_attribute(field, value, self)
     end
   
     def changed_attributes

data/lib/json_record/json_field.rb

@@ -33,11 +33,17 @@ module JsonRecord
       unless @record[@name].blank?
         json = @record[@name]
         json = Zlib::Inflate.inflate(json) if @compressed
-        ActiveSupport::JSON.decode(json).each_pair do |attr_name, attr_value|
-          field = nil
-          @schemas.each{|schema| field = schema.fields[attr_name]; break if field}
-          field = FieldDefinition.new(attr_name, :type => attr_value.class) unless field
-          write_attribute(field, attr_value, false, @record)
+        do_not_track_changes = Thread.current[:do_not_track_json_field_changes]
+        Thread.current[:do_not_track_json_field_changes] = true
+        begin
+          ActiveSupport::JSON.decode(json).each_pair do |attr_name, attr_value|
+            field = nil
+            @schemas.each{|schema| field = schema.fields[attr_name]; break if field}
+            field = FieldDefinition.new(attr_name, :type => attr_value.class) unless field
+            write_attribute(field, attr_value, @record)
+          end
+        ensure
+          Thread.current[:do_not_track_json_field_changes] = do_not_track_changes
         end
       end
     end

data/lib/json_record/schema.rb

@@ -113,16 +113,18 @@ module JsonRecord
     def define_json_accessor (field, json_field_name)
       @klass.send(:define_method, field.name) {read_json_attribute(json_field_name, field)}
       @klass.send(:define_method, "#{field.name}?") {!!read_json_attribute(json_field_name, field)} if field.type == Boolean
-      @klass.send(:define_method, "#{field.name}=") {|val| write_json_attribute(json_field_name, field, val, true)}
-      @klass.send(:define_method, "#{field.name}_changed?") {self.send(:attribute_changed?, field.name)}
-      @klass.send(:define_method, "#{field.name}_change") {self.send(:attribute_change, field.name)}
-      @klass.send(:define_method, "#{field.name}_was") {self.send(:attribute_was, field.name)}
+      @klass.send(:define_method, "#{field.name}=") {|val| write_json_attribute(json_field_name, field, val)}
       @klass.send(:define_method, "#{field.name}_before_type_cast") {self.read_attribute_before_type_cast(field.name)}
+      unless field.type.include?(EmbeddedDocument)
+        @klass.send(:define_method, "#{field.name}_changed?") {self.send(:attribute_changed?, field.name)}
+        @klass.send(:define_method, "#{field.name}_change") {self.send(:attribute_change, field.name)}
+        @klass.send(:define_method, "#{field.name}_was") {self.send(:attribute_was, field.name)}
+      end
     end
     
     def define_many_json_accessor (field, json_field_name)
       @klass.send(:define_method, field.name) {self.read_json_attribute(json_field_name, field)}
-      @klass.send(:define_method, "#{field.name}=") {|val| self.write_json_attribute(json_field_name, field, val, true)}
+      @klass.send(:define_method, "#{field.name}=") {|val| self.write_json_attribute(json_field_name, field, val)}
     end
   end
 end

data/lib/json_record/serialized.rb

@@ -93,8 +93,8 @@ module JsonRecord
       end
       
       # Write a field value to a JsonField
-      def write_json_attribute (json_field_name, field, value, track_changes)
-        json_fields[json_field_name].write_attribute(field, value, track_changes, self)
+      def write_json_attribute (json_field_name, field, value)
+        json_fields[json_field_name].write_attribute(field, value, self)
       end
       
       # Serialize the JSON in the record into JsonField objects.

data/spec/embedded_document_spec.rb

@@ -36,17 +36,20 @@ describe JsonRecord::EmbeddedDocument do
   end
   
   it "should track changes to attributes" do
-    trait = JsonRecord::Test::Trait.new
+    trait = JsonRecord::Test::Trait.new(:value => "val")
+    trait.value_changed?.should == true
+    trait.value_was.should == nil
+    trait.value_change.should == [nil, "val"]
     trait.name = "test"
     trait.name_was.should == nil
     trait.name_changed?.should == true
     trait.name_change.should == [nil, "test"]
-    trait.changes.should == {"name" => [nil, "test"]}
+    trait.changes.should == {"value" => [nil, "val"], "name" => [nil, "test"]}
     trait.name = nil
     trait.name_changed?.should == false
     trait.name_was.should == nil
     trait.name_change.should == nil
-    trait.changes.should == {}
+    trait.changes.should == {"value" => [nil, "val"]}
   end
   
   it "should convert to attributes to json" do

data/spec/serialized_spec.rb

@@ -228,10 +228,19 @@ describe JsonRecord::Serialized do
   end
   
   it "should track changes on json attributes" do
-    model = JsonRecord::Test::Model.create!(:name => "test name")
+    model = JsonRecord::Test::Model.new(:name => "test name", :primary_trait => {:name => "n1", :value => "v1"})
+    model.changes.should == {"name" => [nil, "test name"]}
+    model.primary_trait.changes.should == {"name" => [nil, "n1"], "value" => [nil, "v1"]}
+    model.save!
     model.changes.should == {}
+    
+    model.reload
+    model.changes.should == {}
+    model.primary_trait.name.should == "n1"
     model.name = "new name"
     model.value = 1
+    model.primary_trait = {:name => "n2", :value => "v2"}
+    
     model.changes.should == {"name" => ["test name", "new name"], "value" => [0, 1]}
     model.name_changed?.should == true
     model.name_was.should == "test name"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: json_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -06:00
+date: 2010-02-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency