nitro 0.20.0 → 0.21.0

data/lib/nitro/service.rb

@@ -3,19 +3,19 @@ require 'nitro/controller'
 module Nitro
 
 class Service < Nitro::Controller
-	
-	def index
-		method, args = decode_request(request.raw_body)
-	
-		res = send(method, *args)
-		
-		response.content_type = 'text/xml'
-		
-		print encode_response(method, res)
+  
+  def index
+    method, args = decode_request(request.raw_body)
+  
+    res = send(method, *args)
+    
+    response.content_type = 'text/xml'
+    
+    print encode_response(method, res)
 
-		return :stop
-	end
-	
+    return :stop
+  end
+  
 end
 
 end

data/lib/nitro/service/xmlrpc.rb

@@ -8,35 +8,35 @@ module Nitro
 
 module XmlRpc
 
-	# === In
-	#
-	# [+request+]
-	#		Raw request data.
-	#
-	# === Out
-	#
-	#	[+method+]
-	#	[+args+]	
-	
-	def decode_request(request)
-		method, args = XMLRPC::Marshal.load_call(request)
-		return method.gsub(/\./, '__'), args
-	end
-
-	def encode_response(method_name, response)
-		XMLRPC::Marshal.dump_response(response)
-	end
-
-	private
+  # === In
+  #
+  # [+request+]
+  #    Raw request data.
+  #
+  # === Out
+  #
+  #  [+method+]
+  #  [+args+]  
+  
+  def decode_request(request)
+    method, args = XMLRPC::Marshal.load_call(request)
+    return method.gsub(/\./, '__'), args
+  end
+
+  def encode_response(method_name, response)
+    XMLRPC::Marshal.dump_response(response)
+  end
+
+  private
 
 end
 
 # The XML-RPC base service.
 
 class XmlRpcService < Service
-	include XmlRpc
+  include XmlRpc
 end
-	
+  
 end
 
 # * George Moschovitis <gm@navel.gr>

data/lib/nitro/session.rb

@@ -3,10 +3,12 @@ require 'webrick'
 
 require 'glue/hash'
 require 'glue/attribute'
+require 'glue/configuration'
+
 require 'nitro/cookie'
 
 module Nitro
-	
+  
 # A web application session. 
 #
 # State is a neccessary evil but session variables
@@ -20,134 +22,134 @@ module Nitro
 
 class Session < Hash
 
-	# Session id salt.
-
-	setting :session_id_salt, :default => 'SALT', :doc => 'Session id salt'
-
-	# The name of the cookie that stores the session id.
-
-	setting :cookie_name, :default => 'nsid', :doc => 'The name of the cookie that stores the session id'
-
-	# The sessions store. By default sessions are 
-	# stored in memory.
-
-	cattr_accessor :store; @@store = Glue::SafeHash.new 
-
-	# Set the session store. The following options are
-	# available:
-	#
-	# * :memory [default]
-	# * :drb
-	# * :memcached (not available yet)
-	# * :og (not available yet)
-	# * :file (not available yet)
-
-	def self.store_type=(store_type)
-		# gmosx: RDoc complains about this, so lets use an
-		# eval, AAAAAAAARGH!
-		# require "nitro/session/#{store_type}"
-		eval %{ require 'nitro/session/#{store_type}' }
-	end
-
-	# Lookup the session in the store by using the session
-	# cookie value as a key. If the session does not exist
-	# creates a new session, inserts it in the store and 
-	# appends a new session cookie in the response.
-	
-	def self.lookup(context)
-		if session_id = context.cookies[Session.cookie_name]
-			session = Session.store[session_id]
-		end
-
-		unless session
-			# Create new session.
-			session = Session.new(context)
-			cookie = Cookie.new(Session.cookie_name, session.session_id)
-			context.add_cookie(cookie)
-			Session.store[session.session_id] = session 
-		else
-			# Access ('touch') the existing session.
-			session.touch!
-		end
-		
-		return session
-	end
-
-	# The unique id of this session.
-
-	attr_reader :session_id
-
-	# The time this session was created.
-
-	attr_reader :ctime
-	alias_method :create_time, :ctime
-
-	# The time this session was last modified.
-
-	attr_accessor :mtime
-	alias_method :modify_time, :mtime
-
-	# The time this session was last accessed.
-
-	attr_accessor :atime
-	alias_method :access_time, :mtime
-
-	# Create the session for the given context.
-
-	def initialize(context = nil)
-		@session_id = create_id
-		@ctime = @mtime = @atime = Time.now
-	end
-
-	# Like the unix touch command, upadtes
-	# the atime to now.
-
-	def touch!
-		@atime = Time.now
-	end
-
-	# Synchronize the session store, by 
-	# restoring this session. Especially useful
-	# in distributed and/or multiprocess setups.
-	
-	def sync
-		Session.store[@session_id] = self
-	end
-	alias_method :restore, :sync
-	
+  # Session id salt.
+
+  setting :session_id_salt, :default => 'SALT', :doc => 'Session id salt'
+
+  # The name of the cookie that stores the session id.
+
+  setting :cookie_name, :default => 'nsid', :doc => 'The name of the cookie that stores the session id'
+
+  # The sessions store. By default sessions are 
+  # stored in memory.
+
+  cattr_accessor :store; @@store = Glue::SafeHash.new 
+
+  # Set the session store. The following options are
+  # available:
+  #
+  # * :memory [default]
+  # * :drb
+  # * :memcached (not available yet)
+  # * :og (not available yet)
+  # * :file (not available yet)
+
+  def self.store_type=(store_type)
+    # gmosx: RDoc complains about this, so lets use an
+    # eval, AAAAAAAARGH!
+    # require "nitro/session/#{store_type}"
+    eval %{ require 'nitro/session/#{store_type}' }
+  end
+
+  # Lookup the session in the store by using the session
+  # cookie value as a key. If the session does not exist
+  # creates a new session, inserts it in the store and 
+  # appends a new session cookie in the response.
+  
+  def self.lookup(context)
+    if session_id = context.cookies[Session.cookie_name]
+      session = Session.store[session_id]
+    end
+
+    unless session
+      # Create new session.
+      session = Session.new(context)
+      cookie = Cookie.new(Session.cookie_name, session.session_id)
+      context.add_cookie(cookie)
+      Session.store[session.session_id] = session 
+    else
+      # Access ('touch') the existing session.
+      session.touch!
+    end
+    
+    return session
+  end
+
+  # The unique id of this session.
+
+  attr_reader :session_id
+
+  # The time this session was created.
+
+  attr_reader :ctime
+  alias_method :create_time, :ctime
+
+  # The time this session was last modified.
+
+  attr_accessor :mtime
+  alias_method :modify_time, :mtime
+
+  # The time this session was last accessed.
+
+  attr_accessor :atime
+  alias_method :access_time, :mtime
+
+  # Create the session for the given context.
+
+  def initialize(context = nil)
+    @session_id = create_id
+    @ctime = @mtime = @atime = Time.now
+  end
+
+  # Like the unix touch command, upadtes
+  # the atime to now.
+
+  def touch!
+    @atime = Time.now
+  end
+
+  # Synchronize the session store, by 
+  # restoring this session. Especially useful
+  # in distributed and/or multiprocess setups.
+  
+  def sync
+    Session.store[@session_id] = self
+  end
+  alias_method :restore, :sync
+  
 protected
-	
-	# Calculates a unique id.
-	#
-	# The session id must be unique, a monotonically 
-	# increasing function like time is appropriate. 
-	# Random may produce equal ids? add a prefix 
-	# (SALT) to stop hackers from creating session_ids.
-	
-	def create_id
-		now = Time.now
-		md5 = Digest::MD5.new
-		md5.update(now.to_s)
-		md5.update(now.usec.to_s)
-		md5.update(rand(0).to_s)
-		md5.update(Session.session_id_salt)
-		md5.hexdigest
-	end
+  
+  # Calculates a unique id.
+  #
+  # The session id must be unique, a monotonically 
+  # increasing function like time is appropriate. 
+  # Random may produce equal ids? add a prefix 
+  # (SALT) to stop hackers from creating session_ids.
+  
+  def create_id
+    now = Time.now
+    md5 = Digest::MD5.new
+    md5.update(now.to_s)
+    md5.update(now.usec.to_s)
+    md5.update(rand(0).to_s)
+    md5.update(Session.session_id_salt)
+    md5.hexdigest
+  end
 
 end
 
 # Abstract class for a session store manager. 
 
 class SessionStore
-	def []=(sid, session)
-	end
+  def []=(sid, session)
+  end
 
-	def [](sid)
-	end
+  def [](sid)
+  end
 
-	def delete(sid)
-	end
-	
+  def delete(sid)
+  end
+  
 end
 
 end

data/lib/nitro/session/drb.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: drb.rb 1 2005-04-11 11:04:30Z gmosx $
+# $Id: drb.rb 182 2005-07-22 10:07:50Z gmosx $
 
 require 'drb'
 
@@ -12,20 +12,20 @@ Logger.debug 'Using Drb sessions.'
 module Nitro
 
 class Session
-	
-	# The address of the Session DRb server.
+  
+  # The address of the Session DRb server.
 
-	cattr_accessor :drb_address, '127.0.0.1'
-	
-	# The port of the Session DRb server.
+  cattr_accessor :drb_address, '127.0.0.1'
+  
+  # The port of the Session DRb server.
 
-	cattr_accessor :drb_port, 9069 
+  cattr_accessor :drb_port, 9069 
 
 end
 
 Session.store = DRbObject.new(
-	nil, 
-	"druby://#{Session.drb_address}:#{Session.drb_port}"
+  nil, 
+  "druby://#{Session.drb_address}:#{Session.drb_port}"
 ) 
 
 end

data/lib/nitro/session/drbserver.rb

@@ -2,7 +2,7 @@
 
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: drbserver.rb 1 2005-04-11 11:04:30Z gmosx $
+# $Id: drbserver.rb 182 2005-07-22 10:07:50Z gmosx $
 
 require 'drb'
 require 'optparse'
@@ -19,52 +19,52 @@ debug = false
 
 parser = OptionParser.new do |opts|
 
-	opts.banner = 'Usage: drbserver.rb [options]'
-	opts.separator ''
-	opts.separator 'Specific options:'
+  opts.banner = 'Usage: drbserver.rb [options]'
+  opts.separator ''
+  opts.separator 'Specific options:'
 
-	opts.on('-a A', '--address A', 'Listening address.') do |a|
-		address = a
-	end
+  opts.on('-a A', '--address A', 'Listening address.') do |a|
+    address = a
+  end
 
-	opts.on('-p P', '--port P', Integer, 'Listening port.') do |p|
-		port = p
-	end
+  opts.on('-p P', '--port P', Integer, 'Listening port.') do |p|
+    port = p
+  end
 
-	opts.on('-D', '--debug', 'Run in debug mode.') do |p|
-		debug = true
-	end
-	
-	opts.on_tail('-h', '--help', 'Show this message.') do
-		puts opts
-		exit
-	end
-	
+  opts.on('-D', '--debug', 'Run in debug mode.') do |p|
+    debug = true
+  end
+  
+  opts.on_tail('-h', '--help', 'Show this message.') do
+    puts opts
+    exit
+  end
+  
 end
 
 begin
-	parser.parse!(ARGV)
+  parser.parse!(ARGV)
 rescue OptionParser::InvalidOption
-	puts 'Invalid option, pass the --help parameter to get help!' 
-	exit
+  puts 'Invalid option, pass the --help parameter to get help!' 
+  exit
 end
 
 sessions = Glue::SafeHash.new 
 
 if debug
 
-	class << sessions
-		def []=(k, v)
-			puts "WRITE: #{k} = #{v}"
-			super
-		end
-		
-		def [](k)
-			puts "READ: #{k}"
-			super
-		end
-	end
-	
+  class << sessions
+    def []=(k, v)
+      puts "WRITE: #{k} = #{v}"
+      super
+    end
+    
+    def [](k)
+      puts "READ: #{k}"
+      super
+    end
+  end
+  
 end
 
 DRb.start_service("druby://#{address}:#{port}", sessions)