rhosync 2.1.17.beta2 → 2.1.17.beta3

data/CHANGELOG

@@ -7,6 +7,7 @@
 * #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
+* #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated) 
 
 ## 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,18 +15,13 @@ module Rhosync
     end
     
     def receive_cud(cud_params={},query_params=nil)
-      # 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
+      _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)
     end
     
     def send_cud(token=nil,query_params=nil)

data/lib/rhosync/jobs/bulk_data_job.rb

@@ -134,21 +134,25 @@ module Rhosync
       end
       str[0..-2]
     end
-    
+
+    # #2354: Bulk sync not updating sources table
+    # last_inserted_size +
+    # last_deleted_size
+    # backend_refresh_time +
     def self.populate_sources_table(db,sources_refs) 
       db.transaction do |database|
         database.prepare("insert into sources
-          (source_id,name,sync_priority,partition,sync_type,source_attribs,metadata,schema,blob_attribs,associations) 
-          values (?,?,?,?,?,?,?,?,?,?)") do |stmt|
+          (source_id,name,sync_priority,partition,sync_type,source_attribs,metadata,schema,blob_attribs,associations,last_inserted_size,backend_refresh_time) 
+          values (?,?,?,?,?,?,?,?,?,?,?,?)") do |stmt|
           sources_refs.each do |source_name,ref|
             s = ref[:source]
             stmt.execute(s.source_id,s.name,s.priority,s.partition_type.to_s,
-              s.sync_type.to_s,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many)
+              s.sync_type.to_s,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many,s.get_value(:md_size),s.read_state.refresh_time)
           end
         end
       end
     end  
-    
+
     def self.create_sqlite_data_file(bulk_data,ts)
       sources_refs = {}
       schema,index,bulk_data.dbfile = get_file_args(bulk_data.name,ts)

data/lib/rhosync/version.rb

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

data/spec/client_sync_spec.rb

@@ -33,7 +33,7 @@ describe "ClientSync" do
       verify_result(@cs.client.docname(:create) => queued_create_data,
         @cs.client.docname(:update) => {},
         @cs.client.docname(:delete) => {})
-      @cs.receive_cud({})
+      @cs.receive_cud({:source_name => @s_fields[:name]})
       verify_result(@cs.client.docname(:create) => {},
         @cs.client.docname(:update) => {},
         @cs.client.docname(:delete) => {})

data/spec/spec_helper.rb

@@ -115,8 +115,8 @@ module TestHelpers
   end
   
   def validate_db_by_name(db,s,data)
-    db.execute("select source_id,name,sync_priority,partition,
-      sync_type,source_attribs,metadata,schema,blob_attribs,associations
+    db.execute("select source_id,name,sync_priority,partition,sync_type,source_attribs,
+      metadata,schema,blob_attribs,associations,last_inserted_size, backend_refresh_time
       from sources where name='#{s.name}'").each do |row|
       return false if row[0].to_s != s.source_id.to_s
       return false if row[1] != s.name
@@ -128,6 +128,8 @@ module TestHelpers
       return false if row[7] != s.schema
       return false if row[8] != s.blob_attribs
       return false if row[9] != s.has_many
+      return false if row[10] != s.get_value(:md_size).to_i
+      return false if row[11] != s.read_state.refresh_time
     end
 
     data = json_clone(data)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 4099760631
+  hash: 2250687
   prerelease: 7
   segments: 
   - 2
   - 1
   - 17
   - beta
-  - 2
-  version: 2.1.17.beta2
+  - 3
+  version: 2.1.17.beta3
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-27 00:00:00 Z
+date: 2012-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -582,7 +582,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.20
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework