rhoconnect 4.0.0.beta.12 → 4.0.0.beta.24

data/spec/server/server_spec.rb

@@ -145,6 +145,26 @@ describe "Server" do
           last_response.status.should == 204
         end
       end
+
+      context "rps app authenticate" do
+        it "should authenticate rhoconnect app with correct push server credentials" do
+          # Test app push server settings are
+          # :push_server: http://user:pwd@localhost:8675
+          authorize 'user', 'pwd'
+          get "/rc/#{Rhoconnect::API_VERSION}/system/rps_login", {}
+          last_response.status.should == 204
+        end
+        it "should not authenticate rhoconnect app with invalid rhoconnect push server credentials" do
+          authorize 'someappname', ''
+          get "/rc/#{Rhoconnect::API_VERSION}/system/rps_login", {}
+          last_response.status.should == 401
+        end
+        it "should not authenticate rhoconnect app with invalid basic Authorization header in request" do
+          # Basic Authorization header is missing
+          get "/rc/#{Rhoconnect::API_VERSION}/system/rps_login", {}
+          last_response.status.should == 401
+        end
+      end
     end
 
     describe "controller custom routes" do

data/spec/server/stats_spec.rb

@@ -46,22 +46,12 @@ describe "Middleware" do
     Rhoconnect::Stats::Record.key(metric).should == "stat:#{metric}"
 
     # The conversion algorithm (float to string) currently checks two precisions. 
-    # In Ruby 1.9, it tries 16 digits and if that's not enough it then uses 17. 
-    # In 1.8, it's the same but with 15 and 16.
-    if RUBY_VERSION =~ /1.9/      
-      Rhoconnect::Stats::Record.range(metric, 0, -1).should == [
-        "2.0,0.6000000000000014:12", 
-        "2.0,0.6000000000000014:14", 
-        "2.0,0.6000000000000014:16", 
-        "2.0,0.6000000000000014:18"
-      ]
-    else
-      Rhoconnect::Stats::Record.range(metric, 0, -1).should == [
-        "2.0,0.600000000000002:12", 
-        "2.0,0.600000000000002:14", 
-        "2.0,0.600000000000002:16", 
-        "2.0,0.600000000000002:18"
-      ]
-    end
+    # it tries 16 digits and if that's not enough it then uses 17.       
+    Rhoconnect::Stats::Record.range(metric, 0, -1).should == [
+      "2.0,0.6000000000000014:12", 
+      "2.0,0.6000000000000014:14", 
+      "2.0,0.6000000000000014:16", 
+      "2.0,0.6000000000000014:18"
+    ]
   end  
 end

data/spec/source_adapter_spec.rb

@@ -109,6 +109,12 @@ describe "Model" do
         Store.get_value(@s.docname(:md_size)).to_i.should == 2
       end
 
+      it "should execute Model sync method with nil result" do
+        @sa.inject_result nil
+        @sa.do_query
+        Store.get_data(@s.docname(:md)).should == {}
+      end
+
       it "should fail gracefully if @result is missing" do
         @sa.inject_result nil
         lambda { @sa.query }.should_not raise_error

data/spec/source_sync_spec.rb

@@ -305,21 +305,34 @@ describe "SourceSync" do
       before (:each) do
         rh = lambda { @model.create(params[:create_object])}
         @ssc = Rhoconnect::Handler::Changes::Engine.new(['create'], @model, rh, {})
+        @queue_name = "create"
+        @u2_fields = {:login => 'anotheruser'}
+        @u2 = User.create(@u2_fields)
+        @u2.password = 'testpass'
+        @c2_fields = {
+          :device_type => 'Android',
+          :device_pin => 'efgh',
+          :device_port => '4444',
+          :user_id => @u2.id,
+          :app_id => @a.id
+        }
+        @c2 = Client.create(@c2_fields,{:source_name => @s_fields[:name]})
+        @a.users << @u2.id
       end
 
       it "should do create where adapter.create returns nil" do
-        set_source_queue_state(@s, {:create => {'2'=>@product2}}, @c.id, true)
+        set_source_queue_state(@s, {@queue_name => [[@s.name, [['2', @product2]]]]}, @c.id, true)
         @ssc.create
-        verify_source_queue_data(@s, :create => [])
+        verify_source_queue_data(@s, @queue_name => [])
         verify_doc_result(@c, {:create_errors => {},
                                :create_links => {}})
       end
 
       it "should do create where adapter.create returns object link" do
         @product4['link'] = 'test link'
-        set_source_queue_state(@s, {:create => {'4'=>@product4}},@c.id,true)
+        set_source_queue_state(@s, {@queue_name => [[@s.name, [['4', @product4]]]]},@c.id,true)
         @ssc.create
-        verify_source_queue_data(@s, :create => [])
+        verify_source_queue_data(@s, @queue_name => [])
         verify_doc_result(@c, {:create_errors => {},
                             :create_links => {'4'=>{'l'=>'backend_id'}}})
       end
@@ -327,35 +340,66 @@ describe "SourceSync" do
       it "should raise exception on adapter.create" do
         msg = "Error creating record"
         data = add_error_object({'4'=>@product4,'2'=>@product2},msg)
-        set_source_queue_state(@s, {:create => data},@c.id, true)
+        source_queue_data = []
+        data.each do |key, value|
+          source_queue_data << [key, value]
+        end
+        set_source_queue_state(@s, {@queue_name => [[@s.name, source_queue_data]]},@c.id, true)
         @ssc.create
         verify_doc_result(@c, :create_errors => 
           {"#{ERROR}-error"=>{"message"=>msg},ERROR=>data[ERROR]})
       end
+
+      it "should properly process creates for 2 users using same queue" do
+        @product3['link'] = 'test link'
+        @product4['link'] = 'test link'
+        set_source_queue_state(@s, {@queue_name => [[@s.name, [['temp_id1', @product3]]]]},@c.id,true)
+        set_source_queue_state(@s, {@queue_name => [[@s.name, [['temp_id2', @product4]]]]},@c2.id,true)
+        @s.queue_docname(:create).should == "source:application:#{@s.name}:create"
+        @ssc.create
+        verify_source_queue_data(@s, @queue_name => [])
+        creates_source1 = Source.load(@s.name,
+                    {:user_id => @u.id,:app_id => @a.id})
+        creates_source2 = Source.load(@s.name,
+                    {:user_id => @u2.id,:app_id => @a.id})
+        verify_doc_result(creates_source1, {:md => {'backend_id' => @product3}})
+        verify_doc_result(creates_source2, {:md => {'backend_id' => @product4}})
+        verify_doc_result(@c, {:create_errors => {},
+                            :create_links => {'temp_id1'=>{'l'=>'backend_id'}}})
+        verify_doc_result(@c2, {:create_errors => {},
+                            :create_links => {'temp_id2'=>{'l'=>'backend_id'}}})
+      end
     end
 
     describe "update" do
       before (:each) do
         rh = lambda { @model.update(params[:update_object])}
         @ssu = Rhoconnect::Handler::Changes::Engine.new(['update'], @model, rh, {})
+        @queue_name = "update"
       end
 
       it "should do update with no errors" do
-        set_source_queue_state(@s, {:update => {'4'=> { 'price' => '199.99' }}},@c.id,true)
+        set_source_queue_state(@s, {@queue_name => [[@s.name, [['4', { 'price' => '199.99' }]]]]},@c.id,true)
         @ssu.update
-        verify_source_queue_data(@s, :update => [])
+        verify_source_queue_data(@s, @queue_name => [])
         verify_doc_result(@c, :update_errors => {})
       end
 
       it "should do update with errors" do
         msg = "Error updating record"
-        data = add_error_object({'4'=> { 'price' => '199.99' }},msg)
-        set_source_queue_state(@s, {:update => data},@c.id,true)
+        data = add_error_object({},msg)
+        source_queue_data = []
+        data.each do |key, value|
+          source_queue_data << [key, value]
+        end
+        # this one will be after the error record - and should remain in the queue
+        source_queue_data << ['4', { 'price' => '199.99' }]
+        set_source_queue_state(@s, {@queue_name => [[@s.name, source_queue_data]]},@c.id,true)
         set_doc_state(@c, :cd => { ERROR => { 'price' => '99.99' } }
         )
         @ssu.update
-        update_data,client_ids = @s.get_queue(:update)
-        update_data.should == [{'4'=> { 'price' => '199.99'}}]
+        update_data,client_ids = @s.get_queue(@queue_name)
+        update_data.should == [[[@s.name, [['4', { 'price' => '199.99'}]]]]]
         client_ids.should == [@c.id]
         verify_doc_result(@c, {:update_errors =>
             {"#{ERROR}-error"=>{"message"=>msg}, ERROR=>data[ERROR]},
@@ -367,14 +411,27 @@ describe "SourceSync" do
       before (:each) do
         rh = lambda { @model.update(params[:delete_object])}
         @ssd = Rhoconnect::Handler::Changes::Engine.new(['delete'], @model, rh, {})
+        @queue_name = "delete"
+        @u2_fields = {:login => 'anotheruser'}
+        @u2 = User.create(@u2_fields)
+        @u2.password = 'testpass'
+        @c2_fields = {
+          :device_type => 'Android',
+          :device_pin => 'efgh',
+          :device_port => '4444',
+          :user_id => @u2.id,
+          :app_id => @a.id
+        }
+        @c2 = Client.create(@c2_fields,{:source_name => @s_fields[:name]})
+        @a.users << @u2.id
       end
 
       it "should do delete with no errors" do
-        set_source_queue_state(@s, {:delete => {'4'=>@product4}}, @c.id, true)
+        set_source_queue_state(@s, {@queue_name => [[@s.name, [['4', @product4]]]]}, @c.id, true)
         set_doc_state(@s, :md => {'4'=>@product4,'3'=>@product3})
         set_doc_state(@c, :cd => {'4'=>@product4,'3'=>@product3})
         @ssd.delete
-        verify_source_queue_data(@s, :delete => [])
+        verify_source_queue_data(@s, @queue_name => [])
         verify_doc_result(@c, :delete_errors => {})
         verify_doc_result(@s, :md => {'3'=>@product3})
         verify_doc_result(@c, :cd => {'3'=>@product3})
@@ -382,27 +439,40 @@ describe "SourceSync" do
 
       it "should do delete with errors" do
         msg = "Error delete record"
-        data = add_error_object({'2'=>@product2},msg)
-        set_source_queue_state(@s, {:delete => data}, @c.id, true)
+        data = add_error_object({},msg)
+        source_queue_data = []
+        data.each do |key, value|
+          source_queue_data << [key, value]
+        end
+        # this one will be after the error and should remain in the queue
+        source_queue_data << ['2', @product2]
+        set_source_queue_state(@s, {@queue_name => [[@s.name, source_queue_data]]}, @c.id, true)
         @ssd.delete
-
-        # FIXME: Failed for jruby, ruby 1.9.2
-        # verify_result(@c.docname(:delete_errors) => 
-        #   {"#{ERROR}-error"=>{"message"=>msg}, ERROR=>data[ERROR]},
-        #     @c.docname(:delete) => {'2'=>@product2})
-        
-        # Failure/Error: {"#{ERROR}-error"=>{"message"=>msg}, ERROR=>data[ERROR]},
-        #   Verifying `client:application:testuser:b020a633ac2c43f7b0d30ef92dd43886:SampleAdapter:delete`
-        #   expected: {"2"=>{"name"=>"G2", "brand"=>"Android", "price"=>"99.99"}}
-        #        got: {} (using ==)
-         
-        # Failure/Error: @c.docname(:delete) => {'2'=>@product2})
-        #   Verifying `client:application:testuser:26a072a1da0d4bc18f69376e3229ab30:SampleAdapter:delete`
-        # expected: {"2"=>{"name"=>"G2", "brand"=>"Android", "price"=>"99.99"}}
-        #       got: {} (using ==)
-
-        # But this one works everywhere !!!
         verify_doc_result(@c, :delete_errors => {"#{ERROR}-error"=>{"message"=>msg}, ERROR=>data[ERROR]})
+        verify_source_queue_data(@s, @queue_name => [[[@s.name, [['2', @product2]]]]])
+      end
+
+      it "should properly process deletes for 2 users using same queue" do
+        deletes_source1 = Source.load(@s.name,
+                    {:user_id => @u.id,:app_id => @a.id})
+        deletes_source2 = Source.load(@s.name,
+                    {:user_id => @u2.id,:app_id => @a.id})
+        set_source_queue_state(deletes_source1, {@queue_name => [[@s.name, [['4', @product4]]]]},@c.id,true)
+        set_source_queue_state(deletes_source2, {@queue_name => [[@s.name, [['3', @product3]]]]},@c2.id,true)
+        deletes_source1.queue_docname(:delete).should == "source:application:#{@s.name}:delete"
+        deletes_source1.queue_docname(:delete).should == deletes_source2.queue_docname(:delete)
+        set_doc_state(deletes_source1, :md => {'4'=>@product4,'2'=>@product2,'3'=>@product3})
+        set_doc_state(deletes_source2, :md => {'4'=>@product4,'3'=>@product3, '1'=>@product1})
+        set_doc_state(@c, :cd => {'4'=>@product4,'2'=>@product2,'3'=>@product3})
+        set_doc_state(@c2, :cd => {'4'=>@product4,'3'=>@product3, '1'=>@product1})
+        @ssd.delete
+        verify_source_queue_data(@s, @queue_name => [])
+        verify_doc_result(@c, :delete_errors => {})
+        verify_doc_result(@c2, :delete_errors => {})
+        verify_doc_result(deletes_source1, :md => {'2'=>@product2,'3'=>@product3})
+        verify_doc_result(deletes_source2, :md => {'4'=>@product4, '1'=>@product1})
+        verify_doc_result(@c, :cd => {'2'=>@product2,'3'=>@product3})
+        verify_doc_result(@c2, :cd => {'4'=>@product4, '1'=>@product1})
       end
     end
 
@@ -435,28 +505,43 @@ describe "SourceSync" do
       
     describe "cud conflicts" do
       before (:each) do
+        @create_queue_name = :create
+        @update_queue_name = :update
+        @delete_queue_name = :delete
         rh = lambda { @model.send(params[:operation].to_sym, params["#{params[:operation]}_object".to_sym]) }
         @sscud = Rhoconnect::Handler::Changes::Engine.new(['create', 'update', 'delete'], @model, rh, {})
+        @u2_fields = {:login => 'anotheruser'}
+        @u2 = User.create(@u2_fields)
+        @u2.password = 'testpass'
+        @c2_fields = {
+          :device_type => 'Android',
+          :device_pin => 'efgh',
+          :device_port => '4444',
+          :user_id => @u2.id,
+          :app_id => @a.id
+        }
+        @c2 = Client.create(@c2_fields,{:source_name => @s_fields[:name]})
+        @a.users << @u2.id
       end
 
       it "should detect create conflict and skip the duplicate record creation, but properly update the links" do
-        set_source_queue_state(@s, {:create => {'4'=> { 'name' => 'Android', 'link' => '1' }}},@c.id,true)
-        set_source_queue_state(@s, {:create => {'5'=> { 'name' => 'Android', 'link' => '1', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0' }}},@c.id,true)
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['4', { 'name' => 'Android', 'link' => '1' }]]]]},@c.id,true)
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['5', { 'name' => 'Android', 'link' => '1', 'duplicate_of_cid' => @c.id, 'duplicate_of_entry_index' => '0', 'duplicate_of_queue_index' => '0' }]]]]},@c.id,true)
         @sscud.do_cud
         
-        verify_source_queue_data(@s, :create => [])
+        verify_source_queue_data(@s, @create_queue_name => [])
         verify_doc_result(@c, :create_errors => {})
         verify_doc_result(@c, :create_links => {'4'=> { 'l' => 'backend_id' }, '5' => { 'l' => 'backend_id'}})
       end
       
       it "should detect create conflict and skip the duplicate record creation, but properly update the errors page" do
         create_doc1 = { 'name' => 'wrongname', 'link' => '1', 'an_attribute' => "Create Sample Adapter Error" }
-        create_doc2 = { 'name' => 'wrongname', 'link' => '1', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0'}
-        set_source_queue_state(@s, {:create => {'4' => create_doc1}},@c.id,true)
-        set_source_queue_state(@s, {:create => {'5' => create_doc2}},@c.id,true)
+        create_doc2 = { 'name' => 'wrongname', 'link' => '1', 'duplicate_of_cid' => @c.id, 'duplicate_of_entry_index' => '0', 'duplicate_of_queue_index' => '0'}
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['4', create_doc1]]]]},@c.id,true)
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['5', create_doc2]]]]},@c.id,true)
         @sscud.do_cud
         
-        verify_source_queue_data(@s, :create => [])
+        verify_source_queue_data(@s, @create_queue_name => [])
         verify_doc_result(@c, :create_errors => {"4-error"=>{"message"=>"Create Sample Adapter Error"}, 
                                                      '4' => create_doc1,
                                                      "5-error"=>{"message"=>"Create Sample Adapter Error"}, 
@@ -465,43 +550,123 @@ describe "SourceSync" do
       end
       
       it "should detect create conflict and force and error" do
-        set_source_queue_state(@s, {:create => {'4'=> { 'name' => 'Android', 'link' => true }}},@c.id,true)
-        set_source_queue_state(@s, {:create => {'5'=> { 'name' => 'Android', 'link' => '1', 'force_duplicate_error' => '1' }}},@c.id,true)
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['4', { 'name' => 'Android', 'link' => true }]]]]},@c.id,true)
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['5', { 'name' => 'Android', 'link' => '1', 'force_duplicate_error' => '1' }]]]]},@c.id,true)
         @sscud.do_cud
-        verify_source_queue_data(@s, :create => [])
+        verify_source_queue_data(@s, @create_queue_name => [])
         verify_doc_result(@c, :create_errors => {"5-error"=>{"message"=>"Error during create: object confict detected"}, "5"=>{"name"=>"Android", "link"=>"1", 'force_duplicate_error' => '1'}} )
       end
+
+      it "should detect create conflict in the intermediate state create and skip the duplicate record create" do
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['5', { 'name' => 'InvalidName', 'duplicate_of_cid' => @c.id, 'duplicate_of_entry_index' => '1', 'duplicate_of_queue_index' => '0'}], ['4', { 'name' => 'Android' , 'link' => true}]]]]},@c.id,true)
+        set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['6', { 'name' => 'iPhone', 'link' => true }], ['7', { 'name' => 'InvalidName', 'duplicate_of_cid' => @c.id, 'duplicate_of_entry_index' => '1', 'duplicate_of_queue_index' => '0'}]]]]},@c.id,true)
+        @sscud.do_cud
+        
+        verify_source_queue_data(@s, @create_queue_name => [])
+        verify_doc_result(@c, :create_errors => {})
+        verify_doc_result(@c, :create_links => {'4'=> { 'l' => 'backend_id' }, '5'=> { 'l' => 'backend_id' }, '6' => { 'l' => 'backend_id' }, '7'=> { 'l' => 'backend_id' }})
+      end
       
       it "should detect update conflict and skip the duplicate record update" do
         set_doc_state(@c, :cd => {'4'=> {'name' => 'Apple'}})
-        set_source_queue_state(@s, {:update => {'4'=> { 'name' => 'Android' }}},@c.id,true)
-        set_source_queue_state(@s, {:update => {'4'=> { 'name' => 'InvalidName', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0'}}},@c.id,true)
+        set_source_queue_state(@s, {@update_queue_name => [[@s.name, [['4', { 'name' => 'Android' }]]]]},@c.id,true)
+        set_source_queue_state(@s, {@update_queue_name => [[@s.name, [['4', { 'name' => 'InvalidName', 'duplicate_of_cid' => @c.id, 'duplicate_of_entry_index' => '0', 'duplicate_of_queue_index' => '0'}]]]]},@c.id,true)
+        @sscud.do_cud
+        
+        verify_source_queue_data(@s, @update_queue_name => [])
+        verify_doc_result(@c, :update_errors => {})
+        verify_doc_result(@c, :update_rollback => {})
+      end
+      
+      it "should detect update conflict and force an error on duplicate record update" do
+        set_doc_state(@c, :cd => {'4'=> {'name' => 'Apple'}})
+        set_source_queue_state(@s, {@update_queue_name => [[@s.name, [['4', { 'name' => 'Android' }]]]]},@c.id,true)
+        set_source_queue_state(@s, {@update_queue_name => [[@s.name, [['4', { 'name' => 'ErrorName', 'force_duplicate_error' => '1' }]]]]},@c.id,true)
         @sscud.do_cud
         
-        verify_source_queue_data(@s, :update => [])
+        verify_source_queue_data(@s, @update_queue_name => [])
+        verify_doc_result(@c, :update_errors => {"4-error"=>{"message"=>"Error during update: object confict detected"}, "4"=>{"name"=>"ErrorName", 'force_duplicate_error' => '1'}})
+        verify_doc_result(@c, :update_rollback => {'4'=> {'name' => 'Apple'}})
+      end
+
+      it "should install find_duplicates_on_update , detect equal objects conflict and skip the duplicate record update" do
+        SampleAdapter.enable :find_duplicates_on_update
+        set_doc_state(@c, :cd => {'4'=> {'name' => 'Apple'}})
+        set_doc_state(@c2, :cd => {'4'=> {'name' => 'Apple'}})
+        update_source1 = Source.load(@s.name,
+                    {:user_id => @u.id,:app_id => @a.id})
+        update_source2 = Source.load(@s.name,
+                    {:user_id => @u2.id,:app_id => @a.id})
+        set_source_queue_state(update_source1, {@update_queue_name => [[@s.name, [['4', { 'name' => 'Android' }]]]]},@c.id,true)
+        set_source_queue_state(update_source2, {@update_queue_name => [[@s.name, [['4', { 'name' => 'Android' }]]]]},@c2.id, true)
+        operation_data,client_ids = update_source2.get_queue(:update)
+        invalid_meta = @sscud.model.run_validators(:update,operation_data,client_ids)
+        invalid_meta.should == { 1=> {@s.name => { 0 => { :duplicate_of=>true }}}, 
+                                 0=>{@s.name => { 0 => { :duplicates=>[{:client_id=>@c2.id, :key=>"4", :value=>{"name"=>"Android"}}]}}}}
+        
+        @sscud.model.should_receive(:find_duplicates_on_update).once.and_return(invalid_meta)
+        @sscud.do_cud
+        
+        verify_source_queue_data(@s, @update_queue_name => [])
         verify_doc_result(@c, :update_errors => {})
         verify_doc_result(@c, :update_rollback => {})
+        SampleAdapter.validators.delete(:find_duplicates_on_update)
       end
       
       it "should detect update conflict and force an error on duplicate record update" do
         set_doc_state(@c, :cd => {'4'=> {'name' => 'Apple'}})
-        set_source_queue_state(@s, {:update => {'4'=> { 'name' => 'Android' }}},@c.id,true)
-        set_source_queue_state(@s, {:update => {'4'=> { 'name' => 'ErrorName', 'force_duplicate_error' => '1' }}},@c.id,true)
+        set_source_queue_state(@s, {@update_queue_name => [[@s.name, [['4', { 'name' => 'Android' }]]]]},@c.id,true)
+        set_source_queue_state(@s, {@update_queue_name => [[@s.name, [['4', { 'name' => 'ErrorName', 'force_duplicate_error' => '1' }]]]]},@c.id,true)
         @sscud.do_cud
         
-        verify_source_queue_data(@s, :update => [])
+        verify_source_queue_data(@s, @update_queue_name => [])
         verify_doc_result(@c, :update_errors => {"4-error"=>{"message"=>"Error during update: object confict detected"}, "4"=>{"name"=>"ErrorName", 'force_duplicate_error' => '1'}})
         verify_doc_result(@c, :update_rollback => {'4'=> {'name' => 'Apple'}})
       end
       
+      it "should install find_duplicates_on_update , detect equal objects conflict and raise a custom error" do
+        SampleAdapter.enable :find_duplicates_on_update, :raise_error => true do |options, invalid_meta, operation, operation_data, client_ids|
+          invalid_meta.each do |index, index_data|
+            index_data.each do |source_id, objindex_data|
+              objindex_data.each do |objindex, objmeta|
+                if objmeta.has_key?(:error) 
+                  objmeta[:error] = "My custom error"
+                end
+              end if objindex_data
+            end if index_data
+          end if invalid_meta
+          invalid_meta
+        end
+        set_doc_state(@c, :cd => {'4'=> {'name' => 'Apple'}})
+        set_doc_state(@c2, :cd => {'4'=> {'name' => 'Apple'}})
+        update_source1 = Source.load(@s.name,
+                    {:user_id => @u.id,:app_id => @a.id})
+        update_source2 = Source.load(@s.name,
+                    {:user_id => @u2.id,:app_id => @a.id})
+        set_source_queue_state(update_source1, {@update_queue_name => [[@s.name, [['4', { 'name' => 'Android' }]]]]},@c.id,true)
+        set_source_queue_state(update_source2, {@update_queue_name => [[@s.name, [['4', { 'name' => 'Android' }]]]]},@c2.id, true)
+        operation_data,client_ids = update_source2.get_queue(:update)
+        invalid_meta = @sscud.model.run_validators(:update,operation_data,client_ids)
+        invalid_meta.should == {1=>{@s.name=>{0=>{:error=>"My custom error"}}}}
+        
+        @sscud.do_cud
+        verify_source_queue_data(@s, @update_queue_name => [])
+        verify_doc_result(@c, :update_errors => {})
+        verify_doc_result(@c, :update_rollback => {})
+        verify_doc_result(@c2, :update_errors => {"4-error"=>{"message"=>"My custom error"}, "4"=>{"name"=>"Android"}})
+        verify_doc_result(@c2, :update_rollback => {'4'=> {'name' => 'Apple'}})
+        SampleAdapter.validators.delete(:find_duplicates_on_update)
+      end
+      
+
       it "should detect delete conflict and skip the duplicate record delete" do
         set_doc_state(@c, :cd => {'4'=> {'name' => 'Apple'}})
         set_doc_state(@c, :cd_size => 1)
-        set_source_queue_state(@s, {:delete => {'4'=> { 'name' => 'Apple' }}},@c.id,true)
-        set_source_queue_state(@s, {:delete => {'4'=> { 'name' => 'Apple', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0'}}},@c.id,true)
+        set_source_queue_state(@s, {@delete_queue_name => [[@s.name, [['4', { 'name' => 'Apple' }]]]]},@c.id,true)
+        set_source_queue_state(@s, {@delete_queue_name => [[@s.name, [['4', { 'name' => 'Apple', 'duplicate_of_cid' => @c.id, 'duplicate_of_entry_index' => '0', 'duplicate_of_queue_index' => '0'}]]]]},@c.id,true)
         @sscud.do_cud
         
-        verify_source_queue_data(@s, :delete => [])
+        verify_source_queue_data(@s, @delete_queue_name => [])
         verify_doc_result(@c, :cd => {})
         verify_doc_result(@c, :cd_size => '0')
         verify_doc_result(@c, :delete_errors => {})
@@ -510,11 +675,11 @@ describe "SourceSync" do
       it "should detect delete conflict and force an error on duplicate record delete" do
         set_doc_state(@c, :cd => {'4'=> {'name' => 'Apple'}})
         set_doc_state(@c, :cd_size => 1)
-        set_source_queue_state(@s, {:delete => {'4'=> { 'name' => 'Apple' }}},@c.id,true)
-        set_source_queue_state(@s, {:delete => {'4'=> { 'name' => 'Apple', 'force_duplicate_error' => '1'}}},@c.id,true)
+        set_source_queue_state(@s, {@delete_queue_name => [[@s.name, [['4', { 'name' => 'Apple' }]]]]},@c.id,true)
+        set_source_queue_state(@s, {@delete_queue_name => [[@s.name, [['4', { 'name' => 'Apple', 'force_duplicate_error' => '1'}]]]]},@c.id,true)
         @sscud.do_cud
         
-        verify_source_queue_data(@s, :delete => [])
+        verify_source_queue_data(@s, @delete_queue_name => [])
         verify_doc_result(@c, :delete_errors => {"4-error"=>{"message"=>"Error during delete: object confict detected"}, "4"=>{"name"=>"Apple", 'force_duplicate_error' => '1'}})
       end
     end