serialist 1.5.0 → 1.6.0

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/lib/serialist/serialist_module.rb

@@ -9,10 +9,18 @@ module Serialist
     attr_accessor :serialist_field
 
     def serialist(serialist_field, serialist_options = [])
-      @serialist_field ||= serialist_field
-      @serialist_options ||= []
-      @serialist_options = (@serialist_options + serialist_options).uniq
+      @serialist_field = serialist_field
+      @serialist_options = serialist_options
       serialize(@serialist_field, Hash)
+      include Serialist::DirtyAdditions
+      class_eval do
+        unless method_defined?(:changes)
+          def changes(meth, *args, &block); super; end
+        end
+        alias_method :old_changes, :changes
+        alias_method :changes, :serialist_changes
+      end
+      
       if serialist_options.empty?
         # catch-all mode
         include Serialist::InstanceMethods
@@ -55,8 +63,10 @@ module Serialist
       when "="
         define_method method do |param|
           self.send(serialist_field.to_s + "=", Hash.new) unless self.send(serialist_field)
-          self.send(serialist_field)[method[0..-2].to_sym] = param
-          write_attribute(serialist_field.to_s, self.send(serialist_field)) # needed to get dirty
+          # needed to get dirty
+          slug = self.send(serialist_field).clone
+          slug[method[0..-2].to_sym] = param
+          write_attribute(serialist_field.to_s, slug)
         end
       else
         define_method method do 
@@ -98,6 +108,19 @@ module Serialist
       end
     end
   end
+  
+  module DirtyAdditions
+    def serialist_changes
+      full_changes = self.old_changes
+      unless (slug = full_changes.delete(self.class.serialist_field.to_s)).blank?
+        ((slug[0].try(:keys) || []) + (slug[1].try(:keys) || [])).uniq.each do |serialized_key| 
+          attr_change = [(slug[0].try(:fetch, serialized_key) rescue nil), (slug[1].try(:fetch, serialized_key) rescue nil)]
+          full_changes[serialized_key.to_s] = attr_change if attr_change[0] != attr_change[1]
+        end
+      end
+      full_changes
+    end
+  end
 end
 
 

data/serialist.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{serialist}
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benoit B\303\251n\303\251zech"]

data/test/serialist_test.rb

@@ -87,6 +87,7 @@ class SerialistTest < Test::Unit::TestCase
     @serialisted.reload
     assert_equal @serialisted.foo, "foo2"
     @serialisted.baz = "baz"
+    assert_equal @serialisted.changes, {"baz"=>[nil, "baz"]}
     @serialisted.save
     @serialisted.reload
     assert_equal @serialisted.baz, "baz"
@@ -106,9 +107,11 @@ class SerialistTest < Test::Unit::TestCase
     assert_equal @serialisted.foo, "foo"
     assert_equal @serialisted.foo?, true
     @serialisted.foo = "foo2"
+    assert_equal @serialisted.changes, {"foo"=>["foo", "foo2"]}
     @serialisted.save
     @serialisted.reload
     assert_equal @serialisted.foo, "foo2"
+    assert_equal @serialisted.changes, {}
     @serialisted.bar = nil
     @serialisted.save
     @serialisted.reload

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"