rhoconnect 3.4.5 → 4.0.0.beta.10

data/spec/api/app/push_objects_spec.rb

@@ -7,7 +7,7 @@ describe "RhoconnectApiPushObjects" do
       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')
+      verify_doc_result(@s, {:md => data, :md_size=>'3'})
     end
     
     it "should push new objects to rhoconnect's :md with old api/source route and deprecation warning" do
@@ -16,7 +16,7 @@ describe "RhoconnectApiPushObjects" do
         {: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')
+      verify_doc_result(@s, {:md => data, :md_size=>'3'})
     end
     
     it "should push new objects to rhoconnect's :md with oldest api route and deprecation warning" do
@@ -25,21 +25,21 @@ describe "RhoconnectApiPushObjects" do
         {: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')
+      verify_doc_result(@s, {:md => data, :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')
+      set_doc_state(@s, {:md => data, :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')
+      verify_doc_result(@s, {:md => data, :md_size=>'3'})
     end
   end  
 end

data/spec/api/client/client_get_db_doc_spec.rb

@@ -4,13 +4,14 @@ 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'}}
+      Client.define_valid_doctypes([:myclientdoc])
       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
+      Client.valid_doctypes.delete(dockey.to_sym)
     end
     
     it "should append data to the client's db document by doc name and data" do
@@ -18,14 +19,15 @@ describe "RhoconnectApiClientGetDbDoc" do
       data2 = {'2' => {'foo1' => 'bar1'}}
       data3 = data.merge(data2)
       dockey = 'abc:abc'
-      cdocname = @c.docname(dockey)
+      Client.define_valid_doctypes([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)
+      verify_doc_result(@c, dockey => 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)
+      verify_doc_result(@c, dockey => data3)
+      Client.valid_doctypes.delete(dockey.to_sym)
     end
   end  
 end

data/spec/api/client/client_set_db_doc_spec.rb

@@ -5,10 +5,11 @@ describe "RhoconnectApiClientSetDbDoc" do
     it "should set client's db document by doc key and data" do
       data = {'1' => {'foo' => 'bar'}}
       dockey = 'myclientdoc'
-      cdocname = @c.docname(dockey)
+      Client.define_valid_doctypes([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)
+      verify_doc_result(@c, dockey => data)
+      Client.valid_doctypes.delete(dockey.to_sym)
     end
   end  
 end

data/spec/api/client/get_client_params_spec.rb

@@ -6,6 +6,20 @@ describe "RhoconnectApiGetClientParams" do
       get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}",  {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       res = JSON.parse(last_response.body)
       res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
+      res.sort{|x,y| x['name']<=>y['name']}.should == [
+        {"name"=>"device_type", "value"=>"Apple", "type"=>"string"}, 
+        {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 
+        {"name"=>"device_port", "value"=>"3333", "type"=>"string"},
+        {"name"=>"device_push_type", "type"=>"string", "value"=>nil},  
+        {"name"=>"user_id", "value"=>"testuser", "type"=>"string"}, 
+        {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
+        {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
+    end
+    
+    it "should list client attributes with old route and deprecation warning" do
+      post "/api/get_client_params", {:api_token => @api_token, :client_id =>@c.id}
+      res = JSON.parse(last_response.body)
+      res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
       res.sort{|x,y| x['name']<=>y['name']}.should == [
         {"name"=>"device_type", "value"=>"Apple", "type"=>"string"}, 
         {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 

data/spec/api/client/list_client_docs_spec.rb

@@ -4,29 +4,39 @@ describe "RhoconnectApiListClientDocs" do
   it_should_behave_like "ApiHelper" do
     it "should list client documents" do
       source_id = "SimpleAdapter"
+
+      Client.define_valid_doctypes(['mycustomdoc'])
       get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{source_id}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       JSON.parse(last_response.body).should == {
-        "cd"=>"client:application:testuser:#{@c.id}:SimpleAdapter:cd", 
-        "cd_size"=>"client:application:testuser:#{@c.id}:SimpleAdapter:cd_size", 
-        "create"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create", 
-        "update"=>"client:application:testuser:#{@c.id}:SimpleAdapter:update", 
-        "delete"=>"client:application:testuser:#{@c.id}:SimpleAdapter:delete", 
-
-        "page"=>"client:application:testuser:#{@c.id}:SimpleAdapter:page", 
-        "page_token"=>"client:application:testuser:#{@c.id}:SimpleAdapter:page_token", 
-        "delete_page"=>"client:application:testuser:#{@c.id}:SimpleAdapter:delete_page", 
-        "create_links"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create_links", 
-        "create_links_page"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create_links_page", 
+        "cd"=>"client:application:testuser:#{@c.id}:#{source_id}:cd", 
+        "cd_size"=>"client:application:testuser:#{@c.id}:#{source_id}:cd_size", 
+        "page"=>"client:application:testuser:#{@c.id}:#{source_id}:page", 
+        "delete_page"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_page", 
+        "create_links"=>"client:application:testuser:#{@c.id}:#{source_id}:create_links", 
+        "create_links_page"=>"client:application:testuser:#{@c.id}:#{source_id}:create_links_page", 
+        "metadata_page"=>"client:application:testuser:#{@c.id}:#{source_id}:metadata_page", 
+        "total_count_page"=>"client:application:testuser:#{@c.id}:#{source_id}:total_count_page", 
+        "page_token"=>"client:application:testuser:#{@c.id}:#{source_id}:page_token", 
+        "schema_sha1"=>"client:application:testuser:#{@c.id}:#{source_id}:schema_sha1", 
+        "schema_page"=>"client:application:testuser:#{@c.id}:#{source_id}:schema_page", 
+        "metadata_sha1"=>"client:application:testuser:#{@c.id}:#{source_id}:metadata_sha1", 
+        "search"=>"client:application:testuser:#{@c.id}:#{source_id}:search", 
+        "search_token"=>"client:application:testuser:#{@c.id}:#{source_id}:search_token", 
+        "search_page"=>"client:application:testuser:#{@c.id}:#{source_id}:search_page", 
+        "search_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:search_errors", 
+        "create_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:create_errors", 
+        "create_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:create_errors_page", 
+        "update_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:update_errors", 
+        "update_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:update_errors_page", 
+        "update_rollback"=>"client:application:testuser:#{@c.id}:#{source_id}:update_rollback", 
+        "update_rollback_page"=>"client:application:testuser:#{@c.id}:#{source_id}:update_rollback_page", 
+        "delete_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_errors", 
+        "delete_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_errors_page", 
 
-        "delete_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:delete_errors", 
-        "login_error"=>"client:application:testuser:#{@c.id}:SimpleAdapter:login_error", 
-        "create_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create_errors", 
-        "update_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:update_errors", 
-        "logoff_error"=>"client:application:testuser:#{@c.id}:SimpleAdapter:logoff_error", 
+        "mycustomdoc"=>"client:application:testuser:#{@c.id}:#{source_id}:mycustomdoc"}
 
-        "search"=>"client:application:testuser:#{@c.id}:SimpleAdapter:search",
-        "search_token"=>"client:application:testuser:#{@c.id}:SimpleAdapter:search_token", 
-        "search_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:search_errors"}
+      Client.valid_doctypes.delete('mycustomdoc'.to_sym)
     end
   end
-end
+end
+

data/spec/api/client/reset_spec.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__),'..','api_helper')
+
+describe "RhoconnectApiClientReset" do
+  it_should_behave_like "ApiHelper" do
+    before(:each) do
+      do_post "/rc/#{Rhoconnect::API_VERSION}/app/login",  "login" => @u.login, "password" => 'testpass'
+    end
+
+    it "should handle client reset" do
+      set_doc_state(@c, :cd => @data)
+      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/reset"
+      last_response.should be_ok
+      verify_doc_result(@c, :cd => {})
+      Client.load(@c.id,{:source_name => @s.name}).should_not be_nil
+    end
+      
+    it "should handle client reset on individual source adapters" do
+      @c.source_name = 'SampleAdapter'
+      set_doc_state(@c, :cd => @data)
+      verify_doc_result(@c, :cd => @data)
+        
+      @c.source_name = 'SimpleAdapter'
+      set_doc_state(@c, :cd => @data)
+      verify_doc_result(@c, :cd => @data)
+        
+      sources = [{'name'=>'SimpleAdapter'}]
+      do_post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/reset", {:sources => sources}
+      last_response.should be_ok
+        
+      @c.source_name = 'SampleAdapter'
+      verify_doc_result(@c, :cd => @data)
+      @c.source_name = 'SimpleAdapter'
+      verify_doc_result(@c, :cd => {})
+    end
+  end
+end

data/spec/api/source/get_source_params_spec.rb

@@ -3,33 +3,39 @@ require File.join(File.dirname(__FILE__),'..','api_helper')
 describe "RhoconnectApiGetSourceParams" do
 
   it_should_behave_like "ApiHelper" do
-  
+
     it "should list source attributes" do
       source_id = "SampleAdapter"
       get "/rc/#{Rhoconnect::API_VERSION}/sources/#{source_id}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       result = JSON.parse(last_response.body).sort {|x,y| y["name"] <=> x["name"] }
-      result.should == [
-        {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"}, 
-        {"name"=>"source_id", "value"=>nil, "type"=>"integer"}, 
-        {"name"=>"name", "value"=>"SampleAdapter", "type"=>"string"}, 
-        {"name"=>"url", "value"=>"http://example.com", "type"=>"string"}, 
-        {"name"=>"login", "value"=>"testuser", "type"=>"string"}, 
-        {"name"=>"password", "value"=>"testpass", "type"=>"string"}, 
-        {"name"=>"priority", "value"=>1, "type"=>"integer"}, 
-        {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
+      expected = [
+        {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"},
+        {"name"=>"source_id", "value"=>nil, "type"=>"integer"},
+        {"name"=>"name", "value"=>"SampleAdapter", "type"=>"string"},
+        {"name"=>"url", "value"=>"http://example.com", "type"=>"string"},
+        {"name"=>"login", "value"=>"testuser", "type"=>"string"},
+        {"name"=>"password", "value"=>"testpass", "type"=>"string"},
+        {"name"=>"priority", "value"=>1, "type"=>"integer"},
+        {"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"=>"push_notify", "value"=>"false", "type"=>"string"}, 
-        {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
+        {"name"=>"partition_type", "value"=>"user", "type"=>"string"},
+        {"name"=>"push_notify", "value"=>"false", "type"=>"string"},
+        {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"},
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
         {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
-        {"name"=>"id", "value"=>"SampleAdapter", "type"=>"string"}, 
-        {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
-        {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
-        {"name"=>"pass_through", "value"=>nil, "type"=>"string"}, 
+        {"name"=>"id", "value"=>"SampleAdapter", "type"=>"string"},
+        {"name"=>"queue", "value"=>nil, "type"=>"string"},
+        {"name"=>"query_queue", "value"=>nil, "type"=>"string"},
+        {"name"=>"pass_through", "value"=>nil, "type"=>"string"},
         {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}].sort {|x,y| y["name"] <=> x["name"] }
+      result.each_with_index do |item,i|
+        expect = expected[i]
+        item['name'].should == expect['name']
+        item['value'].should == expect['value']
+        item['type'].should == expect['type']
+      end
     end
   end
 end

data/spec/api/system/get_license_info_spec.rb

@@ -11,25 +11,5 @@ describe "RhoconnectApiGetLicenseInfo" do
         "rhoconnect_version" => "Version 1",
         "licensee" => "Rhomobile" }
     end
-    
-    it "should get custom_license info with deprecation warning" do
-      # this one for test purposes to make sure
-      # that an old way custom REST API still works
-      Rhoconnect::Server.api :custom_license_info do |params,user|
-        {:rhoconnect_version => Rhoconnect.license.rhoconnect_version, 
-         :licensee => Rhoconnect.license.licensee, 
-         :seats => Rhoconnect.license.seats, 
-         :issued => Rhoconnect.license.issued,
-         :available => Rhoconnect.license.available }.to_json
-      end
-      
-      post "/api/custom_license_info", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == {
-        "available" => 9, 
-        "issued" => "Fri Apr 23 17:20:13 -0700 2010", 
-        "seats" => 10, 
-        "rhoconnect_version" => "Version 1",
-        "licensee" => "Rhomobile" }
-    end
   end  
 end

data/spec/api/system/login_spec.rb

@@ -18,6 +18,14 @@ describe "RhoconnectApiGetApiToken" do
       post "/rc/#{Rhoconnect::API_VERSION}/system/login", :login => @u_fields[:login],:password => 'testpass'
       last_response.status.should == 422    
       last_response.body.should == 'Invalid/missing API user'
+    end
+
+    it "should return 422 if token doesn't belong to the API user" do
+      invalid_api_token = ApiToken.create({:value => 'mytoken', :user_id => 'notadmin'})
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => invalid_api_token.value}
+      last_response.status.should == 422
+      last_response.body.should == 'Invalid/missing API user'
     end  
 
     it "should return 422 if no token provided" do

data/spec/api/system/reset_spec.rb

@@ -16,7 +16,6 @@ describe "RhoconnectApiReset" do
       App.is_exist?(test_app_name).should == true
       Store.get_data('somedoc').should == {}
       User.authenticate('rhoadmin','').should_not be_nil
-      load File.join(Rhoconnect.base_directory,test_app_name+'.rb')
     end
   end
 end

data/spec/api/system/stats_spec.rb

@@ -4,7 +4,7 @@ describe "RhoconnectApiStats" do
   it_should_behave_like "ApiHelper" do
     
     def app
-      @app ||= Rhoconnect::Server.new
+      @app ||= Rack::URLMap.new Rhoconnect.url_map
     end
     
     before(:each) do
@@ -29,8 +29,8 @@ describe "RhoconnectApiStats" do
     end
 
     it "should retrieve range metric" do
-      Store.db.zadd('stat:foo', 2, "1:2")
-      Store.db.zadd('stat:foo', 3, "1:3")
+      Store.zadd('stat:foo', 2, "1:2")
+      Store.zadd('stat:foo', 3, "1:3")
       get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
         :metric => 'foo', 
         :start => 0,
@@ -41,7 +41,7 @@ describe "RhoconnectApiStats" do
     end
 
     it "should retrieve string metric" do
-      Store.db.set('stat:foo', 'bar')
+      Store.put_value('stat:foo', 'bar')
       get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
         :metric => 'foo'
       }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
@@ -50,7 +50,7 @@ describe "RhoconnectApiStats" do
     end
     
     it "should retrieve string metric with old route and print deprecation warning" do
-      Store.db.set('stat:foo', 'bar')
+      Store.put_value('stat:foo', 'bar')
       post "/api/stats", {
         :metric => 'foo'
       }, {Rhoconnect::API_TOKEN_HEADER => @api_token}

data/spec/api/user/create_user_spec.rb

@@ -12,17 +12,25 @@ describe "RhoconnectApiCreateUser" do
       @a.users.members.sort.should == [@u.login, params[:attributes][:login]]
     end
     
-    it "should create user and print a deprecation warning in the route" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/api/create_user", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    it "should create user and post a deprecation warning with the old route" do
+      params = {:api_token => @api_token,
+        :attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/api/create_user", params
       last_response.should be_ok
-      last_response.headers['Warning'].index('deprecated').should_not == nil
+      last_response.headers["Warning"].index('deprecated').should_not == nil
       User.load(params[:attributes][:login]).login.should == params[:attributes][:login]
       User.authenticate(params[:attributes][:login],
         params[:attributes][:password]).login.should == params[:attributes][:login]
       @a.users.members.sort.should == [@u.login, params[:attributes][:login]]
     end
-  
+    
+    it "should not create user without the api_token" do
+      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {}
+      last_response.status.should == 422
+      User.is_exist?('testuser1').should == false
+    end
+      
     it "should not create user with empty login" do
       params = {:attributes => {:login => '', :password => ''}}
       post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
@@ -30,4 +38,4 @@ describe "RhoconnectApiCreateUser" do
       User.is_exist?('').should == false
     end
   end 
-end
+end

data/spec/api/user/delete_user_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiDeleteUser" do
-  it_should_behave_like "ApiHelper" do 
+  it_should_behave_like "ApiHelper" do
     it "should delete user" do
       params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
       post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
@@ -16,19 +16,21 @@ describe "RhoconnectApiDeleteUser" do
       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})
+      Source.define_valid_doctypes([:doc1])
+      set_doc_state(s, :doc1 => {'4'=>@product4})
+      set_doc_state(s2, :doc1 => {'4'=>@product4})
+      verify_doc_result(s, :doc1 => {'4'=>@product4})
+      verify_doc_result(s2, :doc1 => {'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})
+      verify_doc_result(s, :doc1 => {})
+      verify_doc_result(s2, :doc1 => {'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"]
+      Source.valid_doctypes.delete(:doc1)
     end
     
     it "should delete user and print deprecation warning with the old route" do
@@ -36,7 +38,7 @@ describe "RhoconnectApiDeleteUser" do
       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'}
@@ -45,21 +47,21 @@ describe "RhoconnectApiDeleteUser" do
       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})
-      
-      
-      post "/api/delete_user", {:user_id => params[:attributes][:login]}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      Source.define_valid_doctypes([:doc1])
+      set_state(s.docname(:doc1) => {'4'=>@product4})
+      set_state(s2.docname(:doc1) => {'4'=>@product4})
+      verify_result(s.docname(:doc1) => {'4'=>@product4})
+      verify_result(s2.docname(:doc1) => {'4'=>@product4})
+      post "/api/delete_user", {:api_token => @api_token, :user_id => params[:attributes][:login]}
       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})
+      verify_result(s.docname(:doc1) => {})
+      verify_result(s2.docname(:doc1) => {'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"]
+      Source.valid_doctypes.delete(:doc1)
     end
-  end  
+  end
 end

data/spec/api/user/list_users_spec.rb

@@ -15,15 +15,14 @@ describe "RhoconnectApiListUsers" do
       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 "/rc/#{Rhoconnect::API_VERSION}/users", params
+  
+    it "should show the deprecation warning on /api/list_users" 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
       post "/api/list_users", {:api_token => @api_token}
       JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
       last_response.headers['Warning'].index('deprecated').should_not == nil
     end
-  end  
+  end
 end

data/spec/api/user/update_user_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiUpdateUser" do
-  it_should_behave_like "ApiHelper" do 
+  it_should_behave_like "ApiHelper" do
     it "should update user successfully" do
       login = 'rhoadmin'
       put "/rc/#{Rhoconnect::API_VERSION}/users/#{login}", {:attributes => {:new_password => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
@@ -13,8 +13,8 @@ describe "RhoconnectApiUpdateUser" do
     
     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}
+      post "/api/update_user", {:api_token => @api_token, :user_id => login,
+        :attributes => {:new_password => '123'}}
       last_response.should be_ok
       user = User.authenticate('rhoadmin','123')
       user.login.should == 'rhoadmin'
@@ -38,7 +38,8 @@ describe "RhoconnectApiUpdateUser" do
       last_response.should be_ok
       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}
+      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'

data/spec/apps/rhotestapp/config.ru

@@ -1 +1,16 @@
-# Dummy config.ru for testing...
+#!/usr/bin/env ruby
+require 'rhoconnect/application/init'
+
+# secret is generated along with the app
+Rhoconnect::Server.set     :secret,      'not a secret'
+
+# !!! Add your custom initializers and overrides here !!!
+# For example, uncomment the following line to enable Stats
+#Rhoconnect::Server.enable  :stats
+# uncomment the following line to disable Resque Front-end console
+#Rhoconnect.disable_resque_console = true
+# uncomment the following line to disable Rhoconnect Front-end console
+#Rhoconnect.disable_rc_console = true
+
+# run RhoConnect Application
+run Rhoconnect.app

data/spec/apps/rhotestapp/controllers/js/js_sample_controller.js

@@ -0,0 +1,23 @@
+var JsSample = require('../../models/js/js_sample');
+var app = require('ballroom');
+var rc_helpers = require('rhoconnect_helpers');
+
+app.controllerName('JsSample');
+app.registerHandler('sync');
+
+app.get('/custom_route',{}, function(req,resp){
+	JsSample.getUser(resp);
+});
+
+app.get('/custom_route2',{}, function(req,resp){
+	JsSample.getSource(resp);
+});
+
+app.get('/custom_route3',{}, function(req,resp){
+	JsSample.get_stash_result(resp);
+});
+
+app.post('/',{"rc_handler":"query"}, function(req,resp){
+	var result = {'id':req.params};
+	resp.send(result);
+});

data/spec/apps/rhotestapp/controllers/js/sample2_controller.js

@@ -0,0 +1,32 @@
+var app = require('ballroom');
+var rc_helpers = require('rhoconnect_helpers');
+
+app.controllerName('Sample2');
+app.defaults({admin_required:false,login_required:true,source_required:true,client_required:true});
+
+app.get('/',{"rc_handler":"query"}, function(req,resp){
+	var result = {'1':{'name':'iPhone'}};
+	resp.send(result);
+});
+
+app.get('/error_throw',{},function(req,resp){
+	throw "Error in function";
+});
+
+//json['args'] = {:product => {:name=>foo,:price=>bar}}
+app.post('/',{}, function(req,resp){
+	var result = {'id':req.params};
+	resp.send(result);
+});
+
+//json['args'] = {:id=>1,:product => {:name=>foo,:price=>bar}}
+app.put('/:id',{}, function(req,resp){
+	var result =  {'id':req.params};
+	resp.send(result);
+});
+
+//json['args'] = {:id => 2}
+app.del('/:id',{}, function(req,resp){
+	var result =  {'id':req.params};
+	resp.send(result);
+});

data/spec/apps/rhotestapp/controllers/ruby/application_controller.rb

@@ -0,0 +1,21 @@
+class ApplicationController < Rhoconnect::Controller::AppBase
+  register Rhoconnect::EndPoint
+
+  post '/login', :rc_handler => :authenticate,
+                 :deprecated_route => {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']}  do
+    username = params[:login]
+    password = params[:password] 
+    session[:auth] = "delegated"
+    raise RuntimeError.new('server error') if password == 'server error'
+    raise LoginException.new('login exception') if password == 'wrongpass'
+    return "different" if password == "diffuser"
+    password == 'wrongpassnomsg' ? false : true  
+  end
+
+  get '/rps_login', :rc_handler => :rps_authenticate, 
+                    :login_required => true do
+    username = params[:login]
+    password = params[:password]
+    'rpsuser:secret' == [username,password].join(':') 
+  end
+end