rhosync 2.1.17.beta6 → 2.1.17.beta7

data/CHANGELOG

@@ -9,7 +9,8 @@
 * #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) 
+* #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated)
+* #29796429 - Zendesk ticket #2447: use list to preserve bulk data sources order
 
 ## 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/bulk_data/bulk_data.rb

@@ -9,7 +9,7 @@ module Rhosync
     field :user_id, :string
     field :refresh_time, :integer
     field :dbfile,:string
-    set   :sources, :string
+    list   :sources, :string
     validates_presence_of :app_id, :user_id, :sources
     
     def completed?
@@ -20,7 +20,7 @@ module Rhosync
     end
     
     def delete
-      sources.members.each do |source|
+      sources[0, -1].each do |source|
         s = Source.load(source,{:app_id => app_id, :user_id => user_id})
         Store.flash_data(s.docname(:md_copy)) if s
       end
@@ -28,7 +28,7 @@ module Rhosync
     end
     
     def process_sources
-      sources.members.each do |source|
+      sources[0, -1].each do |source|
         s = Source.load(source,{:app_id => app_id, :user_id => user_id})
         if s
           SourceSync.new(s).process_query(nil)

data/lib/rhosync/jobs/bulk_data_job.rb

@@ -160,7 +160,7 @@ module Rhosync
       db = SQLite3::Database.new(bulk_data.dbfile)
       db.execute_batch(File.open(schema,'r').read)
       src_counter = 1
-      bulk_data.sources.members.sort.each do |source_name|
+      bulk_data.sources[0, -1].each do |source_name|
         timer = start_timer("start importing sqlite data for #{source_name}")
         source = Source.load(source_name,{:app_id => bulk_data.app_id,
           :user_id => bulk_data.user_id})

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.17.beta6'
+  VERSION = '2.1.17.beta7'
 end

data/spec/bulk_data/bulk_data_spec.rb

@@ -60,6 +60,19 @@ describe "BulkData" do
     BulkData.get_name(:app,@c.user_id).should == 
       File.join(@a_fields[:name],@a_fields[:name])
   end
+
+  it "should have ordered sources list" do
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :inprogress,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => @a.partition_sources(:user, @u.id))
+    data.sources[0, -1].should == ["SampleAdapter", "FixedSchemaAdapter"]
+  end
+
+  it "should have ordered sources list by priority" do
+    pending
+  end
   
   it "should process_sources for bulk data" do
     current = Time.now.to_i

data/spec/spec_helper.rb

@@ -102,7 +102,7 @@ module TestHelpers
   end
   
   def validate_db(bulk_data,data)
-    validate_db_file(bulk_data.dbfile,bulk_data.sources.members,data)  
+    validate_db_file(bulk_data.dbfile,bulk_data.sources[0, -1],data)  
   end
     
   def validate_db_file(dbfile,sources,data)  

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 62196343
+  hash: 62196341
   prerelease: 7
   segments: 
   - 2
   - 1
   - 17
   - beta
-  - 6
-  version: 2.1.17.beta6
+  - 7
+  version: 2.1.17.beta7
 platform: ruby
 authors: 
 - Rhomobile