rhoconnect 4.0.0.beta.10 → 4.0.0.beta.12

data/spec/apps/rhotestapp/models/js/js_sample.js

@@ -1,4 +1,5 @@
-var rcHelpers = require('rhoconnect_helpers');
+var rc = require('rhoconnect_helpers');
+var Store = rc.Store;
 
 var JsSample = function() {
 
@@ -8,7 +9,11 @@ var JsSample = function() {
   };
 
   this.create = function(resp){
-    resp.send('2');
+    if(resp.params.create_object['txtfile-rhoblob'] === 'blob_created'){
+      resp.send('blob_created');
+    } else{
+      resp.send('2');
+    }
   };
 
   this.update = function(resp){
@@ -28,27 +33,69 @@ var JsSample = function() {
     resp.send(true);
   };
 
-  this.getUser = function(resp){
-    rcHelpers.current_user(resp,function(resp){
-      var current_user = resp['result']["login"];
-      resp.send(current_user);
+  this.testGetValue = function(resp){
+    resp.params = 'foo';
+    Store.getValue(resp,function(resp){
+      resp.send(resp.result);
+    });
+  };
+
+  this.testGetData = function(resp){
+    resp.params = 'foo';
+    Store.getData(resp,function(resp){
+      resp.send(resp.result);
+    });
+  };
+
+  this.testGetModelData = function(resp){
+    rc.getData(resp,function(resp){
+      resp.send(resp.result);
+    });
+  };
+
+  this.testPutValue = function(resp){
+    Store.putValue(resp,function(resp){
+      resp.send(resp.result);
     });
   };
 
+  this.testPutData = function(resp){
+    Store.putData(resp,function(resp){
+      resp.send(resp.result);
+    });
+  };
+
+  this.getUser = function(resp){
+    var user = resp.currentUser;
+    resp.send(user);
+  };
+
   this.getSource = function(resp){
-    rcHelpers.source(resp,function(resp){
+    rc.source(resp,function(resp){
       var source = resp['result']['id'];
       resp.send(source);
     });
   };
 
-// var get_stash_result = function(resp){
-//  resp.params = {"1":{"name":"John"}};
-//  rc_helpers.stash_result(resp,function(resp){
-//    var result = {};
-//    resp.send(result);
-//  })
-// }
+  this.testStashResult = function(resp){
+    for(var i = 0; i < 2; i++){
+      var item = i.toString();
+      resp.params = {};
+      resp.params[item] = {'name': item};
+      rc.stashResult(resp);
+    }
+    // Master Document now contains { '0': {'name': '0'}, '1': {'name': '1'} }
+    resp.send(true);
+  };
+
+  this.storeBlob = function(resp){
+    var fs = require('fs');
+    if(fs.existsSync(resp.params.path)){
+      resp.send('blob_created');
+    } else{
+      resp.send('no blob');
+    }
+  };
 
 };
 

data/spec/apps/rhotestapp/models/ruby/sample_adapter.rb

@@ -2,6 +2,11 @@ class SampleAdapter < SourceAdapter
   def initialize(source)
     super(source)
   end
+
+  # to test custom partitions
+  def self.partition_name(user_id)
+    user_id[0..2] == 'cus' ? 'custom_partition' : user_id
+  end
  
   def login
     raise SourceAdapterLoginException.new('Error logging in') if _is_empty?(current_user.login)

data/spec/controllers/js_base_spec.rb

@@ -72,18 +72,23 @@ describe "Rhoconnect::Controller::JsBase" do
       last_response.should be_ok
     end
 
-    it "should register deprecated_route"
-
-    it "should call js model name explicitly" do
-      js = JsSample.new("JsSample")
-      res = js.login
-      res.should == "success"
+    it "should upload blob in multipart post" do
+      file1,file2 = 'upload1.txt'
+      @product1['txtfile-rhoblob'] = file1
+      @product1['_id'] = 'tempobj1'
+      cud = {'create'=>{'1'=>{'name'=>'hello'}},
+        :blob_fields => ['txtfile-rhoblob']}.to_json
+      post "/app/#{Rhoconnect::API_VERSION}/JsSample",
+          {:cud => cud,'txtfile-rhoblob-1' =>
+            Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file1), "application/octet-stream")}, 
+            {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+      get "/app/#{Rhoconnect::API_VERSION}/JsSample", {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      json = JSON.parse(last_response.body)
+      json[5]['links'].should == { "1" => { "l" => "blob_created" } } 
+      json[5]['delete'].should == { "blob_created" => { "name" => "hello", "txtfile-rhoblob" => "blob_created" } }
     end
 
-    it "should print warning if model function not found" do
-      js = JsSample.new("JsSample")
-      res = js.foo
-      res.should == "foo method not defined for JsSample"
-    end
+    it "should register deprecated_route"
   end
 end

data/spec/models/js_model_spec.rb

@@ -18,22 +18,83 @@ describe "Rhoconnect::Model::JsBase" do
 
     after(:each) do
       Rhoconnect::Node.kill_process
+      Source.valid_doctypes.delete('tmpdoc'.to_sym)
     end
 
-    describe "from ruby" do
+    it "should call model's create method"
 
-      it "should call model's create method from ruby"
+    it "should call model's update method"
 
-      it "should call model's update method from ruby"
+    it "should call model's delete method"
 
-      it "should call model's delete method from ruby"
+    it "should call model's query method"
 
-      it "should call model's query method from ruby"
+    it "should call model's login method"
 
-      it "should call model's login method from ruby"
+    it "should call model's logoff method"
 
-      it "should call model's logoff method from ruby"
+    it "should call js model method explicitly" do
+      js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+      res = js.login
+      res.should == "success"
+    end
+
+    it "should print warning if model function not found" do
+      js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+      res = js.foo
+      res.should == "foo method not defined for JsSample"
+    end
+
+    it "should call currentUser from model" do
+      js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+      res = js.getUser
+      res.should == 'testuser'
+    end
+
+    it "should call stashResult from model" do
+      data = { '0' => {'name' => '0'}, '1' => {'name' => '1'} }
+      Source.define_valid_doctypes(['tmpdoc'.to_sym])
+      js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+      js.inject_tmpdoc('tmpdoc')
+      js.testStashResult
+      js.get_data('tmpdoc').should == data
+    end
+
+    it "should call getData for a model" do
+      data = {'1' => {'name' => 'iPhone'}}
+      js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+      res = js.do_query
+      js.testGetModelData.should == data
+    end
+
+    context "Store" do
+      it "should call getValue" do
+        Store.put_value('foo', 'bar')
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        res = js.testGetValue
+        res.should == 'bar'
+      end
+
+      it "should call putValue" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        js.testPutValue('foo', 'baz')
+        Store.get_value('foo').should == 'baz'
+      end
+
+      it "should call getData" do
+        data = {'1' => {'name' => 'iPhone'}}
+        Store.put_data('foo', data)
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        res = js.testGetData
+        res.should == data
+      end
 
+      it "should call putData" do
+        data = {'1' => {'name' => 'iPhone'}}
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        res = js.testPutData('foo', data)
+        Store.get_data('foo').should == data
+      end
     end
   end
 end

data/spec/server/server_spec.rb

@@ -412,6 +412,34 @@ describe "Server" do
           {"count"=>0}, {"progress_count"=>0}, {"total_count"=>2},{}]
       end
 
+      # check custom partitions
+      it "should return data for user with custom partition name" do
+        do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => 'cus_user1', "password" => 'testpass'
+        @c_fields = {
+          :device_type => 'Apple',
+          :device_pin => 'abcd',
+          :device_port => '3333',
+          :user_id => 'cus_user1',
+          :app_id => @a.id
+        }
+        @c = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+        @s = Source.load('SampleAdapter', {:user_id => 'cus_user1', :app_id => APP_NAME})
+
+        data = {'1'=>@product1,'2'=>@product2}
+        set_test_data('test_db_storage',data)
+        get "/app/#{Rhoconnect::API_VERSION}/#{@s.name}", {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.should be_ok
+        token = @c.get_value(:page_token)
+        JSON.parse(last_response.body).should == [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>token},
+          {"count"=>2}, {"progress_count"=>0}, {"total_count"=>2},{'insert'=>data}]
+        get "/app/#{Rhoconnect::API_VERSION}/#{@s.name}", {:token => token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.should be_ok
+        JSON.parse(last_response.body).should == [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>''},
+          {"count"=>0}, {"progress_count"=>0}, {"total_count"=>2},{}]
+        @s.docname(:md).should == "source:#{@s.app.id}:custom_partition:SampleAdapter:md"
+        verify_doc_result(@s, :md => data)
+      end
+
       it "should create source for dynamic adapter if source_name is unknown" do
         get "/app/#{Rhoconnect::API_VERSION}/Broken", {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
         last_response.status.should == 200

data/spec/source_adapter_spec.rb

@@ -1,16 +1,5 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
-class Rhoconnect::Model::Base 
-  def inject_result(result) 
-    @result = result
-  end
-  
-  def inject_tmpdoc(doctype)
-    @tmp_docname = doctype
-    @stash_size = 0
-  end
-end
-
 describe "loading Model" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
     it "should load Model instance from user name" do

data/spec/source_spec.rb

@@ -114,5 +114,44 @@ describe "Source" do
       )
       Source.update_associations([@s.name,@s1.name, @s2.name])
     end
+
+    # check custom partitions
+    it "should return custom partition for users if defined in the model" do
+      u1_fields = {:login => 'cus_user1'}
+      u1 = User.create(u1_fields)
+      u2_fields = {:login => 'cus_user2'}
+      u2 = User.create(u2_fields)
+      u3_fields = {:login => 'other_user'}
+      u3 = User.create(u3_fields)
+
+      s = Source.load('SampleAdapter', {:user_id => u1.login, :app_id => APP_NAME})
+      s.user_by_partition.should == 'custom_partition'
+      s.docname(:md).should == "source:#{s.app.id}:custom_partition:SampleAdapter:md"
+      s = Source.load('FixedSchemaAdapter', {:user_id => u1.login, :app_id => APP_NAME})
+      s.user_by_partition.should == 'cus_user1'
+      s = Source.load('SampleAdapter', {:user_id => u2.login, :app_id => APP_NAME})
+      s.user_by_partition.should == 'custom_partition'
+      s = Source.load('SampleAdapter', {:user_id => u3.login, :app_id => APP_NAME})
+      s.user_by_partition.should == 'other_user'
+    end
+
+    it "should delete data from custom partition" do
+      u1_fields = {:login => 'cus_user1'}
+      u1 = User.create(u1_fields)
+      data = {'1' => {'Name' => 'Value'}}
+      
+      s = Source.load('SampleAdapter', {:user_id => u1.login, :app_id => APP_NAME})
+      s.user_by_partition.should == 'custom_partition'
+      Source.define_valid_doctypes([:md_source])
+      set_doc_state(s, {:md_source => data})
+      Store.get_data("source:#{s.app.id}:custom_partition:SampleAdapter:md_source").should == data
+      Store.get_data("source:#{s.app.id}:cus_user1:SampleAdapter:md_source").should == {}
+      Store.put_data("source:#{s.app.id}:cus_user1:SampleAdapter:md_source", data)
+
+      s.delete
+      Store.get_data("source:#{s.app.id}:custom_partition:SampleAdapter:md_source").should == {}
+      Store.get_data("source:#{s.app.id}:cus_user1:SampleAdapter:md_source").should == data
+      Source.valid_doctypes.delete(:md_source)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -56,6 +56,17 @@ Dir["#{SPEC_PATH}/support/**/*.rb"].each { |f| require f }
 ENV['RACK_ENV'] = 'test'
 ERROR = '0_broken_object_id' unless defined? ERROR
 
+class Rhoconnect::Model::Base
+  def inject_result(result) 
+    @result = result
+  end
+  
+  def inject_tmpdoc(doctype)
+    @tmp_docname = doctype
+    @stash_size = 0
+  end
+end
+
 module TestHelpers
   def get_testapp_path
     File.expand_path(File.join(File.dirname(__FILE__),'apps','rhotestapp'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.10
+  version: 4.0.0.beta.12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -418,6 +418,7 @@ files:
 - doc/metadata.txt
 - doc/rails-plugin.txt
 - doc/java-plugin.txt
+- doc/source-adapters-js.txt
 - doc/adapters-intro.txt
 - doc/migration.txt
 - doc/stats-middleware.txt
@@ -619,47 +620,6 @@ files:
 - lib/rhoconnect/version.rb
 - lib/rhoconnect/user.rb
 - lib/rhoconnect/stats/record.rb
-- lib/rhoconnect/api/system/login.rb
-- lib/rhoconnect/api/system/reset.rb
-- lib/rhoconnect/api/system/save_adapter.rb
-- lib/rhoconnect/api/system/get_license_info.rb
-- lib/rhoconnect/api/system/stats.rb
-- lib/rhoconnect/api/system/get_adapter.rb
-- lib/rhoconnect/api/user/delete_user.rb
-- lib/rhoconnect/api/user/user_set_db_doc.rb
-- lib/rhoconnect/api/user/update_user.rb
-- lib/rhoconnect/api/user/create_user.rb
-- lib/rhoconnect/api/user/list_users.rb
-- lib/rhoconnect/api/user/user_get_db_doc.rb
-- lib/rhoconnect/api/user/list_source_docs.rb
-- lib/rhoconnect/api/user/show_user.rb
-- lib/rhoconnect/api/user/delete_client.rb
-- lib/rhoconnect/api/user/list_clients.rb
-- lib/rhoconnect/api/user/ping.rb
-- lib/rhoconnect/api/client/client_set_db_doc.rb
-- lib/rhoconnect/api/client/list_client_docs.rb
-- lib/rhoconnect/api/client/create.rb
-- lib/rhoconnect/api/client/register.rb
-- lib/rhoconnect/api/client/reset.rb
-- lib/rhoconnect/api/client/get_client_params.rb
-- lib/rhoconnect/api/client/client_get_db_doc.rb
-- lib/rhoconnect/api/app/fast_update.rb
-- lib/rhoconnect/api/app/login.rb
-- lib/rhoconnect/api/app/fast_insert.rb
-- lib/rhoconnect/api/app/query.rb
-- lib/rhoconnect/api/app/search.rb
-- lib/rhoconnect/api/app/push_objects.rb
-- lib/rhoconnect/api/app/queue_updates.rb
-- lib/rhoconnect/api/app/ans_login.rb
-- lib/rhoconnect/api/app/bulk_data.rb
-- lib/rhoconnect/api/app/fast_delete.rb
-- lib/rhoconnect/api/app/push_deletes.rb
-- lib/rhoconnect/api/readstate/set_refresh_time.rb
-- lib/rhoconnect/api/source/get_source_params.rb
-- lib/rhoconnect/api/source/list_sources.rb
-- lib/rhoconnect/api/source/update_source_params.rb
-- lib/rhoconnect/api/store/set_db_doc.rb
-- lib/rhoconnect/api/store/get_db_doc.rb
 - lib/rhoconnect/api_token.rb
 - lib/rhoconnect/generator.rb
 - lib/rhoconnect/ping/rhoconnect_push.rb
@@ -828,7 +788,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3219845311812251669
+      hash: -420963856285787510
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

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

@@ -1,3 +0,0 @@
-# Server.resource_api '', "/rc/#{Rhoconnect::API_VERSION}/app/ans_login", :get, {:login_required => false, :admin_route => false} do
-#   do_ans_login  
-# end

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

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

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

@@ -1,11 +0,0 @@
-# Server.resource_api '', "/app/#{Rhoconnect::API_VERSION}/:source_id/fast_delete", :post, \
-#         {:admin_route => true, :login_required => false, :deprecated_route => {:verb => :post, :url => ['/api/fast_delete', '/api/source/fast_delete']}} do
-#   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
-#   # if source does not exist create one for dynamic adapter
-#   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source
-#   source_sync = SourceSync.new(source)
-#   timeout = params[:timeout] || 10
-#   raise_on_expire = params[:raise_on_expire] || false
-#   source_sync.fast_delete(params[:data], timeout,raise_on_expire)
-#   'done'
-# end

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

@@ -1,11 +0,0 @@
-# Server.resource_api '', "/app/#{Rhoconnect::API_VERSION}/:source_id/fast_insert", :post, \
-#       {:admin_route => true, :login_required => false, :deprecated_route => {:verb => :post, :url => ['/api/fast_insert', '/api/source/fast_insert']}} do
-#   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
-#   # if source does not exist create one for dynamic adapter
-#   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source
-#   source_sync = SourceSync.new(source)
-#   timeout = params[:timeout] || 10
-#   raise_on_expire = params[:raise_on_expire] || false
-#   source_sync.fast_insert(params[:data], timeout,raise_on_expire)
-#   'done'
-# end

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

@@ -1,11 +0,0 @@
-# Server.resource_api '', "/app/#{Rhoconnect::API_VERSION}/:source_id/fast_update", :post, \
-#       {:admin_route => true, :login_required => false, :deprecated_route => {:verb => :post, :url => ['/api/fast_update', '/api/source/fast_update']}} do
-#   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
-#   # if source does not exist create one for dynamic adapter
-#   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source
-#   source_sync = SourceSync.new(source)
-#   timeout = params[:timeout] || 10
-#   raise_on_expire = params[:raise_on_expire] || false
-#   source_sync.fast_update(params[:delete_data], params[:data],timeout,raise_on_expire)
-#   'done'
-# end

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

@@ -1,5 +0,0 @@
-# Server.resource_api '', "/rc/#{Rhoconnect::API_VERSION}/app/login", :post, \
-#                         {:admin_route => false, :login_required => false, :deprecated_route => {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']}} do
-#   logout
-#   do_login
-# end

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

@@ -1,12 +0,0 @@
-# Server.resource_api '', "/app/#{Rhoconnect::API_VERSION}/:source_id/push_deletes", :post, \
-#       {:admin_route => true, :login_required => false, :deprecated_route => {:verb => :post, :url => ['/api/push_deletes', '/api/source/push_deletes']}} do
-#   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
-#   # if source does not exist create one for dynamic adapter
-#   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source
-#   source_sync = SourceSync.new(source)
-#   timeout = params[:timeout] || 10
-#   raise_on_expire = params[:raise_on_expire] || false
-#   rebuild_md = params[:rebuild_md].nil? ? true : params[:rebuild_md]
-#   source_sync.push_deletes(params[:objects],timeout,raise_on_expire,rebuild_md)
-#   'done'
-# end

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

@@ -1,12 +0,0 @@
-# Server.resource_api '', "/app/#{Rhoconnect::API_VERSION}/:source_id/push_objects", :post, \
-#         {:admin_route => true, :login_required => false, :deprecated_route => {:verb => :post, :url => ['/api/push_objects', '/api/source/push_objects']}} do
-#   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
-#   # if source does not exist create one for dynamic adapter
-#   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source
-#   source_sync = SourceSync.new(source)
-#   timeout = params[:timeout] || 10
-#   raise_on_expire = params[:raise_on_expire] || false
-#   rebuild_md = params[:rebuild_md].nil? ? true : params[:rebuild_md]
-#   source_sync.push_objects(params[:objects],timeout,raise_on_expire,rebuild_md)
-#   'done'
-# end

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

@@ -1,8 +0,0 @@
-# Server.resource_api '', "/app/#{Rhoconnect::API_VERSION}/:source_name", :get, \
-#       {:admin_route => false, :login_required => true, :deprecated_route => {:verb => :get, :url => ['/api/application', '/application', '/api/application/query']}} do
-#   content_type :json
-#   res = current_client_sync.send_cud(params[:token],params[:query])
-#   response.headers[Rhoconnect::PAGE_TOKEN_HEADER] = res[1]['token']
-#   response.headers[Rhoconnect::PAGE_OBJECT_COUNT_HEADER] = res[2]['count'].to_s
-#   res.to_json
-# end

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

@@ -1,98 +0,0 @@
-# Server.api4 '', "/app/#{Rhoconnect::API_VERSION}/:source_name/queue_updates", :post, \
-#       {:admin_route => false, :login_required => true, :deprecated_route => {:verb => :post, :url => ['/api/application', '/application', '/api/application/queue_updates']}} do
-#   begin
-#     if params["cud"]
-#       cud = JSON.parse(params["cud"])
-#       params.delete("cud")
-#       params.merge!(cud)
-#     end     
-#   rescue JSON::ParserError => jpe
-#     log jpe.message + jpe.backtrace.join("\n")
-#     throw :halt, [500, "Server error while processing client data"]
-#   rescue Exception => e
-#     log e.message + e.backtrace.join("\n")
-#     throw :halt, [500, "Internal server error"]
-#   end
-# 
-#   catch_all do
-#     current_client_sync.receive_cud(params)
-#     status 200
-#   end
-# end
-# 
-# Server.api4 '', "/app/#{Rhoconnect::API_VERSION}/:source_name", :post, \
-#       {:login_required => true, :admin_route => false} do
-#   begin
-#     if params["cud"]
-#       cud = JSON.parse(params["cud"])
-#       params.delete("cud")
-#       params.merge!(cud)
-#     end     
-#   rescue JSON::ParserError => jpe
-#     log jpe.message + jpe.backtrace.join("\n")
-#     throw :halt, [500, "Server error while processing client data"]
-#   rescue Exception => e
-#     log e.message + e.backtrace.join("\n")
-#     throw :halt, [500, "Internal server error"]
-#   end
-#   
-#   catch_all do
-#     current_client_sync.receive_cud(params)
-#     status 200
-#   end
-# end
-# 
-# Server.api4 '', "/app/#{Rhoconnect::API_VERSION}/:source_name/:id", :put, \
-#       {:login_required => true, :admin_route => false} do
-#   begin
-#     if params["cud"]
-#       cud = JSON.parse(params["cud"])
-#       params.delete("cud")
-#       params.merge!(cud)
-#     end     
-#   rescue JSON::ParserError => jpe
-#     log jpe.message + jpe.backtrace.join("\n")
-#     throw :halt, [500, "Server error while processing client data"]
-#   rescue Exception => e
-#     log e.message + e.backtrace.join("\n")
-#     throw :halt, [500, "Internal server error"]
-#   end
-# 
-#   begin
-#     if params["update"]
-#       cud = params["update"]
-#       params.delete("update")
-#       params.merge!("update" => {params[:id] => cud})
-#     end     
-#   rescue JSON::ParserError => jpe
-#     log jpe.message + jpe.backtrace.join("\n")
-#     throw :halt, [500, "Server error while processing client data"]
-#   rescue Exception => e
-#     log e.message + e.backtrace.join("\n")
-#     throw :halt, [500, "Internal server error"]
-#   end
-# 
-#   catch_all do
-#     current_client_sync.receive_cud(params)
-#     status 200
-#   end
-# end
-# 
-# Server.api4 '', "/app/#{Rhoconnect::API_VERSION}/:source_name/:id", :delete, \
-#       {:login_required => true, :admin_route => false} do
-#   begin
-#     obj = current_client.get_object(:cd, params[:id])
-#     params.merge!("delete" => { params[:id] => obj } )     
-#   rescue JSON::ParserError => jpe
-#     log jpe.message + jpe.backtrace.join("\n")
-#     throw :halt, [500, "Server error while processing client data"]
-#   rescue Exception => e
-#     log e.message + e.backtrace.join("\n")
-#     throw :halt, [500, "Internal server error"]
-#   end
-# 
-#   catch_all do
-#     current_client_sync.receive_cud(params)
-#     status 200
-#   end
-# end

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

@@ -1,8 +0,0 @@
-# Server.resource_api '', "/rc/#{Rhoconnect::API_VERSION}/app/search", :post, \
-#       {:admin_route => false, :login_required => true, :deprecated_route => {:verb => :get, :url => ['/application/search', '/api/application/search']}} do
-#   content_type :json
-#   res = ClientSync.search_all(current_client,params)
-#   response.headers[Rhoconnect::PAGE_TOKEN_HEADER] = res[0][1]['token'] if res[0][1] and res[0][1]['token']
-#   response.headers[Rhoconnect::PAGE_OBJECT_COUNT_HEADER] = res[0][3]['count'].to_s if res[0][3] and res[0][3]['count']
-#   res.to_json
-# end  

data/lib/rhoconnect/api/client/client_get_db_doc.rb

@@ -1,5 +0,0 @@
-# Server.api4 :client_get_db_doc, :get, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/sources/:source_id/docs/:doc", true, nil do |params,user|
-#   c = Client.load(params[:client_id],{:source_name => params[:source_id]})
-#   db_key = c.docname(params[:doc])
-#   Store.get_db_doc(db_key)
-# end