rhoconnect 4.0.0.beta.12 → 4.0.0.beta.24

data/js-adapters/rhoconnect_helpers.js

@@ -1,4 +1,4 @@
-
+var exceptions = require('./exceptions');
 
 var stashResult = function(resp){
 	var json = {};
@@ -58,4 +58,10 @@ var Store = function(){
 exports.stashResult = stashResult;
 exports.getData = getData;
 exports.source = source;
-module.exports.Store = new Store();
+module.exports.Store = new Store();
+module.exports.Exception                    = exceptions.Exception;
+module.exports.LoginException               = exceptions.LoginException;
+module.exports.LogoffException              = exceptions.LogoffException;
+module.exports.ServerTimeoutException       = exceptions.ServerTimeoutException;
+module.exports.ServerErrorException         = exceptions.ServerErrorException;
+module.exports.ObjectConflictErrorException = exceptions.ObjectConflictErrorException;

data/js-adapters/router.js

@@ -1,7 +1,7 @@
 var Response = require('./response');
 var Request = require('./request');
 
-var router = function(json){
+var router = function(json,send){
   switch(json['route']){
     case 'request':
       try {
@@ -23,34 +23,36 @@ var router = function(json){
           else{
             model_dir = process.cwd() + "/models/js/";
           }
-          //console.error("path is: ******* " + model_dir + json['klss'] + '.js');
           var mod = require(model_dir + json['klss'] + '.js');
           mod[json['function']](resp1);
         }
         else{
-          //console.error("reg routes are: " + registeredRoutes[json['url']]);
           registeredRoutes[json['url']](request,resp1);
         }
         break;
       }
       catch(e){
-        console.error("Node.js error caught: "+ e);
-        console.error("Backtrace: " + e.stack);
-        resp1.exception = {"error": e};
+        console.error(e.stack || e.toString());
+        resp1.exception = {"error": {"error_type": e.name, "message": e.message, "stacktrace": e.stack} };
         resp1.send(null);
       }
       break;
     case 'response':
-      //console.error("result callback is: " + json['callback'])
-      var cback = json['callback'];
-      json['callback'] = undefined;
-      var resp2 = new Response();
-      resp2.header = {'request_id':json['request_id'],'route':'response'};
-      resp2.result = json['result'];
+      try {
+        var cback = json['callback'];
+        json['callback'] = undefined;
+        var resp2 = new Response();
+        resp2.header = {'request_id':json['request_id'],'route':'response'};
+        resp2.result = json['result'];
 
 
-      rhoconnectCallbacks[cback](resp2);
-      delete rhoconnectCallbacks[cback];
+        rhoconnectCallbacks[cback](resp2);
+        delete rhoconnectCallbacks[cback];
+      } catch(e) {
+        console.error(e.stack || e.toString());
+        resp2.exception = {"error": {"error_type": e.name, "message": e.message, "stacktrace": e.stack} };
+        resp2.send(null);
+      }
       break;
     case 'deregister':
       var br = require('ballroom');

data/lib/rhoconnect.rb

@@ -56,7 +56,7 @@ module Rhoconnect
       :log_disabled, :license, :bulk_sync_poll_interval, :stats, :appserver, :api_token,
       :raise_on_expired_lock, :lock_duration, :cookie_expire, :predefined_sources,
       :connection_pool_size, :connection_pool_timeout, :redis_timeout, :store_key_ttl,
-      :disable_resque_console, :disable_rc_console, :use_node
+      :disable_resque_console, :disable_rc_console, :use_node, :restart_node_on_error
   end
 
   # this mixin adds the controller into the Application's URL Map
@@ -83,7 +83,6 @@ module Rhoconnect
       end
     end
     app_url_map['/'] = Rhoconnect::DefaultServer.new
-    #puts " and we have URL Map #{app_url_map.inspect}"
     app_url_map
   end
 
@@ -121,6 +120,7 @@ module Rhoconnect
     Rhoconnect.disable_rc_console ||= false
     Rhoconnect.disable_resque_console ||= false
     Rhoconnect.use_node = Rhoconnect.use_node.nil? ? true : Rhoconnect.use_node
+    Rhoconnect.restart_node_on_error ||= true if Rhoconnect.use_node
     if File.directory?(File.join(Rhoconnect.app_directory,'sources'))
       check_and_add(File.join(Rhoconnect.app_directory,'sources'))
       # post deprecation warning !!!
@@ -189,8 +189,8 @@ _MIGRATE_TO_NEW_RHOCONNECT
     Source.update_associations(app.sources)
   end
 
-  def start_nodejs_channels
-    Node.shell_node
+  def start_nodejs_channels(opts = {})
+    Node.shell_node(opts)
     NodeChannel.bootstrap if Node.started
   end
 
@@ -383,7 +383,7 @@ _MIGRATE_TO_NEW_RHOCONNECT
   end
 
   def log(*args)
-    now = Time.now.strftime('%I:%M:%S %p %Y-%m-%d')
+    now = Time.now.strftime('%I:%M:%S.%L %p %Y-%m-%d')
     puts "[#{Process.pid}][#{now}] #{args.join}" unless Rhoconnect.log_disabled
   end
 

data/lib/rhoconnect/client.rb

@@ -97,8 +97,8 @@ module Rhoconnect
     end
 
     def flush_source_documents(source_name)
-      self.class.valid_doctypes.each do |doctype|
-        flush_source_data(doctype, source_name)
+      self.class.valid_doctypes.each do |docname, doctype|
+        flush_source_data(docname, source_name)
       end
     end
 

data/lib/rhoconnect/condition/add_parameter.rb

@@ -0,0 +1,21 @@
+module Rhoconnect
+  module Condition
+    module AddParameter
+      def self.extended(base)
+        base.include_add_parameter_condition
+      end
+
+      def include_add_parameter_condition
+        set(:add_parameter) do |*args|
+          condition do
+          	if args
+          		args.each do |argument|
+              	params[argument[0]] = argument[1]
+            	end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rhoconnect/controller/clients_controller.rb

@@ -66,7 +66,7 @@ module Rhoconnect
         Rhoconnect::Stats::Record.update('clientdocs') do
           c = Client.load(params[:client_id],{:source_name => params[:source_id]})
           res = {}
-          Client.valid_doctypes.each do |doc|
+          Client.valid_doctypes.each do |doc, doctype|
             db_key = c.docname(doc)
             res.merge!(doc => db_key)
           end

data/lib/rhoconnect/controller/js_base.rb

@@ -7,7 +7,6 @@ module Rhoconnect
     end
 
     class JsBase < Rhoconnect::Controller::Base
-
       # Add helpers for deprecated routes
       Rhoconnect::DefaultServer.helpers Rhoconnect::Controller::JsBaseHelpers
 
@@ -40,7 +39,7 @@ module Rhoconnect
       def self.process_defaults(klass,defaults)
         defaults.each do |default|
           default.each do |key,val|
-            klass.send(:set_default,key,val)
+            klass.send(:set_default,key.to_sym,val)
           end
         end
       end

data/lib/rhoconnect/controller/system_controller.rb

@@ -1,5 +1,5 @@
 module Rhoconnect
-  module Controller 
+  module Controller
     class SystemController < Rhoconnect::Controller::APIBase
       set_default :admin_required, true
       set_default :login_required, false
@@ -7,30 +7,53 @@ module Rhoconnect
       set_default :client_required, false
 
       register Rhoconnect::EndPoint
-     
+
       get "/appserver", \
                 :deprecated_route => {:verb => :post, :url => ['/api/get_adapter', '/api/source/get_adapter']} do
         {:adapter_url => Rhoconnect.appserver}.to_json
       end
-     
+
       post "/appserver", \
                 :deprecated_route => {:verb => :post, :url => ['/api/save_adapter', '/api/source/save_adapter']} do
         Rhoconnect.appserver = params['adapter_url'] || params[:attributes]['adapter_url']
       end
-     
+
       get "/license", \
                  :deprecated_route => {:verb => :post, :url => ['/api/get_license_info', '/api/admin/get_license_info']} do
-        {:rhoconnect_version => Rhoconnect.license.rhoconnect_version, 
-         :licensee => Rhoconnect.license.licensee, 
-         :seats => Rhoconnect.license.seats, 
+        {: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 "/login", :rc_handler => :admin_authenticate, :admin_required => false, :deprecated_route => {:verb => :post, :url => ['/login', '/api/admin/login']} do
         user = User.authenticate(params[:login], params[:password])
       end
 
+      # Path used on the RhoConnect instance to handle application credentials
+      get "/rps_login", :admin_required => false do
+        auth = Rack::Auth::Basic::Request.new(request.env)
+        if auth.provided? and auth.basic? and auth.credentials
+          login, password = auth.credentials
+          settings = get_config(Rhoconnect.base_directory)[Rhoconnect.environment]
+          if settings and settings[:push_server]
+            url = URI.parse(settings[:push_server])
+            app_login = url.user
+            app_pwd = url.password.nil? ? '' : url.password
+            if login == app_login && password == app_pwd
+              status(204)
+            else
+              raise ApiException.new(401, "Invalid RhoConnect Push server credentials")
+            end
+          else
+            raise ApiException.new(500, "Invalid RhoConnect Push settings")
+          end
+        else
+          raise ApiException.new(401, "Invalid Basic Authorization header")
+        end
+      end
+
       post "/reset", :deprecated_route => {:verb => :post, :url => ['/api/reset', '/api/admin/reset']} do
         keep_token = current_user.token.value
         Store.flush_all
@@ -39,7 +62,7 @@ module Rhoconnect
         current_user.token = keep_token
         "DB reset"
       end
-     
+
       get "/stats", \
                       :deprecated_route => {:verb => :post, :url => ['/api/stats', '/api/admin/stats']} do
         if Rhoconnect.stats == true
@@ -51,7 +74,7 @@ module Rhoconnect
             rtype = Rhoconnect::Stats::Record.rtype(metric)
             if rtype == 'zset'
               # returns [] if no results
-              Rhoconnect::Stats::Record.range(metric,params[:start],params[:finish]).to_json 
+              Rhoconnect::Stats::Record.range(metric,params[:start],params[:finish]).to_json
             elsif rtype == 'string'
               Rhoconnect::Stats::Record.get_value(metric) || ''
             else

data/lib/rhoconnect/db_adapter.rb

@@ -32,7 +32,7 @@ class DBAdapter
           self['AutoCommit'] = true        
         end          
       end        
-    else # Ruby 1.8/1.9
+    else # Ruby 1.9
       require 'sqlite3'
       db = SQLite3::Database.new(dbfile)
     end

data/lib/rhoconnect/document.rb

@@ -7,15 +7,23 @@ module Document
 
   module ClassMethods
     def define_valid_doctypes(doctypes = [])
-      @valid_doctypes ||= Set.new
+      @valid_doctypes ||= {}
       doctypes.each do |doctype|
-        @valid_doctypes.add(doctype.to_sym)
+        @valid_doctypes[doctype.to_sym] = :document
+      end
+      @enforce_valid_doctypes ||= true
+    end
+
+    def define_valid_queues(queues = [])
+      @valid_doctypes ||= {}
+      queues.each do |doctype|
+        @valid_doctypes[doctype.to_sym] = :queue
       end
       @enforce_valid_doctypes ||= true
     end
 
     def valid_doctypes
-      @valid_doctypes ||= Set.new
+      @valid_doctypes ||= {}
       @valid_doctypes
     end
 

data/lib/rhoconnect/handler/changes.rb

@@ -1,30 +1,31 @@
-require 'rhoconnect/handler/helpers.rb'
-require 'rhoconnect/handler/changes/execute_methods.rb'
-require 'rhoconnect/handler/changes/runner.rb'
-require 'rhoconnect/handler/changes/pass_through_runner.rb'
-require 'rhoconnect/handler/changes/engine.rb'
+require 'rhoconnect/handler/helpers'
+require 'rhoconnect/handler/changes/execute_methods'
+require 'rhoconnect/handler/changes/runner'
+require 'rhoconnect/handler/changes/pass_through_runner'
+require 'rhoconnect/handler/changes/engine'
+require 'rhoconnect/handler/changes/hooks'
 
 module Rhoconnect
   module Handler
   	module Changes
   	  def self.registered(app)
   	  	# CUD
-	    app.post "/", :rc_handler => :cud, :login_required => true, :admin_required => false,
-                      :source_required => true, :client_required => true, 
-	                  :deprecated_route => {:verb => :post, :url => ['/api/application', '/application', '/api/application/queue_updates']} do
-	      operation = params[:operation]
-	      @model.send operation.to_sym, params["#{operation}_object".to_sym]
-	    end
+		    app.post "/", :rc_handler => :cud, :login_required => true, :admin_required => false,
+	                      :source_required => true, :client_required => true, 
+		                  :deprecated_route => {:verb => :post, :url => ['/api/application', '/application', '/api/application/queue_updates']} do
+		      operation = params[:operation]
+		      @model.send operation.to_sym, params["#{operation}_object".to_sym]
+		    end
 
-	    app.put "/:id", :rc_handler => :update, :login_required => true, :admin_required => false,
-                        :source_required => true, :client_required => true do
-	      @model.update(params[:update_object])
-	    end
+		    app.put "/:id", :rc_handler => :update, :login_required => true, :admin_required => false,
+	                        :source_required => true, :client_required => true do
+		      @model.update(params[:update_object])
+		    end
 
-	    app.delete "/:id", :rc_handler => :delete, :login_required => true, :admin_required => false,
-                           :source_required => true, :client_required => true do
-	      @model.delete(params[:delete_object])
-	    end
+		    app.delete "/:id", :rc_handler => :delete, :login_required => true, :admin_required => false,
+	                           :source_required => true, :client_required => true do
+		      @model.delete(params[:delete_object])
+		    end
   	  end
   	end
   end

data/lib/rhoconnect/handler/changes/engine.rb

@@ -135,23 +135,42 @@ module Rhoconnect
         def _process_cud(operation)
           # take everything from the queue and erase it
           # so that no other process will be able to process it again
-          operation_hashes = []
+          operation_data = []
           client_ids = []
-          operation_hashes,client_ids = @source.process_queue(operation)
-          invalid_meta = @model.validate(operation,operation_hashes,client_ids)
+          queue_key = params[:queue_key]
+          queue_name = (queue_key ? "#{operation}:#{queue_key}" : "#{operation}")
+
+          operation_data,client_ids = @source.process_queue(queue_name)
+          invalid_meta = @model.run_validators(operation,operation_data,client_ids)
+
+          # load all clients involved in the current queue
+          processed_clients = {}
+          client_ids.each do |client_id|
+            processed_clients[client_id] = Client.load(client_id,{:source_name => @source.name}) unless processed_clients[client_id]
+          end
           
           errors,links,deletes,creates,dels = {},{},{},{},{}
-          operation_hashes.each_with_index do |client_operation_data,index|
+          operation_data.each_with_index do |client_operation_data,index|
             client_id = client_ids[index]
+            client = processed_clients[client_id]
             
+            # for now - each client operation data can have only one entry (single source CUD)
+            # TODO: should be fixed for multi-source CUD
+            source_id = client_operation_data[0][0]
+            source_operation_data = client_operation_data[0][1]
             current_invalid_meta = invalid_meta[index] || {}
-            client_operation_data.each do |key, value|
+            current_invalid_source_meta = current_invalid_meta[source_id] || {}
+            record_index = 0
+            source_operation_data.each do |source_entry|
               begin
+                key = source_entry[0]
+                value = source_entry[1]
                 continue_loop = true
                 modified_recs = [{:client_id => client_id, :key => key, :value => value }]
-                record_invalid_meta = current_invalid_meta[key] || {}
-                # Remove object from queue
-                client_operation_data.delete(key)
+                record_invalid_meta = current_invalid_source_meta[record_index] || {}
+                # remove processed entries
+                source_operation_data = source_operation_data.drop(1)
+                record_index += 1
                 
                 # skip the rec - if it is a duplicate of some other record
                 next if record_invalid_meta[:duplicate_of]
@@ -166,6 +185,9 @@ module Rhoconnect
                 raise Rhoconnect::Model::ObjectConflictErrorException.new(record_invalid_meta[:error]) if record_invalid_meta[:error]
                 
                 # Call on source adapter to process individual object
+                # NOTE: call should be made from the correct model instance
+                model.source = Source.load(@source.name,
+                    {:user_id => client.user_id,:app_id => APP_NAME})
                 case operation
                 when 'create'
                   _process_create(modified_recs,key,value)
@@ -200,16 +222,11 @@ module Rhoconnect
             end
           
             # Record rest of queue (if something in the middle failed)
-            if not client_operation_data.empty?
-              @source.push_queue(operation,client_id,client_operation_data,true)
+            if not source_operation_data.empty?
+              @source.push_queue(queue_name,client_id,[[source_id, source_operation_data]],true)
             end
           end
           
-          # now, process all the modified docs
-          processed_clients = {}
-          client_ids.each do |client_id|
-            processed_clients[client_id] = Client.load(client_id,{:source_name => @source.name}) unless processed_clients[client_id]
-          end
           { "delete_page" => deletes,
             "#{operation}_links" => links,
             "#{operation}_errors" => errors }.each do |doctype,client_docs|
@@ -226,12 +243,15 @@ module Rhoconnect
               client = processed_clients[client_id]
               client.put_data(:cd,client_doc,true)
               client.update_count(:cd_size,client_doc.size)
-              total_creates.merge!(client_doc)
+              total_creates[client.user_id] ||= {}
+              total_creates[client.user_id].merge!(client_doc)
             end
-            unless total_creates.empty?
-              @source.lock(:md) do |s| 
-                s.put_data(:md,total_creates,true)
-                s.update_count(:md_size,total_creates.size)
+            total_creates.each do |user_id, creates_doc|
+              creates_source = Source.load(@source.name,
+                    {:user_id => user_id,:app_id => APP_NAME})
+              creates_source.lock(:md) do |s| 
+                s.put_data(:md,creates_doc,true)
+                s.update_count(:md_size,creates_doc.size)
               end
             end
           end
@@ -245,12 +265,15 @@ module Rhoconnect
               client = processed_clients[client_id]         
               client.delete_data(:cd,client_doc)
               client.update_count(:cd_size,-client_doc.size)
-              total_dels.merge!(client_doc)
+              total_dels[client.user_id] ||= {}
+              total_dels[client.user_id].merge!(client_doc)
             end
-            unless total_dels.empty?
-              @source.lock(:md) do |s| 
-                s.delete_data(:md,total_dels)
-                s.update_count(:md_size,-total_dels.size)
+            total_dels.each do |user_id, dels_doc|
+              dels_source = Source.load(@source.name,
+                    {:user_id => user_id,:app_id => APP_NAME})
+              dels_source.lock(:md) do |s| 
+                s.delete_data(:md,dels_doc)
+                s.update_count(:md_size,-dels_doc.size)
               end
             end
           end