rsence 2.0.0.11 → 2.0.1.12

data/VERSION

@@ -1 +1 @@
-2.0.0.11
+2.0.1.12

data/js/core/elem/elem.js

@@ -1369,6 +1369,9 @@ ELEM = {
 };
 ELEM._constructor();
 
+var//RSence.Foundation
+ElementManager = ELEM;
+
 var//RSence.Core
 LOAD = ELEM._domLoader;
 

data/js/core/event/event.js

@@ -48,7 +48,7 @@ Event = {
   **/
   isLeftClick: function(e) {
     // IE: left 1, middle 4, right 2
-    if (BROWSER_TYPE.ie || BROWSER_TYPE.safari) {
+    if (BROWSER_TYPE.ie) {
       return (e.button === 1);
     }
     else {

data/js/foundation/eventmanager/eventmanager.js

@@ -37,12 +37,12 @@ EVENT = {
   *
   * = Indexes
   * +EVENT.status[ EVENT.button1 ]+::  The state of the left mouse button.
-  *                                    0 when not pressed
-  *                                    1 when pressed.
+  *                                    false when not pressed
+  *                                    true when pressed.
   *
   * +EVENT.status[ EVENT.button2 ]+::  The state of the right mouse button.
-  *                                    0 when not pressed
-  *                                    1 when pressed.
+  *                                    false when not pressed
+  *                                    true when pressed.
   *
   * +EVENT.status[ EVENT.crsrX ]+::    The x-coordinate of the mouse cursor.
   *
@@ -62,8 +62,14 @@ EVENT = {
   * +EVENT.status[ EVENT.shiftKeyDown ]+::  The boolean status of the Shift
   *                                         modifier key being held down.
   *
+  * +EVENT.status[ EVENT.metaKeyDown ]+::    The boolean status of the Meta
+  *                                          modifier key being held down.
+  *
+  * +EVENT.status[ EVENT.cmdKeyDown ]+::     The boolean status of any of the system-specific
+  *                                          Command, Menu or Start modifier keys being held down.
+  *
   **/
-  status: [false, false, 0, 0, [], false, false, false],
+  status: [false, false, 0, 0, [], false, false, false, false, false],
   
 /** The index in the status array for the left mouse button.
   **/
@@ -88,18 +94,26 @@ EVENT = {
   **/
   keysDown: 4,
 
-/** The index in the status orray for the state of the Alt modifier key.
+/** The index in the status array for the state of the Alt modifier key.
   **/
   altKeyDown: 5,
 
-/** The index in the status orray for the state of the Ctrl modifier key.
+/** The index in the status array for the state of the Ctrl modifier key.
   **/
   ctrlKeyDown: 6,
 
-/** The index in the status orray for the state of the Shift modifier key.
+/** The index in the status array for the state of the Shift modifier key.
   **/
   shiftKeyDown: 7,
 
+/** The index in the status array for the state of the Meta modifier key.
+  **/
+  metaKeyDown: 8,
+
+/** The index in the status array for the state of the Command modifier key.
+  **/
+  cmdKeyDown: 9,
+  
 /** A flag to disable, if your applications don't need drop events.
   * Setting this to false when not needed improves overall performance,
   * because the drop events need constant calculation of the mouse cursor
@@ -231,11 +245,23 @@ EVENT = {
         _this.textEnterCtrls.push(_ctrl.viewId);
       }
     }
+    else {
+      var _textEnterIndex = _this.textEnterCtrls.indexOf(_ctrl.viewId);
+      if (_textEnterIndex !== -1) {
+        _this.textEnterCtrls.splice(_textEnterIndex,1);
+      }
+    }
     if (_focusOptions.resize) {
       if (_this.resizeListeners.indexOf(_ctrl.viewId) === -1) {
         _this.resizeListeners.push(_ctrl.viewId);
       }
     }
+    else {
+      var _resizeIndex = _this.resizeListeners.indexOf(_ctrl.viewId);
+      if (_resizeIndex !== -1) {
+        _this.resizeListeners.splice(_resizeIndex,1);
+      }
+    }
     Event.observe(_elem, 'mouseover', _this._mouseOver);
   },
   
@@ -524,12 +550,12 @@ EVENT = {
   * +_ctrl+::   An object that uses the HControl API, becomes new drag target.
   *
   **/
-  startDragging: function(_ctrl) {
+  startDragging: function(_ctrl, _isLeftButton) {
     var _this = EVENT;
     _this.dragItems = [_ctrl.elemId];
     _this.focus(_ctrl);
     _this.changeActiveControl(_ctrl);
-    _ctrl.startDrag(_this.status[_this.crsrX], _this.status[_this.crsrY]);
+    _ctrl.startDrag( _this.status[_this.crsrX], _this.status[_this.crsrY], _isLeftButton );
   },
 
 /** Mid-level mouse button press manager.
@@ -588,7 +614,7 @@ EVENT = {
     // Call the mouseDown and startDrag events after the active control change has been handled.
     for (i = 0; i !== _startDragElementIds.length; i++) {
       _this.dragItems.push(_startDragElementIds[i]);
-      _this.focusOptions[_startDragElementIds[i]].ctrl.startDrag(x, y);
+      _this.focusOptions[_startDragElementIds[i]].ctrl.startDrag(x, y, _isLeftButton);
       _didStartDrag = true;
     }
 
@@ -672,6 +698,12 @@ EVENT = {
       }
     }
     //if(_this.hovered.length!==0){Event.stop(e);}
+    if(_isLeftButton){
+      _this.status[_this.button1] = false;
+    }
+    else {
+      _this.status[_this.button2] = false;
+    }
     return true;
   },
 
@@ -722,13 +754,11 @@ EVENT = {
         _ctrl,
         i = 0;
     _this._modifiers(e);
-    _this.status[_this.button1] = false;
-    _this.status[_this.button2] = false;
     // Send endDrag for the currently dragged items even when they don't have focus, and clear the drag item array.
     for (; i !== _this.dragItems.length; i++) {
       _elemId = _this.dragItems[i];
       _ctrl = _this.focusOptions[_elemId].ctrl;
-      _ctrl.endDrag(x, y);
+      _ctrl.endDrag(x, y,_isLeftButton);
       _didEndDrag = true;
       // If the mouse slipped off the dragged item before the mouse button was released, blur the item manually
       if (_this.enableDroppableChecks) {
@@ -758,6 +788,12 @@ EVENT = {
         }
       }
     }
+    if(_isLeftButton){
+      _this.status[_this.button1] = false;
+    }
+    else {
+      _this.status[_this.button2] = false;
+    }
     return true;
   },
 
@@ -771,6 +807,9 @@ EVENT = {
     var _this = EVENT,
         _theKeyCode = e.keyCode;
     _this._modifiers(e);
+    if(!_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
+      _this.status[_this.cmdKeyDown] = true;
+    }
     if (_this.activeControl && _this.focusOptions[_this.activeControl.elemId].keyDown === true) {
       Event.stop(e);
       // Workaround for msie rapid fire keydown
@@ -812,6 +851,9 @@ EVENT = {
         _ctrl.textEnter();
       }
     }
+    if(_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
+      _this.status[_this.cmdKeyDown] = false;
+    }
     // Remove the key from the realtime array, inserted in keyDown
     _keyCodeIndex = _this.status[_this.keysDown].indexOf(_theKeyCode);
     if (_keyCodeIndex !== -1) {
@@ -857,23 +899,45 @@ EVENT = {
       }
     }
   },
-
+  
   /* Alternative right button detection, wrapper for the mouseDown method */
   contextMenu: function(e) {
     EVENT.mouseDown(e, false);
     Event.stop(e);
+    if(Event.isLeftClick(e)){
+      EVENT.status[EVENT.button2] = false;
+    }
   },
-
+  
+  _cmdKeys: [
+    224, // Mozilla Left or Right Command Key
+    219, // Opera Left Windows Key
+    220, // Opera Right Windows Key
+    0,   // Opera Menu Key or Linux Gecko: any Windows Key
+    17,  // Opera
+    91,  // Others (Left Start Key or Left Command Key)
+    92,  // Others (Right Start Key)
+    93   // Others (Menu Key or Right Command Key)
+  ],
+  _detectCmdKey: function( _keyCode ) {
+    return (EVENT._cmdKeys.indexOf(_keyCode) !== -1);
+  },
+  
   /* Handle the event modifiers. */
   _modifiers: function(e) {
     var _this = EVENT;
     _this.status[_this.altKeyDown] = e.altKey;
     _this.status[_this.ctrlKeyDown] = e.ctrlKey;
     _this.status[_this.shiftKeyDown] = e.shiftKey;
+    _this.status[_this.metaKeyDown] = e.metaKey;
   }
   
 };
 
+var//RSence.Foundation
+EventManager = EVENT;
+
+
 /** Starts the only instance
   */
 LOAD(

data/lib/http/broker.rb

@@ -89,6 +89,7 @@ class Broker
         sleep 0.2
       end
       puts "..#{host}:#{port} responds!" if ::RSence.args[:debug]
+      puts "RSence is online on the address http://#{host}:#{port}#{::RSence.config[:base_url]}"
       @@transporter.online = true
     end
     
@@ -96,8 +97,8 @@ class Broker
     
     # Loads the selected web-server (default is 'mongrel')
     rack_require = conf[:rack_require]
-    puts conf.inspect
-    puts "rack require: #{rack_require.inspect}" if RSence.args[:debug]
+    puts conf.inspect if RSence.args[:debug]
+    
     require rack_require
     
     # Selects the handler for Rack
@@ -114,14 +115,6 @@ class Broker
     
   end
   
-=begin
-  # Extends the receiver with SingletonMethods
-  def self.included( receiver )
-    receiver.extend( SingletonMethods )
-  end
-=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]

data/lib/session/msg.rb

@@ -155,7 +155,7 @@ module RSence
     # Invalidates the active session.
     # @return [nil]
     def expire_session
-      @sessions.expire_session( @ses_id )
+      @sessions.expire_session( @session[:ses_id] ) if @session
     end
   
     # @private Define the session key.

data/lib/session/sessionmanager.rb

@@ -405,21 +405,60 @@ module RSence
       ### Sets the set-cookie header
       msg.response['Set-Cookie'] = ses_cookie_arr.join('; ')
     end
-  
+    
+    def expire_ses_by_req( req, res )
+      
+      cookie_raw = req.cookies
+      
+      # checks, if a cookie named 'ses_key' is found
+      if cookie_raw.has_key?('ses_key')
+        
+        # gets just the data itself (discards comment, domain, expiration etc)
+        cookie_key = cookie_raw['ses_key'].split(';')[0]
+        
+      end
+      
+      # if a cookie key is found (non-false), checks if it's valid
+      if cookie_key
+        
+        # checks for validity by looking the key up in @session_cookie_keys
+        cookie_key_exist = @session_cookie_keys.has_key?( cookie_key )
+        
+        # sets the cookie key to false, if it doesn't exist
+        cookie_key = false unless cookie_key_exist
+        
+      end
+      
+      # at this point, the cookie key seems valid:
+      if cookie_key and cookie_key_exist
+        
+        # get the session identifier
+        ses_id = @session_cookie_keys[ cookie_key ]
+        
+        # Expire the session
+        expire_session( ses_id )
+        
+        return true
+        
+      end
+      
+      return false
+    end
+    
     ### Creates a message and checks the session
     def init_msg( request, response, options = { :cookies => false, :servlet => false } )
-    
+      
       cookies = options[:cookies]
-    
+      
       if options.has_key?(:query)
         query = options[:query]
       else
         query = request.query
       end
-    
+      
       ## Perform old-session cleanup on all xhr:s
       expire_sessions
-    
+      
       ## The 'ses_id' request query key is required.
       ## The client defaults to '0', which means the
       ## client needs to be initialized.
@@ -427,7 +466,7 @@ module RSence
       if not query.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' ]
         # puts "ses key: #{ses_key}"
@@ -437,13 +476,13 @@ module RSence
         ## request/response/user/session -related
         ## data is needed.
         msg = Message.new( @transporter, request, response, options )
-      
+        
         ## The client tells that its ses_key is '0',
         ## until the server tells it otherwise.
         (req_num, ses_seed) = ses_key.split(':.o.:')
-      
-        if req_num == '0'
         
+        if req_num == '0'
+          
           # If Broker encounters a '/hello' request, it
           # sets cookies to true.
           #
@@ -457,24 +496,24 @@ module RSence
             init_ses( msg, ses_seed )
             ses_status = true
           end
-      
+          
         # for non-'0' ses_keys:
         else
-        
+          
           ## Validate the session key
           ses_status = check_ses( msg, ses_seed )[0]
-        
+          
           ## Renew the cookie even when the request is a "x" (not "hello")
           if @config[:session_cookies] and ses_status
             renew_cookie( msg, msg.session[:cookie_key] )
           end
         
         end # /ses_key
-      
+        
         ## msg.ses_valid is false by default, meaning
         ## it's not valid or hasn't been initialized.
         msg.ses_valid = ses_status
-      
+        
         return msg
       end # /ses_key
     end # /init_msg

data/lib/transporter/transporter.rb

@@ -82,7 +82,9 @@ module RSence
       broker_urls = RSence.config[:broker_urls]
       uri = request.fullpath
     
-      if request_type == :post
+      if @plugins.match_servlet( request_type, request, response, {} )
+        return true
+      elsif request_type == :post
         ## /x handles xhr without cookies
         if uri == broker_urls[:x] and @sessions.accept_requests
           xhr( request, response, { :cookies => true, :servlet => false } )
@@ -91,14 +93,9 @@ module RSence
         elsif uri == broker_urls[:hello] and @sessions.accept_requests
           xhr( request, response, { :cookies => true, :servlet => false } )
           return true
-        else
-          session = {}
-          return @plugins.match_servlet( request_type, request, response, session )
         end
-      else
-        session = {}
-        return @plugins.match_servlet( request_type, request, response, session )
       end
+      return false
     end
   
     # wrapper for the session manager stop client functionality

data/plugins/main/main.rb

@@ -23,12 +23,12 @@ class MainPlugin < Plugin
     super
     @conf  = ::RSence.config[:index_html]
     @bconf = ::RSence.config[:broker_urls]
+    @goodbye_uri = File.join(@bconf[:hello],'goodbye')
   end
   
   # @private Internal structures, matches the "hello/goodbye" session termination request
   def match( uri, request_type )
-    if request_type == :post and
-       uri == File.join(@bconf[:hello],'goodbye')
+    if request_type == :post and uri == @goodbye_uri
       return true
     end
     return false
@@ -39,9 +39,7 @@ class MainPlugin < Plugin
   
   # @private Internal structures, handler for the "hello/goodbye" session termination request
   def post( req, res, ses )
-    msg = @plugins.sessions.init_msg( req, res, { :cookies => true } )
-    msg.expire_session()
-    msg.response_done
+    @plugins.sessions.expire_ses_by_req( req, res )
   end
   
   # @private url_responder gets called whenever the
@@ -69,11 +67,11 @@ class MainPlugin < Plugin
       # server-side session and reloads the page
       if virtual_uri == '/sign_out'
         resp_addr = @conf[:respond_address]
+        msg.expire_session()
         msg.reply( [
           'COMM.Transporter.stop=true;',
           "location.href=#{resp_addr.to_json};"
         ].join('') )
-        msg.expire_session()
       end
       
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rsence
 version: !ruby/object:Gem::Version 
-  hash: 121
+  hash: 115
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  - 11
-  version: 2.0.0.11
+  - 1
+  - 12
+  version: 2.0.1.12
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +03:00
+date: 2010-07-07 00:00:00 +03:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency