rhosync 2.1.17.beta1 → 2.1.17.beta2

data/CHANGELOG

@@ -5,6 +5,8 @@
 * #27612327 - Bulk Sync Not Returning Errors from Zendesk ticket #2336
 * #28219647 - Schema Change Error from Zendesk ticket #2353
 * #28328057 - Feature Request: Adding a Bulk Data Job after_perform hook from Zendesk ticket #2367
+* Empty cud hash to trigger processing of the queued data (Zendesk #2383)
+* Revert fix for Zendesk ticket #2336 by customer request
 
 ## 2.1.16
 * revert rack support for v. 1.4.1 and lock to v. 1.3.6 due to problems with Heroku deployment (Rack 1.4.1 produces 502 error) 

data/lib/rhosync/client_sync.rb

@@ -15,13 +15,18 @@ module Rhosync
     end
     
     def receive_cud(cud_params={},query_params=nil)
-      _process_blobs(cud_params)
-      processed = 0
-      ['create','update','delete'].each do |op|
-        key,value = op,cud_params[op]
-        processed += _receive_cud(key,value) if value
+      # empty hash - means enforce processing of the queue
+      if cud_params.size == 0
+        @source_sync.process_cud(@client.id)
+      else
+        _process_blobs(cud_params)
+        processed = 0
+        ['create','update','delete'].each do |op|
+          key,value = op,cud_params[op]
+          processed += _receive_cud(key,value) if value
+        end
+        @source_sync.process_cud(@client.id) if processed > 0
       end
-      @source_sync.process_cud(@client.id) if processed > 0
     end
     
     def send_cud(token=nil,query_params=nil)
@@ -256,21 +261,6 @@ module Rhosync
         
         if data and data.completed? and data.dbfiles_exist?
           client.update_clientdoc(sources)
-          sources.each do |src|
-            s = Source.load(src, {:user_id => client.user_id, :app_id => client.app_id})
-            errordoc = s.docname(:errors)
-            errors = {}
-            Store.lock(errordoc) do
-              errors = Store.get_data(errordoc)
-            end
-            unless errors.empty?
-              # FIXME: :result => :bulk_sync_error, :errors => "#{errors}"
-              log "Bulk sync errors are found in #{src}: #{errors}"
-              # Delete all related bulk files
-              data.delete_files
-              return {:result => :url, :url => ''}
-            end
-          end
           {:result => :url, :url => data.url}
         elsif data
           {:result => :wait}

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.17.beta1'
+  VERSION = '2.1.17.beta2'
 end

data/spec/client_sync_spec.rb

@@ -25,6 +25,19 @@ describe "ClientSync" do
         @cs.client.docname(:update) => {},
         @cs.client.docname(:delete) => {})
     end
+    
+    it "should handle receive cud that triggers processing of the previously queued data" do
+      params = {'create'=>{'1'=>@product1},'update'=>{'2'=>@product2},'delete'=>{'3'=>@product3}}
+      queued_create_data = {'1'=>@product1}
+      set_state(@c.docname(:create) => queued_create_data)
+      verify_result(@cs.client.docname(:create) => queued_create_data,
+        @cs.client.docname(:update) => {},
+        @cs.client.docname(:delete) => {})
+      @cs.receive_cud({})
+      verify_result(@cs.client.docname(:create) => {},
+        @cs.client.docname(:update) => {},
+        @cs.client.docname(:delete) => {})
+    end
   
     it "should handle send cud" do
       data = {'1'=>@product1,'2'=>@product2}
@@ -594,18 +607,6 @@ describe "ClientSync" do
         "source:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}:md" => @data,
         "source:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}:md_copy" => @data)
     end
-
-    it "should return empty bulk data url if there are errors in query" do
-      ClientSync.bulk_data(:user,@c)
-      BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
-      BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
-      errordoc = @s.docname(:errors) # source SampleAdapter
-      operation = 'query'
-      Store.lock(errordoc) do
-        Store.put_data(errordoc,{"#{operation}-error"=>{'message'=>"Some exception message"}}, true)
-      end
-      ClientSync.bulk_data(:user,@c).should == {:result => :url, :url => ''}
-    end
     
     it "should escape bulk data url" do
       name = 'a b'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 391570199
+  hash: 4099760631
   prerelease: 7
   segments: 
   - 2
   - 1
   - 17
   - beta
-  - 1
-  version: 2.1.17.beta1
+  - 2
+  version: 2.1.17.beta2
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra