rhosync 2.0.0.beta1 → 2.0.0.beta2

data/lib/rhosync/client_sync.rb

@@ -34,8 +34,8 @@ module Rhosync
     
     def search(params)
       res = []
-      return _resend_search_result(params[:search_token]) if params[:search_token] and params[:resend]
-      _ack_search(params[:search_token]) if params[:search_token]
+      return _resend_search_result if params[:token] and params[:resend]
+      _ack_search(params[:token]) if params[:token]
       res = _do_search(params[:search]) if params[:search]
       res
     end
@@ -158,10 +158,11 @@ module Rhosync
         return [] unless params[:sources]
         res = []
         params[:sources].each do |source|
-          s = Source.load(source,{:app_id => client.app_id,
+          s = Source.load(source['name'],{:app_id => client.app_id,
             :user_id => client.user_id})
-          client.source_name = source
+          client.source_name = source['name']
           cs = ClientSync.new(s,client,params[:p_size])
+          params[:token] = source['token'] if source['token']
           search_res = cs.search(params)
           res << search_res if search_res
         end
@@ -193,7 +194,7 @@ module Rhosync
     end
     
     private
-    def _resend_search_result(search_token)
+    def _resend_search_result
        _format_search_result
     end
     
@@ -221,7 +222,7 @@ module Rhosync
         res,diffsize = compute_search 
         return [] if res.empty?
         [ {'version'=>VERSION},
-          {'search_token' => search_token},
+          {'token' => search_token},
           {'source'=>@source.name},
           {'count'=>res.size},
           {'insert'=>res} ]

data/lib/rhosync/console/app/routes/auth.rb

@@ -2,12 +2,10 @@ class RhosyncConsole::Server
   post '/login' do
     begin
       session[:server] = params[:server]
-      session[:app_name] = APP_NAME
       session[:login] = params[:login]
       session[:errors] = nil      
       
       verify_presence_of :server, "Server is not provaided."
-      verify_presence_of :app_name, "Application name is not provaided."
       verify_presence_of :login, "Login is not provaided."
       
       unless session[:errors]         

data/lib/rhosync/console/app/routes/client.rb

@@ -3,8 +3,7 @@ class RhosyncConsole::Server
   get '/device/create' do
     session[:errors] = nil
     handle_api_error("Can't create new device") do  
-      RhosyncApi::create_client(session[:server],
-        session[:app_name],session[:token],params[:user_id])
+      RhosyncApi::create_client(session[:server],session[:token],params[:user_id])
     end      
     redirect url("/user?user_id=#{CGI.escape(params[:user_id])}"), 303  
   end
@@ -12,18 +11,18 @@ class RhosyncConsole::Server
   get '/device' do
     @attributes = []
     handle_api_error("Can't load list of device attributes") do
-      @attributes = RhosyncApi::get_client_params(session[:server],session[:app_name],session[:token],params[:device_id])
+      @attributes = RhosyncApi::get_client_params(session[:server],session[:token],params[:device_id])
     end
     @sources = []
     handle_api_error("Can't load list of sources") do
-      @sources = RhosyncApi::list_sources(session[:server],session[:app_name],session[:token],:all)
+      @sources = RhosyncApi::list_sources(session[:server],session[:token],:all)
     end
     erb :client
   end
   
   get '/device/delete' do
     handle_api_error("Can't delete device #{params[:device_id]}") do 
-      RhosyncApi::delete_client(session[:server],session[:app_name],session[:token],
+      RhosyncApi::delete_client(session[:server],session[:token],
         params[:user_id],params[:device_id])
     end    
     redirect url(session[:errors] ? "/device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}" :

data/lib/rhosync/console/app/routes/docs.rb

@@ -2,8 +2,8 @@ class RhosyncConsole::Server
   get '/docs' do
     @src_params = []
     handle_api_error("Can't load list of source attributes") do
-      @src_params = RhosyncApi::get_source_params(session[:server],
-        session[:app_name],session[:token],params[:source_id])
+      @src_params = RhosyncApi::get_source_params(
+        session[:server],session[:token],params[:source_id])
     end
     @docs = []
     @docs_name = ''
@@ -13,8 +13,7 @@ class RhosyncConsole::Server
       if params[:device_id]
         @docs_name = "device #{params[:device_id]}"
         @back_href = url("device?user_id=#{CGI.escape(params[:user_id])}&device_id=#{CGI.escape(params[:device_id])}") 
-        @docs = RhosyncApi::list_client_docs(session[:server],
-          session[:app_name],session[:token],params[:source_id],params[:device_id])
+        @docs = RhosyncApi::list_client_docs(session[:server],session[:token],params[:source_id],params[:device_id])
       else   
         if params[:user_id]=='*'      
           @docs_name = "app partition"
@@ -24,12 +23,27 @@ class RhosyncConsole::Server
            @back_href = url("user?user_id=#{CGI.escape(params[:user_id])}")
         end   
         @docs = RhosyncApi::list_source_docs(session[:server],
-          session[:app_name],session[:token],params[:source_id],params[:user_id])
+          session[:token],params[:source_id],params[:user_id])
       end    
     end
     erb :docs
   end
   
+  get '/doc/select' do
+    if params[:dbkey].nil?
+      @dbkey = ''
+      @data = {}
+    else
+      @dbkey = params[:dbkey]
+      @is_string = doc_is_string      
+      handle_api_error("Can't load document") do
+        @data = RhosyncApi::get_db_doc(session[:server],
+          session[:token],params[:dbkey],@is_string ? :string : '')
+      end
+    end    
+    erb :select_doc
+  end
+  
   get '/doc' do
     @data = {}
     @is_string = doc_is_string
@@ -51,7 +65,9 @@ class RhosyncConsole::Server
     end
     @result_name = "Clear result"
     @status = "Successfully cleared: [#{CGI.unescape(params[:dbkey])}]"
-    @back_href = url("doc?#{doc_params}&dbkey=#{CGI.escape(params[:dbkey])}")
+    @back_href = params[:user_id] ?
+      url("doc?#{doc_params}&dbkey=#{CGI.escape(params[:dbkey])}") :
+      url("doc/select?dbkey=#{CGI.escape(params[:dbkey])}")     
     erb :result
   end
   
@@ -77,7 +93,9 @@ class RhosyncConsole::Server
     end
     @result_name = "Upload result"
     @status = "Successfully uploadad data to: [#{CGI.unescape(params[:doc])}]"
-    @back_href = url("doc?#{doc_params}&dbkey=#{params[:doc]}")
+    @back_href = params[:user_id] ?
+      url("doc?#{doc_params}&dbkey=#{params[:doc]}") :
+      url("doc/select?dbkey=#{params[:doc]}")
     erb :result
   end
    

data/lib/rhosync/console/app/routes/home.rb

@@ -7,7 +7,7 @@ class RhosyncConsole::Server
       end
       @sources = nil
       handle_api_error("Can't load list of application partition sources") do
-        @sources = RhosyncApi::list_sources(session[:server],session[:app_name],session[:token],:app)
+        @sources = RhosyncApi::list_sources(session[:server],session[:token],:app)
       end
     end
     erb :index

data/lib/rhosync/console/app/routes/user.rb

@@ -2,8 +2,7 @@ class RhosyncConsole::Server
   get '/users' do
     @users = []
     handle_api_error("Can't load list of users") do
-      @users = RhosyncApi::list_users(
-        session[:server],session[:app_name],session[:token])
+      @users = RhosyncApi::list_users(session[:server],session[:token])
     end
     erb :users
   end
@@ -18,7 +17,7 @@ class RhosyncConsole::Server
     unless session[:errors]             
       handle_api_error("Can't create new user") do  
         RhosyncApi::create_user(session[:server],
-          session[:app_name],session[:token],params[:login],params[:password])
+          session[:token],params[:login],params[:password])
       end      
     end
     redirect url(session[:errors] ? '/user/new' : '/users'), 303  
@@ -28,18 +27,18 @@ class RhosyncConsole::Server
     @devices = []
     handle_api_error("Can't load list of devices") do
       @devices = RhosyncApi::list_clients(
-        session[:server],session[:app_name],session[:token],params[:user_id])
+        session[:server],session[:token],params[:user_id])
     end
     @sources = []
     handle_api_error("Can't load list of user partition sources") do
-      @sources = RhosyncApi::list_sources(session[:server],session[:app_name],session[:token],:user)
+      @sources = RhosyncApi::list_sources(session[:server],session[:token],:user)
     end
     erb :user
   end
   
   get '/user/delete' do
     handle_api_error("Can't delete user #{params[:user_id]}") do 
-      RhosyncApi::delete_user(session[:server],session[:app_name],session[:token],params[:user_id])
+      RhosyncApi::delete_user(session[:server],session[:token],params[:user_id])
     end    
     redirect url(session[:errors] ? "/user?user_id=#{CGI.escape(params[:user_id])}" : '/users'), 303
   end
@@ -47,7 +46,7 @@ class RhosyncConsole::Server
   get '/user/ping' do
     @sources = []
     handle_api_error("Can't load list of user partition sources") do
-      @sources = RhosyncApi::list_sources(session[:server],session[:app_name],session[:token],:all)
+      @sources = RhosyncApi::list_sources(session[:server],session[:token],:all)
     end
     erb :ping
   end

data/lib/rhosync/console/app/views/doc.erb

@@ -3,54 +3,6 @@
 <div class='panel'>
 	<a href='<%= @back_href%>' class='nav_button'>Back</a>
 </div>
-<h2>Upload document</h2>
-<div class='panel'>
-	<form action='<%=url("doc/upload?#{@back_params}")%>' method='post' enctype="multipart/form-data">
-		<input type='hidden' name='doc' value='<%= "#{CGI.escape(params[:dbkey])}"%>'/>
-		<table>
-			<%if @is_string%>
-				<tr>
-					<td>Token string:</td>	
-					<td><input type='text' name='string' value=''/></td>
-				</tr>
-			<%else%>
-				<tr>
-					<td>Data (hash of hashes in json):</td>	
-					<td><input type='file' name='file' value=''/></td>
-				</tr>
-			<%end%>	
-			<tr>
-				<td></td>	
-				<td><input type='submit' value='Submit'/></td>
-			</tr>
-		</table>		
-	</form>	
-</div>
-<h2>Data</h2>
-<div class='panel'>
-	<%if @data.size > 0%>
-		<div class='panel'>
-			<a href='<%=url("doc/clear?#{@back_params}&dbkey=#{CGI.escape(params[:dbkey])}")%>' class='nav_button'>Clear document</a>
-		</div>
-		<%if @is_string%>
-			<p>[<%=@data%>]</p>
-		<%else%>
-			<table>
-				<%@data.each do |obj_id,obj|%>
-					<tr>
-						<td colspan=3>[<%=obj_id%>]</td>
-					</tr>	
-					<%obj.each do |attrib,value|%>
-						<tr>
-							<td></td>
-							<td><%=attrib%>:</td>
-							<td><%=value%></td>
-						</tr>
-					<%end%>		
-				<%end%>
-			</table>
-		<%end%>	
-	<%else%>
-		<p>Document is empty</p>
-	<%end%>
-</div>
+<%= erb(:upload_doc, :layout => false) %>
+<%= erb(:docdata, :layout => false) %>
+<br/>

data/lib/rhosync/console/app/views/docdata.erb

@@ -0,0 +1,28 @@
+<h2>Data</h2>
+<div class='panel'>
+	<%if @data.size > 0%>
+		<div class='panel'>
+			<a href='<%=url("doc/clear?#{@back_params}&dbkey=#{CGI.escape(params[:dbkey])}")%>' class='nav_button'>Clear document</a>
+		</div>
+		<%if @is_string%>
+			<p>[<%=@data%>]</p>
+		<%else%>
+			<table>
+				<%@data.each do |obj_id,obj|%>
+					<tr>
+						<td colspan=3>[<%=obj_id%>]</td>
+					</tr>	
+					<%obj.each do |attrib,value|%>
+						<tr>
+							<td></td>
+							<td><%=attrib%>:</td>
+							<td><%=value%></td>
+						</tr>
+					<%end%>		
+				<%end%>
+			</table>
+		<%end%>	
+	<%else%>
+		<p>Document is empty</p>
+	<%end%>
+</div>

data/lib/rhosync/console/app/views/docs.erb

@@ -26,4 +26,5 @@
 			</tr>	
 		<%end%>
 	</table>
-</div>	
+</div>	
+<br/>

data/lib/rhosync/console/app/views/index.erb

@@ -11,6 +11,7 @@
 	</div>	
 	<div class='panel'>
 		<a href="<%=url('reset')%>" class='nav_button'>Reset</a>
+		<a href="<%=url('doc/select')%>" class='nav_button'>Show server document</a>
 	</div>
 	<div class='panel'>
 		<a href="<%=url('users')%>" class='nav_button'>Application users</a>
@@ -29,7 +30,6 @@
 	<h1>Login</h1>
 	<%=show_errors%>
 	<form action="<%=url('login')%>" method='POST'>
-		<input type="hidden" name='app_name' value='application'/>
 		<table>
 			<tr>
 				<td>Server:</td>

data/lib/rhosync/console/app/views/select_doc.erb

@@ -0,0 +1,19 @@
+<h1>Document <%= @dbkey%></h1>
+<%=show_errors%>
+<div class='panel'>
+	<a href='<%= url('/')%>' class='nav_button'>Back</a>
+</div>	
+<form action=<%= url('doc/select')%> method='GET'>
+	<table>
+		<tr>
+			<td>Doc DB key: </db>
+			<td><input name='dbkey' value='<%= @dbkey%>' size=64/></td>
+		</tr>
+	</table>
+	<input type='submit' value='Submit'>
+</form>
+<%if params[:dbkey]%>
+	<%= erb(:upload_doc, :layout => false) %>
+<%end%>
+<%= erb(:docdata, :layout => false) %>		
+				

data/lib/rhosync/console/app/views/upload_doc.erb

@@ -0,0 +1,23 @@
+<h2>Upload document</h2>
+<div class='panel'>
+	<form action='<%=url("doc/upload?#{@back_params}")%>' method='post' enctype="multipart/form-data">
+		<input type='hidden' name='doc' value='<%= "#{CGI.escape(params[:dbkey])}"%>'/>
+		<table>
+			<%if @is_string%>
+				<tr>
+					<td>Token string:</td>	
+					<td><input type='text' name='string' value=''/></td>
+				</tr>
+			<%else%>
+				<tr>
+					<td>Data (hash of hashes in json):</td>	
+					<td><input type='file' name='file' value=''/></td>
+				</tr>
+			<%end%>	
+			<tr>
+				<td></td>	
+				<td><input type='submit' value='Submit'/></td>
+			</tr>
+		</table>		
+	</form>	
+</div>

data/lib/rhosync/console/rhosync_api.rb

@@ -9,72 +9,73 @@ module RhosyncApi
       RestClient.post("#{server}/api/get_api_token",'',{:cookies => res.cookies})
     end
     
-    def list_users(server,app_name,token)
+    def list_users(server,token)
       JSON.parse(RestClient.post("#{server}/api/list_users",
-        {:app_name => app_name, :api_token => token}.to_json, :content_type => :json).body)
+        {:api_token => token}.to_json, :content_type => :json).body)
     end
     
-    def create_user(server,app_name,token,login,password)
+    def create_user(server,token,login,password)
       RestClient.post("#{server}/api/create_user",
-        {:app_name => app_name, :api_token => token,
-         :attributes => {:login => login, :password => password}}.to_json, 
+        {:api_token => token,:attributes => {:login => login, :password => password}}.to_json, 
          :content_type => :json)
     end  
     
-    def delete_user(server,app_name,token,user_id)
+    def delete_user(server,token,user_id)
       RestClient.post("#{server}/api/delete_user",
-        {:app_name => app_name, :api_token => token, :user_id => user_id}.to_json, 
+        {:api_token => token, :user_id => user_id}.to_json, 
          :content_type => :json)    
     end
   
-    def list_clients(server,app_name,token,user_id)
-      JSON.parse(RestClient.post("#{server}/api/list_clients", {:app_name => app_name, 
-        :api_token => token, :user_id => user_id}.to_json, :content_type => :json).body)
+    def list_clients(server,token,user_id)
+      JSON.parse(RestClient.post("#{server}/api/list_clients", 
+        {:api_token => token, :user_id => user_id}.to_json, :content_type => :json).body)
     end
     
-    def create_client(server,app_name,token,user_id)
+    def create_client(server,token,user_id)
       RestClient.post("#{server}/api/create_client",
-        {:app_name => app_name, :api_token => token, :user_id => user_id}.to_json, 
+        {:api_token => token, :user_id => user_id}.to_json, 
          :content_type => :json).body
     end  
     
