rhoconnect 3.4.5 → 4.0.0.beta.10

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

@@ -1,12 +1,12 @@
-Server.api4 :clientregister, :post, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/register", \
-              false, {:verb => :post, :url => ['/application/clientregister', '/api/application/clientregister'] } do |params,user,server|
-  current_client = server.current_client
-  if current_client.nil? and server.current_user and server.current_app
-    fields = {:user_id => server.current_user.id}
-    fields[:id] = params[:client_id].to_s
-    fields[:app_id] = server.current_app.id
-    current_client = Client.create(fields)
-  end
-  current_client.update_fields(params)
-  server.status 200
-end
+# Server.api4 :clientregister, :post, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/register", \
+#               false, {:verb => :post, :url => ['/application/clientregister', '/api/application/clientregister'] } do |params,user,server|
+#   current_client = server.current_client
+#   if current_client.nil? and server.current_user and server.current_app
+#     fields = {:user_id => server.current_user.id}
+#     fields[:id] = params[:client_id].to_s
+#     fields[:app_id] = server.current_app.id
+#     current_client = Client.create(fields)
+#   end
+#   current_client.update_fields(params)
+#   server.status 200
+# end

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

@@ -1,5 +1,5 @@
-Server.api4 :clientreset, :post, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/reset", \
-            false, {:verb => :get, :url => ['/application/clientreset', '/api/application/clientreset']} do |params,user,server|
-  ClientSync.reset(server.current_client, params)
-  server.status 200
-end
+# Server.api4 :clientreset, :post, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/reset", \
+#             false, {:verb => :get, :url => ['/application/clientreset', '/api/application/clientreset']} do |params,user,server|
+#   ClientSync.reset(server.current_client, params)
+#   server.status 200
+# end

data/lib/rhoconnect/api/readstate/set_refresh_time.rb

@@ -1,9 +1,9 @@
-Server.api4 :set_refresh_time, :put, "/rc/#{Rhoconnect::API_VERSION}/readstate/users/:user_name/sources/:source_name", \
-            true, {:verb => :post, :url => ['/api/set_refresh_time', '/api/source/set_refresh_time']} do |params,user|
-  source = Source.load(params[:source_name],
-    {:app_id => APP_NAME, :user_id => params[:user_name]})
-  source.poll_interval = params[:poll_interval] if params[:poll_interval]
-  params[:refresh_time] ||= 0
-  source.read_state.refresh_time = Time.now.to_i + params[:refresh_time].to_i
-  ''
-end
+# Server.api4 :set_refresh_time, :put, "/rc/#{Rhoconnect::API_VERSION}/readstate/users/:user_name/sources/:source_name", \
+#             true, {:verb => :post, :url => ['/api/set_refresh_time', '/api/source/set_refresh_time']} do |params,user|
+#   source = Source.load(params[:source_name],
+#     {:app_id => APP_NAME, :user_id => params[:user_name]})
+#   source.poll_interval = params[:poll_interval] if params[:poll_interval]
+#   params[:refresh_time] ||= 0
+#   source.read_state.refresh_time = Time.now.to_i + params[:refresh_time].to_i
+#   ''
+# end

data/lib/rhoconnect/api/source/get_source_params.rb

@@ -1,4 +1,4 @@
-Server.api4 :get_source_params, :get, "/rc/#{Rhoconnect::API_VERSION}/sources/:source_id", \
-            true, {:verb => :post, :url => ['/api/get_source_params', '/api/source/get_source_params']} do |params,user|
-  Source.load(params[:source_id],{:app_id => APP_NAME,:user_id => '*'}).to_array.to_json
-end
+# Server.api4 :get_source_params, :get, "/rc/#{Rhoconnect::API_VERSION}/sources/:source_id", \
+#             true, {:verb => :post, :url => ['/api/get_source_params', '/api/source/get_source_params']} do |params,user|
+#   Source.load(params[:source_id],{:app_id => APP_NAME,:user_id => '*'}).to_array.to_json
+# end

data/lib/rhoconnect/api/source/list_sources.rb

@@ -1,16 +1,16 @@
-Server.api4 :list_sources, :get, "/rc/#{Rhoconnect::API_VERSION}/sources/type/:partition_type", \
-            true, {:verb => :post, :url => ['/api/list_sources', '/api/source/list_sources']}  do |params,user|
-  sources = App.load(APP_NAME).sources
-  if params['partition_type'].nil? or params['partition_type'] == 'all'
-    sources.to_json 
-  else
-    res = []
-    sources.each do |name|
-      s = Source.load(name,{:app_id => APP_NAME,:user_id => '*'})
-      if s and s.partition_type and s.partition_type == params['partition_type'].to_sym
-        res << name 
-      end
-    end  
-    res.to_json
-  end  
-end
+# Server.api4 :list_sources, :get, "/rc/#{Rhoconnect::API_VERSION}/sources/type/:partition_type", \
+#             true, {:verb => :post, :url => ['/api/list_sources', '/api/source/list_sources']}  do |params,user|
+#   sources = App.load(APP_NAME).sources
+#   if params['partition_type'].nil? or params['partition_type'] == 'all'
+#     sources.to_json 
+#   else
+#     res = []
+#     sources.each do |name|
+#       s = Source.load(name,{:app_id => APP_NAME,:user_id => '*'})
+#       if s and s.partition_type and s.partition_type == params['partition_type'].to_sym
+#         res << name 
+#       end
+#     end  
+#     res.to_json
+#   end  
+# end

data/lib/rhoconnect/api/source/update_source_params.rb

@@ -1,6 +1,6 @@
-Server.api4 :update_source_params, :put, "/rc/#{Rhoconnect::API_VERSION}/sources/:source_id", true, nil do |params,user|
-  source = Source.load(params[:source_id],
-    {:app_id => APP_NAME, :user_id => '*'})
-  source.update_fields(params[:data])
-  ''
-end
+# Server.api4 :update_source_params, :put, "/rc/#{Rhoconnect::API_VERSION}/sources/:source_id", true, nil do |params,user|
+#   source = Source.load(params[:source_id],
+#     {:app_id => APP_NAME, :user_id => '*'})
+#   source.update_fields(params[:data])
+#   ''
+# end

data/lib/rhoconnect/api/store/get_db_doc.rb

@@ -1,4 +1,4 @@
-Server.api4 :get_db_doc, :get, "/rc/#{Rhoconnect::API_VERSION}/store/:doc", \
-          true, {:verb => :post, :url => ['/api/get_db_doc', '/api/source/get_db_doc']} do |params,user|
-  Store.get_db_doc(params[:doc])
-end
+# Server.api4 :get_db_doc, :get, "/rc/#{Rhoconnect::API_VERSION}/store/:doc", \
+#           true, {:verb => :post, :url => ['/api/get_db_doc', '/api/source/get_db_doc']} do |params,user|
+#   Store.get_db_doc(params[:doc])
+# end

data/lib/rhoconnect/api/store/set_db_doc.rb

@@ -1,7 +1,7 @@
-Server.api4 :set_db_doc, :post, "/rc/#{Rhoconnect::API_VERSION}/store/:doc", \
-            true, {:verb => :post, :url => ['/api/set_db_doc', '/api/source/set_db_doc'] } do |params,user|
-  append_to_doc = params[:append]
-  append_to_doc ||= false
-  Store.set_db_doc(params[:doc],params[:data],append_to_doc)
-  ''
-end
+# Server.api4 :set_db_doc, :post, "/rc/#{Rhoconnect::API_VERSION}/store/:doc", \
+#             true, {:verb => :post, :url => ['/api/set_db_doc', '/api/source/set_db_doc'] } do |params,user|
+#   append_to_doc = params[:append]
+#   append_to_doc ||= false
+#   Store.set_db_doc(params[:doc],params[:data],append_to_doc)
+#   ''
+# end

data/lib/rhoconnect/api/system/get_adapter.rb

@@ -1,4 +1,4 @@
-Server.api4 :get_adapter, :get, "/rc/#{Rhoconnect::API_VERSION}/system/appserver", \
-              true, {:verb => :post, :url => ['/api/get_adapter', '/api/source/get_adapter']} do |params,user|
-   {:adapter_url => Rhoconnect.appserver}.to_json
-end
+# Server.api4 :get_adapter, :get, "/rc/#{Rhoconnect::API_VERSION}/system/appserver", \
+#               true, {:verb => :post, :url => ['/api/get_adapter', '/api/source/get_adapter']} do |params,user|
+#    {:adapter_url => Rhoconnect.appserver}.to_json
+# end

data/lib/rhoconnect/api/system/get_license_info.rb

@@ -1,9 +1,9 @@
-Server.api4 :get_license_info, :get, "/rc/#{Rhoconnect::API_VERSION}/system/license", \
-            true, {:verb => :post, :url => ['/api/get_license_info', '/api/admin/get_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
+# Server.api4 :get_license_info, :get, "/rc/#{Rhoconnect::API_VERSION}/system/license", \
+#             true, {:verb => :post, :url => ['/api/get_license_info', '/api/admin/get_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
 

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

@@ -1,15 +1,15 @@
-Server.api4 :login, :post, "/rc/#{Rhoconnect::API_VERSION}/system/login", true, {:verb => :post, :url => ['/login', '/api/admin/login']} do |params,user,server|
-  token = ''
-  server.logout
-  server.do_login
-  u = User.load(params[:login])
-  token = do_get_api_token(params, u)
-end
-
-def do_get_api_token(params, user)
-  if user and user.admin == 1 and user.token
-    user.token.value 
-  else
-    raise ApiException.new(422, "Invalid/missing API user")
-  end
-end
+# Server.api4 :login, :post, "/rc/#{Rhoconnect::API_VERSION}/system/login", true, {:verb => :post, :url => ['/login', '/api/admin/login']} do |params,user,server|
+#   token = ''
+#   server.logout
+#   server.do_login
+#   u = User.load(params[:login])
+#   token = do_get_api_token(params, u)
+# end
+# 
+# def do_get_api_token(params, user)
+#   if user and user.admin == 1 and user.token
+#     user.token.value 
+#   else
+#     raise ApiException.new(422, "Invalid/missing API user")
+#   end
+# end

data/lib/rhoconnect/api/system/reset.rb

@@ -1,11 +1,11 @@
-Server.api4 :reset, :post, "/rc/#{Rhoconnect::API_VERSION}/system/reset", true, {:verb => :post, :url => ['/api/reset', '/api/admin/reset']} do |params,user|
-  keep_token = user.token.value
-  Store.db.flushdb
-  app_klass = Object.const_get(camelize(APP_NAME))
-  if app_klass.singleton_methods.map(&:to_sym).include?(:initializer)
-    app_klass.send :initializer, Rhoconnect.base_directory
-  end
-  # restoring previous token value after flushdb
-  user.token = keep_token
-  "DB reset"
-end
+# Server.api4 :reset, :post, "/rc/#{Rhoconnect::API_VERSION}/system/reset", true, {:verb => :post, :url => ['/api/reset', '/api/admin/reset']} do |params,user|
+#   keep_token = user.token.value
+#   Store.flush_all
+#   app_klass = Object.const_get(camelize(APP_NAME))
+#   if app_klass.singleton_methods.map(&:to_sym).include?(:initializer)
+#     app_klass.send :initializer, Rhoconnect.base_directory
+#   end
+#   # restoring previous token value after flushdb
+#   user.token = keep_token
+#   "DB reset"
+# end

data/lib/rhoconnect/api/system/save_adapter.rb

@@ -1,4 +1,4 @@
-Server.api4 :save_adapter, :post, "/rc/#{Rhoconnect::API_VERSION}/system/appserver", \
-          true, {:verb => :post, :url => ['/api/save_adapter', '/api/source/save_adapter']} do |params,user|
-  Rhoconnect.appserver = params['adapter_url'] || params[:attributes]['adapter_url']
-end
+# Server.api4 :save_adapter, :post, "/rc/#{Rhoconnect::API_VERSION}/system/appserver", \
+#           true, {:verb => :post, :url => ['/api/save_adapter', '/api/source/save_adapter']} do |params,user|
+#   Rhoconnect.appserver = params['adapter_url'] || params[:attributes]['adapter_url']
+# end

data/lib/rhoconnect/api/system/stats.rb

@@ -1,22 +1,22 @@
-Server.api4 :stats, :get, "/rc/#{Rhoconnect::API_VERSION}/system/stats", \
-                true, {:verb => :post, :url => ['/api/stats', '/api/admin/stats']} do |params,user|
-  if Rhoconnect.stats == true
-    names = params[:names]
-    if names
-      Rhoconnect::Stats::Record.keys(names).to_json
-    else
-      metric = params[:metric]
-      rtype = Rhoconnect::Stats::Record.rtype(metric)
-      if rtype == 'zset'
-        # returns [] if no results
-        Rhoconnect::Stats::Record.range(metric,params[:start],params[:finish]).to_json 
-      elsif rtype == 'string'
-        Rhoconnect::Stats::Record.get_value(metric) || ''
-      else
-        raise ApiException.new(404, "Unknown metric")
-      end
-    end
-  else
-    raise ApiException.new(500, "Stats not enabled")
-  end
-end
+# Server.api4 :stats, :get, "/rc/#{Rhoconnect::API_VERSION}/system/stats", \
+#                 true, {:verb => :post, :url => ['/api/stats', '/api/admin/stats']} do |params,user|
+#   if Rhoconnect.stats == true
+#     names = params[:names]
+#     if names
+#       Rhoconnect::Stats::Record.keys(names).to_json
+#     else
+#       metric = params[:metric]
+#       rtype = Rhoconnect::Stats::Record.rtype(metric)
+#       if rtype == 'zset'
+#         # returns [] if no results
+#         Rhoconnect::Stats::Record.range(metric,params[:start],params[:finish]).to_json 
+#       elsif rtype == 'string'
+#         Rhoconnect::Stats::Record.get_value(metric) || ''
+#       else
+#         raise ApiException.new(404, "Unknown metric")
+#       end
+#     end
+#   else
+#     raise ApiException.new(500, "Stats not enabled")
+#   end
+# end

data/lib/rhoconnect/api/user/create_user.rb

@@ -1,7 +1,7 @@
-Server.api4 :create_user, :post, "/rc/#{Rhoconnect::API_VERSION}/users", true, {:verb => :post, :url => ['/api/create_user', '/api/user/create_user']} do |params,user|
-  app = App.load(APP_NAME)
-  u = User.create({:login => params[:attributes]['login']})
-  u.password = params[:attributes]['password']
-  app.users << u.login
-  "User created"
-end
+# Server.api4 :create_user, :post, "/rc/#{Rhoconnect::API_VERSION}/users", true, {:verb => :post, :url => ['/api/create_user', '/api/user/create_user']} do |params,user|
+#   app = App.load(APP_NAME)
+#   u = User.create({:login => params[:attributes]['login']})
+#   u.password = params[:attributes]['password']
+#   app.users << u.login
+#   "User created"
+# end

data/lib/rhoconnect/api/user/delete_client.rb

@@ -1,6 +1,6 @@
-Server.api4 :delete_client, :delete, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/clients/:client_id", \
-          true, {:verb => :post, :url => ['/api/delete_client', '/api/client/delete_client']} do |params,user|
-  Client.load(params[:client_id],{:source_name => '*'}).delete
-  User.load(params[:user_id]).clients.delete(params[:client_id])
-  "Client deleted"
-end
+# Server.api4 :delete_client, :delete, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/clients/:client_id", \
+#           true, {:verb => :post, :url => ['/api/delete_client', '/api/client/delete_client']} do |params,user|
+#   Client.load(params[:client_id],{:source_name => '*'}).delete
+#   User.load(params[:user_id]).clients.delete(params[:client_id])
+#   "Client deleted"
+# end

data/lib/rhoconnect/api/user/delete_user.rb

@@ -1,10 +1,11 @@
-Server.api4 :delete_user, :delete, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id", \
-                true, {:verb => :post, :url => ['/api/delete_user', '/api/user/delete_user']} do |params,user|
-  User.load(params[:user_id]).delete
-  App.load(APP_NAME).users.delete(params[:user_id])
-  params = {:app_id => APP_NAME,:user_id => params[:user_id]}
-  App.load(APP_NAME).sources.each{ |source|
-    Source.load(source, params).flash_store_data
-  }
-  "User deleted"
-end
+# Server.api4 :delete_user, :delete, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id", \
+#                 true, {:verb => :post, :url => ['/api/delete_user', '/api/user/delete_user']} do |params,user|
+#   User.load(params[:user_id]).delete
+#   App.load(APP_NAME).users.delete(params[:user_id])
+#   params = {:app_id => APP_NAME,:user_id => params[:user_id]}
+#   App.load(APP_NAME).sources.each{ |source|
+#     Source.load(source, params).flush_store_data
+#   }
+#   "User deleted"
+# end
+# 

data/lib/rhoconnect/api/user/list_clients.rb

@@ -1,4 +1,4 @@
-Server.api4 :list_clients, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/clients", \
-              true, {:verb => :post, :url => ['/api/list_clients', '/api/client/list_clients']} do |params,user|
-  User.load(params[:user_id]).clients.members.to_json
-end
+# Server.api4 :list_clients, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/clients", \
+#               true, {:verb => :post, :url => ['/api/list_clients', '/api/client/list_clients']} do |params,user|
+#   User.load(params[:user_id]).clients.members.to_json
+# end

data/lib/rhoconnect/api/user/list_source_docs.rb

@@ -1,11 +1,11 @@
-Server.api4 :list_source_docs, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/sources/:source_id/docnames", \
-                true, {:verb => :post, :url => ['/api/list_source_docs', '/api/source/list_source_docs']} do |params,user|
-  res = {}
-  s = Source.load(params[:source_id], {:app_id => APP_NAME,:user_id => params[:user_id]})
-  [:md,:md_size,:md_copy,:errors].each do |doc|
-    db_key = s.docname(doc)
-    res.merge!(doc => db_key)
-  end
-  res.to_json
-end
+# Server.api4 :list_source_docs, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/sources/:source_id/docnames", \
+#                 true, {:verb => :post, :url => ['/api/list_source_docs', '/api/source/list_source_docs']} do |params,user|
+#   res = {}
+#   s = Source.load(params[:source_id], {:app_id => APP_NAME,:user_id => params[:user_id]})
+#   [:md,:md_size,:md_copy,:errors].each do |doc|
+#     db_key = s.docname(doc)
+#     res.merge!(doc => db_key)
+#   end
+#   res.to_json
+# end
 

data/lib/rhoconnect/api/user/list_users.rb

@@ -1,3 +1,3 @@
-Server.api4 :list_users, :get, "/rc/#{Rhoconnect::API_VERSION}/users", true, {:verb => :post, :url => ['/api/list_users', '/api/user/list_users']} do |params,user|
-  App.load(APP_NAME).users.members.to_json
-end
+# Server.api4 :list_users, :get, "/rc/#{Rhoconnect::API_VERSION}/users", true, {:verb => :post, :url => ['/api/list_users', '/api/user/list_users']} do |params,user|
+#   App.load(APP_NAME).users.members.to_json
+# end

data/lib/rhoconnect/api/user/ping.rb

@@ -1,3 +1,3 @@
-Server.api4 :ping, :post, "/rc/#{Rhoconnect::API_VERSION}/users/ping", true, {:verb => :post, :url => ['/api/ping', '/api/client/ping']} do |params,user|
-  User.ping(params)
-end
+# Server.api4 :ping, :post, "/rc/#{Rhoconnect::API_VERSION}/users/ping", true, {:verb => :post, :url => ['/api/ping', '/api/client/ping']} do |params,user|
+#   User.ping(params)
+# end

data/lib/rhoconnect/api/user/show_user.rb

@@ -1,3 +1,3 @@
-Server.api4 :show_user, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id", true, nil do |params,user|
-  User.load(params[:user_id]).to_array.to_json
-end
+# Server.api4 :show_user, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id", true, nil do |params,user|
+#   User.load(params[:user_id]).to_array.to_json
+# end

data/lib/rhoconnect/api/user/update_user.rb

@@ -1,5 +1,5 @@
-Server.api4 :update_user, :put, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id", \
-                true, {:verb => :post, :url => ["/api/update_user", '/api/user/update_user']} do |params,user| 
-  User.load(params[:user_id]).update(params[:attributes])
-  "User updated"
-end
+# Server.api4 :update_user, :put, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id", \
+#                 true, {:verb => :post, :url => ["/api/update_user", '/api/user/update_user']} do |params,user| 
+#   User.load(params[:user_id]).update(params[:attributes])
+#   "User updated"
+# end

data/lib/rhoconnect/api/user/user_get_db_doc.rb

@@ -1,5 +1,5 @@
-Server.api4 :user_get_db_doc, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/sources/:source_id/docs/:doc", true, nil do |params,user|
-  s = Source.load(params[:source_id], {:app_id => APP_NAME,:user_id => params[:user_id]})
-  db_key = s.docname(params[:doc])
-  Store.get_db_doc(db_key)
-end
+# Server.api4 :user_get_db_doc, :get, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/sources/:source_id/docs/:doc", true, nil do |params,user|
+#   s = Source.load(params[:source_id], {:app_id => APP_NAME,:user_id => params[:user_id]})
+#   db_key = s.docname(params[:doc])
+#   Store.get_db_doc(db_key)
+# end

data/lib/rhoconnect/api/user/user_set_db_doc.rb

@@ -1,10 +1,10 @@
-Server.api4 :user_set_db_doc, :post, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/sources/:source_id/docs/:doc", true, nil do |params,user|
-  throw :halt, [500, "Unknown user '#{params[:user_id]}'"] unless User.is_exist?(params[:user_id])
-  
-  s = Source.load(params[:source_id], {:app_id => APP_NAME,:user_id => params[:user_id]})
-  db_key = s.docname(params[:doc])
-  append_to_doc = params[:append]
-  append_to_doc ||= false
-  Store.set_db_doc(db_key,params[:data],append_to_doc)
-  ''
-end
+# Server.api4 :user_set_db_doc, :post, "/rc/#{Rhoconnect::API_VERSION}/users/:user_id/sources/:source_id/docs/:doc", true, nil do |params,user|
+#   throw :halt, [500, "Unknown user '#{params[:user_id]}'"] unless User.is_exist?(params[:user_id])
+#   
+#   s = Source.load(params[:source_id], {:app_id => APP_NAME,:user_id => params[:user_id]})
+#   db_key = s.docname(params[:doc])
+#   append_to_doc = params[:append]
+#   append_to_doc ||= false
+#   Store.set_db_doc(db_key,params[:data],append_to_doc)
+#   ''
+# end

data/lib/rhoconnect/api_token.rb

@@ -1,19 +1,18 @@
 require 'uuidtools'
 module Rhoconnect
-  class ApiToken < Model
+  class ApiToken < StoreOrm
     field :value,:string
     field :user_id,:string
     validates_presence_of :user_id
-    
+
     def self.create(fields)
-      fields[:value] = fields[:value] || Rhoconnect.api_token || get_random_uuid
+      fields[:value] = fields[:value] || get_random_uuid
       fields[:id] = fields[:value]
-      object = super(fields)
+      super(fields)
     end
-    
+
     def user
       User.load(self.user_id)
     end
   end
 end
-    

data/lib/rhoconnect/app.rb

@@ -1,63 +1,27 @@
 module Rhoconnect
-  class App < Model
+  class App < StoreOrm
     field :name, :string
     set   :users, :string
-    attr_reader :delegate
     validates_presence_of :name
-    
+
     @@sources = []
-    
+
     class << self
       def create(fields={})
         fields[:id] = fields[:name]
         super(fields)
       end
     end
-    
-    def can_authenticate?
-      self.delegate && self.delegate.singleton_methods.map(&:to_sym).include?(:authenticate)
-    end
-
-    def can_ans_authenticate?
-      self.delegate && self.delegate.singleton_methods.map(&:to_sym).include?(:ans_authenticate)
-    end
 
-
-    def authenticate(login, password, session)
-      if Rhoconnect.appserver
-        auth_result = DynamicAdapter.authenticate(login,password)
-      elsif self.delegate
-        auth_result = self.delegate.authenticate(login, password, session) 
-      end
-      
-      if auth_result
-        login = auth_result if auth_result.is_a? String
-        user = User.load(login) if User.is_exist?(login)
-        if not user
-          user = User.create(:login => login)
-          users << user.id
-        end
-        return user
-      end
-    end
-
-    def ans_authenticate(login, password)
-      self.delegate ? self.delegate.ans_authenticate(login, password) : false
-    end
-    
-    def delegate
-      @delegate.nil? ? Object.const_get(camelize(self.name)) : @delegate
-    end
-    
     def delete
       @@sources = []
       super
     end
-    
+
     def delete_sources
       @@sources = []
     end
-    
+
     def partition_sources(partition,user_id)
       names = []
       @@sources.each do |source|
@@ -69,11 +33,7 @@ module Rhoconnect
       end
       names
     end
-    
-    def store_blob(obj,field_name,blob)
-      self.delegate.send :store_blob, obj,field_name,blob
-    end
-        
+
     def sources
       @@sources.uniq!
       # Sort sources array by priority

data/lib/rhoconnect/application/init.rb

@@ -27,11 +27,14 @@ Rhoconnect::Server.use     Rack::Static, :urls => ['/data'], :root => Rhoconnect
 if ENV['DEBUG'] == 'yes'
   Rhoconnect::Server.set :use_async_model, false
 end
+# bootstrap the application
+Rhoconnect.bootstrap(ROOT_PATH)
+# Load RhoConnect application controller
 
+# TODO - Move to Rhoconnect.rb??
 module Rhoconnect
   def app
-    # Setup the url map
-    url_map = { '/' => Rhoconnect::Server.new }
+    url_map = Rhoconnect.url_map
     unless Rhoconnect.disable_resque_console
       url_map['/resque'] = Resque::Server.new
     end