rhoconnect 3.3.6 → 3.4.2

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

@@ -1,4 +1,7 @@
 Server.api4 :query, :get, "/app/#{Rhoconnect::API_VERSION}/:source_name", false, {:verb => :get, :url => ['/api/application', '/application', '/api/application/query']} do |params,user,server|
   server.content_type :json
-  res = server.current_client_sync.send_cud(params[:token],params[:query]).to_json
+  res = server.current_client_sync.send_cud(params[:token],params[:query])
+  server.response.headers[Rhoconnect::PAGE_TOKEN_HEADER] = res[1]['token']
+  server.response.headers[Rhoconnect::PAGE_OBJECT_COUNT_HEADER] = res[2]['count'].to_s
+  res.to_json
 end

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

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

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

@@ -1,5 +1,6 @@
 Server.api4 :list_client_docs, :get, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/sources/:source_id/docnames", \
                 true, {:verb => :post, :url => ['/api/list_client_docs', '/api/client/list_client_docs']} do |params,user|
+  result = ""
   Rhoconnect::Stats::Record.update('clientdocs') do
     c = Client.load(params[:client_id],{:source_name => params[:source_id]})
     res = {}
@@ -10,6 +11,7 @@ Server.api4 :list_client_docs, :get, "/rc/#{Rhoconnect::API_VERSION}/clients/:cl
       db_key = c.docname(doc)
       res.merge!(doc => db_key)
     end
-    res.to_json
+    result = res.to_json
   end
+  result
 end

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

@@ -1,7 +1,3 @@
 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
+  User.ping(params)
 end

data/lib/rhoconnect/application/init.rb

@@ -0,0 +1,43 @@
+# Application root path
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+ROOT_PATH = File.expand_path('.')
+
+# Debugger support
+if ENV['DEBUG'] == 'yes'
+  ENV['APP_TYPE'] = 'rhosync'
+  ENV['ROOT_PATH'] = ROOT_PATH
+  require 'debugger'
+end
+
+require 'rhoconnect/server'
+require 'rhoconnect/web-console/server'
+require 'resque/server'
+
+# Rhoconnect server flags
+#Rhoconnect::Server.enable  :stats
+Rhoconnect::Server.disable :run
+Rhoconnect::Server.disable :clean_trace
+Rhoconnect::Server.enable  :raise_errors
+Rhoconnect::Server.set     :root,        ROOT_PATH
+Rhoconnect::Server.use     Rack::Static, :urls => ['/data'], :root => Rhoconnect::Server.root
+# disable Async mode if Debugger is used
+if ENV['DEBUG'] == 'yes'
+  Rhoconnect::Server.set :use_async_model, false
+end
+
+module Rhoconnect
+  def app
+    # Setup the url map
+    url_map = { '/' => Rhoconnect::Server.new }
+    unless Rhoconnect.disable_resque_console
+      url_map['/resque'] = Resque::Server.new
+    end
+    unless Rhoconnect.disable_rc_console
+      url_map['/console'] = RhoconnectConsole::Server.new
+    end
+    return Rack::URLMap.new url_map
+  end
+end

data/lib/rhoconnect/async.rb

@@ -51,13 +51,18 @@ module Rhoconnect
     def execute_api_call(client_call = false)
         f = Fiber.current
         operation = proc {
-          catch_all do
-            res = yield params, current_user, self
-            if params.has_key? :warning
-              Rhoconnect.log params[:warning]
-              response.headers['Warning'] = params[:warning]
+          self.request.env['REQUEST_THREAD'] = Thread.current
+          if(request.env['RHO_ABORT_PROCESS'])
+            res = [500, 'Request is aborted']
+          else
+            catch_all do
+              res = yield params, current_user, self
+              if params.has_key? :warning
+                Rhoconnect.log params[:warning]
+                response.headers['Warning'] = params[:warning]
+              end
+              res
             end
-            res
           end
         }
         result = nil

data/lib/rhoconnect/client_sync.rb

@@ -74,8 +74,7 @@ module Rhoconnect
       else  
         compute_errors_page
         res = build_page do |r|
-          total_count,r['insert'] = compute_page
-          r['delete'] = compute_deleted_page
+          total_count,r['insert'],r['delete'] = compute_page
           r['links'] = compute_links_page
           r['metadata'] = compute_metadata
         end
@@ -84,13 +83,11 @@ module Rhoconnect
         else
           _delete_errors_page 
         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
+      # 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
       [token,progress_count,total_count,res]
     end
     
@@ -167,52 +164,48 @@ 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,total_count = @source.lock(:md) do |s| 
-        res = Store.get_diff_data(@client.docname(:cd),s.docname(:md),@p_size)
+      inserts_elements_map,deletes_elements_map,total_count = @source.lock(:md) do |s| 
+        inserts_elements_map = Store.get_diff_data(@client.docname(:cd),s.docname(:md),@p_size)
         total_count = s.get_value(:md_size).to_i
-        [res,total_count]
+        deletes_elements_map = Store.get_diff_data(s.docname(:md),@client.docname(:cd),@p_size)
+        [inserts_elements_map,deletes_elements_map,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
+      cd_size = inserts_elements_map.size > 0 ? 0 : total_count
       @client.put_value(:cd_size, cd_size)
-      @client.put_data(:page,res)
+      
+      # now, find the exact changes
+      inserts,deletes = Store.get_inserts_deletes(inserts_elements_map,deletes_elements_map)
+      
+      @client.put_data(:page,inserts)
+      @client.put_data(:delete_page,deletes,true)
       @client.put_value(:total_count_page,total_count)
-      [total_count,res]
+      Store.update_elements(@client.docname(:cd),inserts_elements_map,deletes_elements_map)
+      
+      [total_count,inserts,deletes]
     end
     
     # Computes search result, updates md for source and cd for client with the result
     def compute_search
-      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)
+      cd_inserts_elements_map = Store.get_diff_data(@client.docname(:cd),@client.docname(:search),@p_size)
+      
+      Store.update_elements(@client.docname(:cd), cd_inserts_elements_map, {})
+      @client.update_count(:cd_size,cd_inserts_elements_map.size)
+      # remove previous search page and build new one
+      @client.flash_data(:search_page)
+      Store.update_elements(@client.docname(:search_page),cd_inserts_elements_map,{})
+      client_res = @client.get_data(:search_page)
       
       @source.lock(:md) do |s|
-        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)
+        md_inserts_elements_map = Store.get_diff_data(s.docname(:md),@client.docname(:cd))
+        Store.update_elements(s.docname(:md), md_inserts_elements_map, {})
+        s.update_count(:md_size,md_inserts_elements_map.size)
       end
       
       [client_res,client_res.size]
     end
     
-    # Computes deleted objects (down to individual attributes) 
-    # in the client document, trims it to page size, stores page, and returns page as hash      
-    def compute_deleted_page
-      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),@p_size) }
-      diff.each do |key,value|
-        res[key] = value
-        Store.put_object(delete_page_doc,key,value)
-        page_size -= 1
-        break if page_size <= 0          
-      end
-      res
-    end
-    
     # Computes errors for client and stores a copy as errors page
     def compute_errors_page
       ['create','update','delete'].each do |operation|

data/lib/rhoconnect/document.rb

@@ -9,6 +9,10 @@ module Document
     Store.get_object(docname(doctype), key)
   end
   
+  def get_objects(doctype, keys)
+    Store.get_objects(docname(doctype), keys)
+  end
+  
   def get_list(doctype)
     Store.get_list(docname(doctype))
   end

data/lib/rhoconnect/graph_helper.rb

@@ -5,11 +5,7 @@ module GraphHelper
       #name,data,options
       @displayname = params['display_name']
       names = []
-      # begin
-      #     names = get_sources('all')
-      #   rescue Exception => e
-      #     puts "errror #{e.message}"
-      #   end
+    
       names = [params['display_name']]
       @sources = []
       
@@ -61,14 +57,13 @@ module GraphHelper
           s['data'] = data
           options[:series] = series
           options[:cursor] = {:zoom => true, :showTooltip => true} 
-
+          options[:seriesDefaults] = {:pointLabels => { :show=>true }}
           s['options'] = options
         end
         
         @sources << s
       end
-      @graph_t = 'source'
-      @data = [[[1,2],[3,4],[5,6]]].to_json
+    
       erb :jqplot, :layout => false
    end
 
@@ -78,19 +73,14 @@ module GraphHelper
    
        #name,data,options
        @displayname = params['display_name']
-       #names = ["GET","POST"]
-       # begin
-       #          names = get_sources('all')
-       #        rescue Exception => e
-       #          puts "errror #{e.message}"
-       #        end
+     
        @sources = []
        name = key = params['display_name']
        
        s = {}
        data = []
        series = []
-       options = { :legend => { :show => true, :location => 'ne' }, :title => name }
+       options = { :legend => { :show => false }, :title => name }
        s['name'] = name
  
        xmin = 9999999999999999
@@ -98,43 +88,46 @@ module GraphHelper
        ymin = 9999999999999999
        ymax = -1
        
-       method = key.gsub(/http:.*?:/,"")
-       #method.gsub!(/:.*/,"")
-       series << {:showLabel => true, :label => method}
-       range = get_user_count(nil,key,0,-1)
-       thisdata = []
-       range.each do |value|
-         count = value.split(',')[0]
-         value.gsub!(/.*,/,"")
-         thisdata << value.split(":").reverse
-         thisdata[-1][0] = thisdata[-1][0].to_i * 1000
-         thisdata[-1][1] = thisdata[-1][1].to_f
-         thisdata[-1][1] /= count.to_f
-
-         ymin = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f < ymin
-         ymax = thisdata[-1][1].to_f if thisdata[-1][1] && thisdata[-1][1].to_f > ymax
+       keys = Rhoconnect::Stats::Record.keys(key)
+       
+       keys.each_with_index do |k,index|
+         method = key.gsub(/http:.*?:/,"")
+         #method.gsub!(/:.*/,"") unless name == "*"
+         series << {:showLabel => true, :label => method, :showLine => false }
 
+         range = get_user_count(nil,k,0,-1)
+         thisdata = []
+         range.each do |value|
+           count = value.split(',')[0]
+           value.gsub!(/.*,/,"")
+           thisdata << value.split(":").reverse
+           thisdata[-1][0] = thisdata[-1][0].to_i * 1000
+           thisdata[-1][1] = thisdata[-1][1].to_f
+           thisdata[-1][1] /= count.to_f
+         end
+         data << thisdata
+         xmin = thisdata[0][0].to_i if thisdata[0] && thisdata[0][0].to_i < xmin
+         xmax = thisdata[-1][0].to_i if thisdata[-1]  && thisdata[-1][0].to_i > xmax
        end
-       data << thisdata
-       xmin = thisdata[0][0].to_i if thisdata[0] && thisdata[0][0].to_i < xmin
-       xmax = thisdata[-1][0].to_i if thisdata[-1]  && thisdata[-1][0].to_i > xmax
-
- 
+       
+       data_normalized,ymin,ymax,days = average_data(data,ymin,ymax)
+       #puts "dn is ****************** #{data_normalized}"
+       format_str = days ? "%m/%d%y" : "%H"
+       label_time = days ? "Days" : "#{data_normalized.first.first[0].year}-#{data_normalized.first.first[0].month}-#{data_normalized.first.first[0].day} (Hours)"
+       
        options[:axes] = {
          :yaxis => { :tickOptions => { :formatString =>'%.3f'}, :autoscale => true, :min => 0, :max => ymax + (ymax * 0.05), :label  => 'Seconds', :labelRenderer => '$.jqplot.CanvasAxisLabelRenderer'  }, 
-         :xaxis => { :autoscale => true, :renderer=>'$.jqplot.DateAxisRenderer',
-           :tickOptions => {:formatString => '%m/%d/%y'}}
+         :xaxis => { :autoscale => true, :label  => label_time, :renderer=>'$.jqplot.DateAxisRenderer',
+           :tickOptions => {:formatString => format_str}}
        }
- 
-       s['data'] = data
+       s['data'] = data_normalized
        options[:series] = series
-       options[:cursor] = {:zoom => true, :showTooltip => true}  
+       options[:cursor] = {:zoom => true, :showTooltip => true, :show => true}
+       options[:seriesDefaults] = {:pointLabels => { :show=>true },:rendererOptions => {:smooth => true}} 
        s['options'] = options
  
        @sources << s
        
-       @graph_t = 'http'
-       @data = [[[1,2],[3,4],[5,6]]].to_json
        erb :jqplot, :layout => false
    end
     
@@ -194,7 +187,8 @@ module GraphHelper
 
       s['data'] = data
       options[:series] = series
-      options[:cursor] = {:zoom => true, :showTooltip => true}  
+      options[:cursor] = {:zoom => true, :showTooltip => true}
+      options[:seriesDefaults] = {:rendererOptions => {:smooth => true}} 
       s['options'] = options
 
       @sources << s
@@ -207,19 +201,11 @@ module GraphHelper
   
   def get_http_routes()
     keys = get_user_count("http:*:*")
-    method = key.gsub(/http:.*?:/,"")
-    #sources = get_sources('all')
-    
-    #loop through arrays and remove any regex matches
-    # keysf = keys.inject([]) do |keys_final, element|
-    #      found = true
-    #      sources.each do |s|
-    #        found = false if element.match(s)
-    #      end
-    #      keys_final << element.strip if found
-    #      keys_final
-    #    end
-    
+    keys.each do |k|
+      client_id = k.split("/")[4]
+      k.gsub!(client_id,"*") if client_id
+    end
+    keys.uniq
   end
   
   def count_graph(uri,title,name,metric)
@@ -253,6 +239,7 @@ module GraphHelper
   	   }
 
   	options[:cursor] = {:zoom => true, :showTooltip => true} 
+  	options[:seriesDefaults] = {:pointLabels => { :show=>true },:rendererOptions => {:smooth => true}} 
   	s['name'] = name
   	s['data'] = [thisdata]
   	s['options'] = options
@@ -303,7 +290,38 @@ module GraphHelper
       end  
       res
     end
+  end
+  
+  def average_data(data,ymin,ymax)
+    data_buckets = {}
+    data_count   = {}
+    data_result  = []
+    days         = false
+    
+    data.each do |d_arr|
+      bucket     = Time.at(d_arr.first[0]/1000)
+      bucket_key = "#{bucket.year}-#{bucket.month}-#{bucket.day} #{bucket.hour}:0:0"
+      if data_buckets.include? bucket_key
+        data_buckets[bucket_key] += d_arr.first[1]
+        data_count[bucket_key] += 1
+      else
+        data_buckets[bucket_key] = d_arr.first[1]
+        data_count[bucket_key] = 1
+      end
+      ymin = d_arr.first[1].to_f if d_arr.first[1].to_f < ymin.to_f
+      ymax = d_arr.first[1].to_f if d_arr.first[1].to_f > ymax.to_f
+    end
+    data_buckets.each do |index,value|
+      average_val = value/data_count[index]
+      data_result << [[Time.at(Time.parse(index).to_i),average_val.round(3)]]
+    end
     
+    unless data_buckets.size < 2
+      start_day = Time.parse(data_buckets.first.first)
+      end_day   = Time.parse(data_buckets.last.first)
+      days = true if start_day.month != end_day.month and start_day.day != end_day.day
+    end
+    return data_result,ymin,ymax,days
   end
 
 end

data/lib/rhoconnect/middleware/helpers.rb

@@ -10,6 +10,10 @@ module Rhoconnect
   API_TOKEN_HEADER = 'HTTP_X_RHOCONNECT_API_TOKEN'.freeze
   # X-RhoConnect-CLIENT-ID
   CLIENT_ID_HEADER = 'HTTP_X_RHOCONNECT_CLIENT_ID'.freeze
+  # X-RhoConnect-PAGE-TOKEN
+  PAGE_TOKEN_HEADER = 'X-Rhoconnect-PAGE-TOKEN'
+  # X-RhoConnect-PAGE-OBJECT-COUNT
+  PAGE_OBJECT_COUNT_HEADER = 'X-Rhoconnect-PAGE-OBJECT-COUNT'
     
     # old-way admin routes
   OLD_API_URI_REGEXP = /\/api\//