rsence 2.0.9.23 → 2.1.0

data/lib/plugins/pluginmanager.rb

@@ -23,9 +23,21 @@ module RSence
     
     attr_reader :transporter, :sessions
     
+    @@incr = 0
+    def incr
+      return @@incr
+    end
+    
     # Returns the registry data for plugin bundle +plugin_name+
-    def registry( plugin_name )
-      return @registry[ plugin_name ]
+    def registry( plugin_name=false )
+      return @registry unless plugin_name
+      if @registry.has_key?( plugin_name )
+        return @registry[ plugin_name ]
+      elsif @parent_manager
+        return @parent_manager.registry( plugin_name )
+      else
+        throw "Plugin not in registry: #{plugin_name.inspect}"
+      end
     end
     alias [] registry
     
@@ -37,6 +49,8 @@ module RSence
         elsif block == nil
           call( sym, *args )
         end
+      elsif @parent_manager
+        return @parent_manager.method_missing( sym, *args, &block )
       end
     end
     
@@ -63,11 +77,27 @@ module RSence
         inst.init if inst.respond_to? :init and not inst.inited
         @registry[ bundle_name ] = inst
         if inst.respond_to?( :match ) and ( inst.respond_to?( :get ) or inst.respond_to?( :post ) )
-          @servlets.push( bundle_name )
+          add_servlet( bundle_name )
         end
       end
     end
     
+    def add_servlet( bundle_name )
+      if @parent_manager
+        sub_name = "#{@name_prefix.to_s}:#{bundle_name.to_s}"
+        @parent_manager.add_servlet( sub_name )
+      end
+      @servlets.push( bundle_name )
+    end
+    
+    def del_servlet( bundle_name )
+      if @parent_manager
+        sub_name = "#{@name_prefix.to_s}:#{bundle_name.to_s}"
+        @parent_manager.del_servlet( sub_name )
+      end
+      @servlets.delete( bundle_name )
+    end
+    
     def callable?( plugin_name, method_name )
       return false if @deps.category?( plugin_name )
       return false unless @registry.has_key?( plugin_name )
@@ -79,6 +109,20 @@ module RSence
     # Calls the method +method_name+ with args +args+ of the plugin +plugin_name+.
     # Returns false, if no such plugin or method exists.
     def call( plugin_name, method_name, *args )
+      puts "#{plugin_name}.#{method_name}" if RSence.args[:trace_delegate]
+      plugin_name_s = plugin_name.to_s
+      if plugin_name_s.include?(':')
+        colon_index = plugin_name_s.index(':')
+        sub_manager_name = plugin_name_s[0..(colon_index-1)].to_sym
+        plugin_name = plugin_name_s[(colon_index+1)..-1].to_sym
+        if @registry.has_key?( sub_manager_name )
+          sub_manager = @registry[sub_manager_name]
+          if sub_manager.respond_to?( :plugin_plugins )
+            return sub_manager.plugin_plugins.call( plugin_name, method_name, *args )
+          end
+        end
+        return false
+      end
       plugin_name = plugin_name.to_sym
       if callable?( plugin_name, method_name )
         begin
@@ -94,7 +138,7 @@ module RSence
       elsif @deps.category?( plugin_name )
         warn "Warning! Tried to call category: #{plugin_name.inpsect}"
       elsif not @registry.has_key?( plugin_name )
-        warn "Warning! No such plugin: #{plugin_name.inspect}"
+        warn "Warning (#{@pluginmanager_id})! No such plugin: #{plugin_name.inspect} (tried to call #{method_name.inspect[0..100]} using args: #{args.inspect[0..100]}"
       elsif not @registry[ plugin_name ].respond_to?( method_name )
         warn "Warning! Plugin: #{plugin_name.inspect} does not respond to #{method_name.inspect}"
       end
@@ -103,6 +147,7 @@ module RSence
     alias run_plugin call
     
     # Prettier error handling.
+    @@prev_errors = []
     def plugin_error( e, err_location, err_location_descr, eval_repl=false )
       err_msg = [
         "*"*40,
@@ -113,6 +158,12 @@ module RSence
         "\t"+e.backtrace.join("\n\t"),
         "*"*40
       ].join("\n")+"\n"
+      error_say = "Error! #{err_location_descr.capitalize}. #{e.class.to_s}, #{e.message}?"
+      unless @@prev_errors.include?( error_say )
+        @@prev_errors.push( error_say )
+        say error_say
+      end
+      @@prev_errors.shift if @@prev_errors.length > 10
       if eval_repl
         puts
         puts "plugin: #{eval_repl}"
@@ -126,21 +177,10 @@ module RSence
     def match_servlet_uri( uri, req_type=:get )
       match_score = {}
       @servlets.each do | servlet_name |
-        servlet = @registry[ servlet_name ]
-        next unless servlet.respond_to?( req_type )
-        begin
-          if servlet.match( uri, req_type )
-            score = servlet.score
-            match_score[ score ] = [] unless match_score.has_key? score
-            match_score[ score ].push( servlet_name )
-          end
-        rescue => e
-          plugin_error(
-            e,
-            "RSence::PluginManager.match_servlet_uri",
-            "servlet: #{servlet_name.inspect}, req_type: #{req_type.inspect}, uri: #{uri.inspect}",
-            servlet_name
-          )
+        if call( servlet_name, :match, uri, req_type )
+          score = call( servlet_name, :score )
+          match_score[ score ] = [] unless match_score.has_key? score
+          match_score[ score ].push( servlet_name )
         end
       end
       match_scores = match_score.keys.sort
@@ -172,7 +212,7 @@ module RSence
       return false unless matches_order
       matches_order.each do |servlet_name|
         begin
-          @registry[servlet_name].send( req_type, req, resp, session )
+          call( servlet_name, req_type, req, resp, session )
           return true
         rescue => e
           plugin_error(
@@ -206,7 +246,11 @@ module RSence
     # Delegates the +flush+ and +close+ methods to any
     # loaded plugins, in that order.
     def shutdown
-      @transporter.online = false
+      if @parent_manager
+        @closed = true
+      else
+        @transporter.online = false
+      end
       @deps.list.reverse.each do |bundle_name|
         unload_bundle( bundle_name )
       end
@@ -221,9 +265,10 @@ module RSence
       end
       if is_dir
         Dir.entries( bundle_path ).each do |entry_name|
-          next if entry_name[0].chr == '.'
+          next if entry_name[0].chr == '.' # skip hidden, '.' and '..' 
           full_path = File.join( bundle_path, entry_name )
           unless 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] )
@@ -255,7 +300,7 @@ module RSence
         
         # System version requirement.
         # NOTE: Has no effect yet!
-        :sys_version => '>= 1.0.0',
+        :sys_version => '>= 2.0.0',
         
         # Dependency, by default the system category (built-in plugins).
         # A nil ( "~" in yaml ) value means no dependencies.
@@ -270,7 +315,10 @@ module RSence
         
         # Optional, reverse dependency. Loads before the prepended plugin(category).
         # NOTE: Doesn't support packages yet!
-        :prepends       => nil
+        :prepends       => nil,
+        
+        # Name of plugin manager, so the bundle internals know what its path is.
+        :manager        => @name_prefix
         
       }
       
@@ -281,7 +329,7 @@ module RSence
         info_yaml.each do |info_key,info_value|
           info[ info_key.to_sym ] = info_value
         end
-      else
+      elsif RSence.args[:debug]
         warn "Expected info.yaml, using defaults:"
         warn "  #{info_path}"
       end
@@ -425,6 +473,7 @@ module RSence
         if bundle_status
           (bundle_path, src_file) = bundle_status
           unless disabled?( bundle_path )
+            # bundle_name = "#{@name_prefix.to_s}.#{bundle_name}" if @name_prefix
             bundles_found.push( [bundle_path, bundle_name.to_sym, src_file] )
           end
         end
@@ -441,8 +490,10 @@ module RSence
         end
         puts "Unloading bundle: #{bundle_name.inspect}" if RSence.args[:debug]
         @deps.del_item( bundle_name )
-        online_status = @transporter.online?
-        @transporter.online = false
+        if @transporter
+          online_status = @transporter.online?
+          @transporter.online = false
+        end
         call( bundle_name, :flush )
         call( bundle_name, :close )
         @registry.delete( bundle_name )
@@ -452,12 +503,12 @@ module RSence
           end
         end
         if @servlets.include?( bundle_name )
-          @servlets.delete( bundle_name )
+          del_servlet( bundle_name )
         end
         if @info.include?( bundle_name )
           @info.delete( bundle_name )
         end
-        @transporter.online = online_status
+        @transporter.online = online_status if @transporter
         return unload_order
       end
     end
@@ -477,7 +528,7 @@ module RSence
       if RSence.args[:say]
         Thread.new do
           Thread.pass
-          system(%{say "#{message.gsub('"','')}"})
+          system(%{say "#{message.gsub('"',"'").gsub('`',"'")}"})
         end
       end
     end
@@ -564,6 +615,8 @@ module RSence
         puts "done!" if RSence.args[:verbose]
       end
       if not (to_load.empty? and to_unload.empty? and to_reload.empty?)
+        @@incr += 1
+        puts "@@incr: #{@@incr}" if RSence.args[:debug]
         puts "Plugin bundles:"
         puts "  loaded: #{to_load.join(', ')}" unless to_load.empty?
         puts "  unloaded: #{to_unload.join(', ')}" unless to_unload.empty?
@@ -582,25 +635,52 @@ module RSence
       update_bundles!
     end
     
+    attr_reader :transporter
+    attr_reader :sessions
+    attr_reader :autoreload
+    attr_reader :name_prefix
+    attr_reader :plugin_paths
+    attr_reader :parent_manager
+    
+    @@pluginmanager_id = 0
     # Initialize with a list of directories as plugin_paths.
     # It's an array containing all plugin directories to scan.
-    def initialize( plugin_paths, transporter=nil,
-                    autoreload=false, name_prefix=false,
-                    resolved_deps=[], resolved_categories={} )
-      if transporter
-        @transporter = transporter
-        @sessions    = transporter.sessions
-      end
-      @name_prefix = name_prefix
-      @plugin_paths = plugin_paths
-      @deps = Dependencies.new( resolved_deps, resolved_categories )
-      puts "Loading #{name_prefix+' ' if name_prefix}plugins..." if RSence.args[:verbose]
+    def initialize( options )
+      
+      options = {
+        :plugin_paths => nil,
+        :transporter => nil,
+        :autoreload => false,
+        :name_prefix => false,
+        :resolved_deps => [],
+        :resolved_categories => {},
+        :parent_manager => nil
+      }.merge( options )
+      
+      @pluginmanager_id = @@pluginmanager_id
+      @@pluginmanager_id += 1
+      
+      @closed = false
+      @plugin_paths = options[:plugin_paths]
+      
+      if options[:transporter]
+        @transporter = options[:transporter]
+        @sessions    = options[:transporter].sessions
+      end
+      
+      @autoreload = options[:autoreload]
+      @name_prefix = options[:name_prefix]
+      @parent_manager = options[:parent_manager]
+      
+      @deps = Dependencies.new( options[:resolved_deps], options[:resolved_categories] )
+      
+      puts "Loading #{@name_prefix.to_s+' ' if @name_prefix}plugins..." if RSence.args[:verbose]
       init_bundles!
-      puts %{Plugins #{"of #{name_prefix} " if name_prefix}loaded.} if RSence.args[:verbose]
-      if autoreload
+      puts %{Plugins #{"of #{@name_prefix} " if @name_prefix}loaded.} if RSence.args[:verbose]
+      if @autoreload
         @thr = Thread.new do
           Thread.pass
-          while true
+          until @closed
             begin
               update_bundles!
             rescue => e
@@ -608,9 +688,12 @@ module RSence
             end
             sleep 3
           end
+          puts "No longer reloading plugins of #{@name_prefix}." if RSence.args[:verbose]
         end
       end
+      
     end
+    
   end
 end
 

data/lib/plugins/plugins.rb

@@ -123,7 +123,7 @@ module RSence
             path = File.expand_path( path, _bundle_path )
             return path
           end
-          def self.inspect; "#<module BundleWrapper of #{@@bundle_name}}>"; end
+          def self.inspect; "#<module BundleWrapper of #{self._bundle_path}}>"; end
           def self.const_missing( name )
             if name == :Servlet
               return Plugins.Servlet.call( self )
@@ -142,6 +142,15 @@ module RSence
               plugin_src = "_bundle_path = #{params[:bundle_path].inspect};" + plugin_src
             end
             m.module_eval( plugin_src )
+          rescue SyntaxError => e
+            src_path = params[:src_path]
+            src_path = "<undefined src_path>" if src_path == nil
+            params[:plugin_manager].plugin_error(
+              e,
+              'BundleLoaderSyntaxError',
+              "The syntax of #{params[:bundle_name]} is invalid.",
+              src_path
+            )
           rescue => e
             src_path = params[:src_path]
             src_path = "<undefined src_path>" if src_path == nil

data/lib/session/msg.rb

@@ -174,13 +174,37 @@ module RSence
     def user_id
       @session[:user_id]
     end
-  
+    
+    # Getter for the user info hash
+    # @return [Hash] The current user info hash. Returns {} by default.
+    def user_info
+      @session[:user_info] = {} unless @session.has_key?(:user_info)
+      @session[:user_info]
+    end    
+    
+    # @private used for automatic reload of page, when the plugins have been changed.
+    def refresh_page?( plugin_incr )
+      if plugin_incr != @session[:plugin_incr]
+        puts "@session[:plugin_incr] = #{@session[:plugin_incr].inspect}  vs  plugin_incr = #{plugin_incr.inspect}" if RSence.args[:debug]
+        @session[:plugin_incr] = plugin_incr
+        return true
+      end
+      return false
+    end
+    
     # Setter for the user id
     # @param [Number, String] user_id The user id to set. Use in login situations to store the user id.
     # @return [nil]
     def user_id=(user_id)
       @session[:user_id] = user_id
     end
+
+    # Setter for the user info
+    # @param [Hash] user_info The user info hash to set. Use in login situations to store the user information.
+    # @return [nil]
+    def user_info=(user_info)
+      @session[:user_info] = user_info
+    end
     
     # Returns the session id
     # @return [Number]

data/lib/session/sessionmanager.rb

@@ -74,7 +74,9 @@ module RSence
       
         # the time, when the session will time out
         :timeout    =>  timeout,
-      
+        
+        :plugin_incr => @plugins.incr,
+        
         # session id, used internally
         :ses_id     =>  ses_id,
       
@@ -86,6 +88,9 @@ module RSence
       
         # user id, map to your own user management code
         :user_id    =>  0,
+        
+        # user info, map to your own user management code
+        :user_info  => {},
       
         # valuemanager data
         :values     => {
@@ -168,7 +173,7 @@ module RSence
     end
   
     def clone_ses( msg, old_data, old_id, old_key, ses_seed )
-      ses_data = Marshal.restore( Marshal.dump( old_data ) )
+      ses_data = Marshal.load( Marshal.dump( old_data ) )
       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('')
@@ -177,6 +182,7 @@ module RSence
       ses_data[:timeout] = timeout
       ses_data[:ses_key] = ses_key
       ses_data[:cookie_key] = cookie_key
+      ses_data[:plugin_incr] = @plugins.incr
       ses_id = new_ses_id( cookie_key, ses_key, timeout )
       ses_data[:ses_id] = ses_id
       @sessions[ ses_id ] = ses_data
@@ -307,6 +313,9 @@ module RSence
         
           # binds the new cookie key to the old session data
           @sessions[ses_id][:cookie_key] = cookie_key
+          
+          
+          msg.session[:plugin_incr] = @plugins.incr
         
           # Sets the restored_session flag of msg to true
           # It signals plugins to re-set data

data/lib/session/sessionstorage.rb

@@ -181,13 +181,6 @@ module RSence
       ## Used for future upgrades:
       # version = table_version
     
-      if @config[:reset_sessions]
-        puts "Resetting all sessions..."
-        reset_sessions()
-      else
-        restore_sessions()
-      end
-    
       return true
     end
   
@@ -214,16 +207,22 @@ module RSence
       @db[:rsence_session].all do |ses_row|
         ses_id = ses_row[:id]
         ses_data_dump = ses_row[:ses_data]
-      
+        
         if ses_data_dump == nil
           @db[:rsence_session].filter(:id => ses_id).delete
           @db[:rsence_uploads].filter(:ses_id => ses_id).delete
         else
-          ses_data = Marshal.restore( ses_data_dump )
-          ses_key = ses_data[:ses_key]
-          @sessions[ses_id] = ses_data
-          @session_keys[ ses_key ] = ses_id
-          @session_cookie_keys[ ses_data[:cookie_key] ] = ses_id
+          begin
+            ses_data = Marshal.load( ses_data_dump )
+            ses_key = ses_data[:ses_key]
+            @sessions[ses_id] = ses_data
+            @session_keys[ ses_key ] = ses_id
+            @session_cookie_keys[ ses_data[:cookie_key] ] = ses_id
+          rescue => e
+            warn "Unable to restore session id: #{ses_id}, error: #{e.inspect}"
+            @db[:rsence_session].filter(:id => ses_id).delete
+            @db[:rsence_uploads].filter(:ses_id => ses_id).delete
+          end
         end
       end
       db_close
@@ -297,7 +296,7 @@ module RSence
       @sessions.delete( ses_id )
     
       # Removes all ticket-based storage bound to the session
-      @plugins[:ticketservices].expire_ses( ses_id ) if @plugins
+      @plugins[:ticket].expire_ses_id( ses_id ) if @plugins
     
       # target -> source cleanup
       if @clone_sources.has_key?( ses_id )
@@ -317,6 +316,7 @@ module RSence
       if @db_avail
         db_open
         # Deletes the session's row from the database
+        @db[:rsence_uploads].filter(:ses_id => ses_id).delete
         @db[:rsence_session].filter(:id => ses_id).delete
         db_close
       end