rsence 2.2.1 → 2.2.2

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/conf/default_conf.yaml

@@ -78,13 +78,18 @@
     :latency: 0
     #
     # HTTP Port number to listen to.
-    :port:  8001
+    :port:  '8001'
     #
     # Bind this ip address ('0.0.0.0' means all)
     :bind_address:  '127.0.0.1'
     #
-    # Rack handler to use, defaults to thin
-    :rack_require: mongrel
+    # Rack handler to use, defaults to puma
+    :rack_require: puma
+    #
+    # These are default options. Ymmv, but these work fine for puma
+    :handler_options:
+      :Verbose: false
+      :Threads: '4:64' # puma default is '0:16'
   #
   # When enabled, sets http cache headers
   # to cache content as long as possible.

data/conf/rsence_command_strings.yaml

@@ -39,7 +39,7 @@
   :plugin_directory_not_a_directory: |
     Plugin directory not a directory, expected:
       <%%= plugin_path.inspect %>
-  :warn_no_plugin_directory_in_project: |
+  :warn_no_directory_creating: |
     Warning! No <%%= dir_name %> directory in project, creating:
       <%%= dir_path.inspect %>
   :invalid_environment: |

data/js/comm/transporter/transporter.js

@@ -70,20 +70,18 @@ COMM.Transporter = HApplication.extend({
   * to report js errors to the server.
   * If no error, returns an empty string.
   **/
-  getClientEvalError: function(){
-    var _this = COMM.Transporter;
-    return _this._clientEvalError?'&err_msg=' +
-           COMM.Values._encodeString(_this._clientEvalError):'';
-  },
+  // getClientEvalError: function(){
+  //   var _this = COMM.Transporter;
+  //   return _this._clientEvalError?'&err_msg=' +
+  //          COMM.Values._encodeString(_this._clientEvalError):'';
+  // },
   
   parseResponseArray: function( _responseText ){
-    var _arr = eval( _responseText );
-    return _arr;
+    return HVM.decode( _responseText );
   },
   
   _nativeParseResponseArray: function( _responseText ){
-    var _arr = JSON.parse( _responseText );
-    return _arr;
+    return JSON.parse( _responseText );
   },
   
   setValues: function( _values ){
@@ -176,7 +174,9 @@ COMM.Transporter = HApplication.extend({
   flushBusy: function(){
     var _this = COMM.Transporter;
     _this.busy = false;
-    COMM.Values.tosync.length !== 0 && _this.sync();
+    if( COMM.Values.tosync.length !== 0 ){
+      _this.sync();
+    }
   },
   failMessage: function(_title,_message){
     var _this = COMM.Transporter,
@@ -320,18 +320,34 @@ COMM.Transporter = HApplication.extend({
     }
     // console.log('sync.');
     this.busy = true;
+    var _now = new Date().getTime();
     if(window['sesWatcher'] && window.sesWatcher['sesTimeoutValue']){
       // Sets the value of the session watcher to the current time. It could cause an unnecessary re-sync poll immediately after this sync otherwise.
-      sesWatcher.sesTimeoutValue.set( new Date().getTime() );
+      sesWatcher.sesTimeoutValue.set( _now );
     }
-    var _this = this,
-        _values = COMM.Values.sync(),
-        _sesKey = 'ses_key='+COMM.Session.ses_key,
-        _errorMessage = _this.getClientEvalError(),
-        _body = [_sesKey,_errorMessage,_values?'&values='+_values:''].join('');
+    var
+    _this = this,
+    // _values = HVM.sync(),
+    // _boundary = _now.toString(36)+(Math.random()*10000).toString(36)+(Math.random()*10000).toString(36),
+    // _separator = '--'+_boundary,
+    // _errorMessage = _this.getClientEvalError(),
+    _body = HVM.sync();
+    // _body = _separator+
+    //   '\r\nContent-Disposition: form-data; name="ses_key"\r\nContent-Type: text/plain\r\n'+
+    //   '\r\n'+COMM.Session.ses_key+'\r\n'+_separator;
+    // if( _values ){
+    //   _body += '\r\nContent-Disposition: form-data; name="values"\r\nContent-Type: application/json; charset=UTF-8\r\n'+
+    //   '\r\n'+_values+'\r\n'+_separator+'--\r\n';
+    // }
+    // else {
+    //   _body += '--\r\n';
+    // }
+    // _body = [_sesKey,_errorMessage,_values?'&values='+_values:''].join('');
     COMM.request(
       _this.url, {
         _this: _this,
+        // contentType: 'multipart/form-data; boundary='+_boundary,
+        contentType: 'application/json',
         onSuccess: COMM.Transporter.success,
         onFailure: COMM.Transporter.failure,
         method: 'POST',

data/js/comm/values/values.js

@@ -468,22 +468,54 @@ COMM.Values = HClass.extend({
   * An encoded string representation of values to synchronize.
   **/
   sync: function(){
-    if(this.tosync.length===0){
-      return false;
+    var
+    _this = this,
+    _response = [ COMM.Session.ses_key,{},[] ],
+    _error = COMM.Transporter._clientEvalError;
+
+    if( _error ){
+      _response[2].push({'err_msg':_error});
     }
-    var _syncValues = {},
-        _this = this,
-        _values = _this.values,
-        _tosync = _this.tosync,
-        _len = _tosync.length,
-        i = 0, _id, _value;
-    for(;i<_len;i++){
-      _id = _tosync.shift();
-      _value = _values[_id].value;
-      _syncValues[_id] = _value;
+
+    // new implementation, symmetric with the server response format
+    if( this.tosync.length > 0 ){
+      _response[1].set=[];
+      var
+      _syncValues = _response[1].set,
+      _values = _this.values,
+      _tosync = _this.tosync,
+      i = _tosync.length,
+      _id, _value;
+      while(i--){
+        _id = _tosync.shift();
+        _value = _values[_id].value;
+        _syncValues.push( [ _id, _value ] );
+      }
     }
-    return encodeURIComponent(_this.encode(_syncValues));
+    // console.log('response:',_response);
+    // console.log('encoded:',_this.encode(_response));
+    return _this.encode(_response);
   },
+
+  // Old sync implementation:
+  // sync: function(){
+  //   if(this.tosync.length===0){
+  //     return false;
+  //   }
+  //   var
+  //   _syncValues = {},
+  //   _this = this,
+  //   _values = _this.values,
+  //   _tosync = _this.tosync,
+  //   _len = _tosync.length,
+  //   i = 0, _id, _value;
+  //   for(;i<_len;i++){
+  //     _id = _tosync.shift();
+  //     _value = _values[_id].value;
+  //     _syncValues[_id] = _value;
+  //   }
+  //   return encodeURIComponent(_this.encode(_syncValues));
+  // },
   
   _detectNativeJSONSupport: function(){
     if(window['JSON']){

data/lib/rsence/argv/initenv_argv.rb

@@ -157,7 +157,7 @@ module ArgvUtil
         say @strs[:initenv][:enter_http_port]
         str_http_port = @strs[:initenv][:http_port]
         config[:http_server][:port] = ask(str_http_port) do |q|
-          q.default = config[:http_server][:port]
+          q.default = config[:http_server][:port].to_s
         end
       
         say @strs[:initenv][:enter_tcp_ip]

data/lib/rsence/http/broker.rb

@@ -115,18 +115,18 @@ class Broker
     puts conf.inspect if RSence.args[:debug]
 
     require rack_require
+    require 'rack/handler/puma.rb' if rack_require == 'puma'
     
     # Selects the handler for Rack
     handler = {
-      'mongrel2' => lambda { Rack::Handler::Mongrel2 },
       'webrick'  => lambda { Rack::Handler::WEBrick  },
-      'ebb'      => lambda { Rack::Handler::Ebb      },
       'thin'     => lambda { Rack::Handler::Thin     },
       'mongrel'  => lambda { Rack::Handler::Mongrel  },
-      'unicorn'  => lambda { Rack::Handler::Unicorn  },
-      'rainbows' => lambda { Rack::Handler::Rainbows }
+      'puma'     => lambda { Rack::Handler::Puma     }
     }[rack_require].call
-    handler.run( Rack::Lint.new(self.new), :Host => host, :Port => port )
+    handler.run( self.new, {
+      :Host => host, :Port => port
+    }.merge( conf[:handler_options] ) )
   end
   
   # Generic 404 error handler. Just sets up response status, headers, body as a small "Page Not Found" html page

data/lib/rsence/msg.rb

@@ -135,7 +135,7 @@ module RSence
       if options[:servlet]
         @do_gzip = false
       else
-        @response['Content-Type'] = 'text/javascript; charset=utf-8'
+        @response['Content-Type'] = 'application/json; charset=utf-8'
         @response['Cache-Control'] = 'no-cache'
       
         # gnu-zipped responses:

data/lib/rsence/sessionmanager.rb

@@ -84,7 +84,7 @@ module RSence
         # session id, used internally
         :ses_id     =>  ses_id,
       
-        # session key, used externally (client xhr)
+        # session key, used externally (client sync)
         :ses_key    =>  ses_sha,
       
         # session key, used externally (client cookies)
@@ -137,7 +137,7 @@ module RSence
       # new time-out
       ses_data[:timeout] = Time.now.to_i + @config[:timeout_secs]
     
-      # re-generates the ses_key for each xhr
+      # re-generates the ses_key for each sync
       if @config[:disposable_keys]
       
         # disposes the old (current) ses_key:
@@ -233,7 +233,7 @@ module RSence
     ### Otherwise stops the client and returns false.
     def check_ses( msg, ses_key, ses_seed=false )
     
-      # first, check if the session key exists (xhr)
+      # first, check if the session key exists (sync)
       if @session_keys.has_key?( ses_key )
       
         # get the session's id based on its key
@@ -455,7 +455,7 @@ module RSence
       ses_cookie_max_age = @config[:timeout_secs]
     
       ## Only match the handshaking address of rsence,
-      ## prevents unnecessary cookie-juggling in xhr's
+      ## prevents unnecessary cookie-juggling in sync's
       if @config[:trust_cookies]
         ses_cookie_path    = '/'
       elsif ses_cookie_path == nil
@@ -527,19 +527,19 @@ module RSence
         query = request.query
       end
       
-      ## Perform old-session cleanup on all xhr:s
+      ## Perform old-session cleanup on all sync:s
       expire_sessions
       
       ## The 'ses_id' request query key is required.
       ## The client defaults to '0', which means the
       ## client needs to be initialized.
       ## The client's ses_id is the server's ses_key.
-      if not query.has_key?( 'ses_key' )
+      if not options.has_key?( :ses_key )
         return Message.new( @transporter, request, response, options )
       else
         
         ## get the ses_key from the request query:
-        ses_key = query[ 'ses_key' ]
+        ses_key = options[:ses_key]
 
         ## The message object binds request, response
         ## and all user/session -related data to one

data/lib/rsence/transporter.rb

@@ -94,13 +94,13 @@ module RSence
       uri = request.fullpath
     
       if request_type == :post
-        ## /x handles xhr without cookies
+        ## /x handles sync without cookies
         if uri == broker_urls[:x] and @sessions.accept_requests
-          xhr( request, response, { :cookies => true, :servlet => false } )
+          sync( request, response, { :cookies => true, :servlet => false } )
           return true
-        ## /hello handles the first xhr (with cookies, for session key)
+        ## /hello handles the first sync (with cookies, for session key)
         elsif uri == broker_urls[:hello] and @sessions.accept_requests
-          xhr( request, response, { :cookies => true, :servlet => false } )
+          sync( request, response, { :cookies => true, :servlet => false } )
           return true
         end
       end
@@ -108,7 +108,7 @@ module RSence
     end
   
     # wrapper for the session manager stop client functionality
-    def xhr_error_handler(msg,err_name,err_extra_descr='')
+    def sync_error_handler(msg,err_name,err_extra_descr='')
       @sessions.stop_client_with_message( msg,
         @config[:messages][err_name][:title],
         @config[:messages][err_name][:descr]+err_extra_descr,
@@ -116,8 +116,8 @@ module RSence
       )
     end
   
-    # wrapper for tracebacks in xhr
-    def xhr_traceback_handler(e,err_descr='Transporter::UnspecifiedError')
+    # wrapper for tracebacks in sync
+    def sync_traceback_handler(e,err_descr='Transporter::UnspecifiedError')
       puts "=="*40 if RSence.args[:debug]
       puts err_descr
       if RSence.args[:debug]
@@ -127,10 +127,32 @@ module RSence
         puts "=="*40
       end
     end
+
+    def find_client_sync_error( options )
+      return false if options.length == 0
+      errors = []
+      options.each do |err|
+        if err.class == Hash and err.has_key?('err_msg')
+          errors.push( err['err_msg'] )
+        end
+      end
+      return false if errors.length == 0
+      return errors
+    end
   
     ## handles incoming XMLHttpRequests from the browser
-    def xhr(request, response, options = { :cookies => false, :servlet => false } )
-    
+    def sync(request, response, options = { :cookies => false, :servlet => false } )
+      request_body = request.body.read
+      begin
+        request_content = JSON.parse( request_body )
+      rescue JSON::ParseError
+        warn "Request body isn't valid JSON: #{request_body}"
+        request_content = ['-1:.o.:INVALID',{},[]]
+      end
+      options[:ses_key] = request_content[0]
+      options[:values] = request_content[1]
+      options[:messages] = request_content[2]
+
       session_conf = RSence.config[:session_conf]
     
       options[:cookies] = false unless options.has_key?(:cookies)
@@ -143,13 +165,15 @@ module RSence
       msg = @sessions.init_msg( request, response, options )
     
       response_success = true
-    
+      
+      client_errors = find_client_sync_error( options[:messages] )
+
       # If the client encounters an error, display error message
-      if request.query.has_key?('err_msg')
+      if client_errors #request.query.has_key?('err_msg')
         response_success = false
-        client_error_msg = request.query['err_msg'].inspect
+        client_error_msg = client_errors.inspect
         puts "\nCLIENT ERROR:\n#{client_error_msg}\n" if RSence.args[:debug]
-        xhr_error_handler(msg,:client_error,client_error_msg)
+        sync_error_handler(msg,:client_error,client_error_msg)
       end
     
       # If the session is valid, continue:
@@ -175,14 +199,14 @@ module RSence
         end
         
         ## Pass the client XML to the value manager
-        if request.query.has_key?( 'values' )
-          syncdata_str = request.query[ 'values' ]
+        if options[:values].has_key?('set')#request.query.has_key?( 'values' )
+          # syncdata_str = request.query[ 'values' ]
           begin
-            @valuemanager.xhr( msg, syncdata_str )
+            @valuemanager.sync( msg, options[:values]['set'] )
           rescue => e
             response_success = false
-            xhr_error_handler( msg, :valuemanager_xhr_error, e.message )
-            xhr_traceback_handler( e, "Transporter::ValueManagerXHRError: @valuemanager.xhr failed." )
+            sync_error_handler( msg, :valuemanager_sync_error, e.message )
+            sync_traceback_handler( e, "Transporter::ValueManagerXHRError: @valuemanager.sync failed." )
           end
         end
       
@@ -195,8 +219,8 @@ module RSence
               @plugins.delegate( :cloned_target, msg, msg.cloned_source )
             rescue => e
               response_success = false
-              xhr_error_handler( msg, :plugin_delegate_cloned_target_error, e.message )
-              xhr_traceback_handler( e, "Transporter::PluginDelegateClonedTargetError: @plugins.delegate 'cloned_target' failed." )
+              sync_error_handler( msg, :plugin_delegate_cloned_target_error, e.message )
+              sync_traceback_handler( e, "Transporter::PluginDelegateClonedTargetError: @plugins.delegate 'cloned_target' failed." )
             end
           end
           
@@ -205,8 +229,8 @@ module RSence
             msg.session[:plugin_incr] = @plugins.incr
           rescue => e
             response_success = false
-            xhr_error_handler( msg, :plugin_delegate_restore_ses_error, e.message )
-            xhr_traceback_handler( e, "Transporter::PluginDelegateRestoreSesError: @plugins.delegate 'restore_ses' failed." )
+            sync_error_handler( msg, :plugin_delegate_restore_ses_error, e.message )
+            sync_traceback_handler( e, "Transporter::PluginDelegateRestoreSesError: @plugins.delegate 'restore_ses' failed." )
           end
           
         elsif msg.new_session
@@ -216,8 +240,8 @@ module RSence
             msg.session[:plugin_incr] = @plugins.incr
           rescue => e
             response_success = false
-            xhr_error_handler( msg, :plugin_delegate_init_ses_error, e.message )
-            xhr_traceback_handler( e, "Transporter::PluginDelegateInitSesError: @plugins.delegate 'init_ses' failed." )
+            sync_error_handler( msg, :plugin_delegate_init_ses_error, e.message )
+            sync_traceback_handler( e, "Transporter::PluginDelegateInitSesError: @plugins.delegate 'init_ses' failed." )
           end
           
         elsif msg.cloned_targets
@@ -226,8 +250,8 @@ module RSence
             @plugins.delegate( :cloned_source, msg, msg.cloned_targets )
           rescue => e
             response_success = false
-            xhr_error_handler( msg, :plugin_delegate_cloned_source_error, e.message )
-            xhr_traceback_handler( e, "Transporter::PluginDelegateClonedSourceError: @plugins.delegate 'cloned_source' failed." )
+            sync_error_handler( msg, :plugin_delegate_cloned_source_error, e.message )
+            sync_traceback_handler( e, "Transporter::PluginDelegateClonedSourceError: @plugins.delegate 'cloned_source' failed." )
           end
           
         elsif msg.refresh_page?( @plugins.incr ) and @config[:client_autoreload]
@@ -244,8 +268,8 @@ module RSence
           @valuemanager.validate( msg )
         rescue => e
           response_success = false
-          xhr_error_handler( msg, :valuemanager_validate_error, e.message )
-          xhr_traceback_handler( e, "Transporter::ValueManagerValidateError: @valuemanager.validate failed." )
+          sync_error_handler( msg, :valuemanager_validate_error, e.message )
+          sync_traceback_handler( e, "Transporter::ValueManagerValidateError: @valuemanager.validate failed." )
         end
         
         ### Allows every plugin to respond to the idle call
@@ -253,8 +277,8 @@ module RSence
           @plugins.delegate( :idle, msg )
         rescue => e
           response_success = false
-          xhr_error_handler( msg, :plugin_idle_error, e.message )
-          xhr_traceback_handler( e, "Transporter::PluginIdleError: @plugins.idle failed." )
+          sync_error_handler( msg, :plugin_idle_error, e.message )
+          sync_traceback_handler( e, "Transporter::PluginIdleError: @plugins.idle failed." )
         end
         
         ### Processes outgoing values to client
@@ -262,8 +286,8 @@ module RSence
           @valuemanager.sync_client( msg )
         rescue => e
           response_success = false
-          xhr_error_handler( msg, :valuemanager_sync_client_error, e.message )
-          xhr_traceback_handler( e, "Transporter::ValueManagerSyncClientError: @valuemanager.sync_client failed." )
+          sync_error_handler( msg, :valuemanager_sync_client_error, e.message )
+          sync_traceback_handler( e, "Transporter::ValueManagerSyncClientError: @valuemanager.sync_client failed." )
         end
         
       else

data/lib/rsence/valuemanager.rb

@@ -114,10 +114,10 @@ module RSence
     end
   
     # @private Parses the json from the client and passes it on to associated values
-    def xhr( msg, syncdata_str )
+    def sync( msg, syncdata )
     
       # parses the json data sent by the client
-      syncdata = JSON.parse( syncdata_str )
+      # syncdata = JSON.parse( syncdata_str )
     
       session_values = msg.session[:values][:by_id]
       syncdata.each do |value_key, value_data|
@@ -125,7 +125,7 @@ module RSence
           value_obj = session_values[ value_key ]
           value_obj.from_client( msg, value_data )
         else
-          raise "HValue; unassigned value id! (#{val_id.inspect})"
+          warn "HValue; unassigned value key: (#{value_key.inspect})"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '968'
+        version: '971'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '968'
+        version: '971'
 description: ! 'RSence is a different and unique development model and software frameworks
   designed first-hand for real-time web applications. RSence consists of separate,
   but tigtly integrated data- and user interface frameworks.
@@ -358,8 +358,7 @@ files:
 - docs/Values.rdoc
 - VERSION
 - .yardopts
-- !binary |-
-  YmluL3JzZW5jZQ==
+- bin/rsence
 homepage: http://www.rsence.org/
 licenses:
 - GPL-3
@@ -381,8 +380,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rsence-
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Release 2.2 version of RSence.
 test_files: []
+has_rdoc: