rhoconnect 3.3.2 → 3.3.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.3 (2012-08-21)
+* allow selective bulk_sync source parameter to be sent as a comma-separated string
+
 ## 3.3.2 (2012-07-26)
 * D-01571 - 'message' push param should be 'alert'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.3.2)
+    rhoconnect (3.3.3)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2.2)
@@ -18,7 +18,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    addressable (2.2.8)
+    addressable (2.3.2)
     arr-pm (0.0.7)
       cabin (> 0)
     async-rack (0.5.1)
@@ -27,11 +27,11 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (2.3.0)
+    backports (2.6.2)
     builder (3.0.0)
     cabin (0.4.4)
       json
-    childprocess (0.3.4)
+    childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
     clamp (0.3.1)
     coffee-script (2.2.0)
@@ -39,18 +39,18 @@ GEM
       execjs
     coffee-script-source (1.3.3)
     crack (0.3.1)
-    daemons (1.1.8)
+    daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.0.rc.4)
-    excon (0.14.3)
+    excon (0.16.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.15)
     ffaker (1.14.0)
-    ffi (1.1.0)
-    fog (1.4.0)
+    ffi (1.1.5)
+    fog (1.5.0)
       builder
-      excon (~> 0.14.0)
+      excon (~> 0.14)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -59,15 +59,15 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.3)
-    fpm (0.4.9)
+    fpm (0.4.13)
       arr-pm (~> 0.0.7)
-      backports (= 2.3.0)
+      backports (= 2.6.2)
       cabin (~> 0.4.3)
       clamp (= 0.3.1)
       json (= 1.6.6)
     highline (1.6.13)
     hike (1.2.1)
-    jasmine (1.2.0)
+    jasmine (1.2.1)
       jasmine-core (>= 1.2.0)
       rack (~> 1.0)
       rspec (>= 1.3.1)
@@ -80,7 +80,7 @@ GEM
       rainbow
       sprockets (~> 2)
     json (1.6.6)
-    libwebsocket (0.1.4)
+    libwebsocket (0.1.5)
       addressable
     mime-types (1.19)
     multi_json (1.3.6)
@@ -114,7 +114,7 @@ GEM
     rspec-core (2.10.1)
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.10.0)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
     selenium-webdriver (2.25.0)
@@ -126,7 +126,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sinatra (1.3.2)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
@@ -149,8 +149,8 @@ GEM
     uuidtools (2.1.3)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.8.8)
-      addressable (~> 2.2.8)
+    webmock (1.8.9)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
     xml-simple (1.1.1)
 

data/lib/rhoconnect/api/app/bulk_data.rb

@@ -1,6 +1,10 @@
 Server.api4 :bulk_data, :post, "/rc/#{Rhoconnect::API_VERSION}/app/bulk_data", \
             false, {:verb => :get, :url => ['/application/bulk_data', '/api/application/bulk_data']} do |params,user,server|
   server.content_type :json
-  data = ClientSync.bulk_data(params[:partition].to_sym,server.current_client, params[:sources])
+  sources_param = params[:sources]
+  if sources_param.is_a?String
+    sources_param = sources_param.split(',')
+  end
+  data = ClientSync.bulk_data(params[:partition].to_sym,server.current_client, sources_param)
   data.to_json
 end

data/lib/rhoconnect/jobs/bulk_data_job.rb

@@ -47,8 +47,9 @@ module Rhoconnect
       end
     end
 
-    def self.import_data_to_object_values(db,source)
-      data = source.get_data(:md)
+    def self.import_data_to_object_values(db,source,is_selected=true)
+      data = {}
+      data = source.get_data(:md) if is_selected
       counter = {}
       db.transaction do |database|
         database.prepare("insert into object_values 
@@ -65,8 +66,9 @@ module Rhoconnect
     end
     
     # Loads data into fixed schema table based on source settings
-    def self.import_data_to_fixed_schema(db,source)
-      data = source.get_data(:md)
+    def self.import_data_to_fixed_schema(db,source,is_selected=true)
+      data = {}
+      data = source.get_data(:md) if is_selected
       counter = {}
       columns,qm = [],[]
       create_table = ["\"object\" varchar(255) PRIMARY KEY"]
@@ -136,8 +138,10 @@ module Rhoconnect
           values (?,?,?,?,?,?,?,?,?,?,?,?)") do |stmt|
           sources_refs.each do |source_name,ref|
             s = ref[:source]
+            # skipped sources should be marked with sync type :none
+            sync_type = ref[:skip_source] ? 'none' : s.sync_type.to_s
             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.get_value(:md_size).to_i,s.read_state.refresh_time)
+              sync_type,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many,s.get_value(:md_size).to_i,s.read_state.refresh_time)
           end
         end
       end
@@ -154,6 +158,10 @@ module Rhoconnect
       db.execute_batch(File.open(schema,'r').read)
       
       src_counter = 1
+      selected_sources = {}
+      bulk_data.sources[0, -1].each do |source|
+        selected_sources[source] = true
+      end
       bulk_data.partition_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,
@@ -161,13 +169,14 @@ module Rhoconnect
         source.source_id = src_counter
         src_counter += 1
         source_attrib_refs = nil
+        is_selected_source = selected_sources.has_key?(source_name)
         if source.schema
-          source_attrib_refs = import_data_to_fixed_schema(db,source)
+          source_attrib_refs = import_data_to_fixed_schema(db,source,is_selected_source)
         else
-          source_attrib_refs = import_data_to_object_values(db,source)
+          source_attrib_refs = import_data_to_object_values(db,source,is_selected_source)
         end
         sources_refs[source_name] = 
-          {:source => source, :refs => source_attrib_refs}
+          {:source => source, :refs => source_attrib_refs, :skip_source => !is_selected_source}
         lap_timer("finished importing sqlite data for #{source_name}",timer)
       end
       populate_sources_table(db,sources_refs)

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 end

data/spec/jobs/bulk_data_job_spec.rb

@@ -48,6 +48,8 @@ describe "BulkDataJob" do
       expected = { @s_fields[:name] => {},
         'FixedSchemaAdapter' => @data
       }
+      source_existing_data = {'my_key1' => {'my_attrib1' => 'my_val1'}}
+      @s.put_data(:md, source_existing_data)
       data = BulkData.create(:name => docname,
         :state => :inprogress,
         :app_id => @a.id,
@@ -57,7 +59,9 @@ describe "BulkDataJob" do
       do_bulk_data_job("data_name" => data.name)
       data = BulkData.load(docname)
       data.completed?.should == true
-      verify_result(@s.docname(:md) => {},@s.docname(:md_copy) => {})
+      verify_result(@s.docname(:md) => source_existing_data,@s.docname(:md_copy) => {})
+      # skipped source should have :none in the DB - so we pass it for verification
+      @s.sync_type = :none
       validate_db_file(data.dbfile,[@s_fields[:name], 'FixedSchemaAdapter'], expected).should == true
       File.exists?(data.dbfile+'.rzip').should == true
       File.exists?(data.dbfile+'.gzip').should == true

data/spec/server/server_spec.rb

@@ -472,6 +472,14 @@ describe "Server" do
         last_response.body.should == {:result => :wait}.to_json
         last_response.headers['Warning'].index('deprecated').should_not == nil
       end
+      
+      it "should make old-way initial bulk data request and receive wait along with deprecation warning (Sources sent as String)" do
+        set_state('test_db_storage' => @data)
+        get "/application/bulk_data?sources=FixedSchemaAdapter,SampleAdapter", :partition => :user, :client_id => @c.id
+        last_response.should be_ok
+        last_response.body.should == {:result => :wait}.to_json
+        last_response.headers['Warning'].index('deprecated').should_not == nil
+      end
 
       it "should receive url when bulk data is available" do
         set_state('test_db_storage' => @data)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 3
-  - 2
-  version: 3.3.2
+  - 3
+  version: 3.3.3
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement