nitro 0.22.0 → 0.23.0

data/lib/nitro/scaffold/relations.rb

@@ -0,0 +1,54 @@
+require 'nitro/scaffold'
+
+module Nitro::Scaffolding
+
+# A collection of scaffolding helper for Og relations.
+
+module Og
+
+private
+
+  # Scaffold the relations of an Og managed object.
+  
+  def scaffold_relations(obj)
+  end
+
+  # Scaffold a +belongs_to+ relation.
+  
+  def belongs_to_editor(obj, rel, options)
+    entities = rel.target_class.all
+    labels = entities.map { |e| e.to_s }
+    values = entities.map { |e| e.oid }
+    element(
+      label(rel.name),
+      %{
+      <select id="#{rel.name}" name="#{rel.name}">
+        #{options(:labels => labels, :values => values, :selected => 1)}
+      </select>
+      }
+    )
+  end
+
+  # Scaffold a +has_many+ relation.
+  
+  def has_many_editor(obj, rel, options)
+    entities = obj.send(rel.target_plural_name)
+    unless entities.empty?
+      str = entities.inject('') do |acc, e| 
+        acc << "<tr><td>#{e.to_edit_link(@base)}</td></tr>"
+      end
+      str = "<table>#{str}</table>"
+    else 
+      str = 'No entities found.<br /><br />'
+    end
+    element(
+      label(rel.name) + '&nbsp;<a href="#">Add</a>',
+      %{
+      #{str}
+      }
+    )
+  end
+
+end
+
+end

data/lib/nitro/server.rb

@@ -1,5 +1,4 @@
-require 'glue/autoreload'
-
+require 'nitro/controller'
 require 'nitro/server/runner'
 
 module Nitro
@@ -29,6 +28,11 @@ class Server
   
   setting :access_log, :default => nil, :doc => 'The access log'
 
+  # Additional server options. Useful to pass options to 
+  # Webrick for example.
+  
+  setting :options, :default => {}, :doc => "Additional server options"
+
   # The name of the application.
 
   attr_accessor :name
@@ -68,7 +72,8 @@ class Server
     @address, @port = self.class.address, self.class.port
     @public_root = self.class.public_root
     @access_log = self.class.access_log
-    @options = options
+    @options = self.class.options.dup
+    @options.update(options)
   end
   
   # Return the dispatcher.
@@ -146,5 +151,3 @@ end
 # Alias for the Server class.
 
 App = Nitro::Server unless Object.const_defined?(:App)
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/server/runner.rb

@@ -1,6 +1,5 @@
 require 'optparse'
 
-require 'glue/misc'
 require 'glue/configuration'
 
 module Nitro
@@ -202,7 +201,7 @@ class Runner
   def setup_debug
     $DBG = true
     Compiler.reload = true
-    require 'glue/autoreload'
+    require 'nano/kernel/autoreload'
     autoreload(3)
     Caching.caching_enabled = false
     
@@ -273,7 +272,9 @@ class Runner
 
       @server ||= Runner.adapter
 
-      puts "\n==> Listening at #{server.address}:#{server.port}. (#{self.class.mode} mode)\n\n"
+      puts "\n",
+        "==> Listening at #{server.address}:#{server.port}. (#{self.class.mode} mode)",
+        "==> Press Ctrl-C to shutdown; Run with --help for options.\n\n"
 
       case @server
         when :webrick

data/lib/nitro/service.rb

@@ -2,6 +2,8 @@ require 'nitro/controller'
 
 module Nitro
 
+# A Web Service endpoint. This is a specialized controller.
+
 class Service < Nitro::Controller
   
   def index
@@ -10,7 +12,7 @@ class Service < Nitro::Controller
     res = send(method, *args)
     
     response.content_type = 'text/xml'
-    
+
     print encode_response(method, res)
 
     return :stop

data/lib/nitro/service/xmlrpc.rb

@@ -20,7 +20,7 @@ module XmlRpc
   
   def decode_request(request)
     method, args = XMLRPC::Marshal.load_call(request)
-    Logger.debug "Calling XML-RPC method '#{method}'" if $DBG
+    Logger.debug "Calling XML-RPC method '#{method}', args: #{args.inspect}" if $DBG
     return method.gsub(/\./, '__'), args
   end
 

data/lib/nitro/session.rb

@@ -1,7 +1,9 @@
 require 'md5'
 require 'webrick'
 
-require 'glue/hash'
+require 'mega/synchash'
+require 'mega/time_in_english'
+
 require 'glue/attribute'
 require 'glue/configuration'
 
@@ -30,51 +32,68 @@ class Session < Hash
 
   setting :cookie_name, :default => 'nsid', :doc => 'The name of the cookie that stores the session id'
 
+  # The session keepalive time. The session is eligable for
+  # garbage collection after this time passes.
+  
+  setting :keepalive, :default => 30.minutes, :doc => 'The session keepalive time'
+  
   # The sessions store. By default sessions are 
   # stored in memory.
 
-  cattr_accessor :store; @@store = Glue::SafeHash.new 
+  cattr_accessor :store; @@store = SyncHash.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.
+  class << self
   
-  def self.lookup(context)
-    if session_id = context.cookies[Session.cookie_name]
-      session = Session.store[session_id]
+    # 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 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
 
-    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!
+    # 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 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
+
+    # Perform session garbage collection. Typically this method
+    # is called from a cron like mechanism (for example using
+    # script/runner).
     
-    return session
+    def garbage_collection!
+      Session.store.delete_if { |key, s| s.invalid? }
+    end
+    alias_method :gc!, :garbage_collection!
   end
-
+  
   # The unique id of this session.
 
   attr_reader :session_id
@@ -101,7 +120,7 @@ class Session < Hash
     @ctime = @mtime = @atime = Time.now
   end
 
-  # Like the unix touch command, upadtes
+  # Like the unix touch command, updates
   # the atime to now.
 
   def touch!
@@ -117,6 +136,19 @@ class Session < Hash
   end
   alias_method :restore, :sync
   
+  # Keep this session alive?
+  
+  def valid?
+    Time.now < @atime + Session.keepalive 
+  end
+  alias_method :alive?, :valid?
+  
+  # The reverse of keepalive?
+  
+  def invalid?
+    Time.now > @atime + Session.keepalive 
+  end
+  
 protected
   
   # Calculates a unique id.
@@ -138,20 +170,6 @@ protected
 
 end
 
-# Abstract class for a session store manager. 
-
-class SessionStore
-  def []=(sid, session)
-  end
-
-  def [](sid)
-  end
-
-  def delete(sid)
-  end
-  
-end
-
 end
 
 # * George Moschovitis <gm@navel.gr>

data/lib/nitro/session/drb.rb

@@ -1,10 +1,6 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: drb.rb 182 2005-07-22 10:07:50Z gmosx $
-
 require 'drb'
 
-require 'glue/attribute'
+require 'glue/configuration'
 require 'nitro/session'
 
 Logger.debug 'Using Drb sessions.'
@@ -15,11 +11,11 @@ class Session
   
   # The address of the Session DRb server.
 
-  cattr_accessor :drb_address, '127.0.0.1'
+  setting :drb_address, :default => '127.0.0.1', :doc => 'The address of the Session DRb server'
   
   # The port of the Session DRb server.
 
-  cattr_accessor :drb_port, 9069 
+  setting :drb_port, :default => 9069, :doc => 'The port of the Session DRb server'
 
 end
 
@@ -29,3 +25,5 @@ Session.store = DRbObject.new(
 ) 
 
 end
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/session/drbserver.rb

@@ -1,13 +1,9 @@
 #!/usr/bin/env ruby
 
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: drbserver.rb 182 2005-07-22 10:07:50Z gmosx $
-
 require 'drb'
 require 'optparse'
 
-require 'glue/hash'
+require 'mega/synchash'
 require 'nitro/session'
 
 # A distributes session store implemented as
@@ -49,7 +45,7 @@ rescue OptionParser::InvalidOption
   exit
 end
 
-sessions = Glue::SafeHash.new 
+sessions = SyncHash.new 
 
 if debug
 
@@ -69,3 +65,5 @@ end
 
 DRb.start_service("druby://#{address}:#{port}", sessions)
 DRb.thread.join
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/session/memory.rb

@@ -1,13 +1,11 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: memory.rb 1 2005-04-11 11:04:30Z gmosx $
-
-require 'glue/hash'
+require 'mega/synchash'
 
 Logger.debug 'Using In-Memory sessions.'
 
 module Nitro
 
-Session.store = SafeHash.new
+Session.store = SyncHash.new
 
 end
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/part/admin.rb

@@ -0,0 +1,6 @@
+require 'nitro/server'
+
+require 'part/admin/controller'
+require 'part/admin/skin'
+
+Nitro::Server.map['/admin'] = AdminController

data/lib/part/admin/controller.rb

@@ -0,0 +1,24 @@
+require 'nitro/controller'
+
+class AdminController < Nitro::Controller
+
+  @template_root = File.join(File.dirname(__FILE__), 'template')
+  
+  def index
+    @classes = self.class.managed_classes
+  end
+
+  class << self
+    # The managed classes of this application.
+    
+    attr_accessor :managed_classes
+  
+    # Called when this controller is mounted.
+       
+    def mounted
+      @managed_classes = Og.manager.manageable_classes
+      @managed_classes.each { |c| scaffold(c) }
+    end
+  end
+  
+end

data/lib/part/admin/skin.rb

@@ -0,0 +1,21 @@
+require 'nitro/element'
+
+class SystemPage < Nitro::Element  
+  def render
+    %~
+    <html>
+      <head>
+        <title>#@name</title>
+        <base href="\#{context.host_url}/" />    
+        <link rel="stylesheet" href="/system.css" type="text/css" media="screen" />    
+      </head>
+      <body>
+        <h1>#@name</h1>
+        #{content}
+        <br />
+        Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}
+      </body>
+    </html>
+    ~
+  end
+end

data/lib/part/admin/template/index.xhtml

@@ -0,0 +1,9 @@
+<SystemPage name="System">
+  <table>
+  <?r for c in @classes ?>
+    <tr>
+      <td><a href="#@base/#{c.name.plural.underscore}">#{c.name}</a> (#{c.count})</td>
+    </tr>
+  <?r end ?>
+  </table>
+</SystemPage>