rsence 2.1.11 → 2.2.0

data/lib/{http → rsence/http}/request.rb

@@ -7,10 +7,6 @@
  ##
 
 
-
-require 'rubygems'
-require 'rack'
-
 module RSence
   
   # Simple Request class, slightly more involved

data/lib/{http → rsence/http}/response.rb

@@ -7,7 +7,6 @@
  ##
 
 
-
 module RSence
   
   # Classic WEBrick -compatible Response object for Rack.

data/lib/{session → rsence}/msg.rb

@@ -7,7 +7,7 @@
  ##
 
 
-require 'util/gzstring'
+require 'rsence/gzstring'
 
 
 module RSence
@@ -248,9 +248,13 @@ module RSence
           {}, # no session values
         ] + @error_js
       else
+        @session.delete( :_msg_unused ) if @session.has_key?( :_msg_unused )
         ## The response status should always be 200 (OK)
         @response.status = 200
         
+        @value_buffer.delete( :new ) if @value_buffer[:new].empty?
+        @value_buffer.delete( :set ) if @value_buffer[:set].empty?
+        @value_buffer.delete( :del ) if @value_buffer[:del].empty?
         buffer = [
           @ses_key,
           @value_buffer,
@@ -283,6 +287,12 @@ module RSence
       puts data if @config[:trace]
       @buffer.push( data )
     end
+
+    # Same as #reply, but with CoffeeScript instead of JS
+    def coffee(data)
+      puts data if @config[:trace]
+      @buffer.push( @plugins[:client_pkg].coffee( data ) )
+    end
   
     # @private For value manager; insert changed values BEFORE other js.
     def reply_value( operation_type, value_id, data=nil )
@@ -302,6 +312,7 @@ module RSence
     def console(data)
       reply( "console.log(#{data.to_json});" )
     end
+    alias puts console
     
     # Serves an image object and returns its disposable URL.
     # Calls the default `ticket` plugin.
@@ -359,5 +370,10 @@ module RSence
       @plugins.call( plugin_name, plugin_method, *args)
     end
     alias run call
+
+    def inspect
+      "#<Message ses_id:#{ses_id.inspect}, ses_key: #{ses_key.inspect} ...>"
+    end
+
   end
 end

data/lib/{plugins → rsence}/pluginmanager.rb

@@ -7,8 +7,8 @@
  ##
 
  
-require 'plugins/plugins'
-require 'plugins/dependencies'
+require 'rsence/plugins'
+require 'rsence/dependencies'
 
 module RSence
   
@@ -27,6 +27,9 @@ module RSence
     def incr
       return @@incr
     end
+    def incr!
+      @@incr += 1
+    end
     
     # Returns the registry data for plugin bundle +plugin_name+
     def registry( plugin_name=false )
@@ -168,7 +171,11 @@ module RSence
         puts
         puts "plugin: #{eval_repl}"
         puts
-        err_msg = err_msg.gsub(/^\t\(eval\)\:/s,"\t#{eval_repl}:")
+        begin
+          err_msg = err_msg.gsub(/^\t\(eval\)\:/s,"\t#{eval_repl}:")
+        rescue Encoding::CompatibilityError => e
+          $stderr.write( "Encoding::CompatibilityError in plugin error eval!" )
+        end
       end
       $stderr.write( err_msg )
     end
@@ -267,12 +274,11 @@ module RSence
         Dir.entries( bundle_path ).each do |entry_name|
           next if entry_name[0].chr == '.' # skip hidden, '.' and '..' 
           full_path = File.join( bundle_path, entry_name )
-          unless File.directory?( full_path )
+          if File.directory?( full_path )
             next if entry_name == 'plugins' # skip sub-plugins
-            has_dot = entry_name.include?('.')
-            next unless has_dot
-            is_src_file = ['yaml','rb'].include?( entry_name.split('.')[-1] )
-            next unless is_src_file
+          else
+            next unless entry_name.include?('.')
+            next unless ['yaml','rb'].include?( entry_name.split('.')[-1] )
           end
           newest_date = most_recent( full_path, newest_date )
         end
@@ -300,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.
@@ -615,7 +621,7 @@ module RSence
         puts "done!" if RSence.args[:verbose]
       end
       if not (to_load.empty? and to_unload.empty? and to_reload.empty?)
-        @@incr += 1
+        incr!
         puts "@@incr: #{@@incr}" if RSence.args[:debug]
         puts "Plugin bundles:"
         puts "  loaded: #{to_load.join(', ')}" unless to_load.empty?
@@ -636,12 +642,19 @@ module RSence
     end
     
     attr_reader :transporter
-    attr_reader :sessions
     attr_reader :autoreload
     attr_reader :name_prefix
     attr_reader :plugin_paths
     attr_reader :parent_manager
     
+    def sessions
+      warn "no sessions" unless @sessions
+      @sessions
+    end
+    def sessions=(ses_manager)
+      @sessions = ses_manager
+    end
+
     @@pluginmanager_id = 0
     # Initialize with a list of directories as plugin_paths.
     # It's an array containing all plugin directories to scan.
@@ -665,13 +678,17 @@ module RSence
       
       if options[:transporter]
         @transporter = options[:transporter]
-        @sessions    = options[:transporter].sessions
+        #@sessions    = options[:transporter].sessions
       end
       
       @autoreload = options[:autoreload]
       @name_prefix = options[:name_prefix]
       @parent_manager = options[:parent_manager]
       
+      if @parent_manager == nil
+        RSence.plugin_manager = self
+      end
+      
       @deps = Dependencies.new( options[:resolved_deps], options[:resolved_categories] )
       
       puts "Loading #{@name_prefix.to_s+' ' if @name_prefix}plugins..." if RSence.args[:verbose]

data/lib/{plugins → rsence}/plugins.rb

@@ -15,24 +15,24 @@ module RSence
 end
 
 # Contains the PluginBase module which has common methods for the bundle classes
-require 'plugins/plugin_base'
+require 'rsence/plugins/plugin_base'
 
 # guiparser.rb contains the Yaml serializer for gui trees.
 # It uses JSONRenderer on the client to build user interfaces.
-require 'plugins/guiparser'
+require 'rsence/plugins/guiparser'
 
 # plugin_sqlite_db.rb contains automatic local sqlite database
 # creation for a plugin that includes it.
-require 'plugins/plugin_sqlite_db'
+require 'rsence/plugins/plugin_sqlite_db'
 
 # Interface for plugins in a plugin bundle
-require 'plugins/plugin_plugins'
+require 'rsence/plugins/plugin_plugins'
 
 
 # Templates for the main plugin classes.
-require 'plugins/plugin'
-require 'plugins/gui_plugin'
-require 'plugins/servlet'
+require 'rsence/plugins/plugin'
+require 'rsence/plugins/gui_plugin'
+require 'rsence/plugins/servlet'
 
 
 module RSence

data/lib/{plugins → rsence/plugins}/gui_plugin.rb

@@ -34,9 +34,12 @@ module RSence
       # @return [nil]
       def init
         super
-        yaml_src = file_read( "gui/#{@name}.yaml" )
-        unless yaml_src
-          yaml_src = file_read( "gui/main.yaml" )
+        yaml_src = false
+        [ "#{@name}.yaml", 'gui.yaml',
+          "gui/#{@name}.yaml", "gui/main.yaml"
+        ].each do |yaml_name|
+          yaml_src = file_read( yaml_name )
+          break if yaml_src
         end
         if yaml_src
           @gui = GUIParser.new( self, yaml_src, @name )
@@ -90,6 +93,7 @@ module RSence
               client_pkg.add_src_dir( src_dir )
             end
           end
+          sleep 0.1 until client_pkg.ready?
           client_pkg.add_packages(       @client_pkgs[:packages      ] ) if @client_pkgs.has_key?(:packages      )
           client_pkg.add_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
           client_pkg.add_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
@@ -109,6 +113,7 @@ module RSence
               client_pkg.del_src_dir( src_dir )
             end
           end
+          sleep 0.1 until client_pkg.ready?
           client_pkg.del_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
           client_pkg.del_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
           client_pkg.del_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )

data/lib/{plugins → rsence/plugins}/guiparser.rb

@@ -53,7 +53,7 @@ module RSence
         if gui_data.class == Array
           gui_data = {
             'type' => 'GUITree',
-            'version' => 0.7,
+            'version' => 0.9,
             'class' => 'RSence.GUIApp',
             'options' => {
               'priority' => 0,
@@ -67,11 +67,8 @@ module RSence
       end
       
       def kill( msg )
-        gui_name = @parent.name
-        gui_ns = "RSence.guiTrees[#{@gui_name.to_json}]"
-        msg.reply( "#{gui_ns}.die();", true )
-        msg.reply( "#{gui_ns}=null;", true )
-        msg.reply( "delete #{gui_ns};", true )
+        # gui_name = @parent.name
+        msg.reply( "RSence.killGuiTree(#{@gui_name.to_json});" )
       end
       
       # Use this method to extract all the value id's of the +ses+ hash.
@@ -112,6 +109,12 @@ module RSence
           return get_params( sym_arr, params )
         elsif data_class == String and gui_data.strip.start_with?('function(')
           return @parent.plugins[:client_pkg].squeeze( "a="+json_fun( gui_data.to_json ) )[2..-1]
+        elsif data_class == String and gui_data.strip.start_with?('coffee:')
+          coffee = @parent.plugins[:client_pkg].coffee( gui_data.strip[7..-1].strip )
+          return coffee
+        elsif data_class == String and (gui_data.strip =~ /^((\(.*?)\))?(\s*)?->/) == 0
+          coffee = @parent.plugins[:client_pkg].coffee( gui_data.strip )
+          return coffee
         end
         return gui_data
       end

data/lib/{plugins → rsence/plugins}/plugin.rb

@@ -197,10 +197,18 @@ module RSence
       # @return [Hash] Plugin-specific session hash
       def get_ses( msg, key=false )
         name_sym = name_with_manager_s.to_sym
-        unless msg.session.has_key?( name_sym )
-          msg.session[ name_sym ] = {}
+        if msg.class == RSence::Message
+          session = msg.session
+        elsif msg.class == Hash
+          session = msg
+        else
+          warn "Invalid class (#{msg.class}) for get_ses in #{name_sym.inspect}!"
+          return nil
+        end
+        unless session.has_key?( name_sym )
+          session[ name_sym ] = {}
         end
-        ses = msg.session[ name_sym ]
+        ses = session[ name_sym ]
         return ses[key] if key
         return ses
       end
@@ -283,6 +291,12 @@ module RSence
         # Check the required dependencies until everything is loaded.
         dependencies.each do |dependency|
           unless ses[:deps].include?( dependency )
+            if RSence.config[:client_pkg][:compound_packages].include?( dependency )
+              RSence.config[:client_pkg][:compound_packages][dependency].each do |pkg_name|
+                ses[:deps].push( pkg_name )
+                msg.reply(%{jsLoader.loaded("#{pkg_name}");})
+              end
+            end
             ses[:deps].push( dependency )
             msg.reply(%{jsLoader.load("#{dependency}");})
           end
@@ -332,7 +346,6 @@ module RSence
       # @private  Returns a sanitized copy of a single responder specification.
       def sanitize_value_responders( responders_dirty )
         if responders_dirty.class != Array
-          warn "Unsupported responders type: #{responders_dirty.inspect} (expected Array or Hash). Trying work-around.." if responders_dirty.class != Hash and RSence.args[:debug]
           responders_dirty = [ responders_dirty ]
         end
         responders_clean = []
@@ -375,6 +388,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/{plugins → rsence/plugins}/plugin_base.rb

@@ -104,7 +104,17 @@ module RSence
         if not file_data
           return false
         else
-          return YAML.load( file_data )
+          begin
+            return YAML.load( file_data )
+          rescue Psych::SyntaxError => e
+            warn "Syntax Error in YAML file: #{path} (#{e.message})"
+            return false
+          rescue => e
+            warn "An exception occurred while parsing YAML file: #{path}"
+            warn e.message
+            warn "  #{e.backtrace.join("\n  ")}"
+            return false
+          end
         end
       end
       

data/lib/{plugins → rsence/plugins}/plugin_plugins.rb

@@ -30,10 +30,10 @@ module RSence
         super
         @plugin_plugins = RSence::PluginManager.new({
           :plugin_paths => [ bundle_path('plugins') ],
-          :autoreload => false,
+          :autoreload => true,
           :name_prefix => name_with_manager_s.to_sym,
           :parent_manager => @plugins,
-          :resolved_deps => [:system]
+          :resolved_deps => [ :system, @name, name_with_manager_s.to_sym ]
         })
       end
       

data/lib/{session → rsence}/sessionmanager.rb

@@ -14,13 +14,13 @@ module RSence
   require 'json'
 
   ## Shared messaging-object:
-  require 'session/msg'
+  require 'rsence/msg'
 
   ## Unique random number generator:
   require 'randgen'
 
   ## SessionStorage is the superclass of SessionManager
-  require 'session/sessionstorage'
+  require 'rsence/sessionstorage'
 
   require 'digest/sha1'
 
@@ -51,7 +51,11 @@ module RSence
     end
   
     ### Creates a new session
-    def init_ses( msg, ses_seed )
+    def init_ses( msg=nil, ses_seed=false )
+
+      if ses_seed == false
+        ses_seed = @randgen.gen
+      end
     
       ## Assigns new timeout for the session
       time_now = Time.now.to_i # seconds since epoch
@@ -88,6 +92,9 @@ module RSence
       
         # user id, map to your own user management code
         :user_id    =>  0,
+
+        # unused in msg context:
+        :_msg_unused => true,
         
         # user info, map to your own user management code
         :user_info  => {},
@@ -108,17 +115,19 @@ module RSence
     
       # map the ses_id to cookie key
       @session_cookie_keys[ cookie_key ] = ses_id
-    
-      ### Tell the client what the new key is
-      msg.ses_key = ses_key
-    
-      ### Set the session data and id to the message object
-      msg.session = ses_data
-    
-      # Flag the session as new, so associated
-      # plugins know when to create new data
-      msg.new_session = true
-    
+      
+      if msg
+        ### Tell the client what the new key is
+        msg.ses_key = ses_key
+      
+        ### Set the session data and id to the message object
+        msg.session = ses_data
+      
+        # Flag the session as new, so associated
+        # plugins know when to create new data
+        msg.new_session = true
+      end
+
       # Returns the cookie key, so it can be sent in the response header
       return cookie_key
     
@@ -152,12 +161,11 @@ module RSence
         # tell the client what its new session key is
         msg.ses_key = ses_key
       end
-    
+      
       if @config[:clone_cookie_sessions] and @clone_targets.has_key? ses_id
         targets = []
         @clone_targets[ ses_id ].length.times do |n|
           target_id  = @clone_targets[ ses_id ].shift
-          # warn "target_id: #{target_id}"
           target_ses = @sessions[ target_id ]
           if @sessions.has_key?( target_id ) and @sessions[ target_id ].class == Hash
             targets.push( target_ses )
@@ -173,7 +181,22 @@ module RSence
     end
   
     def clone_ses( msg, old_data, old_id, old_key, ses_seed )
-      ses_data = Marshal.load( Marshal.dump( old_data ) )
+      if @plugins
+        @plugins.delegate( :dump_ses, old_data )
+        @plugins.delegate( :dump_ses_id, old_id )
+      end
+      begin
+        old_dump = Marshal.dump( old_data )
+        if @plugins
+          @plugins.delegate( :load_ses_id, old_id )
+          @plugins.delegate( :load_ses, old_data )
+        end
+        ses_data = Marshal.load( old_dump )
+      rescue => e
+        warn "Unable to clone session #{old_id}, because: #{e.message}"
+        init_ses( msg, ses_seed )
+        return
+      end
       old_data[:timeout] = Time.now.to_i + @config[:cloned_session_expires_in]
       timeout = Time.now.to_i + @config[:timeout_secs]
       cookie_key = @randgen.gen_many(@config[:cookie_key_multiplier]).join('')
@@ -191,6 +214,10 @@ module RSence
       @session_cookie_keys[ cookie_key ] = ses_id
       msg.ses_key = ses_key
       msg.session = ses_data
+      if @plugins
+        @plugins.delegate( :load_ses_id, ses_id )
+        @plugins.delegate( :load_ses, ses_data )
+      end
       if @clone_targets.has_key? old_id
         @clone_targets[ old_id ].push( ses_id )
       else
@@ -215,7 +242,7 @@ module RSence
         # get the session's data based on its id
         ses_data = @sessions[ ses_id ]
       
-        if @config[:clone_cookie_sessions] and ses_seed
+        if not ses_data.has_key?(:_msg_unused) and @config[:clone_cookie_sessions] and ses_seed
           clone_ses( msg, ses_data, ses_id, ses_key, ses_seed )
           return [true, true]
         else
@@ -223,9 +250,9 @@ module RSence
           return [true, false]
         end
       
-    
       ## The session was either faked or expired:
-      else
+      elsif RSence.args[:debug]
+    
         ### Tells the client to stop connecting with its session key and reload instead to get a new one.
         stop_client_with_message( msg,
           @config[:messages][:invalid_session][:title],
@@ -235,6 +262,18 @@ module RSence
       
         ## Return failure
         return [false, false]
+
+      else
+
+        msg.error_msg( [
+          "COMM.Transporter.stop = true;",
+          "setTimeout(function(){window.location.reload(true);},3000);",
+          "COMM.Transporter.setInterruptAnim('Session failure, reloading in 3 seconds..','#039');",
+          "setTimeout(function(){COMM.Transporter.setInterruptAnim('Reloading...');},2500);",
+          "setTimeout(function(){COMM.Transporter.setInterruptAnim('Session failure, reloading in 1 seconds..');},2000);",
+          "setTimeout(function(){COMM.Transporter.setInterruptAnim('Session failure, reloading in 2 seconds..');},1000);",
+        ] )
+        return [ false, false ]
       end
     
     end
@@ -255,6 +294,23 @@ module RSence
         "ReloadApp.nu( #{js_str(title)}, #{js_str(descr)}, #{js_str(uri)}  );"
       ] )
     end
+
+    def servlet_cookie_ses( request, response )
+      cookie_raw = request.cookies
+      if cookie_raw.has_key?('ses_key')
+        cookie_key = cookie_raw['ses_key'].split(';')[0]
+      else
+        cookie_key = nil
+      end
+      unless @session_cookie_keys.has_key?( cookie_key )
+        cookie_key = init_ses
+      end
+      ses_id = @session_cookie_keys[ cookie_key ]
+      ses_data = @sessions[ ses_id ]
+      ses_data[:timeout] = Time.now.to_i + @config[:timeout_secs]
+      renew_cookie_req_res( request, response, cookie_key, request.fullpath )
+      return ses_data
+    end
   
     ### Checks / Sets cookies
     def check_cookie( msg, ses_seed )
@@ -302,18 +358,20 @@ module RSence
           cookie_key = msg.session[:cookie_key]
           @valuemanager.resend_session_values( msg )
         elsif ses_status
-          # delete the old cookie key:
-          @session_cookie_keys.delete( cookie_key )
-        
-          # get a new cookie key
-          cookie_key = @randgen.gen_many(@config[:cookie_key_multiplier]).join('')
-        
-          # map the new cookie key to the old session identifier
-          @session_cookie_keys[ cookie_key ] = ses_id
-        
-          # binds the new cookie key to the old session data
-          @sessions[ses_id][:cookie_key] = cookie_key
+
+          unless @sessions[ses_id].has_key?(:_msg_unused)
+            # delete the old cookie key:
+            @session_cookie_keys.delete( cookie_key )
           
+            # get a new cookie key
+            cookie_key = @randgen.gen_many(@config[:cookie_key_multiplier]).join('')
+          
+            # map the new cookie key to the old session identifier
+            @session_cookie_keys[ cookie_key ] = ses_id
+          
+            # binds the new cookie key to the old session data
+            @sessions[ses_id][:cookie_key] = cookie_key
+          end
           
           msg.session[:plugin_incr] = @plugins.incr
         
@@ -353,19 +411,23 @@ module RSence
     end
   
     def renew_cookie( msg, cookie_key )
+      renew_cookie_req_res( msg.request, msg.response, cookie_key )
+    end
+
+    def renew_cookie_req_res( request, response, cookie_key, ses_cookie_path=nil )
       # Uses a cookie comment to tell the user what the
       # cookie is for, change it to anything valid in the
       # configuration.
       ses_cookie_comment = @config[:ses_cookie_comment]
     
       ## mod_rewrite changes the host header to x-forwarded-host:
-      if msg.request.header.has_key?('x-forwarded-host')
-        domain = msg.request.header['x-forwarded-host']
+      if request.header.has_key?('x-forwarded-host')
+        domain = request.header['x-forwarded-host']
       
       ## direct access just uses host (at least mongrel
       ## does mod_rewrite header translation):
       else
-        domain = msg.request.host
+        domain = request.host
       end
     
       if domain == 'localhost'
@@ -373,7 +435,7 @@ module RSence
         return
       end
     
-      server_port = msg.request.port
+      server_port = request.port
     
       ## if the host address is a real domain
       ## (not just hostname or 'localhost'),
@@ -396,10 +458,10 @@ module RSence
       ## prevents unnecessary cookie-juggling in xhr's
       if @config[:trust_cookies]
         ses_cookie_path    = '/'
-      else
+      elsif ses_cookie_path == nil
         ses_cookie_path    = RSence.config[:broker_urls][:hello]
       end
-    
+
       ## Formats the cookie to string
       ## (through array, to keep it readable in the source)
       ses_cookie_arr = [
@@ -412,7 +474,7 @@ module RSence
       ]
     
       ### Sets the set-cookie header
-      msg.response['Set-Cookie'] = ses_cookie_arr.join('; ')
+      response['Set-Cookie'] = ses_cookie_arr.join('; ')
     end
     
     def expire_ses_by_req( req, res )
@@ -478,7 +540,7 @@ module RSence
         
         ## get the ses_key from the request query:
         ses_key = query[ 'ses_key' ]
-        # puts "ses key: #{ses_key}"
+
         ## The message object binds request, response
         ## and all user/session -related data to one
         ## object, which is passed around where