rhoconnect 3.1.2 → 3.2.0.beta1

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

@@ -0,0 +1,38 @@
+App.Views.SetAdapter = Backbone.View.extend({
+	
+	events: {
+		"submit form" : "set_adapter"
+	},
+	
+    initialize: function() {
+		this.render("",domain);
+		this.model.get_adapter();
+    },
+
+	set_adapter: function(e){
+		e.preventDefault();
+		var adapter_url = $('#input_adapter').val();
+		var domain = $('input#domain').val();
+		this.render(adapter_url,domain);
+		$(".setadapter-status")[0].firstChild.className = "label label-warning";
+		$(".setadapter-status")[0].firstChild.innerHTML = "loading...";
+		$(".setadapter-status").css("visibility","visible");
+		this.delegateEvents();
+		this.model.set_adapter(adapter_url, self);
+	},
+	
+    render: function(adapter_url,domain) {
+        $('#secondary-nav').css('display','block');
+		out  = "<h3>Backend App URL</h3>";
+	    out += "<form style='margin:0'>";
+	    out += "<input id='input_adapter' type='text' name='adapter_url' value='"+adapter_url+"' class='input-xlarge' placeholder='Enter Adapter URL' style='margin:0'/>";
+	    out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'/><div class='setadapter-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div>";
+	    out += "</form>";
+	
+        $(this.el).html(out);
+        $('#settings_main').html(this.el);
+    }
+});
+
+
+

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

@@ -0,0 +1,53 @@
+App.Views.Settings = Backbone.View.extend({
+	
+	events: {
+		"click a#change_admin" : "change_admin",
+		"click a#api_token"   : "api_token",
+		"click a#backend_app" : "backend_app"
+	},
+	
+    initialize: function() {
+        this.render();
+		new App.Views.EditUser()
+    },  
+
+	change_admin: function(){
+		this.change_tab('change_admin')
+		new App.Views.EditUser()
+	},
+
+    api_token: function(){
+	this.change_tab('api_token')
+		new App.Views.ApiToken()
+	},
+	
+	backend_app: function(){
+		this.change_tab('backend_app')
+		adapter = new Adapter();
+		new App.Views.SetAdapter({model: adapter })
+	},
+	
+	change_tab: function(tab){
+		$('#change_admin').parent().attr('class','');
+		$('#api_token').parent().attr('class','');
+		$('#backend_app').parent().attr('class','');
+		$('#'+tab).parent().attr('class','active');
+	},
+    
+    render: function() {
+        $('#secondary-nav').css('display','block');
+		out = "<div id='settings-alert' class='alert alert-error' style='display:none'></div>"
+		out += "<div class='tabs-left'><ul class='nav nav-tabs'>"
+		out += "<li class='active'><a id='change_admin'>Change Admin Password</a></li>"
+		out += "<li><a id='api_token'>API Token</a></li>"
+		out += "<li><a id='backend_app'>Plugin Settings</a></li>"
+		out += "</ul>"
+		out += "<div id='settings_main'>"
+		out += "</div>"
+		out += "</div></div>"
+				
+        $(this.el).html(out);
+        $('#main_content').html(this.el);
+		return this
+    }
+});

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

@@ -0,0 +1,56 @@
+App.Views.ShowDevice = Backbone.View.extend({
+	
+	events: {
+		"click a#delete-device" : "delete_device",
+	},
+	
+    initialize: function() {
+	    var device_id = this.model.get('device_id');
+		this.render(device_id);
+		this.model.get_client_params(device_id);
+		//this.model.list_client_docs(device_id,'Product');
+		source = new Source();
+		source.set('partition_type','user');
+		source.set('user_id',this.model.get('user_id'));
+	    source.set('client_id',device_id);
+		source.set('doctype','client');
+		source.fetch();
+    },
+
+	delete_device: function() {
+		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');
+			$.ajax({
+				type: 'POST',
+				url: '	/api/client/delete_client',
+				data: {api_token : this.model.get('api_token'), user_id : user_id, client_id : client_id},
+				success: function(resp){
+					router.navigate("user/"+user_id,true)
+				},
+				error: function(resp){
+					if(resp.status == 422){
+						 new App.Views.Index()
+					}
+					$('#showdevice-alert')[0].innerHTML = resp.responseText;
+			        $('#showdevice-alert').css('display','block');
+				}
+			})
+		}
+	},
+    
+    render: function(device_id) {
+        $('#secondary-nav').css('display','block');
+		out  = "<div class='page-header well'><span style='font-size:24px;line-height:36px;font-weight:bold'>Device: "+device_id+"</span>";
+		out += "<span class='pull-right'><a id='delete-device' class='btn btn-danger'>Delete Device</a></span></div>";
+		out += "<div id='showdevice-alert' class='alert alert-error' style='display:none'></div>";
+	    out += "<table id='deviceattr-table' class='table table-bordered'>";
+	    out += "<tr><th><h3>Attributes</h3></th></tr>";
+	    out += "</table>";
+		out += "<table id='source-table' class='table table-bordered'><tr><th><h3>Sources for device</h3></th></tr>";
+		out += "</table>"
+	   
+        $(this.el).html(out);
+        $('#main_content').html(this.el);
+    }
+});

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

@@ -0,0 +1,38 @@
+App.Views.ShowUser = Backbone.View.extend({
+	
+	events: {
+		"click a#delete-user" : "delete_user",
+	},
+	
+    initialize: function() {
+	    var name = this.model.get('name');
+		this.render(name);
+		client = new Client();
+		client.get_clients(name);
+		source = new Source();
+		source.set('partition_type','user');
+		source.set('user_id',name);
+		source.set('doctype','source');
+		source.fetch();
+    },
+
+    delete_user: function(e) {
+		e.preventDefault();
+		this.model.delete_user();
+	},
+    
+    render: function(name) {
+        $('#secondary-nav').css('display','block');
+		out  = "<div class='page-header well'><div style='font-size:24px;font-weight:bold;display:inline'>User: "+name+"</div><div class='pull-right' style='display:inline'>";
+		out += "<a id='delete-user' class='btn btn-danger'>Delete User</a><a href='#user/newping/"+name+"' class='btn' style='margin-left:10px'>Ping User</a></div></div>";
+		out += "<div id='showuser-alert' class='alert alert-error' style='display:none'></div>";
+	    out += "<table id='source-table' class='table table-bordered'>";
+	    out += "<tr><th><h3>Sources</h3></th></tr>";
+	    out += "</table>";
+		out += "<table id='device-table' class='table table-bordered'><tr><th><h3>Registered Devices</h3></th></tr>";
+		out += "</table>"
+	   
+        $(this.el).html(out);
+        $('#main_content').html(this.el);
+    }
+});

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

@@ -0,0 +1,30 @@
+App.Views.SourceDocs = Backbone.View.extend({
+	
+    initialize: function() {
+		var source_id = this.model.get('source_id');
+		var user	  = this.model.get('user_id');
+		var doctype   = this.model.get('doctype');
+		var client_id = this.model.get('client_id');
+		this.render(source_id);
+		this.model.get_source_params(source_id);
+		if(doctype == 'client'){
+			client = new Client();
+			client.list_client_docs(client_id,source_id)
+		}
+		else{
+			this.model.list_source_docs(source_id,user);
+		}
+    },  	
+    
+    render: function(source_id) {
+        $('#secondary-nav').css('display','block');
+		out  = "<div class='page-header well'><h1>"+source_id+"</h1></div>";
+		out += "<div class='docalert alert-error' style='display:none'></div>";
+	    out += "<table id='sourceparams-table' class='table table-bordered'><thead><tr><th><h3>Attributes</h3></th></tr></thead>";
+		out += "</table>";
+	    out += "<table id='sourcedocs-table' class='table table-bordered'><tr><th class='span5'><h3>Documents</h3></th></tr>";
+	    out += "</table>";
+        $(this.el).html(out);
+        $('#main_content').html(this.el);
+    }
+});

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

@@ -0,0 +1,69 @@
+App.Views.Stats = Backbone.View.extend({
+	
+	events: {
+		"click a#user_count"    		: "user_count",
+		"click a#device_count"  		: "device_count",
+		"click a#http_timing"   		: "http_timing",
+		"click a#source_timing" 		: "source_timing",
+		"click a#source_timing_display" : "source_timing_display",
+		
+	},
+	
+	initialize: function(){
+		this.render();
+		this.user_count();
+	},
+	
+	user_count: function(){
+		this.change_tab('user_count');
+		this.model.user_stats();
+	},
+
+    device_count: function(){
+		this.change_tab('device_count');
+		this.model.device_count();
+	},
+	
+	http_timing: function(ev){
+		var display_name = ev.currentTarget.innerHTML;
+		this.change_tab('http_timing');
+		this.model.http_timing(display_name);
+	},
+	
+	source_timing: function(){
+	   this.change_tab('source_timing');
+	   this.model.source_timing();
+	},
+	
+	source_timing_display: function(ev){
+		var display_name = ev.currentTarget.innerHTML;
+		this.change_tab('source_timing');
+		this.model.source_timing(display_name);	
+	},
+	
+	change_tab: function(tab){
+		$('#user_count').parent().attr('class','');
+		$('#device_count').parent().attr('class','');
+		$('#http_timing').parent().attr('class','');
+		$('#source_timing').parent().attr('class','');
+		$('#'+tab).parent().attr('class','active');
+	},
+	
+	render: function(){
+		$('#secondary-nav').css('display','block');
+		out = "<div id='stats-alert' class='alert alert-error' style='display:none'></div>"
+		out += "<div class='tabs-left'><ul class='nav nav-tabs'>"
+		out += "<li class='active'><a id='user_count'>User Count</a></li>"
+		out += "<li><a id='device_count'>Device Count</a></li>"
+		out += "<li><a id='http_timing'>HTTP Timing</a></li>"
+		out += "<li><a id='source_timing'>Source Timing</a></li>"
+		out += "</ul>"
+		out += "<div id='stats_main' style='margin-left:200px'>"
+		out += "</div>"
+		//out += "<ul id='source-list' class='nav nav-pills' style='margin-left:200px'></ul>"
+		out += "</div></div>"
+				
+        $(this.el).html(out);
+        $('#main_content').html(this.el);
+	}
+})

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

@@ -0,0 +1,20 @@
+App.Views.Users = Backbone.View.extend({
+	
+	
+    initialize: function() {
+		this.render();
+		this.model.get_users('user_table');
+    },
+    
+    render: function() {
+        $('#secondary-nav').css('display','block');
+		out = "<div id='ping-alert' class='alert alert-error' style='display:none'></div>";
+	    out += "<table id='users_table' class='table table-bordered'>";
+	    out += "<tr><th><div style='display:inline;font-size:18px'>Registered Users<div class='pull-right'><a href='#users/new' class='btn btn-primary'>Create User</a>";
+	    out += "<a href='#users/newping' class='btn btn-primary' style='margin-left:10px'>Ping Users</a></div></th></tr>";
+	    out += "</table></form>";
+	   
+        $(this.el).html(out);
+        $('#main_content').html(this.el);
+    }
+});

data/lib/rhoconnect.rb

@@ -56,7 +56,7 @@ module Rhoconnect
     #Load environment
     environment = (ENV['RHO_ENV'] || ENV['RACK_ENV'] || :development).to_sym  
     # Initialize Rhoconnect and Resque
-    Rhoconnect.base_directory = basedir    
+    Rhoconnect.base_directory = basedir
     Rhoconnect.app_directory = get_setting(config,environment,:app_directory)
     Rhoconnect.data_directory = get_setting(config,environment,:data_directory)
     Rhoconnect.vendor_directory = get_setting(config,environment,:vendor_directory)
@@ -143,6 +143,7 @@ module Rhoconnect
     source_config = sources[source_name] unless (sources.nil? or sources[source_name].nil?)
     env_config = Rhoconnect.get_config(Rhoconnect.base_directory)[Rhoconnect.environment]
     force_default = source_config[:force_default]
+    source_config.delete(:force_default)
     # apply global env settings
     [:poll_interval].each do |setting|
       def_setting = env_config["#{setting.to_s}_default".to_sym]

data/rhoconnect.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec 
   )
   s.files       += Dir.glob("bench/**/*")
+  s.files       += Dir.glob("commands/**/*")
   s.files       += Dir.glob("doc/**/*")
   s.files       += Dir.glob("examples/**/*")
   s.files       += Dir.glob("generators/**/*")
@@ -46,5 +47,6 @@ Gem::Specification.new do |s|
   s.add_dependency('redis', '>= 2.2.0')
   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('templater', '~> 1.0.0')
+  s.add_dependency('thor', '~> 0.14.6')  
 end

data/spec/api/application/rhoconnect_api_spec.rb

@@ -24,11 +24,6 @@ describe "RhoconnectApi" do
      RestClient.should_receive(:post).once
      RhoconnectApi::get_adapter('some_url',@api_token).should == ["http://test.com"]
    end
-   
-  it "should save adapter using direct api call" do
-    RhoconnectApi::save_adapter('',@api_token,'http://test.com')
-    Rhoconnect.appserver.should == 'http://test.com'
-  end 
   
   it "should save adapter using rest call" do
     RestClient.stub(:post).and_return("adpater url saved")
@@ -174,6 +169,7 @@ describe "RhoconnectApi" do
         {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
         {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
         {"name"=>"retry_limit", "value"=>0, "type"=>"integer"},
+        {"name"=>"simulate_time", "value"=>0, "type"=>"integer"},
         {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
@@ -378,6 +374,7 @@ describe "RhoconnectApi" do
         {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
         {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
         {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
+        {"name"=>"simulate_time", "value"=>0, "type"=>"integer"},
         {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
@@ -403,6 +400,7 @@ describe "RhoconnectApi" do
         {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
         {"name"=>"poll_interval", "value"=>201, "type"=>"integer"},  
         {"name"=>"retry_limit", "value"=>0, "type"=>"integer"},
+        {"name"=>"simulate_time", "value"=>0, "type"=>"integer"},
         {"name"=>"partition_type", "value"=>"app", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},

data/spec/api/source/fast_delete_spec.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiFastDelete" do
+  it_should_behave_like "ApiHelper" do
+    it "should delete an object from rhoconnect's :md" 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}
+      last_response.should be_ok
+      data.delete('3')
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
+    end
+
+    it "should not properly delete the object if fast_delete is called without all the attributes (because fast_delete doesn't ensure any data integrity)" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      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
+      last_response.should be_ok
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
+    end
+  end  
+end

data/spec/api/source/fast_insert_spec.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiFastInsert" do
+  it_should_behave_like "ApiHelper" do
+    it "should append new objects to rhoconnect's :md" 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}
+      last_response.should be_ok
+      data.merge!({'3' => @product3})
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+
+    it "should incorrectly append data to existing object (because fast_insert doesn't ensure any data integrity)" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      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
+      last_response.should be_ok
+      data['3'].merge!(incorrect_insert['3'])
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'4')
+    end
+  end  
+end

data/spec/api/source/fast_update_spec.rb

@@ -0,0 +1,51 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiFastUpdate" do
+  it_should_behave_like "ApiHelper" do
+    it "should update an attribute and add new one for an object in rhoconnect's :md" 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", :api_token => @api_token, 
+        :user_id => @u.id, :source_id => @s_fields[:name], :delete_data => orig_obj_attrs, :data => new_obj_attrs
+      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 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)
+      set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
+      
+      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
+      last_response.should be_ok
+      data['3'].delete('name')
+      data['3'].merge!(new_obj_attrs['3'])
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+    
+    it "should remove all attributes , but leave the count incorrect (because fast_update doesn't check if the whole object is deleted)" 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' => @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
+      last_response.should be_ok
+      data.delete('3')
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+    end
+  end  
+end

data/spec/api/source/get_source_params_spec.rb

@@ -18,6 +18,7 @@ describe "RhoconnectApiGetSourceParams" do
         {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
         {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
         {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
+        {"name"=>"simulate_time", "value"=>0, "type"=>"integer"},
         {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},

data/spec/api/source/update_source_params_spec.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiUpdateSourceParams" do
+  it_should_behave_like "ApiHelper" do
+    it "should set poll_interval to 99 seconds" do
+      @s1 = Source.load(@s.id,@s_params)
+      before = @s1.poll_interval.to_i
+      post "/api/source/update_source_params", :api_token => @api_token, 
+        :source_name => @s_fields[:name], :user_name => @u_fields[:login], :data => {:poll_interval => 99}
+      last_response.should be_ok
+      @s2 = Source.load(@s.id,@s_params)
+      after = @s2.poll_interval
+      before.should == 300
+      after.should == 99
+    end
+
+    it "should fail to update the source if param is not found" do
+      post "/api/source/update_source_params", :api_token => @api_token, 
+        :source_name => @s_fields[:name], :user_name => @u_fields[:login], :data => {:invalid_param => "invalid_data"}
+        last_response.status.should == 500
+        last_response.body.match('undefined method').should_not be_nil
+    end
+  end  
+end

data/spec/async_spec.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__),'api','api_helper')
+
+# these specs are executed only with Async support
+if RUBY_VERSION =~ /1.9/
+  describe "BasicEventMachineTest with Threads" do
+    it_should_behave_like "ApiHelper" do 
+      it "should run EventMachine gracefully and schedule callback execution in thread" do
+        f = Fiber.current
+        operation = proc { res = 1 }
+        operation_res = 0
+        callback = proc { |proc_res| operation_res = proc_res; f.resume }
+        EventMachine.defer operation, callback
+        Fiber.yield
+        # this code should be executed only after the thread's return
+        operation_res.should == 1
+      end
+    end
+  end
+end

data/spec/client_sync_spec.rb

@@ -38,8 +38,8 @@ describe "ClientSync" do
     end
 
     let(:mock_schema) { {"property" => { "name" => "string", "brand" => "string" }, "version" => "1.0"} }
-    let(:sha1) { get_sha1(mock_schema.to_json) }
-      
+    let(:sha1) { get_sha1(mock_schema['version']) }
+            
     before(:each) do
       @s = Source.load(@s_fields[:name],@s_params)
       @cs = ClientSync.new(@s,@c,2)
@@ -699,6 +699,7 @@ describe "ClientSync" do
         set_state('test_db_storage' => @data)
         ClientSync.bulk_data(:user,@c)
         BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
         ClientSync.bulk_data(:user,@c).should == {:result => :url,
           :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).url}
         verify_result(
@@ -707,6 +708,18 @@ describe "ClientSync" do
           "source:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}:md_copy" => @data)
       end
 
+      it "should return empty bulk data url if there are errors in query" do
+        ClientSync.bulk_data(:user,@c)
+        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
+        errordoc = @s.docname(:errors) # source SampleAdapter
+        operation = 'query'
+        Store.lock(errordoc) do
+          Store.put_data(errordoc,{"#{operation}-error"=>{'message'=>"Some exception message"}}, true)
+        end
+        ClientSync.bulk_data(:user,@c).should == {:result => :url, :url => ''}
+      end
+
       it "should escape bulk data url" do
         name = 'a b'
         data = BulkData.create(:name => bulk_data_docname(@a.id,name),
@@ -715,6 +728,7 @@ describe "ClientSync" do
           :user_id => name,
           :sources => [@s_fields[:name]])
         BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,name))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,name))
         data = BulkData.load(bulk_data_docname(@a.id,name))
         data.url.should match /a%20b/
         data.delete
@@ -725,6 +739,7 @@ describe "ClientSync" do
         @s.partition = :app
         ClientSync.bulk_data(:app,@c)
         BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,"*"))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,"*"))
         ClientSync.bulk_data(:app,@c).should == {:result => :url,
           :url => BulkData.load(bulk_data_docname(@a.id,"*")).url}
         verify_result(
@@ -738,6 +753,7 @@ describe "ClientSync" do
         @s.sync_type = :bulk_sync_only
         ClientSync.bulk_data(:user,@c)
         BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
         ClientSync.bulk_data(:user,@c).should == {:result => :url,
           :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).url}
         verify_result(
@@ -751,6 +767,7 @@ describe "ClientSync" do
         Rhoconnect.blackberry_bulk_sync = true
         ClientSync.bulk_data(:user,@c)
         BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
+        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
         data = BulkData.load(bulk_data_docname(@a.id,@u.id))
         ClientSync.bulk_data(:user,@c).should == {:result => :url, :url => data.url}
         File.delete(data.dbfile)