active_metadata 0.3.1 → 0.3.2

data/lib/active_metadata/base.rb

@@ -95,7 +95,7 @@ module ActiveMetadata
       # Conflicts
       # ====
       # * @conflicts[:warnings] contains any conflict that "apply cleanly" or where the submit value has not been modified by the user that is saving
-      #  the data
+      #  the data.
       #
       # * @conflicts[:fatals] contains any conflict that "do not apply cleanly" or where the passed value does not match the last history value and was modified
       #   by the user that is submittig the data
@@ -120,14 +120,11 @@ module ActiveMetadata
           #if the timestamp is previous of the last history change
           if timestamp < latest_history.created_at.to_f
 
-            # there is a conflict so ensure the actual value
-            self[key.to_sym] = self.changes[key][0]
-
             # We have a conflict.
             # Check if the actual submission has been modified
-            histories.each do |h|
+            histories.each_with_index do |h,i|
               # Looking for the value that was loaded by the user. First history with a ts that is younger than the form ts
-              next if timestamp > h.created_at.to_f
+              next if h.created_at.to_f > timestamp
 
               # History stores values as strings so any boolean is stored as "0" or "1"
               # We need to translate the params passed for a safer comparison.
@@ -135,11 +132,16 @@ module ActiveMetadata
                 b_val = to_bool(h.value)
               end
 
+              # conflict ensure the actual value is not modified
+              self[key.to_sym] = self.changes[key][0]
+
               if [h.value, b_val].include? val
-                self.conflicts[:warnings] << {key.to_sym => [val, h]}
+                self.conflicts[:warnings] << {key.to_sym => latest_history}
               else
-                self.conflicts[:fatals] << {key.to_sym => [val, h]}
+                self.conflicts[:fatals] << {key.to_sym => latest_history}
               end
+
+              break #done for this field
             end
 
           end

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/concurrency_spec.rb

@@ -93,6 +93,52 @@ describe "Manage Concurrency" do
 
     end
 
+    it "should register a warning if the history newest value is different from the submitted once but the submitting user has not modified the value" do
+      #fixtures
+      value = @document.name
+      form_timestamp = Time.now
+      params = {:name => "nuovo nome"}
+
+      #someone change the field value
+      sleep 0.2.seconds
+      @document.update_attributes(params)
+
+      # user submit a different value
+      sleep 0.2.seconds
+      different_params = {:name => value, :active_metadata_timestamp => form_timestamp}
+      @document.update_attributes(different_params)
+
+      #assetions
+      warnings = @document.conflicts[:warnings]
+      warnings.size.should eq 1
+      warnings[0][:name].value.should eq "nuovo nome"
+
+      @document.conflicts[:fatals].should be_empty
+    end
+
+    it "when a warning is registered the submitted value is skipped" do
+      #fixtures
+      value = @document.name
+      form_timestamp = Time.now
+      params = {:name => "nuovo nome"}
+
+      #someone change the field value
+      sleep 0.2.seconds
+      @document.update_attributes(params)
+
+      # user submit a different value
+      sleep 0.2.seconds
+      different_params = {:name => value, :active_metadata_timestamp => form_timestamp}
+      @document.update_attributes(different_params)
+
+      #assetions
+      hs = @document.history_for(:name)
+      hs.count.should eq 2
+      hs.first.value.should eq "nuovo nome"
+      Document.last.name.should eq "nuovo nome"
+
+    end
+
     it "should reject the change as fatal if the history newest value is different from the submitted once and both user has changed the value" do
       #fixtures
       form_timestamp = Time.now
@@ -102,7 +148,7 @@ describe "Manage Concurrency" do
       sleep 0.2.seconds
       @document.update_attributes(params)
 
-      # user submit a new value
+      # user submit a different value
       sleep 0.2.seconds
       different_params = {:name => "altro nome", :active_metadata_timestamp => form_timestamp}
       @document.update_attributes(different_params)
@@ -110,8 +156,26 @@ describe "Manage Concurrency" do
       #assetions
       fatals = @document.conflicts[:fatals]
       fatals.size.should eq 1
-      fatals[0][:name][0].should eq "altro nome"
+      fatals[0][:name].value.should eq "nuovo nome"
       @document.conflicts[:warnings].should be_empty
+
+    end
+
+    it "when a fatal conflict occurs the submitted value is skipped" do
+      #fixtures
+      form_timestamp = Time.now
+      params = {:name => "nuovo nome"}
+
+      #someone change the field value
+      sleep 0.2.seconds
+      @document.update_attributes(params)
+
+      # user submit a different value
+      sleep 0.2.seconds
+      different_params = {:name => "altro nome", :active_metadata_timestamp => form_timestamp}
+      @document.update_attributes(different_params)
+
+      #assetions
       hs = @document.history_for(:name)
       hs.count.should eq 2
       hs.first.value.should eq "nuovo nome"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2165045260 !ruby/object:Gem::Requirement
+  requirement: &2168900840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165045260
+  version_requirements: *2168900840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165044820 !ruby/object:Gem::Requirement
+  requirement: &2168900260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165044820
+  version_requirements: *2168900260
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2165044400 !ruby/object:Gem::Requirement
+  requirement: &2168899660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165044400
+  version_requirements: *2168899660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2165043980 !ruby/object:Gem::Requirement
+  requirement: &2168898680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165043980
+  version_requirements: *2168898680
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2165043480 !ruby/object:Gem::Requirement
+  requirement: &2168897840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165043480
+  version_requirements: *2168897840
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165042740 !ruby/object:Gem::Requirement
+  requirement: &2168896740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165042740
+  version_requirements: *2168896740
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2165041060 !ruby/object:Gem::Requirement
+  requirement: &2168895600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165041060
+  version_requirements: *2168895600
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2165040000 !ruby/object:Gem::Requirement
+  requirement: &2168894400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165040000
+  version_requirements: *2168894400
 - !ruby/object:Gem::Dependency
   name: to_xls
-  requirement: &2165038720 !ruby/object:Gem::Requirement
+  requirement: &2168893600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165038720
+  version_requirements: *2168893600
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com