rsence-pre 2.2.0.36 → 2.2.0.37

data/VERSION

@@ -1 +1 @@
-2.2.0.36.pre
+2.2.0.37.pre

data/js/controls/stringview/stringview.js

@@ -17,47 +17,58 @@
   ** +type+::   '[HStringView]'
   ** +value+::  The string that this string view displays when drawn.
   ***/
-var//RSence.Controls
-HStringView = HControl.extend({
+var HStringView, HLabel;
 
-  componentName: "stringview",
-  
-  defaultEvents: {
-    contextMenu: true
-  },
-  
-/** = Description
-  * HStringView allows the default contextMenu action.
-  *
-  **/
-  contextMenu: function(){
-    return true;
-  },
-  
-/** = Description
-  * The setStyle method of HStringView applies only to the value 
-  * element (not the whole component).
-  *
-  **/
-  setStyle: function(_name, _value, _cacheOverride) {
-    if (!this['markupElemIds']||!this.markupElemIds['value']) {
+(function(){
+  var _HStringViewInterface = {
+
+    componentName: "stringview",
+
+  /** = Description
+    * The setStyle method of HStringView applies only to the value
+    * element (not the whole component).
+    *
+    **/
+    setStyle: function(_name, _value, _cacheOverride) {
+      if (!this['markupElemIds']||!this.markupElemIds['value']) {
+        return this;
+      }
+      this.setStyleOfPart( 'value', _name, _value, _cacheOverride);
       return this;
-    }
-    ELEM.setStyle(this.markupElemIds.value, _name, _value, _cacheOverride);
-    return this;
-  },
-  
-/** = Description
-  * The refreshLabel of HStringView sets a tool tip.
-  * Applied by the setLabel method and the label attribute of options.
-  *
-  **/
-  refreshLabel: function() {
-    if(this.markupElemIds) {
-      if(this.markupElemIds.value) {
-        ELEM.setAttr(this.markupElemIds.value, 'title', this.label);
+    },
+    
+  /** = Description
+    * The refreshLabel of HStringView sets a tool tip.
+    * Applied by the setLabel method and the label attribute of options.
+    *
+    **/
+    refreshLabel: function() {
+      if(this.markupElemIds) {
+        if(this.markupElemIds.value) {
+          if( this.value !== undefined ){
+            this.setAttrOfPart( 'value', 'title', this.label );
+          }
+          else {
+            this.setMarkupOfPart( 'value', this.label );
+          }
+        }
       }
     }
-  }
-});
+  };
+
+  HLabel = HView.extend( _HStringViewInterface );
+  HStringView = HControl.extend( _HStringViewInterface ).extend({
+    defaultEvents: {
+      contextMenu: true
+    },
+    
+  /** = Description
+    * HStringView allows the default contextMenu action.
+    *
+    **/
+    contextMenu: function(){
+      return true;
+    }
+  });
 
+})();

data/js/controls/tab/tab.js

@@ -280,6 +280,13 @@ HTab = HControl.extend({
 var//RSence.Controls
 HTabItem = {
   nu: function(_rect, _parent, _options){
+    if( _rect.hasAncestor && _rect.hasAncestor( HView ) ){
+      _options = _parent;
+      _parent = _rect;
+    }
+    else {
+      console.warn && console.warn( "Warning: the rect constructor argument of HTabItem is deprecated." );
+    }
     return _parent.addTab( _options.label, _options.select );
   }
 };
@@ -356,6 +363,13 @@ GUITreeTabView = HControl.extend({
 var//RSence.Controls
 GUITreeTabItem = {
   nu: function( _rect, _parent, _options ){
+    if( _rect.hasAncestor && _rect.hasAncestor( HView ) ){
+      _options = _parent;
+      _parent = _rect;
+    }
+    else {
+      console.warn && console.warn( "Warning: the rect constructor argument of GUITreeTabItem is deprecated." );
+    }
     return _parent.addTab( _options.label, _options.select, GUITreeTabView, _options );
   }
 };

data/js/controls/tab/themes/default/tab.css

@@ -68,10 +68,12 @@
 .tab_bg {
   position: absolute;
   top: 24px; left: 0px; right: 0px; bottom: 0px;
+  border-radius: 0 0 3px 3px;
   background-image: #{this.getCssFilePath('tab_border_pattern.png')};
 }
 .tab_fg {
   position: absolute;
   top: 0px; left: 1px; right: 1px; bottom: 1px;
+  border-radius: 0 0 3px 3px;
   background-image: #{this.getCssFilePath('tab_bg_color.png')};
 }

data/js/controls/uploader/uploader.coffee

@@ -77,7 +77,6 @@ HUploader = HControl.extend
     @setStyleOfPart( 'form', 'visibility', 'hidden' )
 
   setUploadState: (_state, _uploadKey)->
-    console.log('state:',_state,', uploadKey:',_uploadKey)
     if _state != @uploadState
       @uploadState = _state
       _stateKey = _state.toString()

data/js/core/class/class.js

@@ -129,6 +129,9 @@ HClass.prototype = {
         } )
       )( arguments );
     };
+    this.hasAncestor = function( _obj ){
+      return this.ancestors.indexOf( _obj ) !== -1;
+    };
     this['new'] = this.nu;
     return this;
   },
@@ -190,7 +193,8 @@ HClass.prototype = {
 HClass.extend = function(_instance, _static) {
   // reference to HClass's prototype extend method (HClass's class structure extend method)
   var _extend = HClass.prototype.extend,
-      _prototype, _constructor, _klass, _object;
+      _prototype, _constructor, _klass, _object,
+      _ancestors, i=0;
   // if _instance is undefined,null,"" etc. creates object so that code below works
   if (!_instance) {
     _instance = {};
@@ -206,11 +210,13 @@ HClass.extend = function(_instance, _static) {
   _prototype.constructor = this;
   delete HClass._prototyping;
   
+  _ancestors = [];
   _klass = function() {
     if (!HClass._prototyping) {
       _constructor.apply(this, arguments);
     }
     this.constructor = _klass;
+    this.ancestors = _ancestors;
   };
   // this is the new class's prototype (class structure)
   _klass.prototype = _prototype;
@@ -232,8 +238,14 @@ HClass.extend = function(_instance, _static) {
   if (_object.init instanceof Function) {
     _object.init();
   }
+  _ancestors.push( _object );
+  for( ; i < this.ancestors.length; i++ ){
+    _ancestors.push( this.ancestors[i] );
+  }
+  _object.ancestors = _ancestors;
   return _object;
 };
+HClass.ancestors = [ HClass ];
 
 /** = Description
   * Copies the prototype properties and methods from _interface or if it is an object it's properties and functions

data/js/foundation/json_renderer/json_renderer.js

@@ -24,7 +24,7 @@
 //var//RSence.Foundation
 COMM.JSONRenderer = HClass.extend({
   
-  version: 0.9,
+  version: 1.0,
 
 /** = Description
   * Renders JSON structured data, see some of the demos for usage examples.
@@ -37,12 +37,49 @@ COMM.JSONRenderer = HClass.extend({
     if((_data['type'] === 'GUITree') && (this.version >= _data['version'])){
       this.data   = _data;
       this.parent = _parent;
+      this.byId = {};
+      this.byName = {};
       this.render();
+      var _rndr = this;
+      if( this.view.hasAncestor( HApplication ) ){
+        this.view.getViewbyId = function(_id){ return _rndr.getViewById(_id); };
+        this.view.getViewsbyName = function(_id){ return _rndr.getViewsByName(_id); };
+      }
+      else if ( this.view.hasAncestor( HView ) ){
+        this.view.app.getViewbyId = function(_id){ return _rndr.getViewById(_id); };
+        this.view.app.getViewsbyName = function(_id){ return _rndr.getViewsByName(_id); };
+      }
     }
     else{
       throw("JSONRenderer: Only GUITree version "+this.version+" or older data can be handled.");
     }
   },
+  getViewById: function(_id){
+    if( this.byId[_id] !== undefined ){
+      return this.byId[_id];
+    }
+    console.log('JSONRenderer; no such view Id: '+_id);
+    return null;
+  },
+  addViewId: function(_id, _view){
+    if( this.byId[_id] !== undefined ){
+      console.log('JSONRenderer; already has id: '+_id+' (replacing)');
+    }
+    this.byId[_id] = _view;
+  },
+  getViewsByName: function(_name){
+    if( this.byName[_id] !== undefined ){
+      return this.byName[_name];
+    }
+    console.log('JSONRenderer; no views named: '+_name);
+    return [];
+  },
+  addViewName: function(_name, _view){
+    if( this.byName[_name] === undefined ){
+      this.byName[_name] = [];
+    }
+    this.byName[_name].push(_view);
+  },
   render: function(){
     this.scopes = [window];
     this.scopeDepth = 0;
@@ -141,11 +178,41 @@ COMM.JSONRenderer = HClass.extend({
       return (new _class(_args));
     }
   },
+  _handleCall: function( _instance, _call ){
+    if( _call instanceof Object ){
+      var
+      _methodName, _arguments;
+      for( _methodName in _call ){
+        // console.log('methodName:',_methodName);
+        if( typeof _instance[_methodName] === 'function' ){
+          // console.log('callArguments:',_call[_methodName]);
+          try{
+            _instance[_methodName].apply( _instance, _call[_methodName] );
+          }
+          catch(e){
+            console.log('JSONRenderer handleCall error:',e.toString()+', method:',_instance[_methodName],', call args:', _call[_methodName],', e:',e);
+          }
+        }
+        else {
+          console.log('JSONRenderer handleCall error; undefined method: ',_methodName);
+        }
+      }
+    }
+    else {
+      console.log('JSONRenderer handleCall error, unable to handle call format: ',_call);
+    }
+  },
   renderNode: function( _dataNode, _parent ){
     var
     _reserved = [ 'type', 'args', 'version', 'class', 'rect', 'bind', 'extend', 'options', 'subviews', 'define' ],
     _className, _class, _origNode, _straightParams = false, _rect, _hasRect, _hasSubviews, _subViews,
     _hasOptions, _options, _hasExtension, _extension, _hasBind, _bind,
+    _hasName, _hasId,
+    _isAppClass = false, _isViewClass = false,
+    _autoOptionItems = [
+      'label', 'style', 'visible', 'theme', 'html',
+      'value', 'enabled', 'events', 'active', 'minValue', 'maxValue'
+    ], _autoOptionItem, _hasCall, _call,
     _hasDefinition, _definition, _instance, i, _subView = null;
 
     // The name of the class:
@@ -166,18 +233,35 @@ COMM.JSONRenderer = HClass.extend({
     }
 
     _class = this.findInScope( _className );
+    
+    if (_class['hasAncestor'] !== undefined){
+      _isAppClass = _class.hasAncestor( HApplication );
+      _isViewClass = _class.hasAncestor( HView );
+    }
+
+    _hasId = ( _dataNode['id'] !== undefined ) && ( typeof _dataNode['id'] === 'string' );
+    _hasName = ( _dataNode['name'] !== undefined ) && ( typeof _dataNode['name'] === 'string' );
 
     if( _straightParams ){
-      return this.initStraight( _class, _dataNode );
+      _instance = this.initStraight( _class, _dataNode );
     }
     else if( _dataNode['args'] !== undefined ){
-      return this.initStraight( _class, _dataNode['args'] );
+      _instance = this.initStraight( _class, _dataNode['args'] );
     }
     else if( _origNode && _origNode['args'] !== undefined ){
-      return this.initStraight( _class, _origNode['args'] );
+      _instance = this.initStraight( _class, _origNode['args'] );
+    }
+    if( _instance ){
+      if( _hasId ){
+        this.addViewId( _dataNode.id, _instance );
+      }
+      if( _hasName ){
+        this.addViewName( _dataNode.id, _instance );
+      }
+      return _instance;
     }
     
-    // Currently only HView -derived classes are supported, so 
+    // Currently only HView -derived classes are supported, so
     // the rect is mandatory.
     _rect = _dataNode['rect'];
     _hasRect = (_rect !== undefined) && (_rect instanceof Array || typeof _rect === 'string');
@@ -185,7 +269,12 @@ COMM.JSONRenderer = HClass.extend({
       _hasRect = _origNode['rect'] !== undefined;
       _rect    = _hasRect?_origNode['rect']:null;
     }
-    
+    if( !_isViewClass ){
+      if( _hasRect ){
+        console.log( "renderNode warning; Supposedly rect-incompatible class supplied: "+_className );
+      }
+    }
+
     // Checks, if any sub-views are defined.
     _hasSubviews = _dataNode['subviews'] !== undefined;
     _subViews    = _hasSubviews?_dataNode['subviews']:null;
@@ -201,6 +290,16 @@ COMM.JSONRenderer = HClass.extend({
       _hasOptions = _origNode['options'] !== undefined;
       _options    = _hasOptions?_origNode['options']:null;
     }
+    for( i=0; i < _autoOptionItems.length; i++ ){
+      _autoOptionItem = _autoOptionItems[i];
+      if( _dataNode[ _autoOptionItem ] !== undefined ){
+        if( !_hasOptions ){
+          _hasOptions = true;
+          _options = {};
+        }
+        _options[_autoOptionItem] = _dataNode[ _autoOptionItem ];
+      }
+    }
     
     // JS Extension block
     _hasExtension = _dataNode['extend'] !== undefined;
@@ -217,6 +316,11 @@ COMM.JSONRenderer = HClass.extend({
       _hasBind = _origNode['bind'] !== undefined;
       _bind    = _hasBind?_origNode['bind']:null;
     }
+
+    _hasCall = _dataNode['call'] !== undefined;
+    if( _hasCall ){
+      _call = _dataNode['call'];
+    }
     
     // JS Definition block
     _hasDefinition = _dataNode['define'] !== undefined;
@@ -225,7 +329,10 @@ COMM.JSONRenderer = HClass.extend({
       _hasDefinition  = _origNode['define'] !== undefined;
       _definitions    = _hasDefinition?_origNode['define']:null;
     }
-    
+    if( _rect === null && _class['hasAncestor'] && _class.hasAncestor( HView ) ) {
+      console.log( 'Ancestors include HView, but no rect defined!' );
+    }
+
     // The HView-derived class instance, instance is by default the parent
     _instance = _parent;
     
@@ -280,12 +387,34 @@ COMM.JSONRenderer = HClass.extend({
           }
         }
         // For HApplication -derived classes
-        if(!_hasRect && _hasOptions){
-          _instance = _class.nu(_options);
+        if( _isAppClass ){
+          if( _hasOptions ){
+            _instance = _class.nu( _options );
+          }
+          else {
+            _instance = _class.nu();
+          }
         }
-        // For HView and HControl -derived classes
-        else if(_hasRect){
-          _instance = _class.nu(_rect,_parent,_options);
+        else if ( _isViewClass ){
+          _instance = _class.nu( _rect, _parent, _options );
+        }
+        else {
+          if( _hasRect ){
+            if( _hasOptions ){
+              _instance = _class.nu(_rect,_parent,_options);
+            }
+            else {
+              _instance = _class.nu(_rect,_parent);
+            }
+          }
+          else if ( _hasOptions ){
+            // console.log(_className,_parent,_options);
+            _instance = _class.nu( _parent, _options );
+          }
+          else {
+            // console.log('renderNode warning; unsure how to construct: '+_className+', rect:',_rect,', options:',_options);
+            _instance = _class.nu( _parent );
+          }
         }
         if(!_hasOptions){
           if(_hasBind){
@@ -304,8 +433,17 @@ COMM.JSONRenderer = HClass.extend({
       else if(!(!_class && _hasSubviews)) {
         console.log('renderNode warning; No such class: '+_className+', node: ',_dataNode);
       }
+      if( _hasId ){
+        this.addViewId( _dataNode.id, _instance );
+      }
+      if( _hasName ){
+        this.addViewName( _dataNode.id, _instance );
+      }
+      if(_hasCall){
+        this._handleCall(_instance,_call);
+      }
     }
-    catch(e){
+    catch (e){
       console.log('renderNode error:',e.toString()+', rect:',_rect,', class:',_dataNode['class'],', options:', _options,', e:',e);
     }
     // Iterates recursively through all subviews, if specified.

data/js/lists/checkboxlist/checkboxlist.js

@@ -13,7 +13,7 @@
   **
   ***/
 var//RSence.Lists
-HCheckboxList = HControl.extend({
+HCheckboxList = HListItemControl.extend({
   
 /** = Description
   * Draws borders with 1px and sets 'overflow' to 'auto'.
@@ -21,6 +21,7 @@ HCheckboxList = HControl.extend({
   **/
   drawSubviews: function(){
     this.setStyle('border','1px solid #999');
+    this.setStyle('border-radius','3px');
     this.setStyle('overflow','auto');
   },
   listItems: [],
@@ -103,6 +104,7 @@ HCheckboxList = HControl.extend({
   *
   **/
   setListItems: function(_listItems){
+    _listItems = this._cleanListItems(_listItems);
     var _listItem,
         _value,
         _label,

data/js/lists/listitems/listitems.js

@@ -27,6 +27,13 @@ var//RSence.Lists
 HListItems = HValueResponder.extend({
   
   constructor: function( _rect, _parent, _options ){
+    if( _rect.hasAncestor && _rect.hasAncestor( HView ) ){
+      _options = _parent;
+      _parent = _rect;
+    }
+    else {
+      console.warn && console.warn( "Warning: the rect constructor argument of HListItems is deprecated." );
+    }
     this.parent = _parent;
     if ( this.parent.setListItemResponder ){
       this.parent.setListItemResponder( this );
@@ -54,10 +61,6 @@ HListItems = HValueResponder.extend({
     _this.value = null;
   },
   
-  _warningMessage: function(_messageText){
-    console.log("Warning; HListItems: "+_messageText);
-  },
-  
 /** = Description
   * Iterates through this.value array and calls
   * the setListItems function of the parent class.
@@ -65,40 +68,51 @@ HListItems = HValueResponder.extend({
   **/
   refresh: function(){
     if ( this.value instanceof Array ) {
-      var _listItems = [],
-          _row, _rowType,
-          _label, _value,
-          i = 0;
-      for ( ; i < this.value.length ; i++ ){
-        _row = this.value[i];
-        _rowType = COMM.Values.type( _row );
-        // console.log('row:',_row,' rowType:',_rowType);
-        // hashes
-        if ( _rowType === 'h' ) {
-          _label = _row.label;
-          _value = _row.value;
-          if ( _label === undefined || _value === undefined ){
-            this._warningMessage( "The value or label of row "+_row+" is undefined (ignored)" );
-          }
-          _listItems.push( [_value, _label] );
-        }
-        // Arrays as-is
-        else if ( _rowType == 'a' ){
-          _listItems.push( _row );
-        }
-        // strings and integers
-        else if ( ['s','n'].indexOf(_rowType) !== -1 ){
-          _label = _row.toString();
-          _value = _row;
-          _listItems.push( [_value, _label] );
-        }
-        else {
-          this._warningMessage( "The row "+_row+" is has unsupported row type: '"+_rowType+"' (ignored)" );
-        }
-      }
-      this.parent.setListItems( _listItems );
+      this.parent.setListItems( this.value );
     }
   }
 });
 
+var
+HListItemControl = HControl.extend({
 
+  _cleanListItems: function(_listItemsIn){
+    var _listItems = [],
+        _row, _rowType,
+        _label, _value,
+        i = 0;
+    for ( ; i < _listItemsIn.length ; i++ ){
+      _row = _listItemsIn[i];
+      _rowType = COMM.Values.type( _row );
+      // console.log('row:',_row,' rowType:',_rowType);
+      // hashes
+      if ( _rowType === 'h' ) {
+        _label = _row.label;
+        _value = _row.value;
+        if ( _label === undefined || _value === undefined ){
+          console.log( "The value or label of row "+_row+" is undefined (ignored)" );
+        }
+        _listItems.push( [_value, _label] );
+      }
+      // Arrays as-is
+      else if ( _rowType == 'a' ){
+        _listItems.push( _row );
+      }
+      // strings and integers
+      else if ( ['s','n'].indexOf(_rowType) !== -1 ){
+        _label = _row.toString();
+        _value = _row;
+        _listItems.push( [_value, _label] );
+      }
+      else {
+        console.log( "The row "+_row+" has an unsupported row type: '"+_rowType+"' (ignored)" );
+      }
+    }
+    return _listItems;
+  },
+
+  setListItems: function( _listItems ){
+    _listItems = this._cleanListItems(_listItems);
+  }
+
+});

data/js/lists/radiobuttonlist/radiobuttonlist.js

@@ -11,9 +11,10 @@
   ** The value of the instance is the selected key in the listItems.
   ***/
 var//RSence.Lists
-HRadioButtonList = HControl.extend({
+HRadioButtonList = HListItemControl.extend({
   drawSubviews: function(){
-    this.setStyle('border','1px solid #999');
+    this.setStyle('border','1px solid #999999');
+    this.setStyle('border-radius','3px');
     this.setStyle('overflow-y','auto');
   },
   listItems: [],
@@ -32,6 +33,7 @@ HRadioButtonList = HControl.extend({
   *
   **/
   setListItems: function(_listItems){
+    _listItems = this._cleanListItems(_listItems);
     var _listItem,
         _value,
         _label,

data/js/menus/minimenu/minimenu.js

@@ -132,8 +132,8 @@ HMiniMenu = HRadioButtonList.extend({
     );
   },
   
-  setListItems: function(listItems){
-    this.base(listItems);
+  setListItems: function(_listItems){
+    this.base(_listItems);
     this.valueMatrix = this.menuItemView.valueMatrix;
     this.refreshValue();
     if( this.options.initialVisibility ){

data/lib/rsence/pluginmanager.rb

@@ -306,7 +306,7 @@ module RSence
         
         # System version requirement.
         # NOTE: Has no effect yet!
-        :sys_version => '>= 2.0.0',
+        :sys_version => '>= 2.2.0',
         
         # Dependency, by default the system category (built-in plugins).
         # A nil ( "~" in yaml ) value means no dependencies.

data/lib/rsence/plugins/plugin.rb

@@ -380,6 +380,12 @@ module RSence
       
       # @private  Returns a sanitized copy of a single value item.
       def sanitize_value_item( value_item_dirty )
+        unless value_item_dirty.class == Hash
+          value_item_dirty = {
+            :value => value_item_dirty,
+            :restore_default => false
+          }
+        end
         value_item_clean = {}
         value_item_dirty.each do | key, value |
           if key.to_sym == :value or key.to_sym == :data

data/lib/rsence.rb

@@ -74,7 +74,9 @@ module RSence
   # +:autoupdate+:: (true or false) True, if the +-a+ or +--auto-update+ command-line option was given. Default is false.
   # +:latency+:: (Number) Amount of milliseconds to sleep in each request given with the +--latency+ command-line option. Default is 0.
   # +:say+:: (true or false) True, if the +-S+ or +--say+ command-line option was given. Default is false.
-  def self.args;    @@argv_parser.args;    end
+  def self.args; @@argv_parser.args; end
+
+  def self.env_path; @@argv_parser.args[:env_path]; end
   
   # @private  This accessor enables RSence.startable? method, which returns true if a start-type command was given.
   def self.startable?; @@argv_parser.startable?; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.2.0.36
+  version: 2.2.0.37
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
-  requirement: &70324830245020 !ruby/object:Gem::Requirement
+  requirement: &70324729769980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,7 +22,7 @@ dependencies:
         version: '966'
   type: :runtime
   prerelease: false
-  version_requirements: *70324830245020
+  version_requirements: *70324729769980
 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.