rhoconnect 3.2.1 → 3.3.1.beta2

data/lib/rhoconnect/web-console/views/edit_user.js

@@ -13,9 +13,12 @@ App.Views.EditUser = Backbone.View.extend({
 	    var session = new Session()
 	    var password = $("#password2").val();
 	  	$.ajax({
-			type: 'POST',
-			url: '/api/user/update_user',
-			data: {api_token : session.getApiKey(), attributes : {login : 'rhoadmin', password : password}},
+			type: 'PUT',
+			url: '/rc/v1/users/' + 'rhoadmin',
+			data: {attributes : {login : 'rhoadmin', password : password}},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(){
 				//router.navigate("users", true);
 			},

data/lib/rhoconnect/web-console/views/home.js

@@ -1,20 +1,16 @@
 App.Views.Home = Backbone.View.extend({
 	
 	events: {
-		"click a#reset" : "reset" 
+		"click a#reset"    : "reset",
+		"click #app_url"   : "set_adapter",
+		"submit form"      : "edit",
+		"click #api_btn" : "toggle_api_token"
 	},
 	
     initialize: function() {
  	    var domain = $('input#domain').val();
+		this.model.get_license_info();
 	    this.model.set('partition_type','app')
-		this.model.save({
-			error: function(model,resp)
-			{
-				if(resp.status == 422){
-					 new App.Views.Index()
-				}
-			}
-		});
 		this.model.fetch({
 			error: function(model,resp)
 			{
@@ -24,6 +20,7 @@ App.Views.Home = Backbone.View.extend({
 			}
 		});
         this.render(domain);
+		this.options.model2.get_adapter();
     },  
 
     reset: function(){
@@ -32,23 +29,99 @@ App.Views.Home = Backbone.View.extend({
 			session.reset()
 		}
 	},
+	
+	edit: function(e){
+		e.preventDefault();
+	    var session = new Session()
+	    var password = $("#password2").val();
+		$(".edituser-status")[0].firstChild.className = "label label-warning";
+		$(".edituser-status")[0].firstChild.innerHTML = "loading...";
+		$(".edituser-status").css("visibility","visible");
+	  	$.ajax({
+			type: 'PUT',
+			url: '/rc/v1/users/' + 'rhoadmin',
+			data: {attributes : {login : 'rhoadmin', password : password}},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
+			success: function(){
+				//router.navigate("users", true);
+				$(".edituser-status")[0].firstChild.className = "label label-success";
+				$(".edituser-status")[0].firstChild.innerHTML = "success";
+			},
+			error: function(resp){
+				if(resp.status == 422){
+					 new App.Views.Index()
+				}
+				$(".edituser-status")[0].firstChild.className = "label label-important";
+				$(".edituser-status")[0].firstChild.innerHTML = "error";
+				$('#home-alert')[0].innerHTML = resp.responseText;
+		        $('#home-alert').css('display','block');
+			}
+		})
+		return false;
+	},
+	
+	set_adapter: function(e){
+		e.preventDefault();
+		var adapter_url = $('#input_adapter').val();
+		//this.render();
+		$(".setadapter-status")[0].firstChild.className = "label label-warning";
+		$(".setadapter-status")[0].firstChild.innerHTML = "loading...";
+		$(".setadapter-status").css("visibility","visible");
+		this.delegateEvents();
+		this.options.model2.set_adapter(adapter_url);
+		return false;
+	},
+	
+	toggle_api_token: function(e){
+		e.preventDefault();
+		if ($("#api_btn").attr("value") == "Show"){
+			$("#api_token").css('display','inline');
+			$("#api_btn").attr("value","Hide");
+		}
+		else {
+			$("#api_token").css('display','none');
+			$("#api_btn").attr("value","Show");
+		}
+	},
     
     render: function(domain) {
+		session = new Session();
         $('#secondary-nav').css('display','block');
-		//out  = "<div class='page-header well'><h1>Home</h1></div>"
 		out = "<div id='home-alert' class='alert alert-error' style='display:none'></div>"
 		out += "<div class='alert alert-info' style='padding:10px 0 30px 0'>"
-		//out += "<div class='container'>"
 		out += "<div id='license' style='padding-left:5px' class='pull-left'></div>"
-		out += "<div class='pull-right'>"
-		out += "<div class='reset-status' style='display:inline;'><span class='' style='margin-right:5px'></span></div>"
-		out += "<a id='reset' class='btn btn-danger'>Reset</a>"
-		out += "</div></div>"
-		out += "<div class='span4'>"
-	    out += "<table id='source-table' class='table table-bordered'><thead><tr><th><h3>App partition sources</h3></th></tr></thead>"
+		out += "</div>";
+		out += "<div class='span4' style='margin-left:0'>"
+	    out += "<table id='source-table' class='table table-bordered'><thead><tr><th><h3>App partition sources</h3>";
+	    out += "</th></tr></thead>"
 		out += "</table></div>"
-		out += "<div class='span4 pull-right'><h3>Sync Server URL</h3><code style='margin:0'>http://"+domain+"</code></br>";
-		out += "<em style='margin-top:5px'>Paste this url into your client app configuration to sync with this RhoConnect instance.</em></div>";
+		
+		out += "<table class='table table-bordered'>";
+		out += "<tr><td><p style='margin-top:10px'>Sync Server</p></td>";
+		out += "<td><p style='margin-top:10px'><code style='margin:0'>http://"+domain+"</code></p></td>";
+		out += "<td><p style='margin-top:10px'>Paste this url into your client app configuration to sync with this RhoConnect instance.</p></td>"
+		out += "<form>"
+		out += "<tr>"
+		out += "<td width='20%'><p style='margin-top:10px'>Change Admin Password</p></td>"
+		out += "<td width='40%'><p style='margin-top:10px'><input id='password2' type='password' name='password' value='' class='input-xlarge' placeholder='Enter new password' style='margin:0'/>"
+		out += "<input type='submit' class='btn btn-primary' value='Save' style='margin-left:10px'/><div class='edituser-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div></p></td>"
+		out += "<td width='40%'><p style='margin-top:10px'>By default the admin password is blank.</p></td>"
+		out += "</form>"
+		out += "<tr>"
+		out += "<td width='20%'><p style='margin-top:10px'>API Token</p></td>"
+		out += "<td width='40%'><p id='api_token' style='margin-top:10px;display:none'><code>"+ session.getApiKey() +"</code></p>";
+		out += "<input type='button' id='api_btn' class='btn' value='Show' style='display:inline;margin-left:10px'/></td>"
+		out += "<td width='40%'><p style='margin-top:10px'>Include this token in all API calls made to RhoConnect.</p></td></tr>"
+		out += "<tr>";
+		out += "<td width='20%'><p style='margin-top:10px'>Backend App URL</p></td>";
+	    out += "<td width='40%'><p style='margin-top:10px'><input id='input_adapter' type='text' name='adapter_url' value='' class='input-xlarge' placeholder='Enter URL' style='margin:0'/>";
+	    out += "<input id='app_url' type='button' value='Save' class='btn btn-primary' style='margin-left:10px'/><div class='setadapter-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div></p></td>";
+	    out += "<td width='40%'><p style='margin-top:10px'>If you are using <a href='http://docs.rhomobile.com/rhoconnect/plugin-intro' target='_blank'>RhoConnect Plugins</a>, you will need to ";
+	    out += "define your backend app URL either here or in the plugin configuration.  For example, if you are using the rhoconnect-rb plugin in your rails app running locally, use the URL http://localhost:3000. <em><b>This needs to be set in order to use RhoConnect Plugins.</b></em></p></td>"
+	    out += "</table>"
+		
 		out += "<div class='span12' style='margin-top:20px'><h2>Getting Started with RhoConnect</h2>";
 		out += "<ol style='font-size:18px;margin-top:20px'><li>The Home Screen</li>";
 		out += "<ul style='margin:20px'>"
@@ -61,15 +134,15 @@ App.Views.Home = Backbone.View.extend({
 		out += 	"<p style='margin:10px'>Enter a key to view the stored value in the database.  You can also set and delete keys here.</p>"
 		out += "<li>Users</li>"
 		out += "<p style='margin:10px'>View a list of registered users here.  You can also create,delete, and ping users.  Viewing a particular user will allow you to view source adapters partitioned by user as well as that user's registered devices."
-		out += "<li>Settings</li><ul style='margin:20px'><li>Change Admin Password</li><p style='margin-top:10px'>By default the admin password is blank.  Here you can change the admin password.</p>"
-		out += "<li>API Token</li><p>View your RhoConnect API Token.  This token needs to be included in all API calls made to RhoConnect</p>"
-		out += "<li>Plugin Settings</li><p style='margin-top:10px'>If you are using Dynamic Adapters (opposed to source adapters) with <a href='http://docs.rhomobile.com/rhoconnect/plugin-intro' target='_blank'>RhoConnect Plugins</a>, you will need to "
-		out += "define your backend app URL here.  For example, if I am using the plugin rhoconnect-rb with my rails app, I would put the URL http://myrailsapp.com here. <em><b>This value needs to be set in order to use RhoConnect Plugins.</b></em></p></ul>"
+		out += "</ul>"
 		out += "<li>Statistics</li>"
 		out += "<p style='margin-top:10px'>If you do not see a link to Statistics, it is not enabled in your config.ru file.  By default Rhoconnect apps will have this line <code>Rhoconnect::Server.enable  :stats</code> commented out. "
 		out += "Older versions of RhoConnect will not have this line in the config.ru file at all.  Uncomment or add the line above to enable Statistics.  The Statistics tab will have different graphs to measure metrics/performance for RhoConnect.</p>"
-		out += "</ol></div>"
-		
+		out += "</ol>"
+		out += "<div class='pull-right'>"
+		out += "<div class='reset-status' style='display:inline;'><span class='' style='margin-right:5px'></span></div>"
+		out += "<a id='reset' class='btn btn-danger'>Reset</a>"
+		out += "</div>"
         $(this.el).html(out);
         $('#main_content').html(this.el);
 		return this

data/lib/rhoconnect/web-console/views/index.js

@@ -14,7 +14,7 @@ App.Views.Index = Backbone.View.extend({
 		var password = $("#password").val();
 		$.ajax({
 			type: 'POST',
-			url: '/api/admin/login',
+			url: '/rc/v1/system/login',
 			data: {login:login,password:password},
 			success: function(resp){
 				var session = new Session();

data/lib/rhoconnect/web-console/views/new_ping.js

@@ -20,11 +20,14 @@ App.Views.NewPing = Backbone.View.extend({
 		var sound = $('#pingsound').val();
 		var badge = $('#pingbadge').val();
 		var sources = $('#sources').val().split(',');
-
+		var token = this.model.get('api_token');
 		$.ajax({
 			type: 'POST',
-			url: '/api/client/ping',
-			data: {api_token : this.model.get('api_token'), user_id : users, message : message, vibrate : vibrate, badge : badge, sources : sources},
+			url: '/rc/v1/users/ping',
+			data: {user_id : users, message : message, vibrate : vibrate, badge : badge, sources : sources},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", token);
+			},
 			success: function(){
 				router.navigate("users", true);
 			},

data/lib/rhoconnect/web-console/views/server_doc.js

@@ -13,11 +13,15 @@ App.Views.ServerDoc = Backbone.View.extend({
 	clear: function(e){
 		e.preventDefault();
 		dbkey = this.model.get('dbkey');
+		token = this.model.get('api_token')
 		var self = this;
 		$.ajax({
 			type: 'POST',
-			url: '/api/source/set_db_doc',
-			data: {api_token : this.model.get('api_token'), doc : dbkey, data : '', data_type : 'string'},
+			url: '/rc/v1/store/' + dbkey,
+			data: {data : ''},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", token);
+			},
 			success: function(){
 				data = "<tr><th colspan=3><h3 style='display:inline'>Data</h3><div class='pull-right'>" + 
 						"<a class='btn btn-danger'>clear document</a></div></th></tr>" +
@@ -44,10 +48,14 @@ App.Views.ServerDoc = Backbone.View.extend({
 		$(".upload-status").css("visibility","visible");
 		var doc = $('#input_key').val();
 		var data = $("#data").val();
+		token = this.model.get('api_token');
 		$.ajax({
 			type: 'POST',
-			url: '/api/source/set_db_doc',
-			data: {api_token : this.model.get('api_token'), doc : doc, data : data, data_type : 'string'},
+			url: '/rc/v1/store/' + doc,
+			data: {data : data},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", token);
+			},
 			success: function(){
 				$(".upload-status")[0].firstChild.className = "label label-success";
 				$(".upload-status")[0].firstChild.innerHTML = "success";

data/lib/rhoconnect/web-console/views/show_device.js

@@ -21,10 +21,13 @@ App.Views.ShowDevice = Backbone.View.extend({
 		if(confirm("Are you sure you want to delete this device?")){
 		    var user_id = this.model.get('user_id');
 		 	var client_id = this.model.get('device_id');
+			var token = this.model.get('api_token')
 			$.ajax({
-				type: 'POST',
-				url: '	/api/client/delete_client',
-				data: {api_token : this.model.get('api_token'), user_id : user_id, client_id : client_id},
+				type: 'DELETE',
+				url: '	/rc/v1/users/' + user_id + '/clients/' + client_id,
+				beforeSend: function (HttpRequest) {
+				            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", token);
+				},
 				success: function(resp){
 					router.navigate("user/"+user_id,true)
 				},

data/rhoconnect.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency('bundler', '~> 1.0')  
-#  s.add_dependency("rack", '~> 1.4.0')
   s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '~> 0.9.2')
   s.add_dependency('json', '~> 1.6.0')
@@ -48,5 +47,5 @@ Gem::Specification.new do |s|
   s.add_dependency('resque', '~> 1.20.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')
-  s.add_dependency('thor', '~> 0.14.6')
+  s.add_dependency('thor', '~> 0.15.0')
 end

data/spec/api/{source → app}/fast_delete_spec.rb

@@ -6,8 +6,8 @@ describe "RhoconnectApiFastDelete" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
       set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
-      post "/api/source/fast_delete", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :data => {'3' => @product3}
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete", 
+        {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data.delete('3')
       verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
@@ -18,8 +18,8 @@ describe "RhoconnectApiFastDelete" do
       delete_data = {'3' => {'price' => '1.99'}}
       @s = Source.load(@s_fields[:name],@s_params)
       set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
-      post "/api/source/fast_delete", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :data => delete_data
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete", 
+        {:user_id => @u.id, :data => delete_data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
     end

data/spec/api/{source → app}/fast_insert_spec.rb

@@ -6,8 +6,8 @@ describe "RhoconnectApiFastInsert" do
       data = {'1' => @product1, '2' => @product2}
       @s = Source.load(@s_fields[:name],@s_params)
       set_state(@s.docname(:md) => data,@s.docname(:md_size) => '2')
-      post "/api/source/fast_insert", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :data => {'3' => @product3}
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
+        {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data.merge!({'3' => @product3})
       verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
@@ -18,8 +18,8 @@ describe "RhoconnectApiFastInsert" do
       incorrect_insert = {'3' => {'price' => '1.99', 'new_field' => 'value'}}
       @s = Source.load(@s_fields[:name],@s_params)
       set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
-      post "/api/source/fast_insert", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :data => incorrect_insert
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
+        {:user_id => @u.id, :data => incorrect_insert}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data['3'].merge!(incorrect_insert['3'])
       verify_result(@s.docname(:md_size)=>'4')

data/spec/api/{source → app}/fast_update_spec.rb

@@ -10,13 +10,29 @@ describe "RhoconnectApiFastUpdate" do
       orig_obj_attrs = {'3' => {'price' => @product3['price']}}
       new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
       
-      post "/api/source/fast_update", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :delete_data => orig_obj_attrs, :data => new_obj_attrs
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
+        {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data['3'].merge!(new_obj_attrs['3'])
       verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
     end
     
+    it "should update an attribute and add new one for an object in rhoconnect's :md using old route with deprecation warning" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      @s = Source.load(@s_fields[:name],@s_params)
+      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      
+      orig_obj_attrs = {'3' => {'price' => @product3['price']}}
+      new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
+      
+      post "/api/source/fast_update", 
+        {:user_id => @u.id, :source_id => @s_fields[:name], :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      last_response.headers["Warning"].index('deprecated').should_not == nil
+      data['3'].merge!(new_obj_attrs['3'])
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+    
     it "should update one attr, add one attr, and remove one attr for an object in rhoconnect's :md" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
@@ -25,8 +41,8 @@ describe "RhoconnectApiFastUpdate" do
       orig_obj_attrs = {'3' => {'name' => @product3['name'], 'price' => @product3['price']}}
       new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
       
-      post "/api/source/fast_update", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :delete_data => orig_obj_attrs, :data => new_obj_attrs
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
+        {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data['3'].delete('name')
       data['3'].merge!(new_obj_attrs['3'])
@@ -41,8 +57,8 @@ describe "RhoconnectApiFastUpdate" do
       orig_obj_attrs = {'3' => @product3}
       new_obj_attrs = {}
       
-      post "/api/source/fast_update", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :delete_data => orig_obj_attrs, :data => new_obj_attrs
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
+        {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data.delete('3')
       verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')

data/spec/api/{source → app}/push_deletes_spec.rb

@@ -8,8 +8,8 @@ describe "RhoconnectApiPushDeletes" do
       @s = Source.load(@s_fields[:name],@s_params)
       set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
       data.delete('2')
-      post "/api/source/push_deletes", :api_token => @api_token, 
-        :user_id => @u.id, :source_id => @s_fields[:name], :objects => ['2']
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_deletes",
+        {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
     end

data/spec/api/app/push_objects_spec.rb

@@ -0,0 +1,45 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiPushObjects" do
+  it_should_behave_like "ApiHelper" do
+    it "should push new objects to rhoconnect's :md" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_objects",
+        {:user_id => @u.id, :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+    
+    it "should push new objects to rhoconnect's :md with old api/source route and deprecation warning" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      post "/api/source/push_objects",
+        {:user_id => @u.id, :source_id => @s_fields[:name], :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      last_response.headers["Warning"].index('deprecated').should_not == nil
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+    
+    it "should push new objects to rhoconnect's :md with oldest api route and deprecation warning" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      post "/api/push_objects",
+        {:user_id => @u.id, :source_id => @s_fields[:name], :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      last_response.headers["Warning"].index('deprecated').should_not == nil
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+
+    it "should push updates to existing objects to rhoconnect's :md" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      update = {'price' => '0.99', 'new_field' => 'value'}
+      @s = Source.load(@s_fields[:name],@s_params)
+      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      update.each do |key,value|
+        data['2'][key] = value
+      end
+      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_objects",
+        {:user_id => @u.id, :objects => {'2'=>update}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+  end  
+end

data/spec/api/client/client_get_db_doc_spec.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiClientGetDbDoc" do
+  it_should_behave_like "ApiHelper" do
+    it "should get clients's db document by doc key and data" do
+      data = {'1' => {'foo' => 'bar'}}
+      dockey = 'myclientdoc'
+      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      
+      get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      JSON.parse(last_response.body).should == data
+    end
+    
+    it "should append data to the client's db document by doc name and data" do
+      data = {'1' => {'foo' => 'bar'}}
+      data2 = {'2' => {'foo1' => 'bar1'}}
+      data3 = data.merge(data2)
+      dockey = 'abc:abc'
+      cdocname = @c.docname(dockey)
+      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_result(cdocname => data)
+      
+      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_result(cdocname => data3)
+    end
+  end  
+end