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

data/lib/rhoconnect/store.rb

@@ -240,7 +240,7 @@ module Rhoconnect
       end
       
       
-      def put_zdata(dockey,assoc_key,data={},append=false)
+      def put_zdata(dockey,assoc_key,data=[],append=false)
         get_store(0).put_zdata(dockey, assoc_key, data, append)
       end
       
@@ -774,18 +774,25 @@ module Rhoconnect
       end
     end
     
-    def put_zdata(dockey,assoc_key,data={},append=false)
+    def put_zdata(dockey,assoc_key,data=[],append=false)
       return true unless (dockey and assoc_key and data)
       flush_zdata(dockey) unless append
       current_score = 0
       current_score_data = @db.zrevrange(dockey,0,0,:with_scores => true)
       current_score = current_score_data[-1][1].to_i if current_score_data and current_score_data[-1]
       current_score += 1
-      data.each do |key,hash_value|
-        unique_record_key = setelement(current_score,assoc_key, key)
-        @db.zadd(dockey, current_score, unique_record_key)
-       	put_data("#{dockey}:#{unique_record_key}",{key => hash_value})
-      end
+
+      data.each_with_index do |source_queue_entry, source_entry_index|
+        source_id = source_queue_entry[0]
+        source_id_with_index = "#{source_id}:#{source_entry_index}"
+        source_entry_data = source_queue_entry[1]
+        source_entry_docname = setelement(current_score,assoc_key, source_id_with_index)
+        source_entry_data.each_with_index do |obj_entry, obj_index|
+          obj_key_with_index = "#{obj_index}_#{obj_entry[0]}"
+          put_data("#{dockey}:#{source_entry_docname}",{obj_key_with_index => obj_entry[1]},true)
+        end if source_entry_data
+        @db.zadd(dockey, current_score, source_entry_docname)
+      end if data
       true
     end
     
@@ -793,29 +800,34 @@ module Rhoconnect
     def get_zdata(dockey)
       data = @db.zrange(dockey, 0, -1)
       ret = []
-      keys = []
-      unless data.nil?
-        scores = []
-        data.each do |zsetkey|
-          obj_hash = get_data "#{dockey}:#{zsetkey}"
-          score,key,objkey = getelement(zsetkey)
-          if scores[-1] != score
-            ret << obj_hash
-            keys << key
-            scores << score
-          else
-            ret[-1].merge!(obj_hash)
-          end
+      assoc_keys = []
+      scores = []
+      data.each do |zsetkey|
+        obj_entries = []
+        obj_hash = get_data "#{dockey}:#{zsetkey}"
+        obj_hash.each do |obj_key_with_index, objdata|
+          index,objkey = obj_key_with_index.split('_', 2)
+          obj_entries[index.to_i] = [objkey, objdata]
         end
-      end
-      [ret, keys]
+        score,assoc_key,source_id_with_index = getelement(zsetkey)
+        source_id, source_index = source_id_with_index.split(':', 2)
+
+        if scores[-1] != score
+          ret << [[source_id, obj_entries]]
+          assoc_keys << assoc_key
+          scores << score
+        else
+          ret[-1] << [source_id, obj_entries]
+        end
+      end if data
+      [ret, assoc_keys]
     end
     
     # Deletes all keys and their hashes from the Redis DB
     def flush_zdata(dockey)
       data = @db.zrange(dockey, 0, -1)
-      data.each do |hash_key|
-        _delete_doc("#{dockey}:#{hash_key}")
+      data.each do |zsetkey|
+        _delete_doc("#{dockey}:#{zsetkey}")
       end
       @db.zremrangebyrank(dockey, 0, -1)
     end
@@ -859,7 +871,6 @@ module Rhoconnect
 
     private
 
-if RUBY_VERSION =~ /1.9/
     def _get_redis(server=nil)
       url = ENV[REDIS_URL] || ENV[REDISTOGO_URL] || nil
       if url
@@ -882,23 +893,6 @@ if RUBY_VERSION =~ /1.9/
         end
       end
     end
-else # Ruby 1.8 does not support Connnection Pools      
-    def _get_redis(server=nil)
-      url = ENV[REDIS_URL] || ENV[REDISTOGO_URL] || nil
-      if url
-        Redis.connect(:url => url, :timeout => Rhoconnect.redis_timeout, :thread_safe => true)
-      elsif server and server.is_a?(String)
-        host,port,db,password = server.split(':')
-        Redis.connect(:thread_safe => true, :host => host,
-            :port => port, :db => db, :password => password, :timeout => Rhoconnect.redis_timeout)
-      elsif server and (server.is_a?(Redis) or server.is_a?(ConnectionPool::Wrapper))
-        server
-      else
-        Redis.connect(:timeout => 30, :thread_safe => true)
-      end
-    end
-end # end of if RUBY_VERSION
-
     
     def _lock_key(dockey)
       "lock:#{dockey}"
@@ -1063,22 +1057,8 @@ end # end of if RUBY_VERSION
     end
 
 # Set Obj Element MUST ensure the order of attribs
-# In 1.8.7 Hash keys are not-sorted - therefore
-# to ensure same order - we sort them before storing      
-if RUBY_VERSION =~ /1.8/
-    def set_obj_element(key, obj)
-      return unless (key and key.size > 0 and obj and obj.size > 0)
-      elem = "#{key}"
-      obj.sort.each do |attrib, value|
-        unless _is_reserved?(attrib,value)
-          elem += ":^rho&:#{attrib}:#{value}"
-        end
-      end
-      elem
-    end
 # in Ruby 1.9.x Hash keys are sorted (always in the same order), so 
 # we do not need to do redundant sorting
-else
     def set_obj_element(key, obj)
       return unless (key and key.size > 0 and obj and obj.size > 0)
       elem = "#{key}"
@@ -1089,6 +1069,5 @@ else
       end
       elem
     end
-end # if Ruby 1.8
   end
 end 

data/lib/rhoconnect/test_methods.rb

@@ -29,9 +29,10 @@ module Rhoconnect
       handler_sync = lambda { @model.query(params[:query])}
       @query_engine = Rhoconnect::Handler::Query::Engine.new(@model, handler_sync, {})
       handler_cud = lambda { @model.send params[:operation].to_sym, params["#{params[:operation]}_object".to_sym] }
-      @cud_engine = Rhoconnect::Handler::Changes::Engine.new(['create', 'update', 'delete'], @model, handler_cud, {})
+      @cud_engine = Rhoconnect::Handler::Changes::Engine.new(['create', 'update', 'delete'], @model, handler_cud, {:queue_key => 'post:/'})
       handler_search = lambda { @model.search(params[:search]) }
       @search_engine = Rhoconnect::Handler::Search::Engine.new(@model, @c, handler_search, {})
+      Source.define_valid_queues(["create:post:/", "update:post:/", "delete:post:/"])
     end
     
     # Executes the adapter's query method and returns 
@@ -163,7 +164,7 @@ module Rhoconnect
         @cud_engine.params = {'create'=> {'temp-id' => record}}
         @cud_engine.do_pass_through_cud
       else
-        @s.push_queue(:create,@c.id,{'temp-id' => record},true)
+        @s.push_queue("create:post:/",@c.id,[[@s.name,[['temp-id', record]]]],true)
         @cud_engine.do_cud
         links = @c.get_data(:create_links)['temp-id']
         links ? links['l'] : nil
@@ -193,7 +194,7 @@ module Rhoconnect
         @cud_engine.params = {'update'=> record }
         @cud_engine.do_pass_through_cud
       else
-        @s.push_queue(:update,@c.id,record,true)
+        @s.push_queue("update:post:/",@c.id,[[@s.name,record.to_a]],true)
         @cud_engine.do_cud
       end
     end
@@ -227,7 +228,7 @@ module Rhoconnect
         @cud_engine.params = {'delete'=> record }
         @cud_engine.do_pass_through_cud
       else
-        @s.push_queue(:delete,@c.id,record,true)
+        @s.push_queue("delete:post:/",@c.id,[[@s.name, record.to_a]],true)
         @cud_engine.do_cud
       end
     end

data/lib/rhoconnect/utilities.rb

@@ -110,11 +110,13 @@ EOF
     exit 1
   end
 
-#    def jetty_rackup?
-#      'jruby -S jetty-rackup'
-#    end
-
   def trinidad?
     'bundle exec jruby -S trinidad'
   end
-end #Utilities
+
+  def dtach_installed?
+    return false if windows? # n/a on windows
+    `which dtach` != ''
+  end
+
+end

data/lib/rhoconnect/version.rb

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

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

@@ -3,27 +3,28 @@ require 'erb'
 require 'json'
 require 'rhoconnect/graph_helper'
 
-module RhoconnectConsole  
+module RhoconnectConsole
   class << self
     ROOT_DIR = File.dirname(File.expand_path(__FILE__)) unless defined? ROOT_DIR
     def root_path(*args)
       File.join(ROOT_DIR, *args)
     end
-  end  
+  end
 
   class Server < Sinatra::Base
     set :views,   RhoconnectConsole.root_path('templates')
     set :public_folder, RhoconnectConsole.root_path
-    set :static,        true    
-    use Rack::Session::Cookie
+    set :static,        true
+    use Rack::Session::Cookie, :key => 'rhoconnect.console',
+      :secret => SecureRandom.hex(64)
     HEROKU_NAV = ENV['INSTANCE_ID'] ? RestClient.get('http://nav.heroku.com/v1/providers/header') : nil
     before do
       headers['Expires'] = 'Sun, 19 Nov 1978 05:00:00 GMT'
-      headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'  
+      headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'
       headers['Pragma'] = 'no-cache'
     end
     include GraphHelper
-    
+
     get '/' do
       #if heroku instance single sign will already have logged in a have token in session
       @token = session[:token] if ENV['INSTANCE_ID']
@@ -33,17 +34,17 @@ module RhoconnectConsole
       @domain += "/application" if @domain and !ENV['RHODES_URL']
       erb :index
     end
-    
+
     get "/heroku/resources/:id" do
       begin
         # check heroku addon started app
         halt 403 unless ENV['INSTANCE_ID'] == params[:id]  && params[:token] == ENV['API_TOKEN']
         # rhoconnect authentication
-        session[:login] = 'rhoadmin'     
+        session[:login] = 'rhoadmin'
         session[:token] = User.load(session[:login]).token.value
       rescue Exception => e
         session[:token] = nil
-        halt 403 
+        halt 403
       end
       response.set_cookie('heroku-nav-data', :value => params[:nav], :path => '/')
       redirect '/'
@@ -60,7 +61,7 @@ module RhoconnectConsole
     post '/http_timing' do
       http_timing(params)
     end
-    
+
     post '/http_timing_key' do
       http_timing_key(params)
     end
@@ -68,16 +69,16 @@ module RhoconnectConsole
     post '/device_count' do
       count_graph('timing/devicecount', "Device Count", "Devices", "clients")
     end
-    
+
     get '/get_sources' do
       sources = App.load(APP_NAME).sources
       sources.to_json
     end
-    
+
     get '/get_http_routes' do
       # keys = get_user_count("http:*:*")
       #   sources = get_sources('all')
-      #   
+      #
       #   #loop through arrays and remove any regex matches
       #   keysf = keys.inject([]) do |keys_final, element|
       #     found = true
@@ -87,11 +88,11 @@ module RhoconnectConsole
       #     keys_final << element.strip if found
       #     keys_final
       #   end
-      
+
       keysf = get_http_routes()
-      
+
       keysf.to_json
     end
-    
+
   end
 end

data/rhoconnect.gemspec

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rhoconnect/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'rhoconnect/version'
 
 Gem::Specification.new do |s|
-  s.name        = "rhoconnect"
+  s.name        = 'rhoconnect'
   s.version     = Rhoconnect::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Rhomobile"]
+  s.authors     = ['Rhomobile']
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.email       = %q{dev@rhomobile.com}
   s.homepage    = %q{http://rhomobile.com/products/rhoconnect}
@@ -18,30 +18,30 @@ Gem::Specification.new do |s|
   s.files        = %w(
     CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec
   )
-  s.files       += Dir.glob("bench/**/*")
-  s.files       += Dir.glob("commands/**/*")
-  s.files       += Dir.glob("doc/**/*")
-  s.files       += Dir.glob("examples/**/*")
-  s.files       += Dir.glob("generators/**/*")
-  s.files       += Dir.glob("generators/templates/application/.rcgemfile")
-  s.files       += Dir.glob("installer/**/*")
-  s.files       += Dir.glob("lib/**/*")
-  s.files       += Dir.glob("js-adapters/**/*")
-  s.files       += Dir.glob("tasks/**/*")
-  s.test_files   = Dir.glob("spec/**/*")
-  s.executables  = Dir.glob("bin/*").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.files       += Dir.glob('bench/**/*')
+  s.files       += Dir.glob('commands/**/*')
+  s.files       += Dir.glob('doc/**/*')
+  s.files       += Dir.glob('examples/**/*')
+  s.files       += Dir.glob('generators/**/*')
+  s.files       += Dir.glob('generators/templates/application/.rcgemfile')
+  s.files       += Dir.glob('installer/**/*')
+  s.files       += Dir.glob('lib/**/*')
+  s.files       += Dir.glob('js-adapters/**/*')
+  s.files       += Dir.glob('tasks/**/*')
+  s.test_files   = Dir.glob('spec/**/*')
+  s.executables  = Dir.glob('bin/*').map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = %q{1.5.0}
   s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
+    'LICENSE',
+    'README.md'
   ]
 
   s.add_dependency('bundler', '~> 1.0')
-  s.add_dependency("rack", '~> 1.5.2')
-  s.add_dependency("sinatra", '~> 1.3')
+  s.add_dependency('rack', '~> 1.5.2')
+  s.add_dependency('sinatra', '~> 1.3')
   s.add_dependency('rake', '~> 10.0.0')
   s.add_dependency('json', '~> 1.7.7')
   s.add_dependency('rubyzip', '~> 0.9.4')
@@ -51,6 +51,5 @@ Gem::Specification.new do |s|
   s.add_dependency('resque', '>= 1.22.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')
-  s.add_dependency('thor', '~> 0.15.0')
-  s.add_dependency('ohm', '~> 0.1.3')
+  s.add_dependency('thor', '~> 0.18.0')
 end

data/spec/apps/rhotestapp/controllers/js/js_sample_controller.js

@@ -17,6 +17,10 @@ app.get('/custom_route3',{}, function(req,resp){
 	JsSample.get_stash_result(resp);
 });
 
+app.get('/no_client_route', {login_required: false, client_required: false}, function(req,resp){
+  resp.send('no client required!');
+});
+
 app.post('/',{"rc_handler":"query"}, function(req,resp){
 	var result = {'id':req.params};
 	resp.send(result);

data/spec/apps/rhotestapp/models/js/js_sample.js

@@ -5,6 +5,13 @@ var JsSample = function() {
 
   this.query = function(resp){
     var result = {'1': {'name': 'iPhone'}};
+    if(resp.params && resp.params.raise_an_error){
+      new rc.ServerErrorException(resp, 'query error occured');
+    }
+
+    if(resp.params && resp.params.test_non_hash){
+      result = true;
+    }
     resp.send(result);
   };
 
@@ -88,6 +95,35 @@ var JsSample = function() {
     resp.send(true);
   };
 
+  this.testRaiseException = function(resp){
+    new rc.Exception(resp, 'some custom message');
+  };
+
+  this.testRaiseLoginException = function(resp){
+    new rc.LoginException(resp, 'some login message');
+  };
+
+  this.testRaiseLogoffException = function(resp){
+    new rc.LogoffException(resp, 'some logoff message');
+  };
+
+  this.testRaiseTimeoutException = function(resp){
+    new rc.ServerTimeoutException(resp, 'some timeout message');
+  };
+
+  this.testRaiseErrorException = function(resp){
+    new rc.ServerErrorException(resp, 'some error message');
+  };
+
+  this.testRaiseConflictException = function(resp){
+    new rc.ObjectConflictErrorException(resp, 'some object conflict message');
+  };
+
+  this.partitionName = function(resp){
+    resp.send(resp.params.user_id + '_partition');
+  };
+
+
   this.storeBlob = function(resp){
     var fs = require('fs');
     if(fs.existsSync(resp.params.path)){