-    def delete_client(server,app_name,token,user_id,client_id)
+    def delete_client(server,token,user_id,client_id)
       RestClient.post("#{server}/api/delete_client",
-        {:app_name => app_name, :api_token => token, :user_id => user_id, 
+        {:api_token => token, :user_id => user_id, 
          :client_id => client_id}.to_json, :content_type => :json)    
     end
 
-    def get_client_params(server,app_name,token,client_id)
-      JSON.parse(RestClient.post("#{server}/api/get_client_params", {:app_name => app_name, 
-        :api_token => token, :client_id => client_id}.to_json, :content_type => :json).body)
+    def get_client_params(server,token,client_id)
+      JSON.parse(RestClient.post("#{server}/api/get_client_params", 
+        {:api_token => token, :client_id => client_id}.to_json, :content_type => :json).body)
     end
     
-    def list_sources(server,app_name,token,partition='all') 
-      JSON.parse(RestClient.post("#{server}/api/list_sources", {:app_name => app_name, 
-        :api_token => token, :partition_type => partition}.to_json, :content_type => :json).body)
+    def list_sources(server,token,partition='all') 
+      JSON.parse(RestClient.post("#{server}/api/list_sources", 
+        {:api_token => token, :partition_type => partition}.to_json, :content_type => :json).body)
     end
 
-    def get_source_params(server,app_name,token,source_id)
-      JSON.parse(RestClient.post("#{server}/api/get_source_params", {:app_name => app_name, 
-        :api_token => token, :source_id => source_id}.to_json, :content_type => :json).body)
+    def get_source_params(server,token,source_id)
+      JSON.parse(RestClient.post("#{server}/api/get_source_params", 
+        {:api_token => token, :source_id => source_id}.to_json, :content_type => :json).body)
     end
     
-    def list_source_docs(server,app_name,token,source_id,user_id='*')
-      JSON.parse(RestClient.post("#{server}/api/list_source_docs", {:app_name => app_name, 
-        :api_token => token, :source_id => source_id, :user_id => user_id}.to_json, :content_type => :json).body)
+    def list_source_docs(server,token,source_id,user_id='*')
+      JSON.parse(RestClient.post("#{server}/api/list_source_docs", 
+        {:api_token => token, :source_id => source_id, :user_id => user_id}.to_json, :content_type => :json).body)
     end  
       
-    def list_client_docs(server,app_name,token,source_id,client_id)
-      JSON.parse(RestClient.post("#{server}/api/list_client_docs", {:app_name => app_name, 
-        :api_token => token, :source_id => source_id, :client_id => client_id}.to_json, :content_type => :json).body)
+    def list_client_docs(server,token,source_id,client_id)
+      JSON.parse(RestClient.post("#{server}/api/list_client_docs", 
+        {:api_token => token, :source_id => source_id, :client_id => client_id}.to_json, :content_type => :json).body)
     end  
-        
+    
+    #TODO: figure out data_type programmatically     
     def get_db_doc(server,token,doc,data_type='')
       res = RestClient.post("#{server}/api/get_db_doc", 
         {:api_token => token, :doc => doc, :data_type => data_type}.to_json, :content_type => :json).body
       data_type=='' ? JSON.parse(res) : res
     end
 
+    #TODO: figure out data_type programmatically     
     def set_db_doc(server,token,doc,data={},data_type='')
       RestClient.post("#{server}/api/set_db_doc", 
        {:api_token => token, :doc => doc, :data => data, :data_type => data_type}.to_json, :content_type => :json)

data/lib/rhosync/license.rb

@@ -34,7 +34,7 @@ module Rhosync
         end
       end
       unless incr
-        msg = "WARNING: Maximum # of clients exceeded for this license."
+        msg = "WARNING: Maximum # of devices exceeded for this license."
         log msg; raise LicenseSeatsExceededException.new(msg)
       end
     end

data/lib/rhosync/tasks.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'mechanize'
 require 'zip/zip'
 require 'uri'
 require File.join(File.dirname(__FILE__),'console','rhosync_api')
@@ -47,6 +46,10 @@ module Rhosync
     def rhosync_pid
       "/tmp/rhosync.pid"
     end
+
+    def windows?
+      RUBY_PLATFORM =~ /(win|w)32$/
+    end
   end
 end
 
@@ -62,13 +65,20 @@ namespace :rhosync do
     $url = "#{$url}:#{uri.port}" if uri.port && uri.port != 80
     $host = uri.host
     $port = uri.port
-    $agent = Mechanize.new
     $appname = $settings[env][:syncserver].split('/').last
     $token_file = File.join(ENV['HOME'],'.rhosync_token')
     $token = File.read($token_file) if File.exist?($token_file)
   end
   
-  desc "Reset the rhosync database (you will need to run rhosync:get_api_token afterwards)"
+  task :dtach_installed do
+    if !windows? and (`which dtach` == '')
+      puts "WARNING: dtach not installed or not on path, some tasks will not work!"
+      puts "  Install with '[sudo] rake dtach:install'"
+      exit
+    end
+  end
+  
+  desc "Reset the rhosync database (you will need to run rhosync:get_token afterwards)"
   task :reset => :config do
     RhosyncApi.reset($url,$token)
   end
@@ -130,21 +140,25 @@ namespace :rhosync do
   end
   
   desc "Start rhosync server"
-  task :start do
-    puts 'Detach with Ctrl+\  Re-attach with rake rhosync:attach'
-    sleep 1
-    command = "dtach -A #{rhosync_socket} rackup config.ru -P #{rhosync_pid}"
-    sh command
+  task :start => :dtach_installed do
+    if windows?
+      puts 'Starting server in new window...'
+      system('start cmd.exe /c rackup config.ru')
+    else
+      puts 'Detach with Ctrl+\  Re-attach with rake rhosync:attach'
+      sleep 2
+      sh "dtach -A #{rhosync_socket} rackup config.ru -P #{rhosync_pid}"
+    end
   end
   
   desc "Stop rhosync server"
-  task :stop do
-    sh "cat #{rhosync_pid} | xargs kill -3"
+  task :stop => :dtach_installed do
+    sh "cat #{rhosync_pid} | xargs kill -3" unless windows?
   end
   
   desc "Attach to rhosync console"
-  task :attach do
-    sh "dtach -a #{rhosync_socket}"
+  task :attach => :dtach_installed do
+    sh "dtach -a #{rhosync_socket}" unless windows?
   end
 end
 

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0.beta2'
 end

data/spec/api/create_client_spec.rb

@@ -4,7 +4,7 @@ describe "RhosyncApiCreateUser" do
   it_should_behave_like "ApiHelper"
   
   it "should create client for a user" do
-    post "/api/create_client", {:app_name => @test_app_name, :api_token => @api_token, :user_id => @u_fields[:login]}
+    post "/api/create_client", {:api_token => @api_token, :user_id => @u_fields[:login]}
     last_response.should be_ok
     clients = User.load(@u_fields[:login]).clients.members
     clients.size.should == 2

data/spec/api/create_user_spec.rb

@@ -4,7 +4,7 @@ describe "RhosyncApiCreateUser" do
   it_should_behave_like "ApiHelper"
   
   it "should create user as admin" do
-    params = {:app_name => @test_app_name, :api_token => @api_token,
+    params = {:api_token => @api_token,
       :attributes => {:login => 'testuser1', :password => 'testpass1'}}
     post "/api/create_user", params
     last_response.should be_ok

data/spec/api/delete_client_spec.rb

@@ -4,7 +4,7 @@ describe "RhosyncApiDeleteUser" do
   it_should_behave_like "ApiHelper"
   
   it "should delete client" do
-    post "/api/delete_client", {:app_name => @test_app_name, :api_token => @api_token,
+    post "/api/delete_client", {:api_token => @api_token,
       :user_id => @u_fields[:login], :client_id => @c.id}
     last_response.should be_ok
     Client.is_exist?(@c.id).should == false

data/spec/api/delete_user_spec.rb

@@ -4,12 +4,12 @@ describe "RhosyncApiDeleteUser" do
   it_should_behave_like "ApiHelper"
   
   it "should delete user" do
-    params = {:app_name => @test_app_name, :api_token => @api_token,
+    params = {:api_token => @api_token,
       :attributes => {:login => 'testuser1', :password => 'testpass1'}}
     post "/api/create_user", params
     last_response.should be_ok
     User.is_exist?(params[:attributes][:login]).should == true
-    post "/api/delete_user", {:app_name => @test_app_name, :api_token => @api_token, 
+    post "/api/delete_user", {:api_token => @api_token, 
       :user_id => params[:attributes][:login]}  
       last_response.should be_ok
     User.is_exist?(params[:attributes][:login]).should == false

data/spec/api/get_api_token_spec.rb

@@ -17,8 +17,7 @@ describe "RhosyncApiGetApiToken" do
   end  
   
   it "should return 422 if no token provided" do
-    params = {:app_name => @test_app_name, :attributes => 
-      {:login => 'testuser1', :password => 'testpass1'}}
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
     post "/api/create_user", params
     last_response.status.should == 422
   end

data/spec/api/get_source_params_spec.rb

@@ -4,7 +4,7 @@ describe "RhosyncApiGetSourceParams" do
   it_should_behave_like "ApiHelper"
   
   it "should list source attributes" do
-    post "/api/get_source_params", {:app_name => @test_app_name, :api_token => @api_token, :source_id =>"SampleAdapter"}
+    post "/api/get_source_params", {:api_token => @api_token, :source_id =>"SampleAdapter"}
     JSON.parse(last_response.body).should == [
       {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"}, 
       {"name"=>"source_id", "value"=>nil, "type"=>"integer"}, 

data/spec/api/list_client_docs_spec.rb

@@ -4,7 +4,7 @@ describe "RhosyncApiListClientDocs" do
   it_should_behave_like "ApiHelper"
   
   it "should list client documents" do
-    post "/api/list_client_docs", {:app_name => @test_app_name, :api_token => @api_token,
+    post "/api/list_client_docs", {:api_token => @api_token,
       :source_id => "SimpleAdapter", :client_id => @c.id}
     JSON.parse(last_response.body).should == {
       "cd"=>"client:application:testuser:#{@c.id}:SimpleAdapter:cd",