rhoconnect 3.2.1 → 3.3.1.beta2

data/lib/rhoconnect/api/{admin → system}/get_license_info.rb

@@ -1,4 +1,5 @@
-Server.api :get_license_info, :admin do |params,user|
+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, 

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

@@ -0,0 +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

data/lib/rhoconnect/api/{admin → system}/reset.rb

@@ -1,10 +1,11 @@
-Server.api :reset, :admin do |params,user|
+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 = params[:api_token]
+  user.token = keep_token
   "DB reset"
 end

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

@@ -0,0 +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[:attributes]['adapter_url'] || params['adapter_url']
+end

data/lib/rhoconnect/api/{admin → system}/stats.rb

@@ -1,4 +1,5 @@
-Server.api :stats, :admin do |params,user|
+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

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

@@ -1,7 +1,7 @@
-Server.api :create_user, :user do |params,user|
+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
+end

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

@@ -0,0 +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

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

@@ -1,4 +1,5 @@
-Server.api :delete_user, :user do |params,user|
+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]}

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

@@ -0,0 +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

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

@@ -0,0 +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
+

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

@@ -1,3 +1,3 @@
-Server.api :list_users, :user do |params,user|
+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

@@ -0,0 +1,7 @@
+Server.api4 :ping, :post, "/rc/#{Rhoconnect::API_VERSION}/users/ping", true, {:verb => :post, :url => ['/api/ping', '/api/client/ping']} do |params,user|
+  if params['async']
+    PingJob.enqueue(params)
+  else
+    PingJob.perform(params)
+  end
+end

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

@@ -0,0 +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

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

@@ -1,4 +1,5 @@
-Server.api :update_user, :user do |params,user|
-  user.update(params[:attributes])
+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

@@ -0,0 +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

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

@@ -0,0 +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

data/lib/rhoconnect/app.rb

@@ -15,10 +15,14 @@ module Rhoconnect
     end
     
     def can_authenticate?
-      # TODO: optimize it!
       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)
@@ -36,6 +40,10 @@ module Rhoconnect
         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
@@ -67,7 +75,9 @@ module Rhoconnect
     end
         
     def sources
-      @@sources.uniq! || @@sources
+      @@sources.uniq!
+      # Sort sources array by priority
+      @@sources = @@sources.sort_by { |s| Source.load(s, {:app_id => self.name, :user_id => '*'}).priority }
     end
   end
 end

data/lib/rhoconnect/async.rb

@@ -51,17 +51,13 @@ module Rhoconnect
     def execute_api_call(client_call = false)
         f = Fiber.current
         operation = proc {
-          if client_call or check_api_token
-            catch_all do
-              res = yield params, (client_call ? current_user : api_user), self
-              if params.has_key? :warning
-                Rhoconnect.log params[:warning]
-                response.headers['Warning'] = params[:warning]
-              end
-              res
+          catch_all do
+            res = yield params, current_user, self
+            if params.has_key? :warning
+              Rhoconnect.log params[:warning]
+              response.headers['Warning'] = params[:warning]
             end
-          else
-            [422, "No API token provided"]
+            res
           end
         }
         result = nil

data/lib/rhoconnect/bulk_data/bulk_data.rb

@@ -9,7 +9,7 @@ module Rhoconnect
     field :user_id, :string
     field :refresh_time, :integer
     field :dbfile,:string
-    set   :sources, :string
+    list  :sources, :string
     validates_presence_of :app_id, :user_id, :sources
     
     def completed?
@@ -20,7 +20,7 @@ module Rhoconnect
     end
     
     def delete
-      sources.members.each do |source|
+      sources[0, -1].each do |source|
         s = Source.load(source,{:app_id => app_id, :user_id => user_id})
         Store.flash_data(s.docname(:md_copy)) if s
       end
@@ -28,7 +28,7 @@ module Rhoconnect
     end
     
     def process_sources
-      sources.members.each do |source|
+      sources[0, -1].each do |source|
         s = Source.load(source,{:app_id => app_id, :user_id => user_id})
         if s
           SourceSync.new(s).process_query(nil)
@@ -58,7 +58,7 @@ module Rhoconnect
     def delete_files
       FileUtils.rm Dir.glob(File.join(Rhoconnect.base_directory, "#{self.url}*"))
     end
-
+    
     class << self
       def create(fields={})
         fields[:id] = fields[:name]

data/lib/rhoconnect/client.rb

@@ -2,13 +2,14 @@ module Rhoconnect
   class InvalidSourceNameError < RuntimeError; end
   
   class Client < Model
-    field :device_type, :string
-    field :device_pin,  :string
-    field :device_port, :string
-    field :phone_id,    :string
-    field :user_id,     :string
-    field :last_sync,   :datetime
-    field :app_id,      :string
+    field :device_type,       :string
+    field :device_push_type,  :string
+    field :device_pin,        :string
+    field :device_port,       :string
+    field :phone_id,          :string
+    field :user_id,           :string
+    field :last_sync,         :datetime
+    field :app_id,            :string
     attr_accessor :source_name
     validates_presence_of :app_id, :user_id
     
@@ -81,9 +82,9 @@ module Rhoconnect
     end
     
     def update_fields(params)
-      [:device_type,:device_pin,:device_port,:phone_id].each do |setting|
+      [:device_type, :device_push_type,:device_pin,:device_port,:phone_id].each do |setting|
         self.send "#{setting}=".to_sym, params[setting].to_s if params[setting]
-      end
+      end 
     end
     
     private

data/lib/rhoconnect/client_sync.rb

@@ -2,10 +2,11 @@ module Rhoconnect
   class ClientSync
     attr_accessor :source,:client,:p_size,:source_sync
     
-    VERSION = 3
     UNKNOWN_CLIENT = "Unknown client"
     UNKNOWN_SOURCE = "Unknown source"
     
+    # TODO : Remove in Rhoconnect 4.0
+    SYNC_VERSION = 3
     
     def initialize(source,client,p_size=nil)
       raise ArgumentError.new(UNKNOWN_CLIENT) unless client
@@ -73,7 +74,7 @@ module Rhoconnect
       else  
         compute_errors_page
         res = build_page do |r|
-          progress_count,total_count,r['insert'] = compute_page
+          total_count,r['insert'] = compute_page
           r['delete'] = compute_deleted_page
           r['links'] = compute_links_page
           r['metadata'] = compute_metadata
@@ -82,9 +83,13 @@ module Rhoconnect
           token = compute_token(@client.docname(:page_token))
         else
           _delete_errors_page 
-        end    
+        end
         @client.put_data(:cd,res['insert'],true)      
         @client.delete_data(:cd,res['delete'])
+        # TODO: progress count can not be computed properly
+        # without comparing what has actually changes
+        # so we need to obsolete it in the future versions
+        progress_count = 0
       end
       [token,progress_count,total_count,res]
     end
@@ -120,7 +125,7 @@ module Rhoconnect
           r['delete'] = @client.get_data(:delete_page)
           r['links'] = @client.get_data(:create_links_page)
           r['metadata'] = @client.get_value(:metadata_page)
-          progress_count = @client.get_value(:cd_size).to_i
+          progress_count = 0
           total_count = @client.get_value(:total_count_page).to_i
         end
       end
@@ -162,27 +167,29 @@ module Rhoconnect
     # Computes diffs between master doc and client doc, trims it to page size, 
     # stores page, and returns page as hash  
     def compute_page
-      res,diffsize,total_count = @source.lock(:md) do |s| 
-        res,diffsize = Store.get_diff_data(@client.docname(:cd),s.docname(:md),@p_size)
+      res,total_count = @source.lock(:md) do |s| 
+        res = Store.get_diff_data(@client.docname(:cd),s.docname(:md),@p_size)
         total_count = s.get_value(:md_size).to_i
-        [res,diffsize,total_count]
+        [res,total_count]
       end
+      # until sync is not done - set cd_size to 0
+      # once there are no changes, then, set cd_size to md_size
+      cd_size = res.size > 0 ? 0 : total_count
+      @client.put_value(:cd_size, cd_size)
       @client.put_data(:page,res)
-      progress_count = total_count - diffsize
-      @client.put_value(:cd_size,progress_count)
       @client.put_value(:total_count_page,total_count)
-      [progress_count,total_count,res]
+      [total_count,res]
     end
     
     # Computes search result, updates md for source and cd for client with the result
     def compute_search
-      client_res,diffsize = Store.get_diff_data(@client.docname(:cd),@client.docname(:search),@p_size)
+      client_res = Store.get_diff_data(@client.docname(:cd),@client.docname(:search),@p_size)
       @client.put_data(:cd,client_res,true)
       @client.update_count(:cd_size,client_res.size)
       @client.put_data(:search_page,client_res)
       
       @source.lock(:md) do |s|
-        source_diff,source_diffsize = Store.get_diff_data(s.docname(:md),@client.docname(:cd))
+        source_diff = Store.get_diff_data(s.docname(:md),@client.docname(:cd))
         s.put_data(:md,source_diff,true)
         s.update_count(:md_size,source_diff.size)
       end
@@ -196,12 +203,10 @@ module Rhoconnect
       res = {}
       delete_page_doc = @client.docname(:delete_page)
       page_size = @p_size
-      diff = @source.lock(:md) { |s| Store.get_diff_data(s.docname(:md),@client.docname(:cd))[0] }
+      diff = @source.lock(:md) { |s| Store.get_diff_data(s.docname(:md),@client.docname(:cd),@p_size) }
       diff.each do |key,value|
         res[key] = value
-        value.each do |attrib,val|
-          Store.db.sadd(delete_page_doc,setelement(key,attrib,val))
-        end
+        Store.put_object(delete_page_doc,key,value)
         page_size -= 1
         break if page_size <= 0          
       end
@@ -347,14 +352,14 @@ module Rhoconnect
     def _format_search_result(res={},diffsize=nil)
       error = @client.get_data(:search_errors)
       if not error.empty?
-        [ {'version'=>VERSION},
+        [ {'version'=>SYNC_VERSION},
           {'source'=>@source.name},
           {'search-error'=>error} ]
       else  
         search_token = @client.get_value(:search_token)
         search_token ||= ''
         return [] if res.empty?
-        [ {'version'=>VERSION},
+        [ {'version'=>SYNC_VERSION},
           {'token' => search_token},
           {'source'=>@source.name},
           {'count'=>res.size},
@@ -423,7 +428,7 @@ module Rhoconnect
       count = 0
       count += res['insert'].length if res['insert']
       count += res['delete'].length if res['delete']
-      [ {'version'=>VERSION},
+      [ {'version'=>SYNC_VERSION},
         {'token'=>(token ? token : '')},
         {'count'=>count},
         {'progress_count'=>progress_count},

data/lib/rhoconnect/document.rb

@@ -2,17 +2,33 @@ module Document
   
   # Store wrapper methods for document
   def get_data(doctype,type=Hash)
-    Store.get_data(docname(doctype),type)
+    Store.get_data(docname(doctype), type)
+  end
+  
+  def get_object(doctype, key)
+    Store.get_object(docname(doctype), key)
+  end
+  
+  def get_list(doctype)
+    Store.get_list(docname(doctype))
   end
   
   def get_value(doctype)
     Store.get_value(docname(doctype))
   end
   
+  def put_object(doctype, key, data={})
+    Store.put_object(docname(doctype), key, data)
+  end
+  
   def put_data(doctype,data,append=false)
     Store.put_data(docname(doctype),data,append)
   end
   
+  def put_list(doctype,data,append=false)
+    Store.put_list(docname(doctype),data,append)
+  end
+  
   def update_objects(doctype,updates)
     Store.update_objects(docname(doctype),updates)
   end
@@ -62,8 +78,6 @@ module Document
   
   # Update count for a given document
   def update_count(doctype,count)
-    name = docname(doctype)
-    value = Store.db.get(name).to_i + count
-    Store.db.set(name,value < 0 ? 0 : value) 
+    Store.update_count(docname(doctype), count)
   end
 end

data/lib/rhoconnect/graph_helper.rb

@@ -205,8 +205,10 @@ module GraphHelper
   end
   
   def get_sources(partition_type)
-    sources = App.load(APP_NAME).sources
-    puts "sources is -- #{sources}"
+    # app.sources returns reference
+    # so we need to make a copy
+    # otherwise we will end up modifying the @@sources variable in App 
+    sources = App.load(APP_NAME).sources.clone
     if partition_type.nil? or partition_type == 'all'
       sources
     else