rsence 2.1.2 → 2.1.3

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.1.3

data/js/comm/transporter/transporter.js

@@ -27,7 +27,8 @@ COMM.Transporter = HApplication.extend({
   **/
   constructor: function(){
     var _this = this;
-    this.serverLostMessage = 'Server Connection Lost: Reconnecting...';
+    _this._detectNativeJSONSupport();
+    _this.serverLostMessage = 'Server Connection Lost: Reconnecting...';
     _this.label = 'Transporter';
     _this.url = false;
     _this.busy = false;
@@ -37,6 +38,17 @@ COMM.Transporter = HApplication.extend({
     _this._busyFlushTimeout = false;
     _this.base(1);
   },
+
+  _detectNativeJSONSupport: function(){
+    if(window['JSON']){
+      var
+      _JSON = window.JSON,
+      _fun = 'function';
+      if((typeof _JSON['parse'] === _fun) && (typeof _JSON['stringify'] === _fun)){
+        this.parseResponseArray = this._nativeParseResponseArray;
+      }
+    }
+  },
   
 /** Tries to (re)connect to the server as often as possible,
   * mandated essentially by the priority of its
@@ -64,6 +76,49 @@ COMM.Transporter = HApplication.extend({
            COMM.Values._encodeString(_this._clientEvalError):'';
   },
   
+  parseResponseArray: function( _responseText ){
+    var _arr = eval( _responseText );
+    return _arr;
+  },
+  
+  _nativeParseResponseArray: function( _responseText ){
+    var _arr = JSON.parse( _responseText );
+    return _arr;
+  },
+  
+  setValues: function( _values ){
+    if(!_values instanceof Object){
+      console.log("Invalid values block: ", _values );
+      return;
+    }
+    var
+    i = 0,
+    _valueManager = COMM.Values,
+    _itemtype,
+    _valueId,
+    _valueData;
+    if(_values['new'] instanceof Array){
+      for(i=0;i<_values['new'].length;i++){
+        _valueId = _values['new'][i][0];
+        _valueData = _values['new'][i][1];
+        _valueManager.create( _valueId, _valueData );
+      }
+    }
+    if(_values['set'] instanceof Array){
+      for(i=0;i<_values['set'].length;i++){
+        _valueId = _values['set'][i][0];
+        _valueData = _values['set'][i][1];
+        _valueManager.s( _valueId, _valueData );
+      }
+    }
+    if(_values['del'] instanceof Array){
+      for(i=0;i<_values['del'].length;i++){
+        _valueId = _values['del'][i];
+        _valueManager.del( _valueId );
+      }
+    }    
+  },
+  
 /** = Description
   * Handles synchronization responses.
   *
@@ -83,10 +138,11 @@ COMM.Transporter = HApplication.extend({
       _this.failure(resp);
       return;
     }
-    var _responseArray = eval(resp.X.responseText),
-        i = 1,
+    var _responseArray = _this.parseResponseArray(resp.X.responseText),
+        i = 2,
         _responseArrayLen = _responseArray.length,
         _sesKey = _responseArray[0],
+        _values = _responseArray[1],
         _session = COMM.Session,
         _queue = COMM.Queue;
     if(_sesKey === ''){
@@ -95,6 +151,7 @@ COMM.Transporter = HApplication.extend({
     else {
       _session.newKey(_sesKey);
     }
+    _this.setValues( _values );
     for(;i<_responseArrayLen;i++){
       try {
         _queue.pushEval( _responseArray[i] );
@@ -123,7 +180,7 @@ COMM.Transporter = HApplication.extend({
   failMessage: function(_title,_message){
     var _this = COMM.Transporter,
         _queue = COMM.Queue;
-    console.log('failMessage?');
+    console.log('failMessage title:',_title,', message:',_message);
     _this.stop = true;
     _queue.push(function(){jsLoader.load('default_theme');});
     _queue.push(function(){jsLoader.load('controls');});

data/js/comm/values/values.js

@@ -322,6 +322,11 @@ COMM.Values = HClass.extend({
     return _str;
   },
   
+  _nativeEncode: function(_obj){
+    return JSON.stringify( _obj );
+  },
+  
+  
 /** = Description
   * Decodes a JSON object. Decodes url-encoded strings contained.
   *
@@ -355,6 +360,29 @@ COMM.Values = HClass.extend({
     return _obj;
   },
   
+  _nativeDecode: function(_ibj){
+    var _obj, _type, _this = this;
+    if(_ibj !== null && _ibj !== undefined){
+      _type = _this.type(_ibj);
+      if(!_type){
+        return null;
+      }
+      switch(_type){
+        case 'b': _obj = _ibj; break;
+        case 'n': _obj = _ibj; break;
+        case 's': _obj = _this._decodeString(_ibj); break;
+        case 'd': _obj = _ibj; break;
+        case 'a': _obj = JSON.parse(_ibj); break;
+        case 'h': _obj = JSON.parse(_ibj); break;
+        default: _obj = null; break;
+      }
+    }
+    else {
+      return null;
+    }
+    return _obj;
+  },
+  
 /** = Description
   * Makes a deep copy of the object.
   *
@@ -408,6 +436,24 @@ COMM.Values = HClass.extend({
     }
   },
   
+  _nativeClone: function( _obj ){
+    if(_obj === null){
+      return null;
+    }
+    else if (_obj === undefined){
+      console.log('Undefined object, supplementing with null.');
+      return null;
+    }
+    if( (_obj instanceof Array) || (_obj instanceof Object) ){
+      // conversion via encoding/decoding via JSON string.
+      return JSON.parse( JSON.stringify( _obj ) );
+    }
+    else {
+      // no conversion needed (numbers, strings, booleans etc..)
+      return _obj;
+    }
+  },
+  
 /** = Description
   * Returns an URI-encoded string representation of all the changed values to
   * synchronize to the server.
@@ -431,9 +477,25 @@ COMM.Values = HClass.extend({
       _syncValues[_id] = _value;
     }
     return encodeURIComponent(_this.encode(_syncValues));
+  },
+  
+  _detectNativeJSONSupport: function(){
+    if(window['JSON']){
+      var
+      _JSON = window.JSON,
+      _fun = 'function';
+      if((typeof _JSON['parse'] === _fun) && (typeof _JSON['stringify'] === _fun)){
+        // console.log('Has native JSON support. Re-routing encode, decode and clone methods of COMM.Values...');
+        this.clone = this._nativeClone;
+        this.encode = this._nativeEncode;
+        // this.decode = this._nativeDecode;
+      }
+    }
   }
 });
 
+COMM.Values._detectNativeJSONSupport();
+
 // Backwards compatibility assignment for code that still
 // uses HVM as a reference of the Value Manager:
 HVM = COMM.Values;

data/js/foundation/json_renderer/json_renderer.js

@@ -24,7 +24,7 @@
 //var//RSence.Foundation
 COMM.JSONRenderer = HClass.extend({
   
-  version: 0.7,
+  version: 0.8,
 
 /** = Description
   * Renders JSON structured data, see some of the demos for usage examples.
@@ -77,7 +77,10 @@ COMM.JSONRenderer = HClass.extend({
     for( _key in _definition ){
       if( _reserved.indexOf( _key ) === -1 ){
         _value = _definition[_key];
-        _extension[_key] = this.extEval( _value );
+        if( typeof _value === 'string' ){
+          _value = this.extEval( _value );
+        }
+        _extension[_key] = _value;
       }
     }
     _scope[ _className ] = _extend.extend( _extension );

data/lib/session/msg.rb

@@ -111,7 +111,11 @@ module RSence
       @options = options
     
       # Value response output.
-      @value_buffer = []
+      @value_buffer = {
+        :new => [],
+        :set => [],
+        :del => []
+      }
     
       # The session key placeholder.
       @ses_key = false
@@ -238,21 +242,22 @@ module RSence
       if not @response_success
         @response.status = 200
         #@response.status = 503
-      
+        
         buffer = [
-          "" # empty session key will stop the syncing
+          "", # empty session key will stop the syncing
+          {}, # no session values
         ] + @error_js
       else
         ## The response status should always be 200 (OK)
         @response.status = 200
-      
-        buffer = @value_buffer + @buffer
-        if @ses_key
-          buffer.unshift( @ses_key )
-        end
-      
+        
+        buffer = [
+          @ses_key,
+          @value_buffer,
+        ] + @buffer
+        
       end
-    
+      
       # flush the output
       if @do_gzip
         outp = GZString.new('')
@@ -262,13 +267,13 @@ module RSence
       else
         outp = buf_json(buffer)
       end
-    
+      
       @response['content-length'] = outp.size
       @response.body = outp
-    
+      
       @response_sent = true
     end
-  
+    
     # Sends data to the client, usually javascript, but is valid for any data that responds to #to_json
     # @param [String<js>, #to_json] data Javascript source or object that responds to #to_json
     # @param [Boolean] dont_squeeze When true, doesn't `squeeze` the contents (jsmin + jscompress)
@@ -280,9 +285,16 @@ module RSence
     end
   
     # @private For value manager; insert changed values BEFORE other js.
-    def reply_value(data)
-      puts data if @config[:trace]
-      @value_buffer.push( data )
+    def reply_value( operation_type, value_id, data=nil )
+      if operation_type == :set
+        @value_buffer[:set].push( [ value_id, data ] )
+      elsif operation_type == :new
+        @value_buffer[:new].push( [ value_id, data ] )
+      elsif operation_type == :del
+        @value_buffer[:del].push( value_id )
+      else
+        throw "Invalid reply_value operation: operation_type: #{operation_type.inspect}, value_id: #{value_id.inspect}, data: #{data.inspect}"
+      end
     end
   
     # Sends data to the client's javascript console.

data/lib/values/hvalue.rb

@@ -248,12 +248,11 @@ module RSence
     def to_client( msg )
       if @is_new_to_client
         ## Initialize a new client value
-        init_str = "COMM.Values.create(#{@value_id.to_json},#{@data.to_json});"
-        msg.reply_value( init_str )
+        msg.reply_value( :new, @value_id, @data )
         @is_new_to_client = false
       else
         ## Sets the client value
-        msg.reply_value "HVM.s(#{@value_id.to_json},#{@data.to_json});" 
+        msg.reply_value( :set, @value_id, @data )
       end
     end
     
@@ -270,142 +269,13 @@ module RSence
       session_values.delete( @value_id )
       
       if msg and not @is_new_to_client
-        msg.reply_value("HVM.del(#{@value_id.to_json});")
+        msg.reply_value( :del, @value_id )
       end
     end
     alias die die!
     
   end
 
-
-=begin
-  class UploadValue < HValue
-  
-    @state_responders = {
-      :ready   => [], # id == 0
-      :started => [], # id == 1
-      :process => [], # id == 2 ; also uses bind
-      3 => [], # id == 3
-      4 => [], # id == 4
-      :error => [] # id < 0
-    }
-  
-    @upload_state = 0
-    @upload_key = ''
-    @uploads = []
-  
-    # the data should contain both state and key in the value
-    def from_client( msg, data )
-    
-      ## change the valid state, because the value was set by the client!
-      @is_valid = data.include?(':::')
-    
-      # the state and key are separated by the ':::' delimiter string
-      if @is_valid
-      
-        # split state and key using the delimiter
-        (upload_state, upload_key) = data.split(':::')
-      
-        # the state is a number
-        upload_state = upload_state.to_i
-      
-        @upload_state = upload_state
-        @upload_key = upload_key
-      
-        # negative states are errors
-        if upload_state < 0
-          # "upload error: #{upload_state}"
-          # (parse the error)
-          unless @state_responders[:error].empty?
-            @state_responders[:error].each do |plugin_name,method_name|
-              msg.run( plugin_name,method_name,msg,self,upload_state )
-            end
-          end
-        
-        # the default state, 0 means the UI is ready to send an
-        # upload and ticketserve is ready to receive it
-        elsif upload_state == 0
-          # "upload state: ready to upload."
-          # (do nothing)
-        
-          unless @state_responders[:ready].empty?
-            @state_responders[:ready].each do |plugin_name,method_name|
-              msg.run( plugin_name,method_name,msg,self,upload_state )
-            end
-          end
-        
-        # this state means the upload's transfer is started and progressing
-        elsif upload_state == 1
-          # "upload state: upload started."
-          # (show progress bar)
-        
-          unless @state_responders[:started].empty?
-            @state_responders[:started].each do |plugin_name,method_name|
-              msg.run( plugin_name,method_name,msg,self,upload_state )
-            end
-          end
-      
-        # this state means the upload's transfer is complete,
-        # but the uploaded data hasn't been handled yet.
-        elsif upload_state == 2
-          # "upload state: waiting to process."
-        
-          uploads = msg.plugins[:ticketservices].get_uploads(upload_key,true)
-          if uploads.size == 1
-            uploaded_data = uploads[0]
-          
-            # only process changes, if different from the one already stored.
-            if uploaded_data != @data
-            
-              @data = uploaded_data
-            
-              ## add the id to the values to be checked
-              check_ids = msg.session[:values][:check]
-              unless check_ids.include?( @value_id )
-                check_ids.push( @value_id )
-              end
-            
-            end
-            msg.plugins[:ticketservices].del_uploads(upload_key,msg.ses_id)
-          else
-            # "upload, amount of uploads: #{uploads.size}"
-          end
-        
-          # 
-          hvalue.set(msg,"3:::#{upload_key}")
-        
-          msg.console( "upload state: set to ack" )
-        
-        elsif upload_state == 3
-          # "upload state: waiting for user ack."
-          # (do nothing)
-        
-          msg.console( "upload state: waiting user ack" )
-        
-        
-        elsif upload_state == 4
-          # "upload state: user wants to upload again."
-          # (set a new upload key, )
-        
-          msg.console( "upload state: ack, getting new key" )
-        
-        
-          setup_upload( msg, hvalue )
-        
-        
-        else
-          # "upload unknown state: #{upload_state.inspect}"
-        end
-      end
-      return true
-    end
-    def setup_upload(msg,hvalue,size_bytes=500*1024,accept_mime=/image\/(.*?)/,allow_multi=false)
-      upload_key = msg.plugins[:ticketservices].upload_key(msg,hvalue.val_id,size_bytes,accept_mime,allow_multi)
-      hvalue.set( msg, upload_key )
-    end
-  end
-=end
-
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsence
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 1
-  - 2
-  version: 2.1.2
+  - 3
+  version: 2.1.3
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +02:00
+date: 2010-12-12 00:00:00 +02:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency