rhoconnect 4.0.0 → 4.0.1

data/js-adapters/server.js

@@ -1,5 +1,5 @@
 var ballroom = require('./ballroom');
-var channel = process.argv[2] + "RedisSUB";
+var channel = process.argv[2] + "-RedisSUB";
 
 ballroom.listen(channel);
 ballroom.register();

data/lib/rhoconnect.rb

@@ -2,6 +2,7 @@ require 'redis'
 require 'cgi'
 require 'json'
 require 'base64'
+require 'securerandom'
 require 'zip/zip'
 require 'yaml'
 require 'rhoconnect/license'
@@ -55,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, :restart_node_on_error
+      :disable_resque_console, :disable_rc_console, :use_node, :restart_node_on_error, :redis_url
   end
 
   # this mixin adds the controller into the Application's URL Map
@@ -69,10 +70,13 @@ module Rhoconnect
   # Rhoconnect API version
   def add_to_url_map(subclass)
     @controllers_map ||= Set.new
-    #puts " adding to URL map #{subclass.name}"
     @controllers_map << subclass
   end
 
+  def remove_from_url_map(subclass)
+    @controllers_map.delete(subclass) if @controllers_map
+  end
+
   def url_map
     @controllers_map ||= Set.new
     app_url_map = {}
@@ -288,9 +292,9 @@ _MIGRATE_TO_NEW_RHOCONNECT
     [res[0], res[1], res[2]]
   end
 
-  # Get random UUID string
-  def get_random_uuid
-    UUIDTools::UUID.random_create.to_s.gsub(/\-/,'')
+  # Get secure random string
+  def get_random_identifier
+    SecureRandom.hex
   end
 
   # Generates new token (64-bit integer) based on # of

data/lib/rhoconnect/api_token.rb

@@ -1,4 +1,3 @@
-require 'uuidtools'
 module Rhoconnect
   class ApiToken < StoreOrm
     field :value,:string
@@ -6,7 +5,7 @@ module Rhoconnect
     validates_presence_of :user_id
 
     def self.create(fields)
-      fields[:value] = fields[:value] || get_random_uuid
+      fields[:value] = fields[:value] || get_random_identifier
       fields[:id] = fields[:value]
       super(fields)
     end

data/lib/rhoconnect/client.rb

@@ -44,7 +44,7 @@ module Rhoconnect
     
     def self.create(fields,params={})
       Rhoconnect.license.check_and_use_seat
-      fields[:id] ||= get_random_uuid
+      fields[:id] ||= get_random_identifier
       res = super(fields,params)
       user = User.load(fields[:user_id])
       user.clients << res.id

data/lib/rhoconnect/controller/js_base.rb

@@ -11,7 +11,7 @@ module Rhoconnect
       Rhoconnect::DefaultServer.helpers Rhoconnect::Controller::JsBaseHelpers
 
       helpers Rhoconnect::Controller::JsBaseHelpers
-      register Rhoconnect::Handler::PluginCallbacks
+      #register Rhoconnect::Handler::PluginCallbacks
 
       # source name is available inherently from controller
       before do
@@ -32,6 +32,11 @@ module Rhoconnect
           Rhoconnect.add_to_url_map(klass)
           process_defaults(klass,val['defaults'])
           process_routes(klass,val['routes'])
+
+          # add PluginCallback routes (but only for Adapter Controllers)
+          unless controller_name == "ApplicationController"
+            klass.register Rhoconnect::Handler::PluginCallbacks
+          end
         end
       end
 
@@ -74,7 +79,7 @@ module Rhoconnect
              :route => 'request'
           }
           json[:user] = @model.current_user.login if @model
-          return_value = NodeChannel.publish_channel_and_wait(json,@model)
+          return_value = NodeChannel.publish_channel_and_wait(json,@model || self)
           if finish_block
             self.send(finish_block, return_value)
           else

data/lib/rhoconnect/model/base.rb

@@ -123,7 +123,7 @@ module Rhoconnect
       end
 
       def before_query
-        @tmp_docname = :md.to_s + get_random_uuid
+        @tmp_docname = :md.to_s + get_random_identifier
         @stash_size = 0
       end
 

data/lib/rhoconnect/predefined_adapters/controllers/js/rho_internal_js_bench_adapter_controller.js

@@ -0,0 +1,12 @@
+var app = require('ballroom');
+var rc_helpers = require('rhoconnect_helpers');
+//var RhoInternalJsBenchAdapter = require('../../models/js/rho_internal_js_bench_adapter');
+
+app.controllerName('RhoInternalJsBenchAdapter');
+app.registerHandler('sync');
+
+// app.post('/',{}, function(req,resp){
+//   console.log("inside of controller post");
+//   var result = {'id':req.params};
+//   resp.send(result);
+// });

data/lib/rhoconnect/predefined_adapters/models/js/rho_internal_js_bench_adapter.js

@@ -0,0 +1,107 @@
+var rc = require('rhoconnect_helpers');
+var Store = rc.Store;
+
+var RhoInternalJsBenchAdapter = function() {
+
+  this.query = function(resp){
+    rc.source(resp,function(resp){
+      var source = resp.result;
+      var result;
+      var db_name = get_db_name(source);
+      resp.params = db_name;
+      if(source.simulate_time > 0){
+        setTimeout(rc.Store.getData(resp,function(resp){
+          resp.send(resp.result);
+        }), source.simulate_time);
+      }
+      else{
+        rc.Store.getData(resp,function(resp){
+          resp.send(resp.result);
+        });
+      }
+    });
+  };
+
+  this.create = function(resp){
+    var hsh = resp.params.create_object;
+    var mockId2 = hsh["mock_id"];
+    rc.source(resp,function(resp){
+      var source = resp.result;
+      var create_hash = {}
+      create_hash[mockId2] = hsh;
+      var p = [get_db_name(source),create_hash,true];
+      resp.params = p;
+      rc.Store.putData(resp,function(resp){
+        console.log(JSON.stringify(resp));
+        resp.send(mockId2);
+      });
+    });
+  };
+
+  this.update = function(resp){
+    var id = resp.params["id"];
+    var update_hash = resp.params["update_object"];
+    
+    rc.source(resp,function(resp){
+      var source = resp.result;
+      var db = get_db_name(source);
+      resp.params = db;
+      rc.Store.getData(resp,function(resp){
+        var data = resp.result;
+        //console.log("data_raw is"+JSON.stringify(data));
+        if(data == null || JSON.stringify(data) === "{}"){
+          new rc.Exception(resp, 'there is no data to update.');
+        }
+        for(var key in update_hash){
+          data[id][key] = update_hash[key];
+        }
+        //console.log("data is"+JSON.stringify(data));
+        resp.params =  [db,data];
+        rc.Store.putData(resp,function(resp){
+          resp.send(id);
+        });
+      });
+      
+    });
+  };
+
+  this.del = function(resp){
+    var id = resp.params["id"];
+    var delete_hash = resp.params["delete_object"];
+    rc.source(resp,function(resp){
+      var source = resp.result;
+      var del_obj = {}
+      del_obj[id] = delete_hash
+      resp.params = [get_db_name(source),del_obj];
+      rc.Store.deleteData(resp,function(resp){
+        resp.send(id);
+      });
+    });
+  };
+
+  this.login = function(resp){
+    resp.send(true);
+  };
+
+  this.logoff = function(resp){
+    resp.send(true);
+  };
+
+  this.sync = function(resp){
+    console.log("called sync");
+  };
+
+
+  function get_db_name(source){
+    var res;
+    if(source.user_id.substring(0,2) == 'nq')
+      res = "test_db_storage:"+source.app_id + ":nquser";
+    else if(source.user_id.substring(0,2) == 'mq')
+        res = "test_db_storage:"+source.app_id+":mquser";
+    else
+      res = "test_db_storage:"+source.app_id+":benchuser";
+    return res;
+  }
+
+};
+module.exports = new RhoInternalJsBenchAdapter();

data/lib/rhoconnect/source.rb

@@ -124,6 +124,11 @@ module Rhoconnect
       update_fields(fields)
     end
 
+    def to_hash
+      res = super
+      res.merge({:user_id=>self.user_id,:app_id=>self.app_id})
+    end
+
     def self.set_defaults(fields)
       fields[:url] ||= ''
       fields[:login] ||= ''

data/lib/rhoconnect/store.rb

@@ -874,11 +874,13 @@ module Rhoconnect
     def _get_redis(server=nil)
       url = ENV[REDIS_URL] || ENV[REDISTOGO_URL] || nil
       if url
+        Rhoconnect.redis_url = url
         ConnectionPool::Wrapper.new(:size => Rhoconnect.connection_pool_size,
                                     :timeout => Rhoconnect.connection_pool_timeout) do
           Redis.connect(:url => url, :timeout => Rhoconnect.redis_timeout, :thread_safe => true)
         end
       elsif server and server.is_a?(String)
+        Rhoconnect.redis_url = "redis://#{server}"
         host,port,db,password = server.split(':')
         ConnectionPool::Wrapper.new(:size => Rhoconnect.connection_pool_size,
                                     :timeout => Rhoconnect.connection_pool_timeout) do
@@ -888,6 +890,7 @@ module Rhoconnect
       elsif server and (server.is_a?(Redis) or server.is_a?(ConnectionPool::Wrapper))
         server
       else
+        Rhoconnect.redis_url = "redis://localhost:6379"
         ConnectionPool::Wrapper.new(:size => 5, :timeout => 30) do
           Redis.connect(:timeout => 30, :thread_safe => true)
         end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/lib/rhoconnect/web-console/server.rb

@@ -30,8 +30,7 @@ module RhoconnectConsole
       @token = session[:token] if ENV['INSTANCE_ID']
       @heroku = RestClient.get('http://nav.heroku.com/v1/providers/header') if @token
       @version = Rhoconnect::VERSION
-      @domain =  ENV['RHODES_URL'] || request.host_with_port
-      @domain += "/application" if @domain and !ENV['RHODES_URL']
+      @domain =  "#{request.scheme}://#{request.host_with_port}"
       erb :index
     end
 

data/rhoconnect.gemspec

@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
   s.add_dependency('rake', '~> 10.0.0')
   s.add_dependency('json', '~> 1.7.7')
   s.add_dependency('rubyzip', '~> 0.9.4')
-  s.add_dependency('uuidtools', '>= 2.1.1')
   s.add_dependency('connection_pool', '~> 1.0.0')
   s.add_dependency('redis', '>= 3.0.1')
   s.add_dependency('resque', '>= 1.22.0')

data/spec/apps/jstestapp/Rakefile

@@ -0,0 +1 @@
+# Dummy Rakefile for testing...

data/spec/apps/jstestapp/config.ru

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'rhoconnect/application/init'
+
+# secret is generated along with the app
+Rhoconnect::Server.set     :secret,      'not a secret'
+
+# !!! Add your custom initializers and overrides here !!!
+# For example, uncomment the following line to enable Stats
+#Rhoconnect::Server.enable  :stats
+# uncomment the following line to disable Resque Front-end console
+#Rhoconnect.disable_resque_console = true
+# uncomment the following line to disable Rhoconnect Front-end console
+#Rhoconnect.disable_rc_console = true
+
+# run RhoConnect Application
+run Rhoconnect.app

data/spec/apps/jstestapp/controllers/js/application_controller.js

@@ -0,0 +1,18 @@
+var app = require('ballroom');
+var rc = require('rhoconnect_helpers');
+var Store = rc.Store;
+app.controllerName('Application');
+
+app.post('/login',{'rc_handler':'authenticate'}, function(req,resp){
+  console.log("inside application_controller.js");
+  var login = req.params.login;
+  var password = req.params.password;
+  if(login === 'storeapitest') {
+    resp.params = ['loginkey',login]
+    Store.putValue(resp, function(resp){
+      resp.send(true);
+    });
+  } else {
+    resp.send(true);
+  }
+});

data/spec/apps/jstestapp/settings/license.key

@@ -0,0 +1 @@
+858fc60fadfde40273d0ac505906969318aa4931d1a2c4aeb24d98393c74379f60e226651601969874257f7f1fbda9b099ecd551a641519aa46819947fda0191

data/spec/apps/jstestapp/settings/settings.yml

@@ -0,0 +1,13 @@
+:sources:
+:development:
+  :licensefile: settings/license.key
+  :redis: localhost:6379
+  :syncserver: http://localhost:9292/
+:test:
+  :licensefile: settings/license.key
+  :redis: localhost:6379
+  :syncserver: http://localhost:9292/
+:production:
+  :licensefile: settings/license.key
+  :redis: localhost:6379
+  :syncserver: http://localhost:9292/

data/spec/controllers/js_base_spec.rb

@@ -8,113 +8,145 @@ describe "Rhoconnect::Controller::JsBase" do
 
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
     def app
-      @app ||= Rack::URLMap.new Rhoconnect.url_map
+      @app = Rack::URLMap.new Rhoconnect.url_map
     end
 
-    before(:each) do
-      Rhoconnect::Server.set :environment, :test
-      Rhoconnect::Server.set :secret, "secure!"
-      Rhoconnect.use_node = true
-      Rhoconnect.bootstrap(get_testapp_path)
-      do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
-    end
-
-    after(:each) do
-      Rhoconnect::Node.kill_process
-    end
-
-    it "should get / of js controller with route overridden" do
-      get '/app/v1/JsSample', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-      body = JSON.parse(last_response.body)
-      body[2]['count'].should == 1
-      body.last['insert'].should == {'1' => {'name' => 'iPhone'}}
-    end
-
-    it "should get /custom_route of js controller" do
-      get '/app/v1/JsSample/custom_route', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.body.should == 'testuser'
-    end
-
-    it "should get /source from custom route" do
-      get '/app/v1/JsSample/custom_route2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.body.should == 'JsSample'
-    end
-
-    it "should get stash_result from js model" do
-      pending "stash_result not supported yet"
-      get '/app/v1/JsSample/custom_route3',{}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      res = JSON.parse(last_response.body)
-      res[2]["count"].should == 1
+    def remove_application_controller
+      Object.send(:remove_const, :ApplicationController) rescue nil
     end
 
-    it "should register sync route" do
-      get '/app/v1/Sample2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      res = JSON.parse(last_response.body)
-      res[2]["count"].should == 1
+    after(:all) do
+      Rhoconnect.use_node = false
     end
 
-    it "should post to js controller" do
-      hsh = {'1'=>{'name'=>'testname','price'=>'$199'}}
-      post '/app/v1/JsSample',hsh, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-    end
-
-    it "should put to js controller" do
-      put '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.body.should == ''
-    end
-
-    it "should delete to js controller" do
-      @c1 = Client.create({:user_id => @u.id,:app_id => @a.id},{:source_name => 'JsSample'})
-      set_doc_state(@c1, :cd => @data)
-      delete '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c1.id}
-      last_response.should be_ok
-    end
-
-    it "should call route that overrides default option" do
-      get '/app/v1/JsSample/no_client_route', {}
-      last_response.should be_ok
-      last_response.body.should == 'no client required!'
-    end
-
-    it "should upload blob in multipart post" do
-      file1,file2 = 'upload1.txt'
-      @product1['txtfile-rhoblob'] = file1
-      @product1['_id'] = 'tempobj1'
-      cud = {'create'=>{'1'=>{'name'=>'hello'}},
-        :blob_fields => ['txtfile-rhoblob']}.to_json
-      post "/app/#{Rhoconnect::API_VERSION}/JsSample",
-          {:cud => cud,'txtfile-rhoblob-1' =>
-            Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file1), "application/octet-stream")}, 
-            {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-      get "/app/#{Rhoconnect::API_VERSION}/JsSample", {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      json = JSON.parse(last_response.body)
-      json[5]['links'].should == { "1" => { "l" => "blob_created" } } 
-      json[5]['delete'].should == { "blob_created" => { "name" => "hello", "txtfile-rhoblob" => "blob_created" } }
+    def bootstrap_rhoconnect(jsapp = false)
+      Rhoconnect::Server.set :environment, :test
+      Rhoconnect::Server.set :secret, "secure!"
+      Rhoconnect.use_node = true
+      if jsapp
+        Rhoconnect.bootstrap(get_jstestapp_path)
+      else
+        Rhoconnect.bootstrap(get_testapp_path)
+      end
+      # reload ruby controllers
+      Dir[File.join(Rhoconnect.app_directory,'controllers','ruby','*.rb')].each do |controller_file| 
+        load controller_file
+      end
     end
 
-    it "should push_objects to js controller" do
-      s = Source.load('JsSample', @s_params)
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_objects",
-        {:user_id => @u.id, :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(s, {:md => data, :md_size=>'3'})
+    describe "ApplicationController" do
+      after(:each) do
+        Rhoconnect.remove_from_url_map(ApplicationController)
+        remove_application_controller
+      end
+
+      it "should call Store api in ApplicationController" do
+        Rhoconnect.remove_from_url_map(ApplicationController)
+        remove_application_controller
+        bootstrap_rhoconnect(true)
+        do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => 'storeapitest', "password" => 'testpass'
+        Store.get_value('loginkey').should == 'storeapitest'
+      end
     end
 
-    it "should push_deletes to js controller" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      s = Source.load('JsSample',@s_params)
-      set_doc_state(s, {:md => data, :md_size => '3'})
-      data.delete('2')
-      post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_deletes",
-        {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(s, {:md => data, :md_size=>'2'})
+    describe "Named Controller" do
+
+      before(:each) do
+        bootstrap_rhoconnect
+        do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
+      end
+
+      it "should get / of js controller with route overridden" do
+        get '/app/v1/JsSample', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.should be_ok
+        body = JSON.parse(last_response.body)
+        body[2]['count'].should == 1
+        body.last['insert'].should == {'1' => {'name' => 'iPhone'}}
+      end
+
+      it "should get /custom_route of js controller" do
+        get '/app/v1/JsSample/custom_route', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.body.should == 'testuser'
+      end
+
+      it "should get /source from custom route" do
+        get '/app/v1/JsSample/custom_route2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.body.should == 'JsSample'
+      end
+
+      it "should get stash_result from js model" do
+        pending "stash_result not supported yet"
+        get '/app/v1/JsSample/custom_route3',{}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        res = JSON.parse(last_response.body)
+        res[2]["count"].should == 1
+      end
+
+      it "should register sync route" do
+        get '/app/v1/Sample2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        res = JSON.parse(last_response.body)
+        res[2]["count"].should == 1
+      end
+
+      it "should post to js controller" do
+        hsh = {'1'=>{'name'=>'testname','price'=>'$199'}}
+        post '/app/v1/JsSample',hsh, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.should be_ok
+      end
+
+      it "should put to js controller" do
+        put '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.body.should == ''
+      end
+
+      it "should delete to js controller" do
+        @c1 = Client.create({:user_id => @u.id,:app_id => @a.id},{:source_name => 'JsSample'})
+        set_doc_state(@c1, :cd => @data)
+        delete '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c1.id}
+        last_response.should be_ok
+      end
+
+      it "should call route that overrides default option" do
+        get '/app/v1/JsSample/no_client_route', {}
+        last_response.should be_ok
+        last_response.body.should == 'no client required!'
+      end
+
+      it "should upload blob in multipart post" do
+        file1,file2 = 'upload1.txt'
+        @product1['txtfile-rhoblob'] = file1
+        @product1['_id'] = 'tempobj1'
+        cud = {'create'=>{'1'=>{'name'=>'hello'}},
+          :blob_fields => ['txtfile-rhoblob']}.to_json
+        post "/app/#{Rhoconnect::API_VERSION}/JsSample",
+            {:cud => cud,'txtfile-rhoblob-1' =>
+              Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file1), "application/octet-stream")}, 
+              {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        last_response.should be_ok
+        get "/app/#{Rhoconnect::API_VERSION}/JsSample", {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+        json = JSON.parse(last_response.body)
+        json[5]['links'].should == { "1" => { "l" => "blob_created" } } 
+        json[5]['delete'].should == { "blob_created" => { "name" => "hello", "txtfile-rhoblob" => "blob_created" } }
+      end
+
+      it "should push_objects to js controller" do
+        s = Source.load('JsSample', @s_params)
+        data = {'1' => @product1, '2' => @product2, '3' => @product3}
+        post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_objects",
+          {:user_id => @u.id, :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+        last_response.should be_ok
+        verify_doc_result(s, {:md => data, :md_size=>'3'})
+      end
+
+      it "should push_deletes to js controller" do
+        data = {'1' => @product1, '2' => @product2, '3' => @product3}
+        s = Source.load('JsSample',@s_params)
+        set_doc_state(s, {:md => data, :md_size => '3'})
+        data.delete('2')
+        post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_deletes",
+          {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+        last_response.should be_ok
+        verify_doc_result(s, {:md => data, :md_size=>'2'})
+      end
     end
-
-    it "should register deprecated_route"
   end
 end