rhoconnect 4.0.0.beta.10 → 4.0.0.beta.12

data/install.sh

@@ -46,7 +46,7 @@ checkDeps ()
 }
 
 # determinePkgMgr
-# Determines if the system is currently using rpm or 
+# Determines if the system is currently using rpm or
 # debian based pckage management
 determinePkgMgr ()
 {
@@ -195,7 +195,7 @@ installRuby ()
     echo "tar -xzf ${prefix}/${rubyTar} -C ${prefix}" >> $log
     tar -xzf ${prefix}/${rubyTar} -C ${prefix} > /dev/null 2>&1
   fi
-  
+
   echo "Installing ruby. This may take some time..." | tee -a $log
   echo "pushd ${prefix}/${rubyDir}" | tee -a $log
   pushd ${prefix}/${rubyDir}
@@ -204,14 +204,14 @@ installRuby ()
   echo "make && make install" | tee -a $log
   make >> $log 2>&1
   make install >> $log 2>&1
-  
+
   if (( $? )) ; then
     echo "Some dependencies not installed..." | tee -a $log
     echo "Please install them and then re-run the installation script." | tee -a $log
     echo "For troubleshooting see file $log ..." | tee -a $log
     exit 1
   fi
-  
+
   popd
   echo -e "$rubyDir is successfully installed.\n" | tee -a $log
 }
@@ -257,10 +257,15 @@ webServer=""
 rubyVersion=""
 rubyBinDir=""
 
-# Define ruby vession to be installed ...
+# Define ruby and nodejs versions to be installed ...
 RUBY_PATCH="p392"
 RUBY_VERSION="ruby-1.9.3-${RUBY_PATCH}"
 
+NODE_VERSION=v0.10.4
+NODE_URL=http://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz
+ARCH=$([[ `uname -m` == x86_64 ]] && echo "x64" || echo "x86")
+NODE_BIN_URL=http://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-${ARCH}.tar.gz
+
 # parse command-line options
 parseOpts "$*"
 
@@ -293,10 +298,75 @@ fi
 # Install redis, sqllite3, nginx, rhoconnect
 opts=" -d $dist -l $log"
 ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/rhoinstaller.rb ${opts}
-if (( $? )) ; then 
+if (( $? )) ; then
   echo "Installation failed. For troubleshooting see file $log ..." | tee -a $log
   exit 1
 fi
 
+
+##################################################################################
+# Install nodejs
+echo
+echo "Downloading ${NODE_URL} file ..." | tee -a $log
+wget ${NODE_URL} -O node-${NODE_VERSION}.tar.gz -o /dev/null
+tar -xzf node-${NODE_VERSION}.tar.gz > /dev/null 2>&1
+
+echo "Building nodejs $NODE_VERSION ..."  | tee -a $log
+cd node-${NODE_VERSION}/
+# Cent OS/RHEL 5 requires python 2.6
+export PYTHON=`which python26 2> /dev/null`
+$PYTHON ./configure --prefix=$prefix  >> $log 2>&1
+make >> $log 2>&1
+make install >> $log 2>&1
+if [[ $? != 0 ]]; then
+  echo "Installation of nodejs $NODE_VERSION  is failed. For troubleshooting see file $log ..." | tee -a $log
+  exit
+fi
+cd ../
+rm node-${NODE_VERSION}.tar.gz
+rm -rf node-${NODE_VERSION}/
+
+echo "nodejs $NODE_VERSION is successfully installed"  | tee -a $log
+echo
+
+# TODO:
+# if [ -e /etc/redhat-release ] ; then
+#   grep '5\.[0-9]\{1,2\}' /etc/redhat-release > /dev/null
+#   CentOS5=$?
+# else
+#   CentOS5=1
+# fi
+# if [ $CentOS5 -eq 0 ] ; then
+#   echo "CentOS 5.x is found ..."
+#   echo "Downloading ${NODE_URL} source file ..." | tee -a $log
+#   wget ${NODE_URL} -O node-${NODE_VERSION}.tar.gz -o /dev/null
+#   tar -xzf node-${NODE_VERSION}.tar.gz > /dev/null 2>&1
+#   echo "Building nodejs $NODE_VERSION ..."  | tee -a $log
+#   cd node-${NODE_VERSION}/
+#   # Cent OS/RHEL 5 requires python 2.6
+#   export PYTHON=`which python26 2> /dev/null`
+#   $PYTHON ./configure --prefix=$prefix  >> $log 2>&1
+#   make >> $log 2>&1
+#   make install >> $log 2>&1
+#   if [[ $? != 0 ]]; then
+#     echo "Installation of nodejs $NODE_VERSION  is failed. For troubleshooting see file $log ..." | tee -a $log
+#     exit
+#   fi
+#   cd ../
+#   rm node-${NODE_VERSION}.tar.gz
+#   rm -rf node-${NODE_VERSION}/
+# else
+#   echo "Downloading ${NODE_BIN_URL} linux binary file ..." | tee -a $log
+#   wget ${NODE_BIN_URL} -O node-${NODE_VERSION}-linux-${ARCH}.tar.gz -o /dev/null
+#   path=`pwd`
+#   pushd ${prefix}
+#   tar xzf ${path}/node-${NODE_VERSION}-linux-${ARCH}.tar.gz --strip=1 > /dev/null 2>&1
+#   popd
+# fi
+# echo "nodejs $NODE_VERSION is successfully installed"  | tee -a $log
+#
+
+##################################################################################
+
 # Create configuration scripts for redis, nginx, thin.
 ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/create_texts.rb ${opts}

data/installer/utils/constants.rb

@@ -12,19 +12,19 @@ module Constants
   SSH_KEY         = "#{HOME_DIR}/.ssh/#{PEM_FILE}"
   ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2"
   UBUNTU_STACK    = { :image_id  => 'ami-02d7f547', # jenkins-ubuntu-12.04-test-image
-                      :tags => {'Name' => 'Ubuntu-12.04'}, 
+                      :tags => {'Name' => 'Ubuntu-12.04'},
                       :flavor_id => 'c1.xlarge',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'ubuntu'}
-  CENTOS5_STACK   = { :image_id  => 'ami-6aaf8d2f', # jenkins-centos-5.9-test-image
-                      :tags => {'Name' => 'CentOS-5.9'}, 
+  CENTOS5_STACK   = { :image_id  => 'ami-bed9f5fb', # jenkins-centos-5.9-test-image
+                      :tags => {'Name' => 'CentOS-5.9'},
                       :flavor_id => 'c1.xlarge',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'root'}
   CENTOS6_STACK   = { :image_id  => 'ami-02ae8c47', # jenkins-centos-6.3-test-image
-                      :tags => {'Name' => 'CentOS-6.3'}, 
+                      :tags => {'Name' => 'CentOS-6.3'},
                       :flavor_id => 'c1.xlarge',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',

data/js-adapters/ballroom.js

@@ -6,7 +6,8 @@ var redis = require('redis'),
     routes = require('./router'),
     client_sub = redis.createClient(),
     client_pub = redis.createClient(),
-    pub_channel = process.argv[2] + "RedisPUB";
+    pub_channel = process.argv[2] + "RedisPUB",
+    rcHelpers = require('./rhoconnect_helpers');
 
 //define global hash functions to store callbacks, routes
 rhoconnectCallbacks = {};
@@ -176,11 +177,6 @@ var defaults = function(hsh){
 
 var format_options = function(opts){
   return JSON.stringify(opts);
-  // var f_opts = "";
-  // for(var propt in opts){
-  //   f_opts += propt + ":" + opts[propt];
-  // }
-  // return f_opts;
 };
 
 function guid() {
@@ -213,4 +209,7 @@ exports.put = put;
 exports.del = del;
 exports.post = post;
 exports.defaults = defaults;
-exports.exitNodejs = exitNodejs;
+exports.exitNodejs = exitNodejs;
+exports.stashResult = rcHelpers.stashResult;
+exports.source = rcHelpers.source;
+module.exports.Store = rcHelpers.Store;

data/js-adapters/node_channel.rb

@@ -96,7 +96,8 @@ module Rhoconnect
         rescue Exception=>e
           RESULT_HASH[key][:status] = 'broken'
           RESULT_HASH[key][:result] = "exception #{e.message}\n#{e.backtrace}"
-          puts "Timeout on wait, setting JavaScript result state to broken: #{e.inspect}"
+          log "Timeout on wait, setting JavaScript result state to broken: #{e.inspect}"
+          log e.backtrace.join("\n")
         end
 
         #request waiting either timed out or returned response
@@ -151,24 +152,29 @@ module Rhoconnect
       end
 
       def process_message(curr_model,data)
-        #puts "proccessing msg #{data}"
-        if curr_model.respond_to?(data['function'])
+        # puts "proccessing msg #{data.inspect}"
+        klass = curr_model
+        klass = Object.const_get(data['kls']) if data['kls']
+        if klass.respond_to?(data['function'].to_sym)
           if data['args'] and data['args'].size > 0
             if(data['function'] == 'stash_result')
-              curr_model.send('result=',data['args'])
-              curr_model.send(data['function'])
+              klass.send('result=',data['args'])
+              klass.send(data['function'])
               process_res = nil
             else
-              res = curr_model.send(data['function'],data['args'])
+              res = klass.send(data['function'],*data['args'])
             end
           else
-            res = curr_model.send(data['function'])
+            res = klass.send(data['function'])
           end
         else
           raise Exception.new("Method #{data['function']} not found in model #{curr_model.class.name.to_s}.")
         end
 
-        process_res = res.is_a?(String) ? res : res.to_hash if res
+        process_res = res
+        unless res.is_a?(String) or res.is_a?(TrueClass) or res.is_a?(FalseClass) or res.nil?
+          process_res = res.to_hash
+        end
 
         {:result=>process_res,:callback=>data['callback'],:request_id=>data['request_id'],:route=>'response'}
       end

data/js-adapters/request.js

@@ -1,20 +1,20 @@
-var Request = function(){	
+var Request = function(){
 	this.__defineGetter__("params",function(){
-		return params; 
+		return params;
 	});
-	
+
 	this.__defineSetter__("params",function(arg){
 		params = arg;
 	});
-	
+
 	this.__defineGetter__("header",function(){
 		return header;
 	});
-	
+
 	this.__defineSetter__("header",function(arg){
 		header = arg;
 	});
-		
+
 	this.__defineGetter__("model",function(){
 		return model;
 	});
@@ -22,6 +22,5 @@ var Request = function(){
 	this.__defineSetter__("model",function(arg){
 		model = arg;
 	});
-	
-}
+};
 module.exports = Request;

data/js-adapters/response.js

@@ -34,20 +34,28 @@ var Response = function(){
 		exception = arg;
 	});
 
+	this.__defineGetter__("currentUser",function(){
+		return currentUser;
+	});
+
+	this.__defineSetter__("currentUser",function(arg){
+		currentUser = arg;
+	});
+
 	this.send = function(data){
 		var ballroom = require("./ballroom");
 		var user_json = {};
 
 		//if callback we are sending request to ruby
-		if(data['callback']){
+		if(data && data['callback']){
 			this.params = null;
 			this.header['route'] = 'request';
 			user_json = data;
 		}
 		else{
 			user_json["result"] = data;
+			this.header['route'] = 'response';
 		}
-
 		Object.extend(user_json,this.params);
 		Object.extend(user_json,this.header);
 		Object.extend(user_json,this.exception);

data/js-adapters/rhoconnect_helpers.js

@@ -1,19 +1,13 @@
 
-var current_user = function(resp,callback){
-	var json = {};
-  json['function'] = 'current_user';
-	json['args'] = '';
-  json['callback'] = callback;
-	resp.send(json);
-}
 
-var stash_result = function(resp,callback){
+var stashResult = function(resp){
 	var json = {};
+	var callback = function(){};
   json['function'] = 'stash_result';
 	json['args'] = resp.params;
   json['callback'] = callback;
 	resp.send(json);
-}
+};
 
 var source = function(resp,callback){
 	var json = {};
@@ -21,40 +15,47 @@ var source = function(resp,callback){
 	json['args'] = '';
   json['callback'] = callback;
 	resp.send(json);
-}
+};
+
+var getData = function(resp,callback){
+	var json = {};
+  json['function'] = 'get_data';
+	json['args'] = '';
+  json['callback'] = callback;
+	resp.send(json);
+};
 
 var Store = function(){
-	var kls = 'Store';
-	
-	this.put_value = function(resp,callback){
-		var json = this.format_json('put_value',resp.params);
+
+	this.putValue = function(resp,callback){
+		var json = this.formatJson('put_value',resp.params,callback);
 		resp.send(json);
-	}
-	this.get_value = function(resp,callback){
-		var json = this.format_json('get_value',resp.params);
+	};
+	this.getValue = function(resp,callback){
+		var json = this.formatJson('get_value',resp.params,callback);
 		resp.send(json);
-	}
-	this.put_data = function(resp,callback){
-		var json = this.format_json('put_data',resp.params);
+	};
+	this.putData = function(resp,callback){
+		var json = this.formatJson('put_data',resp.params,callback);
 		resp.send(json);
-	}
-	this.get_data = function(resp,callback){
-		var json = this.format_json('get_data',resp.params);
+	};
+	this.getData = function(resp,callback){
+		var json = this.formatJson('get_data',resp.params,callback);
 		resp.send(json);
-	}
-	
-	function format_json(method,args){
+	};
+
+	this.formatJson = function(method,args,callback){
 		var json = {};
-		json['kls'] = this.kls;
+		json['kls'] = 'Store';
 		json['function'] = method;
 		json['args'] = args;
+		json['callback'] = callback;
 		json['route'] = 'request';
 		return json;
-	}
-}
-
+	};
+};
 
-exports.current_user = current_user;
-exports.stash_result = stash_result;
+exports.stashResult = stashResult;
+exports.getData = getData;
 exports.source = source;
-module.exports.Store = Store;
+module.exports.Store = new Store();

data/js-adapters/router.js

@@ -6,47 +6,50 @@ var router = function(json){
     case 'request':
       try {
         var request = new Request();
-        var response = new Response();
+        var resp1 = new Response();
 
         request.params = json['args'];
         request.header = {'request_id':json['request_id'],'route':json['route']};
         request.model = json['model'];
-        response.header = {'request_id':json['request_id'],'route':'response'};
+        resp1.currentUser = json['user'];
+        resp1.header = {'request_id':json['request_id'],'route':'response'};
 
         //if calling model function directly load file first
         if(json['klss'] !== undefined){
+          var model_dir = '';
           if(process.argv[3] == 'test' ){
-            var model_dir = process.cwd() + "/spec/apps/rhotestapp/models/js/";
+            model_dir = process.cwd() + "/spec/apps/rhotestapp/models/js/";
           }
           else{
-            var model_dir = process.cwd() + "/models/js/";
+            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']](response);
+          mod[json['function']](resp1);
         }
         else{
           //console.error("reg routes are: " + registeredRoutes[json['url']]);
-          registeredRoutes[json['url']](request,response);
+          registeredRoutes[json['url']](request,resp1);
         }
         break;
       }
       catch(e){
         console.error("Node.js error caught: "+ e);
         console.error("Backtrace: " + e.stack);
-        response.exception = {"error": e};
-        response.send(null);
+        resp1.exception = {"error": e};
+        resp1.send(null);
       }
       break;
     case 'response':
       //console.error("result callback is: " + json['callback'])
       var cback = json['callback'];
       json['callback'] = undefined;
-      var response = new Response();
-      response.header = {'request_id':json['request_id'],'route':'response'};
-      response.result = json['result'];
+      var resp2 = new Response();
+      resp2.header = {'request_id':json['request_id'],'route':'response'};
+      resp2.result = json['result'];
 
-      rhoconnectCallbacks[cback](response);
+
+      rhoconnectCallbacks[cback](resp2);
       delete rhoconnectCallbacks[cback];
       break;
     case 'deregister':

data/lib/rhoconnect/controller/js_base.rb

@@ -62,13 +62,7 @@ module Rhoconnect
       end
 
       def self.hshify(str)
-        result = JSON.parse(str, :symbolize_names => true)
-        # result = str.split(",").inject({}) do |res,element|
-        #   items = element.split(":")
-        #   res[items[0].to_sym] = items[1]
-        #   res
-        # end
-        result
+        JSON.parse(str, :symbolize_names => true)
       end
 
       def self.js_block(key,finish_block=nil)
@@ -79,6 +73,7 @@ module Rhoconnect
              :model => under_score(params[:source_name]),
              :route => 'request'
           }
+          json[:user] = @model.current_user.login if @model
           return_value = NodeChannel.publish_channel_and_wait(json,@model)
           if finish_block
             self.send(finish_block, return_value)

data/lib/rhoconnect/document.rb

@@ -138,7 +138,7 @@ module Document
     # app-partitioned sources go to 0
     # everything else if sharded
     if(source.partition == :user)
-      index_char = Digest::SHA1.hexdigest("#{user_id}:#{source.name}")[0]
+      index_char = Digest::SHA1.hexdigest("#{source.partition_name}:#{source.name}")[0]
       # designate Store 0 only for system data
       num_user_stores = Store.num_stores - 1
       if num_user_stores > 0

data/lib/rhoconnect/model/base.rb

@@ -28,8 +28,12 @@ module Rhoconnect
         source.get_data(docname)
       end
 
-      def self.create(source)
-        model=nil
+      def self.partition_name(user_id)
+        user_id
+      end
+
+      def self.load_source_model(source)
+        model_klass=nil
         if source
           begin
             if source.name
@@ -39,20 +43,32 @@ module Rhoconnect
             # certain models are pre-defined and reserved
             # load them and instantiate
             if Rhoconnect.predefined_sources.has_key?(source.name)
-              model = (Object.const_get(source.name)).new(source)
+              model_klass = Object.const_get(source.name)
             elsif Object.const_defined?(source.name) && Object.const_get(source.name).to_s.split("::").first != 'Rhoconnect'
               # fix until source adpaters are phased out, checking for Rhoconnect namespace
               # so that backend models with same name as Rhoconnect models are instantiated correctly
-              kls = Object.const_get(source.name)
-              unless kls
+              model_klass = Object.const_get(source.name)
+              unless model_klass
                 require under_score(source.name)
-                model = (Object.const_get(source.name)).new(source)
-              else
-                model = kls.new(source)
+                model_klass = Object.const_get(source.name)
               end
             else
-              model=Rhoconnect::Model::DynamicAdapterModel.new(source)
+              model_klass=Rhoconnect::Model::DynamicAdapterModel
             end
+          rescue Exception => e
+            log "Failure to find class for model #{source.name}: #{e.inspect.to_s}"
+            raise e
+          end
+        end
+        model_klass
+      end
+
+      def self.create(source)
+        model=nil
+        model_klass = load_source_model(source)
+        if model_klass
+          begin
+            model = model_klass.new(source)
           rescue ArgumentError => e
             # Backward compatibility with code generated by gems < 2.2.0
             log "ERROR: credential parameter in `initialize` method is deprecated and removed in version >= 2.2.0."
@@ -209,7 +225,6 @@ module Rhoconnect
         @source.announce_changes
       end
 
-      protected
       def current_user
         @source.user
       end

data/lib/rhoconnect/model/js_base.rb

@@ -64,8 +64,8 @@ module Rhoconnect
       end
 
       def store_blob(obj,field_name,blob)
-        raise "store_blob not implemented in JavaScript yet."
-        # TODO: add method handling here
+        blob[:path] = blob[:tempfile].path
+        rho_methods('storeBlob',blob)
       end
 
       private
@@ -84,9 +84,10 @@ module Rhoconnect
            :klss   => self.class.actual_name,
            :function => method_name,
            :args  => args,
+           :user  => current_user.login,
            :route => 'request'
          }
-         NodeChannel.publish_channel_and_wait(json,self.class)
+         NodeChannel.publish_channel_and_wait(json,self)
       end
     end
   end

data/lib/rhoconnect/source.rb

@@ -359,7 +359,21 @@ module Rhoconnect
     end
 
     def user_by_partition
-      self.partition.to_sym == :user ? self.user_id : '__shared__'
+      self.partition.to_sym == :user ? partition_name : '__shared__'
+    end
+
+    def partition_name
+      # edge case - used in deleting documents
+      return self.user_id if self.user_id == '*'
+      # default is user_id
+      pname = self.user_id
+      begin 
+        model_klass = Rhoconnect::Model::Base.load_source_model(self)
+        pname = model_klass ? model_klass.partition_name(self.user_id) : self.user_id
+      # eat the exception here
+      rescue Exception => e
+      end
+      pname
     end
 
     def check_refresh_time

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '4.0.0.beta.10'
+  VERSION = '4.0.0.beta.12'
 end