rsence-pre 2.2.0.23 → 2.2.0.24

data/VERSION

@@ -1 +1 @@
-2.2.0.23.pre
+2.2.0.24.pre

data/js/controls/tab/tab.js

@@ -143,13 +143,20 @@ HTab = HControl.extend({
   * +_doSelect+::
   *
   **/
-  addTab: function(_tabLabel,_doSelect,_viewClass){
-    var _tabIdx=this.tabs.length,
-        _tabLabelHTML = '',
-        _labelTextWidth = this.stringWidth( _tabLabel, null, 0, this.fontStyle ),
-        _labelWidth = _labelTextWidth+this.tabLabelLeftEdge+this.tabLabelRightEdge,
-        _tab = HTabView.nu( [0,this.tabLabelHeight,null,null,0,0] ,this),
-        _tabLabelElemId = ELEM.make(this.markupElemIds[this.tabLabelParentElem],this.tabLabelElementTagName);
+  addTab: function(_tabLabel,_doSelect,_viewClass,_viewClassOptions){
+    var
+    _tabIdx=this.tabs.length,
+    _tabLabelHTML = '',
+    _labelTextWidth = this.stringWidth( _tabLabel, null, 0, this.fontStyle ),
+    _labelWidth = _labelTextWidth+this.tabLabelLeftEdge+this.tabLabelRightEdge,
+    _tabLabelElemId = ELEM.make(this.markupElemIds[this.tabLabelParentElem],this.tabLabelElementTagName),
+    _tab;
+    if( _viewClass === undefined ){
+      _tab = HTabView.nu( [0,this.tabLabelHeight,null,null,0,0], this);
+    }
+    else {
+      _tab = _viewClass.nu( [0,this.tabLabelHeight,null,null,0,0], this, _viewClassOptions );
+    }
     _tabIdx = this.tabs.length;
     if(this.tabLabelNoHTMLPrefix){
       _tabLabelHTML = _tabLabel;
@@ -277,4 +284,79 @@ HTabItem = {
   }
 };
 
+var//RSence.Controls
+GUITreeTabView = HControl.extend({
+  controlDefaults: HControlDefaults.extend({
+    visible: false,
+    autoCreate: false,
+    autoDestroy: true
+  }),
+  jsonRenderer: false,
+  createJSONRenderer: function(){
+    var
+    _this = this,
+    _value = _this.value,
+    _progressView = HView.nu( [4,0, 150, 34, 0, null], _this ),
+    // _indicatorPhases = ['/','-','\\','|','/','-','\\','|'], // ascii
+    // _indicatorPhases = ['◴','◷','◶','◵'], // unicode sector ball
+    // _indicatorPhases = ['◑','◒','◐','◓'], // unicode half ball
+    // _indicator = HStringView.nu( [ 2, 2, 32, 32 ], _progressView, { value: _indicatorPhases[0], style: { 'font-size': '24px' } } ),
+    // _indicatorTimeout = setInterval( function(){
+    //   _indicatorPhase = _indicatorPhases.shift();
+    //   _indicatorPhases.push( _indicatorPhase );
+    //   _indicator.setValue( _indicatorPhase );
+    // }, 100 ),
+    _indicatorStr = HStringView.nu( [ 34, 12, 100, 20, 4, null ], _progressView, { value: 'Rendering' } );
+    _this.destroyJSONRenderer();
+    if( _value.type === undefined || _value.version === undefined ){
+      _value = {
+        'type': 'GUITree',
+        'version': 0.9,
+        'class': 'HView',
+        'rect': [0,0, null,null, 0,0],
+        'options': { 'style': { 'overflow': 'auto' } },
+        'subviews': _value
+      };
+    }
+    setTimeout( function(){
+      _this.jsonRenderer = JSONRenderer.nu( _value, _this );
+      // clearTimeout( _indicatorTimeout );
+      _progressView.die();
+    }, 10 );
+  },
+  destroyJSONRenderer: function(){
+    if( this.jsonRenderer ){
+      this.jsonRenderer.die();
+      this.jsonRenderer = false;
+    }
+  },
+  drawSubviews: function(){
+    if( this.options.autoCreate ){
+      this.createJSONRenderer();
+    }
+  },
+  show: function(){
+    this.base();
+    if(!this.jsonRenderer){
+      this.createJSONRenderer();
+    }
+  },
+  hide: function(){
+    this.base();
+    if( this.options.autoDestroy ){
+      this.destroyJSONRenderer();
+    }
+  },
+  die: function(){
+    this.destroyJSONRenderer();
+    this.base();
+  }
+});
+
+var//RSence.Controls
+GUITreeTabItem = {
+  nu: function( _rect, _parent, _options ){
+    return _parent.addTab( _options.label, _options.select, GUITreeTabView, _options );
+  }
+};
 

data/js/foundation/system/system.js

@@ -204,15 +204,33 @@ HSystem = {
   *
   **/
   killApp: function(_appId, _forced){
-    if( !_forced ){
-      var _startedWaiting = new Date().getTime();
-      while( this.busyApps[ _appId ] === true ) {
-        /* Waiting for the app to finish its idle loop... */
-        if (new Date().getTime() > _startedWaiting + this.maxAppRunTime) {
-          break;
-        }
-      }
+    this.reniceApp( _appId, -1 ); // prevent new idle calls to the app
+    if( _forced || ( this.busyApps[ _appId ] === false ) ){
+      this._forceKillApp( _appId );
+    }
+    else {
+      /* Waiting for the app to finish its idle loop before killing it */
+      var
+      _startedWaiting = new Date().getTime(),
+      _this = this,
+      _timeout = setInterval(
+        function(){
+          if( _this.busyApps[ _appId ] === true ) {
+            if (new Date().getTime() > _startedWaiting + _this.maxAppRunTime) {
+              clearTimeout(_timeout);
+              _this._forceKillApp( _appId );
+            }
+            else {
+              clearTimeout(_timeout);
+              _this._forceKillApp( _appId );
+            }
+          }
+        }, 10
+      );
     }
+  },
+
+  _forceKillApp: function( _appId ){
     this.busyApps[_appId] = true;
     
     this.apps[ _appId ].destroyAllViews();

data/js/lists/checkboxlist/checkboxlist.js

@@ -27,10 +27,10 @@ HCheckboxList = HControl.extend({
   listItemViews: [],
   ListCheckbox: HCheckbox.extend({
 
-/** = Description
-  * Adds listValues to the parent if they are true otherwise deletes them.
-  *
-  **/
+  /** = Description
+    * Adds listValues to the parent if they are true otherwise deletes them.
+    *
+    **/
     refreshValue: function(){
       this.base();
       if(this.value === true){
@@ -40,7 +40,15 @@ HCheckboxList = HControl.extend({
         this.parent.delItem( this.options.listValue );
       }
     }
-  }),
+  }), // End ListCheckbox
+
+  setEnabled: function(_state){
+    this.base(_state);
+    if(!this['listItemViews']){ return; }
+    for(var i=0;i<this.listItems.length;i++){
+      this.listItemViews[i].setEnabled(_state)
+    }
+  },
 
 /** = Description
   * Checks if +_listValue+ can be found from the values. Adds the value
@@ -121,7 +129,8 @@ HCheckboxList = HControl.extend({
         this, {
           label: _label,
           value: _checked,
-          listValue: _value
+          listValue: _value,
+          enabled: this.enabled
         }
       );
       this.listItemViews[i] = _checkbox;

data/js/lists/radiobuttonlist/radiobuttonlist.js

@@ -61,7 +61,8 @@ HRadioButtonList = HControl.extend({
     return HRadiobutton.nu(
       [ 4, (i*23)+4, null, 23, 4, null ],
       this, {
-        label: _label
+        label: _label,
+        enabled: this.enabled
       }
     );
   },
@@ -94,6 +95,13 @@ HRadioButtonList = HControl.extend({
   },
   radioButtonIndexValue: false,
   radioButtonResponder: false,
+  setEnabled: function(_state){
+    this.base(_state);
+    if(!this['listItemViews']){ return; }
+    for(var i=0;i<this.listItems.length;i++){
+      this.listItemViews[i].setEnabled(_state)
+    }
+  },
   
 /** = Description
   * 
@@ -104,12 +112,15 @@ HRadioButtonList = HControl.extend({
       this.parent = _parent;
     },
     refresh: function(){
-      var _listItems = this.parent.listItems;
+      var
+      _listItems = this.parent.listItems,
+      _value;
       if(_listItems === undefined || _listItems === null){
         return;
       }
       if(_listItems[ this.value ] !== undefined){
-        this.parent.setValue( _listItems[ this.value ][0] );
+        _value = _listItems[ this.value ];
+        this.parent.setValue( _value[0] );
       }
     }
   }),
@@ -119,6 +130,7 @@ HRadioButtonList = HControl.extend({
   refreshValue: function(){
     var _value = this.value;
     if ( this.listItems && this.listItems.length !== 0 && this['valueMatrix'] !== undefined ) {
+      // debugger;
       if ( this.radioButtonResponder === false ){
         this.radioButtonIndexValue = HValue.nu( false, 0 );
         this.radioButtonIndexValue.bind( this.valueMatrix );

data/lib/http/broker.rb

@@ -15,7 +15,6 @@ require 'http/response'
 ## Minimally WEBrick -compatible request object
 require 'http/request'
 
-
 module RSence
 
 
@@ -41,8 +40,15 @@ class Broker
     response = Response.new
     request_method = request.request_method.downcase
     dispatcher = dispatcher_class.new( request, response )
-    dispatcher.send( request_method )
-    content_type = dispatcher.content_type
+    if dispatcher.respond_to?( request_method )
+      begin
+        dispatcher.send( request_method )
+      rescue => e
+        dispatcher.server_error( e )
+      end
+    else
+      dispatcher.not_implemented( request.request_method )
+    end
     response_body = response.body
     response.header['Content-Length'] = response.body_bytes unless response.header.has_key?('Content-Length')
     return [response.status, response.header, response_body]
@@ -55,7 +61,6 @@ class Broker
   # @return [Broker] An instance of Broker with a {Request} instance as +@request+ and a {Response} instance as +@response+
   def dispatcher_class
     @dispatcher ||= Class.new(self.class) do
-      attr_accessor :content_type
       def initialize(request,response)
         @request  = request
         @response = response
@@ -99,7 +104,7 @@ class Broker
     # Loads the selected web-server (default is 'mongrel')
     rack_require = conf[:rack_require]
     puts conf.inspect if RSence.args[:debug]
-    
+
     require rack_require
     
     # Selects the handler for Rack
@@ -112,41 +117,113 @@ class Broker
       'unicorn'  => lambda { Rack::Handler::Unicorn  },
       'rainbows' => lambda { Rack::Handler::Rainbows }
     }[rack_require].call
-    
     handler.run( Rack::Lint.new(self.new), :Host => host, :Port => port )
-    
   end
   
   # Generic 404 error handler. Just sets up response status, headers, body as a small "Page Not Found" html page
   def not_found
     puts "/404: #{@request.fullpath.inspect}" if RSence.args[:verbose]
     @response.status = 404
-    err404 = '<html><head><title>404 - Page Not Found</title></head><body>404 - Page Not Found</body></html>'
+    err404 = "<html><head><title>404 - Page Not Found</title></head><body>404 - Page &quot;#{@request.fullpath}&quot; Not Found</body></html>"
     @response['Content-Type'] = 'text/html; charset=UTF-8'
-    @response['Content-Length'] = err404.bytesize.to_s
     @response.body = err404
   end
   
   # Routes POST requests to {Transporter#servlet}
   def post
-    
     puts "post: #{@request.fullpath}" if RSence.args[:verbose]
-    
     not_found unless @@transporter.servlet( :post, @request, @response )
-    
   end
   
   # Routes GET requests to {Transporter#servlet}
   def get
-    
     puts "get: #{@request.fullpath}" if RSence.args[:verbose]
-    
     not_found unless @@transporter.servlet( :get, @request, @response )
-    
   end
   
-  ### -- Add more http methods here when we have some apps to test with CalDAV implementation maybe? ++
+  # Routes HEAD requests to {Transporter#servlet}
+  # Uses GET and removes the response body, if nothing matches HEAD directly.
+  def head
+    puts "head: #{@request.fullpath}" if RSence.args[:verbose]
+    return if @@transporter.servlet( :head, @request, @response )
+    if @@transporter.servlet( :get, @request, @response )
+      @response.body = ''
+    else
+      not_found
+    end
+  end
+
+  # Generic 405 (method not allowed) handler.
+  def not_allowed( method_name )
+    @response.status = 405
+    body_txt = "Error 405: The method #{method_name} is not allowed on #{@request.fullpath}.\r\n"
+    @response['Content-Type'] = 'text/plain; charset=UTF-8'
+    @response.body = body_txt
+  end
+  
+  # Generic 501 (method not implemented) handler.
+  def not_implemented( method_name )
+    @response.status = 501
+    body_txt = "Error 501: The method #{method_name} is not implemented on #{@request.fullpath}.\r\n"
+    @response['Content-Type'] = 'text/plain; charset=UTF-8'
+    @response.body = body_txt
+  end
   
+  # Generic 500 (server error) handler.
+  def server_error( e, custom_name='Broker Exception' )
+    @response.status = 500
+    exception_detail = [
+      custom_name,
+      "Time: #{Time.now.to_s}",
+      "#{'-='*39}-",
+      "#{e.class}: #{e.to_s}",
+      "\t#{e.backtrace.join("\r\n\t")}",
+      "#{'-='*39}-",
+      "Request method: #{@request.request_method}",
+      "Request path: #{@request.fullpath}",
+      "Request headers: #{@request.header.inspect}",
+      "#{'-='*39}-\r\n\r\n"
+    ].join("\r\n")
+    $stderr.puts exception_detail
+    if RSence.args[:debug]
+      body_txt = "Error 500: "+ exception_detail
+    else
+      body_txt = "Error 500: General server error.\r\n"
+    end
+    @response['Content-Type'] = 'text/plain; charset=UTF-8'
+    @response.body = body_txt
+  end
+  
+  # Routes OPTIONS requests to {Transporter#servlet}
+  def options
+    puts "options: #{@request.fullpath}" if RSence.args[:verbose]
+    not_allowed('OPTIONS') unless @@transporter.servlet( :options, @request, @response )
+  end
+
+  # Routes PUT requests to {Transporter#servlet}
+  def put
+    puts "put: #{@request.fullpath}" if RSence.args[:verbose]
+    not_allowed('PUT') unless @@transporter.servlet( :put, @request, @response )
+  end
+
+  # Routes DELETE requests to {Transporter#servlet}
+  def delete
+    puts "delete: #{@request.fullpath}" if RSence.args[:verbose]
+    not_allowed('DELETE') unless @@transporter.servlet( :delete, @request, @response )
+  end
+
+  # Routes TRACE requests to {Transporter#servlet}
+  def trace
+    puts "trace: #{@request.fullpath}" if RSence.args[:verbose]
+    not_allowed('TRACE') unless @@transporter.servlet( :trace, @request, @response )
+  end
+
+  # Routes CONNECT requests to {Transporter#servlet}
+  def connect
+    puts "connect: #{@request.fullpath}" if RSence.args[:verbose]
+    not_allowed('CONNECT') unless @@transporter.servlet( :connect, @request, @response )
+  end
+
 end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence-pre
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: 
   segments: 
   - 2
   - 2
   - 0
-  - 23
-  version: 2.2.0.23
+  - 24
+  version: 2.2.0.24
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsence-deps
@@ -371,3 +371,4 @@ specification_version: 3
 summary: Pre-Release 2.2 version of RSence.
 test_files: []
 
+has_rdoc: