active_metadata 0.8.7 → 0.8.7.1

data/lib/active_metadata/persistence/history.rb

@@ -9,10 +9,7 @@ module ActiveMetadata::Persistence::History
     def save_history
       return if ActiveMetadata.skip_history?
       self.changes.each do |key, value|
-        # Do not go on in case if new and old values are nil
-        # https://github.com/rails/rails/issues/8874
-        return if value.compact.empty?
-        next if ActiveMetadata::CONFIG['history_skip_fields'].include?(key)
+        next if ActiveMetadata::CONFIG['history_skip_fields'].include?(key) || !change_is_valid_for_history?(value)
         ActiveMetadata::History.create! :value => value[1],:model_class => metadata_class, :model_id => metadata_id,:label => key.to_s, :created_by => current_user_id
         invalidate_history_cache_for key.to_s
         self.send(:send_notification, key, value[0], value[1], :history_message, current_user_id) unless skip_history_notification?
@@ -35,6 +32,20 @@ module ActiveMetadata::Persistence::History
       ActiveMetadata::History.all(:conditions => {:model_class => metadata_class, :model_id => metadata_id,:label => field}, :order => order)
     end
 
+    private
+
+    # Private
+    #
+    # - change The change array coming from AR changes method
+    #
+    # Return false if chnage has the following aspect:
+    #  * [nil, nil]
+    #  * ["", nil]
+    #  * [nil, ""]
+    def change_is_valid_for_history? change
+      sanitized_change = change.dup.compact
+      sanitized_change.empty? || (sanitized_change.size == 1 && sanitized_change[0].to_s.blank?) ? false : true
+    end
 
   end
 end

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.8.7"
+  VERSION = "0.8.7.1"
 end

data/spec/lib/history_spec.rb

@@ -3,7 +3,6 @@ require "time"
 
 describe ActiveMetadata do
 
-
   describe "history" do
 
     before(:each) do
@@ -28,8 +27,6 @@ describe ActiveMetadata do
     end
 
     it "should not save the history and send any notification if new value and old are both nil" do
-      # see
-      # https://github.com/rails/rails/issues/8874
       @user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith')
       ActiveMetadata::Watcher.create! :model_class => "Document", :label => :date, :owner_id => @user.id
       @document.date = ""
@@ -38,6 +35,15 @@ describe ActiveMetadata do
       @document.history_for(:date).should be_empty
     end
 
+    it "should not save the history and send any notification if changes is [nil,""]" do
+      @user = User.create!(:email => "email@email.it", :lastname => 'smith')
+      ActiveMetadata::Watcher.create! :model_class => "Document", :label => :date, :owner_id => @user.id
+      @document.surname = ""
+      @document.save
+      @document.notifier.should be_nil
+      @document.history_for(:surname).should be_empty
+    end
+
     it "should verify that history return records only for the self document" do
       # fixtures
       @another_doc = Document.create :name => "Andrea"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -245,7 +245,6 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/dummy/tmp/cache/.gitkeep
 - spec/helpers/active_metadata/stream_helpers_spec.rb
 - spec/lib/active_metadata_spec.rb
 - spec/lib/attachments_spec.rb
@@ -278,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3047558855022061685
+      hash: -264193675356772785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -287,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3047558855022061685
+      hash: -264193675356772785
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.24
@@ -340,7 +339,6 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/dummy/tmp/cache/.gitkeep
 - spec/helpers/active_metadata/stream_helpers_spec.rb
 - spec/lib/active_metadata_spec.rb
 - spec/lib/attachments_spec.rb