rhoconnect 3.2.1 → 3.3.1.beta2

data/spec/api/{client → user}/delete_client_spec.rb

@@ -1,10 +1,9 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
-describe "RhoconnectApiDeleteUser" do
+describe "RhoconnectApiDeleteClient" do
   it_should_behave_like "ApiHelper" do  
-    it "should delete client" do
-      post "/api/client/delete_client", {:api_token => @api_token,
-        :user_id => @u_fields[:login], :client_id => @c.id}
+    it "should delete client for the user" do
+      delete "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients/#{@c.id}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       Client.is_exist?(@c.id).should == false
       User.load(@u_fields[:login]).clients.members.should == []

data/spec/api/user/delete_user_spec.rb

@@ -3,9 +3,37 @@ require File.join(File.dirname(__FILE__),'..','api_helper')
 describe "RhoconnectApiDeleteUser" do
   it_should_behave_like "ApiHelper" do 
     it "should delete user" do
-      params = {:api_token => @api_token,
-        :attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/api/user/create_user", params
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      User.is_exist?(params[:attributes][:login]).should == true
+      
+      #set up two users with data for the same source
+      params2 = {:app_id => APP_NAME,:user_id => 'testuser1'}
+      params3 = {:app_id => APP_NAME,:user_id => 'testuser'}
+      time = Time.now.to_i
+      s  = Source.load('SampleAdapter', params2)
+      s.read_state.refresh_time = time
+      s2 = Source.load('SampleAdapter', params3)
+      s2.read_state.refresh_time = time
+      set_state(s.docname(:delete) => {'4'=>@product4})
+      set_state(s2.docname(:delete) => {'4'=>@product4})
+      verify_result(s.docname(:delete) => {'4'=>@product4})
+      verify_result(s2.docname(:delete) => {'4'=>@product4})
+      
+      delete "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}  
+      last_response.should be_ok
+      verify_result(s.docname(:delete) => {})
+      verify_result(s2.docname(:delete) => {'4'=>@product4})
+      s.load_read_state.should == nil
+      s2.load_read_state.refresh_time.should == time
+      User.is_exist?(params[:attributes][:login]).should == false
+      App.load(test_app_name).users.members.should == ["testuser"]
+    end
+    
+    it "should delete user and print deprecation warning with the old route" do
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       User.is_exist?(params[:attributes][:login]).should == true
       
@@ -23,8 +51,9 @@ describe "RhoconnectApiDeleteUser" do
       verify_result(s2.docname(:delete) => {'4'=>@product4})
       
       
-      post "/api/user/delete_user", {:api_token => @api_token, :user_id => params[:attributes][:login]}  
+      post "/api/delete_user", {:user_id => params[:attributes][:login]}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
+      last_response.headers['Warning'].index('deprecated').should_not == nil
       verify_result(s.docname(:delete) => {})
       verify_result(s2.docname(:delete) => {'4'=>@product4})
       s.load_read_state.should == nil

data/spec/api/user/list_clients_spec.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiListUserClients" do
+  it_should_behave_like "ApiHelper" do
+    it "should list user's clients" do
+      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      res = JSON.parse(last_response.body)
+      res.is_a?(Array).should == true
+      res.size.should == 1
+      res[0].is_a?(String) == true
+      res[0].length.should == 32
+    end
+    
+    it "should list user's clients with old route and show deprecation warning" do
+      post "/api/list_clients", {:api_token => @api_token,
+        :user_id => @u_fields[:login]}
+      res = JSON.parse(last_response.body)
+      res.is_a?(Array).should == true
+      res.size.should == 1
+      res[0].is_a?(String) == true
+      res[0].length.should == 32
+    end
+
+    it "should handle empty client's list" do
+      @u.clients.delete(@c.id)
+      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      JSON.parse(last_response.body).should == []    
+    end
+  end
+end

data/spec/api/user/list_source_docs_spec.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiListSourceDocs" do
+  it_should_behave_like "ApiHelper" do
+    it "should list of shared source documents" do
+      sourcename = "SimpleAdapter"
+      user_id = '*'
+      get "/rc/#{Rhoconnect::API_VERSION}/users/#{user_id}/sources/#{sourcename}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      JSON.parse(last_response.body).should == {
+        "md"=>"source:application:__shared__:SimpleAdapter:md", 
+        "errors"=>"source:application:__shared__:SimpleAdapter:errors", 
+        "md_size"=>"source:application:__shared__:SimpleAdapter:md_size", 
+        "md_copy"=>"source:application:__shared__:SimpleAdapter:md_copy"}
+    end
+    
+    it "should list of shared source documents with old route and deprecation warning" do
+      post "/api/list_source_docs", {:source_id => "SimpleAdapter", :user_id => '*'}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      JSON.parse(last_response.body).should == {
+        "md"=>"source:application:__shared__:SimpleAdapter:md", 
+        "errors"=>"source:application:__shared__:SimpleAdapter:errors", 
+        "md_size"=>"source:application:__shared__:SimpleAdapter:md_size", 
+        "md_copy"=>"source:application:__shared__:SimpleAdapter:md_copy"}
+    end
+
+    it "should list user source documents" do
+      sourcename = "SampleAdapter"
+      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{sourcename}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      JSON.parse(last_response.body).should == {
+        "md"=>"source:application:testuser:SampleAdapter:md", 
+        "errors"=>"source:application:testuser:SampleAdapter:errors", 
+        "md_size"=>"source:application:testuser:SampleAdapter:md_size", 
+        "md_copy"=>"source:application:testuser:SampleAdapter:md_copy"}
+    end
+  end
+end

data/spec/api/user/list_users_spec.rb

@@ -3,24 +3,23 @@ require File.join(File.dirname(__FILE__),'..','api_helper')
 describe "RhoconnectApiListUsers" do
   it_should_behave_like "ApiHelper" do
     it "should list users" do
-      params = {:api_token => @api_token,
-        :attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/api/user/create_user", params
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
-      post "/api/user/list_users", {:api_token => @api_token}
+      get "/rc/#{Rhoconnect::API_VERSION}/users", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
     end
 
     it "should handle empty user's list" do
       @a.delete; @a = App.create(@a_fields)
-      post "/api/user/list_users", {:api_token => @api_token}
+      get "/rc/#{Rhoconnect::API_VERSION}/users", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       JSON.parse(last_response.body).should == []    
     end
     
     it "should show the deprecation warning on /api/list users" do
       params = {:api_token => @api_token,
         :attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/api/user/create_user", params
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params
       last_response.should be_ok
       post "/api/list_users", {:api_token => @api_token}
       JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort

data/spec/api/{client → user}/ping_spec.rb

@@ -3,20 +3,18 @@ require File.join(File.dirname(__FILE__),'..','api_helper')
 describe "RhoconnectApiPing" do
   it_should_behave_like "ApiHelper" do
     it "should do ping synchronously" do
-      params = {"user_id" => @u.id, "api_token" => @api_token,
-        "sources" => [@s.name], "message" => 'hello world', 
+      params = {"user_id" => @u.id, "sources" => [@s.name], "message" => 'hello world', 
         "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
       PingJob.should_receive(:perform).once.with(params)
-      post "/api/client/ping", params
+      post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
     end
 
     it "should do ping asynchronously" do
-      params = {"user_id" => @u.id, "api_token" => @api_token, 
-        "async" => "true","sources" => [@s.name], "message" => 'hello world', 
+      params = {"user_id" => @u.id, "async" => "true","sources" => [@s.name], "message" => 'hello world', 
         "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
       PingJob.should_receive(:enqueue).once.with(params)
-      post "/api/client/ping", params
+      post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
     end
   end  

data/spec/api/user/show_user_spec.rb

@@ -0,0 +1,14 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiShowUser" do
+  it_should_behave_like "ApiHelper" do
+    it "should show user" do
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      get "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      JSON.parse(last_response.body).should include({"name"=>"login", "value"=>"testuser1", "type"=>"string"}) 
+    end
+  end  
+end

data/spec/api/user/update_user_spec.rb

@@ -3,8 +3,18 @@ require File.join(File.dirname(__FILE__),'..','api_helper')
 describe "RhoconnectApiUpdateUser" do
   it_should_behave_like "ApiHelper" do 
     it "should update user successfully" do
-      post "/api/user/update_user", :api_token => @api_token, 
-        :attributes => {:new_password => '123'}
+      login = 'rhoadmin'
+      put "/rc/#{Rhoconnect::API_VERSION}/users/#{login}", {:attributes => {:new_password => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      user = User.authenticate('rhoadmin','123')
+      user.login.should == 'rhoadmin'
+      user.admin.should == 1
+    end
+    
+    it "should update user successfully with old route and print deprecation warning" do
+      login = 'rhoadmin'
+      post "/api/update_user", {:user_id => login,
+        :attributes => {:new_password => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       user = User.authenticate('rhoadmin','123')
       user.login.should == 'rhoadmin'
@@ -12,20 +22,28 @@ describe "RhoconnectApiUpdateUser" do
     end
 
     it "should fail to update user with wrong attributes" do
-      post "/api/user/update_user", :api_token => @api_token,
-        :attributes => {:missingattrib => '123'}
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      User.is_exist?(params[:attributes][:login]).should == true
+      
+      put "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {:attributes => {:missingattrib => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.status.should == 500
       last_response.body.match('undefined method').should_not be_nil
     end
 
     it "should not update login attribute for user" do
-      post "/api/user/update_user", :api_token => @api_token, 
-        :attributes => {:new_password => '123', :login => 'admin1'}
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
-      user = User.authenticate('rhoadmin','123')
-      user.login.should == 'rhoadmin'
-      user.admin.should == 1
-      User.is_exist?('admin1').should == false
+      User.is_exist?(params[:attributes][:login]).should == true
+      
+      put "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {:attributes => {:new_password => '123', :login => 'someotheruser1'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      user = User.authenticate('testuser1','123')
+      user.login.should == 'testuser1'
+      user.admin.should_not == 1
+      User.is_exist?('someotheruser1').should == false
     end
   end
 end

data/spec/api/user/user_get_db_doc_spec.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiUserGetDbDoc" do
+  it_should_behave_like "ApiHelper" do
+    it "should get user's db document by doc key and data" do
+      data = {'1' => {'foo' => 'bar'}}
+      dockey = 'myuserdoc'
+      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      
+      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      JSON.parse(last_response.body).should == data
+    end
+  end  
+end

data/spec/api/user/user_set_db_doc_spec.rb

@@ -0,0 +1,41 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiUserSetDbDoc" do
+  it_should_behave_like "ApiHelper" do
+    it "should set user's db document by doc key and data" do
+      data = {'1' => {'foo' => 'bar'}}
+      dockey = 'myuserdoc'
+      sdocname = @s2.docname(dockey)
+      
+      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_result(sdocname => data)
+    end
+    
+    it "should append data to the user's db document by doc name and data" do
+      data = {'1' => {'foo' => 'bar'}}
+      data2 = {'2' => {'foo1' => 'bar1'}}
+      data3 = data.merge(data2)
+      dockey = 'abc:abc'
+      sdocname = @s2.docname(dockey)
+      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_result(sdocname => data)
+      
+      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_result(sdocname => data3)
+    end
+    
+    it "should error out in ateempt to set a db doc for a non-existent user" do
+      data = {'1' => {'foo' => 'bar'}}
+      data2 = {'2' => {'foo1' => 'bar1'}}
+      data3 = data.merge(data2)
+      dockey = 'abc:abc'
+      sdocname = @s2.docname(dockey)
+      post "/rc/#{Rhoconnect::API_VERSION}/users/invalid_user/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.status.should == 500
+      last_response.should_not be_ok
+    end
+  end  
+end

data/spec/apps/rhotestapp/application.rb

@@ -13,6 +13,10 @@ class Application < Rhoconnect::Base
     def initializer(path)
       super
     end
+
+    def ans_authenticate(username, password)
+      'ansuser:secret' == [username,password].join(':')
+    end
   end
 end
 

data/spec/apps/rhotestapp/settings/settings.yml

@@ -1,11 +1,13 @@
 :sources:
   SampleAdapter:
     :poll_interval: 300
+    :priority: 1
   SimpleAdapter:
     :poll_interval: 600
     partition_type: 'app'
   FixedSchemaAdapter:
     :poll_interval: 300
+    :priority: 5
     sync_type: 'incremental'
     belongs_to: 
       - brand: 'SampleAdapter'
@@ -19,7 +21,6 @@
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :api_token: b6f22608fa8b4acf84e844808845e2fe
 :test: 
   :licensefile: settings/license.key
   :iphonecertfile: settings/apple_fake_cert.pem
@@ -30,6 +31,7 @@
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
   :api_token: b6f22608fa8b4acf84e844808845e2fe
+  :push_server: http://user:pwd@localhost:8675
   :cookie_expire: 9999999
   :poll_interval_default: 201
 :production: 

data/spec/bulk_data/bulk_data_spec.rb

@@ -59,6 +59,19 @@ describe "BulkData" do
         File.join(@a_fields[:name],@a_fields[:name])
     end
 
+    it "should have ordered sources list by priority" 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"]
+      p1 = Source.load("SampleAdapter", {:app_id => data.app_id, :user_id => data.user_id}).priority 
+      p2 = Source.load("FixedSchemaAdapter", {:app_id => data.app_id, :user_id => data.user_id}).priority
+      p1.should < p2
+    end
+
     it "should process_sources for bulk data" do
       current = Time.now.to_i
       @s.read_state.refresh_time = current

data/spec/client_sync_spec.rb

@@ -28,8 +28,7 @@ describe "ClientSync" do
       @c.source_name = 'Product'
       @cs1 = ClientSync.new(@s2,@c,2)
       
-      @cs1.send_cud.should == [{'version'=>ClientSync::VERSION},
-        {'token'=>@c.get_value(:page_token)},
+      @cs1.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>@c.get_value(:page_token)},
         {'count'=>data.size},{'progress_count'=>0},
         {'total_count'=>data.size},expected]
         
@@ -89,8 +88,7 @@ describe "ClientSync" do
       expected = {'insert'=>data}
       set_test_data('test_db_storage',data)
       
-      @cs.send_cud.should == [{'version'=>ClientSync::VERSION},
-        {'token'=>@c.get_value(:page_token)},
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>@c.get_value(:page_token)},
         {'count'=>data.size},{'progress_count'=>0},
         {'total_count'=>data.size},expected]
       verify_result(@cs.client.docname(:page) => data,
@@ -103,8 +101,7 @@ describe "ClientSync" do
       expected = {'insert'=>data}
       set_test_data('test_db_storage',data)
       @s.pass_through = 'true'
-      @cs.send_cud.should == [{'version'=>ClientSync::VERSION},
-        {'token'=>@c.get_value(:page_token)},
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>@c.get_value(:page_token)},
         {'count'=>data.size},{'progress_count'=>0},
         {'total_count'=>data.size},expected]
       verify_result(@cs.client.docname(:page) => {},
@@ -116,8 +113,7 @@ describe "ClientSync" do
       expected = {}
       #set_test_data('test_db_storage',data)
       @s.pass_through = 'true'
-      @cs.send_cud.should == [{'version'=>ClientSync::VERSION},
-        {'token'=>""},
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>""},
         {'count'=>data.size},{'progress_count'=>0},
         {'total_count'=>data.size},expected]
       verify_result(@cs.client.docname(:page) => {},
@@ -128,14 +124,13 @@ describe "ClientSync" do
       msg = "Error during query"
       data = {'1'=>@product1,'2'=>@product2}
       set_test_data('test_db_storage',data,msg,'query error')
-      @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-        {"token"=>""}, {"count"=>0}, {"progress_count"=>0},{"total_count"=>0}, 
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0},{"total_count"=>0}, 
         {"source-error"=>{"query-error"=>{"message"=>msg}}}]
     end
     
     it "should return login errors in send cud" do
       @u.login = nil
-      @cs.send_cud.should == [{"version"=>ClientSync::VERSION},{"token"=>""}, 
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, 
         {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
         {'source-error'=>{"login-error"=>{"message"=>"Error logging in"}}}]
     end
@@ -143,8 +138,7 @@ describe "ClientSync" do
     it "should return logoff errors in send cud" do
       msg = "Error logging off"
       set_test_data('test_db_storage',{},msg,'logoff error')
-      @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-        {"token"=>@c.get_value(:page_token)}, 
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>@c.get_value(:page_token)}, 
         {"count"=>1}, {"progress_count"=>0}, {"total_count"=>1}, 
         {"source-error"=>{"logoff-error"=>{"message"=>msg}}, 
         "insert"=>{ERROR=>{"name"=>"logoff error", "an_attribute"=>msg}}}]
@@ -159,8 +153,7 @@ describe "ClientSync" do
         data = {'1'=>@product1,'2'=>@product2}
         expected = {'insert'=>data}
         set_test_data('test_db_storage',data)
-        @cs.send_cud.should == [{'version'=>ClientSync::VERSION},
-          {'token'=>@c.get_value(:page_token)},
+        @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>@c.get_value(:page_token)},
           {'count'=>data.size},{'progress_count'=>0},
           {'total_count'=>data.size},expected]
         verify_result(@cs.client.docname(:page) => data,
@@ -172,14 +165,13 @@ describe "ClientSync" do
         msg = "Error during query"
         data = {'1'=>@product1,'2'=>@product2}
         set_test_data('test_db_storage',data,msg,'query error')
-        @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-          {"token"=>""}, {"count"=>0}, {"progress_count"=>0},{"total_count"=>0}, 
+        @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0},{"total_count"=>0}, 
           {"source-error"=>{"query-error"=>{"message"=>msg}}}]
       end
 
       it "should return login errors in send cud" do
         @u.login = nil
-        @cs.send_cud.should == [{"version"=>ClientSync::VERSION},{"token"=>""}, 
+        @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, 
           {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
           {'source-error'=>{"login-error"=>{"message"=>"Error logging in"}}}]
       end
@@ -187,8 +179,7 @@ describe "ClientSync" do
       it "should return logoff errors in send cud" do
         msg = "Error logging off"
         set_test_data('test_db_storage',{},msg,'logoff error')
-        @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-          {"token"=>@c.get_value(:page_token)}, 
+        @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>@c.get_value(:page_token)}, 
           {"count"=>1}, {"progress_count"=>0}, {"total_count"=>1}, 
           {"source-error"=>{"logoff-error"=>{"message"=>msg}}, 
           "insert"=>{ERROR=>{"name"=>"logoff error", "an_attribute"=>msg}}}]
@@ -211,8 +202,7 @@ describe "ClientSync" do
           error_objs = add_error_object({},"Error delete record")
           op_data = {'delete'=>error_objs}
           @cs.receive_cud(op_data)
-          @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-            {"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
+          @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
             {"delete-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>error_objs[ERROR]}}]      
         end
 
@@ -221,12 +211,10 @@ describe "ClientSync" do
           error_objs = add_error_object({},"Error delete record")
           op_data = {'delete'=>error_objs}
           @cs.receive_cud(op_data)
-          @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-            {"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
+          @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
             {"delete-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>error_objs[ERROR]}}]
           verify_result(@c.docname(:delete_errors) => {})
-          @cs.send_cud.should ==   [{"version"=>ClientSync::VERSION},
-            {"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},{}]
+          @cs.send_cud.should ==   [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},{}]
         end
 
         
@@ -295,7 +283,7 @@ describe "ClientSync" do
       def search_and_verify_res(params)
         res = @cs.search(params)
         token = @c.get_value(:search_token)
-        res[0]['version'].should == ClientSync::VERSION
+        res[0]['version'].should == ClientSync::SYNC_VERSION
         res[1]['token'].should == token
         res[2]['source'].should == @s.name
         res[3]['count'].should == 1
@@ -307,7 +295,7 @@ describe "ClientSync" do
         set_state('test_db_storage' => @data)
         res = @cs.search(params)
         token = @c.get_value(:search_token)
-        res.should == [{'version'=>ClientSync::VERSION},{'token'=>token},
+        res.should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>token},
           {'source'=>@s.name},{'count'=>1},{'insert'=>{'1'=>@product1}}]
         verify_result(@c.docname(:search) => {'1'=>@product1},
           @c.docname(:search_errors) => {})
@@ -318,7 +306,7 @@ describe "ClientSync" do
         set_state('test_db_storage' => @data)
         res = @cs.search(nil)
         token = @c.get_value(:search_token)
-        res.should == [{'version'=>ClientSync::VERSION},{'token'=>token},
+        res.should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>token},
           {'source'=>@s.name},{'count'=>@data.size},{'insert'=>@data}]
         verify_result(@c.docname(:search) => @data,
           @c.docname(:search_errors) => {})
@@ -371,8 +359,7 @@ describe "ClientSync" do
         @source = @s
         set_state({@c.docname(:search_page) => {'1'=>@product1}})
         token = compute_token @cs.client.docname(:search_token)
-        @cs.search({:resend => true,:token => token}).should == [{'version'=>ClientSync::VERSION},
-          {'token'=>token},{'source'=>@s.name},{'count'=>1},{'insert'=>{'1'=>@product1}}]
+        @cs.search({:resend => true,:token => token}).should == [{'version'=>ClientSync::SYNC_VERSION},{'token'=>token},{'source'=>@s.name},{'count'=>1},{'insert'=>{'1'=>@product1}}]
         verify_result(@c.docname(:search_page) => {'1'=>@product1},
           @c.docname(:search_errors) => {},
           @cs.client.docname(:search_token) => token)
@@ -395,8 +382,7 @@ describe "ClientSync" do
         @cs.search(
           {:token => 'abc',
           :search => {'name' => 'iPhone'}}
-        ).should == [{'version'=>ClientSync::VERSION},
-          {'source'=>@s.name},{'search-error'=>{'search-error'=>
+        ).should == [{'version'=>ClientSync::SYNC_VERSION},{'source'=>@s.name},{'search-error'=>{'search-error'=>
           {'message'=>"Search error - invalid token"}}}]
         verify_result(@c.docname(:search) => {},
           @c.docname(:search_errors) => {},
@@ -408,7 +394,7 @@ describe "ClientSync" do
         set_state('test_db_storage' => @data)
         res = ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}})
         token = Store.get_value(@cs.client.docname(:search_token))
-        res.should == [[{'version'=>ClientSync::VERSION},{'token'=>token},
+        res.should == [[{'version'=>ClientSync::SYNC_VERSION},{'token'=>token},
           {'source'=>sources[0]['name']},{'count'=>1},{'insert'=>{'1'=>@product1}}]]
         verify_result(@c.docname(:search) => {'1'=>@product1},
           @c.docname(:search_errors) => {})
@@ -420,7 +406,7 @@ describe "ClientSync" do
         @s.pass_through = 'true'
         res = ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}})
         token = Store.get_value(@cs.client.docname(:search_token))
-        res.should == [[{'version'=>ClientSync::VERSION},{'token'=>token},
+        res.should == [[{'version'=>ClientSync::SYNC_VERSION},{'token'=>token},
           {'source'=>sources[0]['name']},{'count'=>1},{'insert'=>{'1'=>@product1}}]]
         verify_result(@c.docname(:search) => {},
           @c.docname(:search_errors) => {})
@@ -432,8 +418,7 @@ describe "ClientSync" do
         error = set_test_data('test_db_storage',@data,msg,'search error')
         res = ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}})
         token = Store.get_value(@cs.client.docname(:search_token))
-        res.should == [[{'version'=>ClientSync::VERSION},
-          {'source'=>sources[0]['name']},{'search-error'=>{'search-error'=>{'message'=>msg}}}]]
+        res.should == [[{'version'=>ClientSync::SYNC_VERSION},{'source'=>sources[0]['name']},{'search-error'=>{'search-error'=>{'message'=>msg}}}]]
         verify_result(@c.docname(:search) => {})
       end
 
@@ -443,7 +428,7 @@ describe "ClientSync" do
         msg = "Error logging in"
         error = set_test_data('test_db_storage',@data,msg,'search error')
         ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}}).should == [
-          [{'version'=>ClientSync::VERSION},{'source'=>sources[0]['name']},
+          [{'version'=>ClientSync::SYNC_VERSION},{'source'=>sources[0]['name']},
           {'search-error'=>{'login-error'=>{'message'=>msg}}}]]
         verify_result(@c.docname(:search) => {},
           @c.docname(:search_token) => nil)
@@ -455,7 +440,7 @@ describe "ClientSync" do
         res = ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}})
         @c.source_name = 'SampleAdapter'
         token = Store.get_value(@c.docname(:search_token))
-        res.sort.should == [[{"version"=>ClientSync::VERSION},{'token'=>token},
+        res.sort.should == [[{'version'=>ClientSync::SYNC_VERSION},{'token'=>token},
           {"source"=>"SampleAdapter"},{"count"=>1},{"insert"=>{'1'=>@product1}}],[]].sort
       end
 
@@ -467,9 +452,9 @@ describe "ClientSync" do
         token = Store.get_value(@c.docname(:search_token))
         @c.source_name = 'SampleAdapter'
         token1 = Store.get_value(@c.docname(:search_token))
-        res.should == [[{"version"=>ClientSync::VERSION}, {'token'=>token},
+        res.should == [[{'version'=>ClientSync::SYNC_VERSION},{'token'=>token},
           {"source"=>"SimpleAdapter"},{"count"=>1},{"insert"=>{'obj'=>{'foo'=>'bar'}}}],
-          [{"version"=>ClientSync::VERSION},{'token'=>token1},{"source"=>"SampleAdapter"}, 
+          [{'version'=>ClientSync::SYNC_VERSION},{'token'=>token1},{"source"=>"SampleAdapter"}, 
            {"count"=>1}, {"insert"=>{'1'=>@product1}}]]      
       end
 
@@ -507,8 +492,7 @@ describe "ClientSync" do
         Store.get_data(@s.docname(:md)).should == @data
         Store.put_value(@s.docname(:md_size),@data.size)
 
-        progress_count, total_count, res = @cs.compute_page
-        progress_count.to_i.should == 0
+        total_count, res = @cs.compute_page
         total_count.to_i.should == 3
         res.each do |key, value|
           @data.has_key?(key).should == true
@@ -565,10 +549,10 @@ describe "ClientSync" do
         params = {'name' => 'iPhone'}
         @cs.send_cud(nil,params)
         token = @c.get_value(:page_token)
-        @cs.send_cud.should == [{"version"=>ClientSync::VERSION},{"token"=>token}, 
+        @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>token}, 
           {"count"=>1}, {"progress_count"=>0},{"total_count"=>1},{'insert' => expected}]
-        @cs.send_cud(token).should == [{"version"=>ClientSync::VERSION},{"token"=>""}, 
-          {"count"=>0}, {"progress_count"=>1}, {"total_count"=>1}, {}]
+        @cs.send_cud(token).should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, 
+          {"count"=>0}, {"progress_count"=>0}, {"total_count"=>1}, {}]
         Store.get_data(@cs.client.docname(:page)).should == {}              
         @c.get_value(:page_token).should be_nil
       end
@@ -580,7 +564,7 @@ describe "ClientSync" do
         mock_metadata_method([SampleAdapter]) do
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          result.should == [{"version"=>ClientSync::VERSION},{"token"=>token}, 
+          result.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>token}, 
             {"count"=>1}, {"progress_count"=>0},{"total_count"=>1},
             {'metadata'=>metadata,'insert'=>expected}]
           @c.get_value(:metadata_page).should == metadata
@@ -593,7 +577,7 @@ describe "ClientSync" do
         mock_metadata_method([SampleAdapter]) do
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          @cs.send_cud.should == [{"version"=>ClientSync::VERSION},{"token"=>token}, 
+          @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>token}, 
             {"count"=>1}, {"progress_count"=>0},{"total_count"=>1},
             {'metadata'=>"{\"foo\":\"bar\"}",'insert'=>expected}] 
         end
@@ -605,8 +589,8 @@ describe "ClientSync" do
         mock_metadata_method([SampleAdapter]) do
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          @cs.send_cud(token).should == [{"version"=>ClientSync::VERSION},{"token"=>""}, 
-            {"count"=>0}, {"progress_count"=>1},{"total_count"=>1},{}]
+          @cs.send_cud(token).should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, 
+            {"count"=>0}, {"progress_count"=>0},{"total_count"=>1},{}]
           @c.get_value(:metadata_page).should be_nil
         end
       end
@@ -617,7 +601,7 @@ describe "ClientSync" do
         mock_schema_method([SampleAdapter]) do
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          result.should ==  [{"version"=>ClientSync::VERSION},{"token"=>token}, 
+          result.should ==  [{'version'=>ClientSync::SYNC_VERSION},{"token"=>token}, 
             {"count"=>1}, {"progress_count"=>0},{"total_count"=>1},{'insert'=>expected}]
           @c.get_value(:schema_sha1).should == sha1
         end
@@ -628,7 +612,7 @@ describe "ClientSync" do
           @c.put_value(:schema_sha1,'foo')
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          result.should ==  [{"version"=>ClientSync::VERSION},{"token"=>token}, 
+          result.should ==  [{'version'=>ClientSync::SYNC_VERSION},{"token"=>token}, 
             {"count"=>0}, {"progress_count"=>0},{"total_count"=>0},{'schema-changed'=>'true'}]
           @c.get_value(:schema_page).should == sha1
           @c.get_value(:schema_sha1).should == sha1
@@ -640,7 +624,7 @@ describe "ClientSync" do
           @c.put_value(:schema_sha1,'foo')
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          @cs.send_cud.should ==  [{"version"=>ClientSync::VERSION},{"token"=>token}, 
+          @cs.send_cud.should ==  [{'version'=>ClientSync::SYNC_VERSION},{"token"=>token}, 
             {"count"=>0}, {"progress_count"=>0},{"total_count"=>0},{'schema-changed'=>'true'}]
           @c.get_value(:schema_page).should == sha1
           @c.get_value(:schema_sha1).should == sha1
@@ -652,7 +636,7 @@ describe "ClientSync" do
           @c.put_value(:schema_sha1,'foo')
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          @cs.send_cud(token).should ==  [{"version"=>ClientSync::VERSION},{"token"=>""}, 
+          @cs.send_cud(token).should ==  [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, 
             {"count"=>0}, {"progress_count"=>0},{"total_count"=>0},{}]
           @c.get_value(:schema_page).should be_nil
           @c.get_value(:schema_sha1).should == sha1
@@ -671,7 +655,7 @@ describe "ClientSync" do
           @c.put_value(:schema_sha1,'foo')
           result = @cs.send_cud
           token = @c.get_value(:page_token)
-          @cs.send_cud(token).should ==  [{"version"=>ClientSync::VERSION},{"token"=>""}, 
+          @cs.send_cud(token).should ==  [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, 
             {"count"=>0}, {"progress_count"=>0},{"total_count"=>0},{}]
           @c.get_value(:schema_page).should be_nil
           @c.get_value(:schema_sha1).should == sha1
@@ -790,15 +774,13 @@ describe "ClientSync" do
     op_data = {operation=>{ERROR=>{'an_attribute'=>msg,'name'=>'wrongname'}}}
     @cs.receive_cud(op_data) 
     if operation == 'update'
-      @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-        {"token"=>""}, {"count"=>0}, {"progress_count"=>1}, {"total_count"=>1},
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>1},
         {
           "update-rollback"=>{"0_broken_object_id"=>{"price"=>"99.99"}},
           "#{operation}-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>op_data[operation][ERROR]}
         }]
     else
-      @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-        {"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
+      @cs.send_cud.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
         {"#{operation}-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>op_data[operation][ERROR]}}]
     end
   end