rsence 2.1.7 → 2.1.8

data/INSTALL.rdoc

@@ -84,7 +84,7 @@ Replace the +\my_projects+ path with the path to the directory where you want to
   * Using just defaults, the following URL should work: http://127.0.0.1:8001
 
 ==== Windows limitations
-If you install the sqlite dll and the sqlite3-ruby gem, you'll gain persistent sessions and this warning message will disappear:
+If you install the sqlite dll and the sqlite3 gem, you'll gain persistent sessions and this warning message will disappear:
 `Warning: Session database is not available. Can't use persistent sessions`
 
 It's not a dependency in the default install, because it's not strictly required and makes the first installation much easier. Also, you can use any other database supported by Sequel instead of Sqlite.
@@ -134,10 +134,10 @@ This not only enables SessionStorage (persistent sessions between RSence restart
 * *jscompress*:: C-optimized Javascript compression and obfuscation library developed for RSence specifically
 * *html_min*:: C-optimized HTML whitespace removal library developed for RSence specfically
 * *cssmin*:: CSS whitespace removal library
-* *sequel*[http://www.sequel.org]
+* *sequel*[http://sequel.rubyforge.org/]
   * Generic SQL database ORM
   * A Sequel driver for your preferred database is also needed:
-    * *sqlite3-ruby*:: SQLite[http://www.sqlite.org] is a light-weight SQL library. Recommended for development and small projects.
+    * *sqlite3*:: SQLite[http://www.sqlite.org] is a light-weight SQL library. Recommended for development and small projects.
     * Other database adapters compatible with Sequel are fine. Just configure RSence accordingly.
 * *highline*:: Console-based menu prompt system by the init command.
 * rmagick
@@ -151,6 +151,7 @@ The primary installation method of RSence is via RubyGems.
 
 To ensure your RubyGems is up-to-date, run:
   sudo gem update --system
+* gem update --system is disabled in Debian based systems, such as Ubuntu. It's okay to skip on these systems.
 
 Even if RubyGems is up-to-date, ensure your installed gems are up-to-date, some of these are updated frequently. This will also update RSence release versions to the most recent version, if installed.
   sudo gem update
@@ -160,8 +161,11 @@ Even if RubyGems is up-to-date, ensure your installed gems are up-to-date, some
 This will install RSence via RubyGems, the preferred method. All dependencies are installed too, except for the ones you already might have installed.
   gem install rsence
 
+Debian/Ubuntu users need to include /var/lib/gems/1.8/bin into PATH either by adding it directly there or by making a symbolic link:
+  sudo ln -s /var/lib/gems/1.8/bin/rsence /usr/local/bin/rsence
+
 Optionally, you might want to contribute to RSence development, just clone or fork the GIT repository on Github:
-  * http://github.com/rsence/rsence
+  http://github.com/rsence/rsence
 
 When installed, ensure it works by exploring the help of the 'rsence' command, like:
   rsence

data/VERSION

@@ -1 +1 @@
-2.1.7
+2.1.8

data/js/controls/stringview/stringview.js

@@ -22,8 +22,21 @@ HStringView = HControl.extend({
 
   componentName: "stringview",
   
+  defaultEvents: {
+    contextMenu: true
+  },
+  
+/** = Description
+  * HStringView allows the default contextMenu action.
+  *
+  **/
+  contextMenu: function(){
+    return true;
+  },
+  
 /** = Description
-  * setStyle function
+  * The setStyle method of HStringView applies only to the value 
+  * element (not the whole component).
   *
   **/
   setStyle: function(_name, _value, _cacheOverride) {
@@ -35,7 +48,8 @@ HStringView = HControl.extend({
   },
   
 /** = Description
-  * refreshLable function
+  * The refreshLabel of HStringView sets a tool tip.
+  * Applied by the setLabel method and the label attribute of options.
   *
   **/
   refreshLabel: function() {

data/js/controls/textcontrol/textcontrol.js

@@ -22,7 +22,8 @@ HTextControl = HControl.extend({
   componentName: "textcontrol",
   
   defaultEvents: {
-    textEnter: true
+    textEnter: true,
+    contextMenu: true
   },
   
   controlDefaults: (HControlDefaults.extend({
@@ -30,6 +31,13 @@ HTextControl = HControl.extend({
     refreshOnInput: true
   })),
   
+/** = Description
+  * The contextMenu event for text input components is not prevented by default.
+  **/
+  contextMenu: function(){
+    return true;
+  },
+  
 /** = Description
   * The refreshLabel method sets the title property of the text
   * field, essentially creating a tooltip using the label.
@@ -60,7 +68,50 @@ HTextControl = HControl.extend({
 /** This flag is true, when the text input field has focus.
   **/
   hasTextFocus: false,
-
+  
+  _getChangeEventFn: function(){
+    var _this = this;
+    return function(e){
+      if(_this._clipboardEventTimer){
+        clearTimeout( this._clipboardEventTimer );
+      }
+      _this._clipboardEventTimer = setTimeout( function(){_this.clipboardEvent();}, 200 );
+      return true;
+    };
+  },
+  
+  _updateValueFromField: function(){
+    this.setValue(
+      this.validateText(
+        this.getTextFieldValue()
+      )
+    );
+  },
+  
+  _clipboardEventTimer: null,
+  clipboardEvent: function(){
+    this._updateValueFromField();
+    clearTimeout( this._clipboardEventTimer );
+    this._clipboardEventTimer = null;
+  },
+  
+  _changeEventFn: null,
+  _clearChangeEventFn: function(){
+    if( this._changeEventFn ){
+      Event.stopObserving( ELEM.get(this.markupElemIds.value), 'paste', this._changeEventFn );
+      Event.stopObserving( ELEM.get(this.markupElemIds.value), 'cut', this._changeEventFn );
+      this._changeEventFn = null;
+    }
+  },
+  _setChangeEventFn: function(){
+    if( this._changeEventFn ){
+      this._clearChangeEventFn();
+    }
+    this._changeEventFn = this._getChangeEventFn();
+    Event.observe( ELEM.get(this.markupElemIds.value), 'paste', this._changeEventFn );
+    Event.observe( ELEM.get(this.markupElemIds.value), 'cut', this._changeEventFn );
+  },
+  
 /** = Description
   * Special event for text entry components.
   * Called when the input field gains focus.
@@ -68,6 +119,7 @@ HTextControl = HControl.extend({
   **/
   textFocus: function(){
     this.hasTextFocus = true;
+    this._setChangeEventFn();
     return true;
   },
 
@@ -78,12 +130,19 @@ HTextControl = HControl.extend({
   **/
   textBlur: function(){
     this.hasTextFocus = false;
+    this._clearChangeEventFn();
+    this._updateValueFromField();
     if(this.options.refreshOnBlur){
       this.refreshValue();
     }
     return true;
   },
-
+  
+  onIdle: function(){
+    this.hasTextFocus && this._updateValueFromField();
+    this.base();
+  },
+  
 /** = Description
   * refreshValue function
   *
@@ -148,6 +207,11 @@ HTextControl = HControl.extend({
     return '---'+Math.round((1+Math.random())*10000)+'---';
   },
   
+  die: function(){
+    this._clearChangeEventFn();
+    this.base();
+  },
+  
 /** = Description
   * Returns the selection (or text cursor position) of the input element
   * as an +Array+ like +[ startOffset, endOffset ]+.
@@ -283,7 +347,8 @@ HNumericTextControl = HTextControl.extend({
   
   defaultEvents: {
     mouseWheel: true,
-    textEnter: true
+    textEnter: true,
+    contextMenu: true
   },
   
 /** Uses the mouseWheel event to step up/down the value.

data/js/core/elem/elem.js

@@ -1016,6 +1016,9 @@ ELEM = {
         if (_key === 'opacity') {
           _this.setOpacity(_id, _value);
         }
+        else if ( !_elems[_id] ){
+          console.log('ELEM#setStyle: Not a element! id:',_id,', key:',_key,', value:', _value);
+        }
         else {
           _this._setElementStyle( _elems[_id], _key, _cached[_key] );
         }
@@ -1203,6 +1206,9 @@ ELEM = {
       if (_key === 'opacity') {
         _this.setOpacity(_id, _cached[_key]);
       }
+      else if ( !_elem ){
+        console.log('ELEM#_flushStyleCache: Not a element! id:',_id,', key:',_key,', value:', _value);
+      }
       else {
         _this._setElementStyle( _elem, _key, _cached[_key] );
       }

data/js/foundation/control/eventresponder/eventresponder.js

@@ -153,7 +153,8 @@ HEventResponder = HClass.extend({
         textEnter:   false,
         click:       false,
         resize:      false,
-        doubleClick: false
+        doubleClick: false,
+        contextMenu: false
       } ).extend( this.defaultEvents ).extend( _events?_events:{} ).nu();
     }
     this.events.ctrl = this;
@@ -284,6 +285,24 @@ HEventResponder = HClass.extend({
     return this;
   },
   
+/** = Description
+  * Registers or releases event listening for contextMenu events depending on 
+  * the value of the flag argument.
+  *
+  * = Parameters
+  * +_flag+:: Set the contextMenu event listening on/off (true/false) for
+  *           the component instance.
+  *
+  * = Returns
+  * +self+
+  *
+  **/
+  setContextMenu: function(_flag) {
+    this.events.contextMenu = _flag;
+    this.setEvents();
+    return this;
+  },
+  
 /** = Description
   * Registers or releases event listening for mouseUp events depending on the 
   * value of the flag argument.
@@ -537,6 +556,13 @@ HEventResponder = HClass.extend({
   **/
   doubleClick: function(x,y,_isLeftButton){},
   
+/** = Description
+  * Default contextMenu event responder method. Does nothing by default.
+  * Extend to return true to allow the default action of the browser.
+  *
+  **/
+  contextMenu: function(x,y,_isLeftButton){},
+  
 /** = Description
   * Default mouseDown event responder method. Does nothing by default.
   *

data/js/foundation/eventmanager/eventmanager.js

@@ -28,7 +28,8 @@ EVENT = {
     mouseWheel: false,
     resize: false,
     textEnter: false,
-    doubleClick: false
+    doubleClick: false,
+    contextMenu: false
   },
   
 /** = Description
@@ -841,14 +842,13 @@ EVENT = {
   **/
   doubleClick: function(e) {
     var _this = EVENT,
-        _didEndDrag = false,
         x = _this.status[_this.crsrX],
         y = _this.status[_this.crsrY],
         _elemId,
         _ctrl,
         i = 0;
     _this._modifiers(e);
-    // Check for mouseUp listeners.
+    // Check for doubleClick listeners.
     for (i = 0; i !== _this.focused.length; i++) {
       if (_this.focused[i] === true) {
         if (_this.focusOptions[i].doubleClick === true) {
@@ -890,20 +890,38 @@ EVENT = {
     }
   },
   
-  /* Alternative right button detection, wrapper for the mouseDown method */
+/** Mid-level context menu manager.
+  * Gets called on the onContextMenu event.
+  * Delegates the following call to the high-level event receivers of all
+  * enabled controls registered, depending on the events they registered:
+  * - contextMenu
+  *
+  * Just make a component return true to allow the browser's default action.
+  *
+  **/
   contextMenu: function(e) {
-    // EVENT.mouseDown(e, false);
-    Event.stop(e);
-    
-    /***
-    
-    IMPLEMENT SEPARATE CONTEXT-MENU EVENT HANDLING HERE
-    
-    ***/
-    
-    // if(Event.isLeftClick(e)){
-    //   EVENT.status[EVENT.button2] = false;
-    // }
+    var _this = EVENT,
+        x = _this.status[_this.crsrX],
+        y = _this.status[_this.crsrY],
+        _preventDefault = true,
+        _elemId,
+        _ctrl,
+        i = 0;
+    _this._modifiers(e);
+    // Check for contextMenu listeners.
+    for (i = 0; i !== _this.focused.length; i++) {
+      if (_this.focused[i] === true) {
+        if (_this.focusOptions[i].contextMenu === true) {
+          if( _this.focusOptions[i].ctrl.contextMenu() ){
+            _preventDefault = false;
+          }
+        }
+      }
+    }
+    if( _preventDefault ){
+      Event.stop( e );
+    }
+    return true;
   },
 
 

data/js/foundation/view/morphanimation/morphanimation.js

@@ -168,7 +168,9 @@ HMorphAnimation = HClass.extend({
   // --Moves the view for one step. This gets called repeatedly when the animation++
   // --is happening.++
   _animateStep: function(_obj) {
-    var _time = new Date().getTime(), i;
+    var
+    _time = new Date().getTime(),
+    i;
     if (_time < _obj.startTime + _obj.duration) {
       var _cTime = _time - _obj.startTime;
       
@@ -189,14 +191,16 @@ HMorphAnimation = HClass.extend({
           if(_unit){
             _propNow += _unit;
           }
-          ELEM.setStyle(this.elemId,_key, _propNow);
+          ELEM.setStyle( this.elemId, _key, _propNow );
         }
       }
-      
-    } else {
+    }
+    else {
       // Animation is done, clear the interval and finalize the animation.
       for (i = 0; i < _obj.props.length; i++) {
-        ELEM.setStyle(this.elemId,_obj.props[i].prop,
+        ELEM.setStyle(
+          this.elemId,
+          _obj.props[i].prop,
           _obj.props[i].to + _obj.props[i].unit);
       }
       this._animationDone = true;

data/js/foundation/view/view.js

@@ -1047,6 +1047,20 @@ HView = HClass.extend({
   },
   
   setStyles: function(_styles){
+    var _stylesObjType = COMM.Values.type(_styles);
+    if(_stylesObjType==='a'){
+      this.setStylesArray(_styles);
+    }
+    else if(_stylesObjType==='h'){
+      this.setStylesHash(_styles);
+    }
+    else {
+      console.log('HView#setStyles: Invalid data, expected array or hash; type: '+h+', data:',_styles);
+    }
+    return this;
+  },
+  
+  setStylesArray: function(_styles){
     var
     _styleItem, _styleKey, _styleValue, i = 0;
     for(;i<_styles.length;i++){
@@ -1058,6 +1072,16 @@ HView = HClass.extend({
     return this;
   },
   
+  setStylesHash: function(_styles){
+    var
+    _styleKey, _styleValue;
+    for(_styleKey in _styles){
+      _styleValue  = _styles[_styleKey];
+      this.setStyle(_styleKey,_styleValue);
+    }
+    return this;
+  },
+  
 /** = Description
   * Returns a style of the main DOM element of the component.
   * Utilizes +ELEM+ cache to perform the action.
@@ -1252,6 +1276,9 @@ HView = HClass.extend({
     this.stopAnimation();
     // Delete the children first.
     var _childViewId, i;
+    if(!this.views){
+      console.log('HView#die: no subviews for component name: ',this.componentName,', self:',this);
+    }
     while (this.views.length !== 0) {
       _childViewId = this.views[0];
       this.destroyView(_childViewId);
@@ -1365,10 +1392,7 @@ HView = HClass.extend({
     // Could be cached.
     var _bounds = new HRect(this.rect);
     
-    _bounds.right -= _bounds.left;
-    _bounds.left = 0;
-    _bounds.bottom -= _bounds.top;
-    _bounds.top = 0;
+    _bounds.offsetTo(0,0);
     
     return _bounds;
   },

data/js/lists/checkboxlist/checkboxlist.js

@@ -129,12 +129,21 @@ HCheckboxList = HControl.extend({
     this.refreshValue();
   },
   
+  _listItemResponder: null,
+  setListItemResponder: function(_listItemResponder){
+    this._listItemResponder = _listItemResponder;
+  },
+  
 /** = Description
   * Sets listItems and ListItemViews to null and calls 
   * the inherited destructor.
   *
   **/
   die: function(){
+    if(this._listItemResponder){
+      this._listItemResponder.die();
+      this._listItemResponder = null;
+    }
     this.listItems = null;
     this.listItemViews = null;
     this.base();

data/js/lists/listitems/listitems.js

@@ -28,6 +28,12 @@ HListItems = HValueResponder.extend({
   
   constructor: function( _rect, _parent, _options ){
     this.parent = _parent;
+    if ( this.parent.setListItemResponder ){
+      this.parent.setListItemResponder( this );
+    }
+    else {
+      console.log('Warning; parent does not respond to setListItemResponder');
+    }
     if (_options instanceof Object) {
       if (_options['valueObj'] !== undefined) {
         _options.valueObj.bind( this );
@@ -38,6 +44,16 @@ HListItems = HValueResponder.extend({
       }
     }
   },
+  
+  die: function() {
+    var _this = this;
+    if(_this.valueObj){
+      _this.valueObj.unbind(_this);
+      _this.valueObj = null;
+    }
+    _this.value = null;
+  },
+  
   _warningMessage: function(_messageText){
     console.log("Warning; HListItems: "+_messageText);
   },

data/js/lists/radiobuttonlist/radiobuttonlist.js

@@ -66,13 +66,26 @@ HRadioButtonList = HControl.extend({
     );
   },
   
+  _listItemResponder: null,
+  setListItemResponder: function(_listItemResponder){
+    this._listItemResponder = _listItemResponder;
+  },
+  
 /** = Description
   * Destructor. Sets listItems and listItemViews to null and initiates
   * destructor for radioButtonIndexValue.
   * 
   **/
   die: function(){
+    if(this._listItemResponder){
+      this._listItemResponder.die();
+      this._listItemResponder = null;
+    }
+    this.radioButtonIndexValue && this.radioButtonIndexValue.die();
     this.listItems = null;
+    for(var i=0;i<this.listItemViews.length;i++){
+      this.listItemViews[i].die();
+    }
     this.listItemViews = null;
     this.radioButtonIndexValue && this.radioButtonIndexValue.die();
     this.base();
@@ -90,6 +103,9 @@ HRadioButtonList = HControl.extend({
     },
     refresh: function(){
       var _listItems = this.parent.listItems;
+      if(_listItems === undefined || _listItems === null){
+        return;
+      }
       if(_listItems[ this.value ] !== undefined){
         this.parent.setValue( _listItems[ this.value ][0] );
       }
@@ -100,7 +116,7 @@ HRadioButtonList = HControl.extend({
   
   refreshValue: function(){
     var _value = this.value;
-    if ( this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {
+    if ( this.listItems && this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {
       if ( this.radioButtonResponder === false ){
         this.radioButtonIndexValue = HValue.nu( false, 0 );
         this.radioButtonIndexValue.bind( this.valueMatrix );

data/js/menus/minimenu/minimenu.js

@@ -56,10 +56,12 @@ HMiniMenu = HRadioButtonList.extend({
   
   refreshValue: function(){
     this.base();
-    for(var i=0;i<this.listItems.length;i++){
-      if(this.listItems[i][0]===this.value){
-        this.setLabel( this.listItems[i][1] );
-        return;
+    if(this.listItems && this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {
+      for(var i=0;i<this.listItems.length;i++){
+        if(this.listItems[i][0]===this.value){
+          this.setLabel( this.listItems[i][1] );
+          return;
+        }
       }
     }
   },
@@ -97,8 +99,10 @@ HMiniMenu = HRadioButtonList.extend({
   },
   
   die: function(){
-    this.menuItemView.die();
+    this.valueMatrix = null;
+    var _menuItemView = this.menuItemView;
     this.base();
+    _menuItemView.die();
   },
   
   drawSubviews: function(){

data/lib/http/request.rb

@@ -17,8 +17,13 @@ module RSence
   # than the Rack::Request it's extending.
   class Request < Rack::Request
     attr_reader :header, :path, :query
+    class RequestHeader < Hash
+      def [](key)
+        super(key.downcase)
+      end
+    end
     def initialize(env)
-      @header = {}
+      @header = RequestHeader.new
       super
       env2header()
       @path = path_info()

data/lib/http/response.rb

@@ -17,13 +17,15 @@ module RSence
     # Adds the + method "operator" to an extended Array.
     # Used for pushing http body data.
     class ResponseBody < Array
+      
       def push( body_data )
         super( sanitize_body_data( body_data ) )
       end
       def sanitize_body_data( body_data )
-        if body_data.class == String
+        if body_data.class == String or body_data.class == GZString
           return body_data
         elsif body_data.respond_to?(:to_s)
+          warn "WARNING: RSence::Response::ResponseBody -> body_data is not a string. It's a #{body_data.class}, with the following contents: #{body_data.inspect}" if RSence.args[:verbose]
           return body_data.to_s
         else
           warn "Invalid response data: #{body_data.inspect[0..100]}"

data/plugins/client_pkg/lib/client_pkg_serve.rb

@@ -21,204 +21,238 @@ module ClientPkgServe
     return time.gmtime.strftime('%a, %d %b %Y %H:%M:%S %Z')
   end
   
-  ## Responds to get-requests
-  def get( request, response, session )
-    
+  def build_busy_wait
     while @build_busy
       puts "-- build not finished, waiting.. --"
       sleep 0.1
     end
-    
+  end
+  
+  def set_headers( response )
     # Sets the response date header to the current time:
     response['Date'] = httime( Time.now )
     
     # Controls caching with headers based on the configuration
     if ::RSence.config[:cache_maximize]
       response['Expires'] = httime(Time.now+::RSence.config[:cache_expire])
-    
     else
       response['Cache-Control'] = 'no-cache'
     end
-    
-    support_gzip = (request.header.has_key?('accept-encoding') and request.header['accept-encoding'].include?('gzip'))
+  end
+  
+  def check_ua( request )
+    support_gzip = (request.header.has_key?('Accept-Encoding') and request.header['Accept-Encoding'].include?('gzip'))
     support_gzip = false if ::RSence.config[:no_gzip]
-    if request.header.has_key?('user-agent')
-      ua = request.header['user-agent']
+    if request.header.has_key?('User-Agent')
+      ua = request.header['User-Agent']
       is_symbian = ua.include?("SymbianOS")
       is_safari  = ((not is_symbian) and ua.include?("WebKit"))
       is_msie = ((not ua.include?("Opera")) and ua.include?("MSIE"))
       is_msie6 = ((not ua.include?("Opera")) and ua.include?("MSIE 6.0"))
     end
-    
-    ## Split path into an array for determining what to serve
-    request_uri = '/'+request.path.match( /^#{::RSence.config[:broker_urls][:h]}(.*)$/ )[1]
-    
-    request_path = request_uri.split( '/' )
-    
-    ## Requested type of client resource (js/themes)
-    req_type = request_path[2]
-    
-    if not ['js','themes'].include? req_type
-      req_rev = req_type
-      req_type = request_path[3]
-      request_path.delete_at(2)
+    if is_safari
+      version = ua.split( 'WebKit/' )[1].split('.')[0].to_i
+    else
+      version = 0 # not used for others
     end
+    return {
+      :symbian => is_symbian,
+      :safari  => is_safari,
+      :msie    => is_msie,
+      :msie6   => is_msie6,
+      :version => version
+    }
+  end
+  
+  def support_gzip?( ua )
+    doesnt_support = ( ua[:msie6] or ua[:symbian] or (ua[:safari] and ua[:version] < 533) )
+    return ( not doesnt_support )
+  end
+  
+  def serve_htc( request, response, request_path )
+    req_file = request_path[3]
     
-    ## Special rules for the special browser
-    if request.path.include?('.htc')
-      req_file = request_path[3]
+    # this file is a part of iefix, it injects calls to
+    # the ie rendering engine to override stupid behavior
+    # when changing element properties
+    if request_path.include?('ie_css_element.htc')
+      response.status = 200
+      response['Content-Type'] = 'text/x-component'
+      ## Usually, we don't need it, because the client framework does calls when needed
+      response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
       
-      # this file is a part of iefix, it injects calls to
-      # the ie rendering engine to override stupid behavior
-      # when changing element properties
-      if request_path.include?('ie_css_element.htc')
-        response.status = 200
-        response['Content-Type'] = 'text/x-component'
-        ## Usually, we don't need it, because the client framework does calls when needed
-        response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
-        
-        ## Enable it to call iefix automatically whenever element properties are changed
-        #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onpropertychange",iefix.htcElementEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+      ## Enable it to call iefix automatically whenever element properties are changed
+      #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onpropertychange",iefix.htcElementEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+    
+    # this file is a part of iefix, it injects calls to
+    # the ie rendering engine to override stupid behavior
+    # when changing style properties
+    elsif request_path.include?('ie_css_style.htc')
+      response.status = 200
+      response['Content-Type'] = 'text/x-component'
       
-      # this file is a part of iefix, it injects calls to
-      # the ie rendering engine to override stupid behavior
-      # when changing style properties
-      elsif request_path.include?('ie_css_style.htc')
-        response.status = 200
-        response['Content-Type'] = 'text/x-component'
-        
-        ## Usually, we don't need it, because the client framework does calls when needed
-        response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
-        
-        ## Enable it to call iefix automatically whenever element properties are changed
-        #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onreadystatechange",iefix.htcStyleEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+      ## Usually, we don't need it, because the client framework does calls when needed
+      response.body = %{<PUBLIC:COMPONENT lightWeight="true"></PUBLIC:COMPONENT>}
       
-      # Other htc requests are invalid
-      else
-        response.status = 503
-        response.body   = '503 - Invalid Request'
-      end
-      
-    ## Serve compiled client javascript component files:
-    elsif req_type == 'js'
+      ## Enable it to call iefix automatically whenever element properties are changed
+      #response.body = %{<PUBLIC:COMPONENT lightWeight="true">\r\n<script type="text/javascript">\r\ntry{element.attachEvent("onreadystatechange",iefix.htcStyleEntry);}catch(e){}\r\n</script>\r\n</PUBLIC:COMPONENT>}
+    
+    # Other htc requests are invalid
+    else
+      response.status = 503
+      response.body   = '503 - Invalid Request'
+    end
+  end
+  
+  def serve_js( request, response, request_path, ua )
+    # the file-specific identifier ('core', 'basic' etc)
+    req_file = request_path[3][0..-4]
+    
+    if not @client_cache.js_cache.has_key?( req_file )
+      response.status = 404
+      response.body   = '/* 404 - Not Found */'
+    else
       
+      response.status = 200
+      response['Content-Type'] = 'text/javascript; charset=utf-8'
       
-      # the file-specific identifier ('core', 'basic' etc)
-      req_file = request_path[3][0..-4]
+      # these browsers have issues with gzipped js content
+      support_gzip = support_gzip?( ua )
       
-      if not @client_cache.js_cache.has_key?( req_file )
-        response.status = 404
-        response.body   = '/* 404 - Not Found */'
+      if support_gzip
+        #response['Transfer-Encoding'] = 'chunked,gzip'
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.gz_cache[ req_file ]+"\r\n\r\n"
+        response['Content-Length'] = body.bytesize.to_s
+        response['Content-Encoding'] = 'gzip'
+        response.body   = body
       else
         
-        response.status = 200
-        response['Content-Type'] = 'text/javascript; charset=utf-8'
-        
-        # these browsers have issues with gzipped js content
-        support_gzip = false if (is_safari or is_msie or is_symbian)
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.js_cache[ req_file ]
+        response['Content-Length'] = body.bytesize.to_s
+        response.body = body
         
-        if support_gzip
-          #response['Transfer-Encoding'] = 'chunked,gzip'
-          response['Last-Modified'] = @client_cache.last_modified
-          body = @client_cache.gz_cache[ req_file ]+"\r\n\r\n"
-          response['Content-Length'] = body.bytesize.to_s
-          response['Content-Encoding'] = 'gzip'
-          response.body   = body
-        else
-          
-          response['Last-Modified'] = @client_cache.last_modified
-          body = @client_cache.js_cache[ req_file ]
-          response['Content-Length'] = body.bytesize.to_s
-          response.body = body
-          
-        end
       end
+    end
+  end
+  
+  def serve_theme( request, response, request_path, ua )
+    # Get the name of the theme
+    theme_name = request_path[3]
     
-    ## Serve client theme files
-    elsif req_type == 'themes'
-      
-      # Get the name of the theme
-      theme_name = request_path[3]
-      
-      # Get the theme resource type (html/css/gfx)
-      theme_part = request_path[4].to_sym
-      
-      # Get the theme resource identifier
-      req_file  = request_path[5]
-      
-      # checks for theme name
-      has_theme = @client_cache.theme_cache.has_key?( theme_name )
-      
-      # checks for theme part (css/html/gfx)
-      has_theme_part = has_theme and @client_cache.theme_cache[theme_name].has_key?( theme_part )
-      
+    # Get the theme resource type (html/css/gfx)
+    theme_part = request_path[4].to_sym
+    
+    # Get the theme resource identifier
+    req_file  = request_path[5]
+    
+    # checks for theme name
+    has_theme = @client_cache.theme_cache.has_key?( theme_name )
+    
+    # checks for theme part (css/html/gfx)
+    has_theme_part = ( has_theme and @client_cache.theme_cache[theme_name].has_key?( theme_part ) )
+    
+    # checks for theme file
+    has_theme_file = ( has_theme_part and @client_cache.theme_cache[theme_name][theme_part].has_key?( req_file ) )
+    
+    if not has_theme_file and req_file == 'common.css'
+      response.status = 200
+      response['Content-Type'] = 'text/css'
+      response.body = ''
+    end
+    
+    if not has_theme
+      response.status = 404
+      response.body   = '404 - Theme Not Found'
+      puts "Theme #{theme_name} not found, avail: #{@client_cache.theme_cache.keys.join(', ')}" if RSence.args[:verbose]
+    elsif not has_theme_part
+      response.status = 503
+      response.body   = '503 - Invalid Theme Part Request'
+    elsif not has_theme_file
+      response.status = 404
+      response.body   = '404 - Theme Resource Not Found'
+      puts "File not found, avail: #{@client_cache.theme_cache[theme_name][theme_part].keys.join(', ')}" if RSence.args[:verbose]
+    else
       
-      # puts "has_theme_part: #{@client_cache.theme_cache[theme_name][theme_part.to_sym].inspect}"
-      # checks for theme file
-      has_theme_file = has_theme_part and @client_cache.theme_cache[theme_name][theme_part].has_key?( req_file )
+      response.status = 200
       
+      file_ext = req_file.split('.')[-1]
+      response['Content-Type'] = {
+        'html' => 'text/html; charset=utf-8',
+        'css'  => 'text/css; charset=utf-8',
+        'png'  => 'image/png',
+        'jpg'  => 'image/jpeg',
+        'gif'  => 'image/gif',
+        'swf'  => 'application/x-shockwave-flash'
+      }[file_ext]
       
-      if not has_theme_file and req_file == 'common.css'
-        response.status = 200
-        response['Content-Type'] = 'text/css'
-        response.body = ''
+      if theme_part == :gfx
+        support_gzip = false
+      else
+        support_gzip = support_gzip?( ua )
       end
       
-      if not has_theme
-        response.status = 404
-        response.body   = '404 - Theme Not Found'
-        puts "Theme #{theme_name} not found, avail: #{@client_cache.theme_cache.keys.join(', ')}" if RSence.args[:verbose]
-      elsif not has_theme_part
-        response.status = 503
-        response.body   = '503 - Invalid Theme Part Request'
-      elsif not has_theme_file
-        response.status = 404
-        response.body   = '404 - Theme Resource Not Found'
-        puts "File not found, avail: #{@client_cache.theme_cache[theme_name][theme_part].keys.join(', ')}" if RSence.args[:verbose]
+      if support_gzip
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.theme_cache[theme_name][theme_part][ req_file+'.gz' ]
+        response['Content-Length'] = body.bytesize.to_s
+        response['Content-Encoding'] = 'gzip'
+        response.body   = body
       else
         
-        response.status = 200
-        
-        file_ext = req_file.split('.')[-1]
-        response['Content-Type'] = {
-          'html' => 'text/html; charset=utf-8',
-          'css'  => 'text/css; charset=utf-8',
-          'png'  => 'image/png',
-          'jpg'  => 'image/jpeg',
-          'gif'  => 'image/gif',
-          'swf'  => 'application/x-shockwave-flash'
-        }[file_ext]
-        
-        support_gzip = false if theme_part == :gfx
-        support_gzip = false if (is_safari or is_msie or is_symbian)
-        
-        if support_gzip
-          response['Last-Modified'] = @client_cache.last_modified
-          body = @client_cache.theme_cache[theme_name][theme_part][ req_file+'.gz' ]
-          response['Content-Length'] = body.bytesize.to_s
-          response['Content-Encoding'] = 'gzip'
-          response.body   = body
-        else
-          
-          # Special IE6 condition to serve gifs instead of png's, because it works much better
-          # than using the ActiveX alpha filter hack
-          if is_msie6 and req_file[-4..-1] == '.png'
-            ie6_req_png2gif = req_file.gsub('.png','-ie6.gif')
-            req_file = ie6_req_png2gif if @client_cache.theme_cache[theme_name][theme_part].include?(ie6_req_png2gif)
-          end
-        
-          response['Last-Modified'] = @client_cache.last_modified
-          body = @client_cache.theme_cache[theme_name][theme_part][ req_file ]
-          if body.nil?
-            warn "ClientPkgServe#get: empty body for #{request.path}"
-            body = ''
-          end
-          response['Content-Length'] = body.bytesize.to_s
-          response.body = body
-          
+        # Special IE6 condition to serve gifs instead of png's, because it works much better
+        # than using the ActiveX alpha filter hack
+        if ua[:msie6] and req_file[-4..-1] == '.png'
+          ie6_req_png2gif = req_file.gsub('.png','-ie6.gif')
+          req_file = ie6_req_png2gif if @client_cache.theme_cache[theme_name][theme_part].include?(ie6_req_png2gif)
         end
-      end
       
+        response['Last-Modified'] = @client_cache.last_modified
+        body = @client_cache.theme_cache[theme_name][theme_part][ req_file ]
+        if body.nil?
+          warn "ClientPkgServe#get: empty body for #{request.path}"
+          body = ''
+        end
+        response['Content-Length'] = body.bytesize.to_s
+        response.body = body
+        
+      end
+    end
+  end
+  
+  ## Responds to get-requests
+  def get( request, response, session )
+    
+    build_busy_wait
+    
+    ua = check_ua( request )
+    
+    set_headers( response )
+    
+    ## Split path into an array for determining what to serve
+    request_uri = '/'+request.path.match( /^#{::RSence.config[:broker_urls][:h]}(.*)$/ )[1]
+    
+    request_path = request_uri.split( '/' )
+    
+    ## Requested type of client resource (js/themes)
+    req_type = request_path[2]
+    
+    unless ['js','themes'].include? req_type
+      req_rev = req_type
+      req_type = request_path[3]
+      request_path.delete_at(2)
+    end
+    
+    ## Special rules for the special browser
+    if request.path.end_with?('.htc')
+      serve_htc( request, response, request_path )
+    ## Serve compiled client javascript component files:
+    elsif req_type == 'js'
+      serve_js( request, response, request_path, ua )
+    ## Serve client theme files
+    elsif req_type == 'themes'
+      serve_theme( request, response, request_path, ua )
     end
     
   end

data/setup/welcome/gui/welcome.yaml

@@ -18,7 +18,7 @@ dependencies:
 class: RSence.GUIApp
 # Each class takes a number of options for its constructor.
 options:
-  title: Welcome App
+  label: Welcome App
 # The subviews use the class defined above as their parent component.
 subviews:
   # The sheet is used as the main visual container for the gui in this app.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsence
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 2
   - 1
-  - 7
-  version: 2.1.7
+  - 8
+  version: 2.1.8
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +02:00
+date: 2011-01-28 00:00:00 +02:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -403,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rsence-
-rubygems_version: 1.4.1
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Release 2.1 version of the RSence framework.