active_metadata 0.3.0 → 0.3.1

data/lib/active_metadata/base.rb

@@ -38,11 +38,20 @@ module ActiveMetadata
       include ActiveMetadata::Helpers
 
       def self.included(klass)
+
         [:notes, :attachments, :history].each do |item|
           klass.send(:define_method, "#{item.to_s}_cache_key".to_sym) do |field|
             "#{Rails.env}/active_metadata/#{item.to_s}/#{self.class}/#{metadata_id}/#{field}/"
           end
         end
+
+        [:fatals, :warnings].each do |conf|
+          klass.send(:define_method, "has_#{conf.to_s}_conflicts?".to_sym) do
+            return false if self.conflicts.nil? || self.conflicts[conf.to_sym].nil? || self.conflicts[conf.to_sym].empty?
+            true
+          end
+        end
+
       end
 
       def metadata_id
@@ -101,17 +110,18 @@ module ActiveMetadata
         self.attributes.each do |key, val|
           # ensure the query order
           histories = history_for key.to_sym, "created_at DESC"
-          next if histories.count == 0 #if history does not exists yet cannot be a conflict
+
+          # if history does not exists yet cannot be a conflict  OR
+          # if value has no change respect to the latest db saved we have no conflict
+          next if histories.count == 0 || self.changes[key].nil?
 
           latest_history = histories.first
 
           #if the timestamp is previous of the last history change
           if timestamp < latest_history.created_at.to_f
 
-            begin
-              self[key.to_sym] = self.changes[key][0]
-            rescue
-            end  # there is a conflict so ensure the actual value if any change exists
+            # 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

data/lib/active_metadata/version.rb

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

data/spec/concurrency_spec.rb

@@ -37,6 +37,19 @@ describe "Manage Concurrency" do
 
   end
 
+  describe "has_fatals_conflicts" do
+
+    it "should return false if no fatals conflicts are present" do
+        @document.has_fatals_conflicts?.should be_false
+    end
+
+    it "should return true if model has generated fatals conflicts" do
+       @document.conflicts= {:fatals => [1]}
+       @document.has_fatals_conflicts?.should be_true
+    end
+
+  end
+
   describe "when a field is modified and the form ts is subsequent of the history ts" do
 
     it "should save the new value and history must be updated with the latest change" do
@@ -58,7 +71,7 @@ describe "Manage Concurrency" do
 
   describe "when a field is modified and the form ts is preceding the history ts" do
 
-    it "should not change the model value and the history if the newest history value is equal to the submitted once, param should be retuned as warning" do
+    it "should not change the model value and the history if the newest history value is equal to the submitted once" do
       form_timestamp = Time.now
 
       #someone change the field value
@@ -69,11 +82,9 @@ describe "Manage Concurrency" do
       sleep 0.2.seconds
       @document.update_attributes({:name => "nuovo nome", :active_metadata_timestamp => form_timestamp})
 
-      warnings = @document.conflicts[:warnings]
-      warnings.size.should eq 1
-      warnings[0][:name][0].should eq "nuovo nome"
-
+      @document.conflicts[:warnings].should be_empty
       @document.conflicts[:fatals].should be_empty
+
       hs = @document.history_for(:name)
       #last change shoudl not be recorded in history
       hs.count.should eq 2
@@ -82,7 +93,7 @@ describe "Manage Concurrency" do
 
     end
 
-    it "should reject the change if the history newest value is different from the submitted once, param should be returned as fatal" do
+    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
       params = {:name => "nuovo nome"}
@@ -108,27 +119,6 @@ describe "Manage Concurrency" do
 
     end
 
-    it "should return both fatals and warnings if required" do
-      form_timestamp = Time.now
-      params = {:name => "nuovo nome", :keep_alive => false}
-
-      #someone change the field value
-      sleep 0.2.seconds
-      @document.update_attributes params
-
-      # user submit a new value
-      sleep 0.2.seconds
-      different_params = {:name => "altro nome", :keep_alive => false, :active_metadata_timestamp => form_timestamp}
-      @document.update_attributes(different_params)
-
-      fatals = @document.conflicts[:fatals]
-      fatals.size.should eq 1
-      fatals[0][:name][0].should eq "altro nome"
-      warnings = @document.conflicts[:warnings]
-      warnings.size.should eq 1
-      warnings[0][:keep_alive][0].should eq false
-    end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2169814040 !ruby/object:Gem::Requirement
+  requirement: &2165045260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169814040
+  version_requirements: *2165045260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169813620 !ruby/object:Gem::Requirement
+  requirement: &2165044820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169813620
+  version_requirements: *2165044820
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2169813200 !ruby/object:Gem::Requirement
+  requirement: &2165044400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169813200
+  version_requirements: *2165044400
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2169812780 !ruby/object:Gem::Requirement
+  requirement: &2165043980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169812780
+  version_requirements: *2165043980
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2169812300 !ruby/object:Gem::Requirement
+  requirement: &2165043480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169812300
+  version_requirements: *2165043480
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169811520 !ruby/object:Gem::Requirement
+  requirement: &2165042740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169811520
+  version_requirements: *2165042740
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2169810280 !ruby/object:Gem::Requirement
+  requirement: &2165041060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169810280
+  version_requirements: *2165041060
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2169803300 !ruby/object:Gem::Requirement
+  requirement: &2165040000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169803300
+  version_requirements: *2165040000
 - !ruby/object:Gem::Dependency
   name: to_xls
-  requirement: &2169802640 !ruby/object:Gem::Requirement
+  requirement: &2165038720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169802640
+  version_requirements: *2165038720
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com