nitro 0.31.0 → 0.40.0

data/lib/nitro/router.rb

@@ -1,3 +1,6 @@
+require 'cgi'
+require 'facet/dictionary'
+
 module Nitro
 
 # Router mixin. Typically used to generate 'nice' urls.
@@ -38,6 +41,9 @@ module Nitro
 module Router
 
   # Strip the beginning of the path, used by cgi adapter.
+  #--
+  # gmosx: !?! remove!
+  #++
   
   setting :strip_path, :default => nil, :doc => 'Strip the beginning of the path, used by cgi adapter'
 
@@ -62,14 +68,18 @@ module Router
   # Returns false if no decoding is possible. 
   
   def decode_route(url)
+    # Front end server (for example Apache) some times escape 
+    # the url.
+    url = CGI.unescape(url)
+
     for rule in @rules
       if md = url.match(rule[:match])
         params = nil
         if param_names = rule[:params] || rule[:param]
           param_names = [ param_names ] unless param_names.is_a?(Array)
-          params = {}
+          params = Dictionary.new
           md.captures.each_with_index do |val, idx|
-            params[param_names[idx].to_s] = val
+            params << [param_names[idx].to_s, val]
           end
         end
         Logger.debug "Rewriting '#{url}' to '#{rule[:controller]}##{rule[:action]}(#{params.values.join(', ')})." if $DBG
@@ -119,5 +129,3 @@ module Router
 end
 
 end
-
-# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/sanitize.rb

@@ -0,0 +1,48 @@
+# Code from rubyonrails project (http://www.rubyonrails.com)
+# Temporarily here.
+
+require 'html/tokenizer'
+require 'html/node'
+
+VERBOTEN_TAGS = %w(form script) unless defined?(VERBOTEN_TAGS)
+VERBOTEN_ATTRS = /^on/i unless defined?(VERBOTEN_ATTRS)
+
+class String
+  # Sanitizes the given HTML by making form and script tags into regular
+  # text, and removing all "onxxx" attributes (so that arbitrary Javascript
+  # cannot be executed). Also removes href attributes that start with
+  # "javascript:".
+  #
+  # Returns the sanitized text.
+  def self.sanitize(html)
+    # only do this if absolutely necessary
+    if html.index("<")
+      tokenizer = HTML::Tokenizer.new(html)
+      new_text = ""
+
+      while token = tokenizer.next
+        node = HTML::Node.parse(nil, 0, 0, token, false)
+        new_text << case node
+          when HTML::Tag
+            if VERBOTEN_TAGS.include?(node.name)
+              node.to_s.gsub(/</, "&lt;")
+            else
+              if node.closing != :close
+                node.attributes.delete_if { |attr,v| attr =~ VERBOTEN_ATTRS }
+                if node.attributes["href"] =~ /^javascript:/i
+                  node.attributes.delete "href"
+                end
+              end
+              node.to_s
+            end
+          else
+            node.to_s.gsub(/</, "&lt;")
+        end
+      end
+
+      html = new_text
+    end
+
+    html
+  end
+end

data/lib/nitro/scaffold.rb

@@ -44,9 +44,9 @@ module Scaffold
     def enchant_class klass
       # to_s
             
-      if klass.respond_to? :title
+      if klass.instance_methods.include? 'title'
         define_instance_method klass, :to_s, %{ title }, force = true      
-      elsif klass.respond_to? :name
+      elsif klass.instance_methods.include? 'name'
         define_instance_method klass, :to_s, %{ name }, force = true      
       end
     
@@ -54,7 +54,7 @@ module Scaffold
       # ex: blog/articles/23
       
       define_instance_method klass, :to_href, %{
-        "\#{self.class.ann.self.controller.mount_path}/\#{self.class.name.underscore.pluralize}/\#{oid}"
+        "\#{self.class.ann.self.controller.mount_path}/\#{self.class.name.demodulize.underscore.pluralize}/\#{oid}"
       }
 
       # to_link
@@ -68,7 +68,7 @@ module Scaffold
       # ex: admin/articles/edit/23
 
       define_instance_method klass, :to_admin_href, %{
-        "\#{AdminController.mount_path}/\#{self.class.name.underscore.pluralize}/edit/\#{oid}"
+        "\#{AdminController.mount_path}/\#{self.class.name.underscore.gsub(/::/, '_').pluralize}/edit/\#{oid}"
       }
 
       if defined? AdminController
@@ -76,14 +76,14 @@ module Scaffold
         # ex: admin/articles/list
 
         define_instance_method klass, :to_admin_href, %{
-          "\#{AdminController.mount_path}/\#{self.class.name.underscore.pluralize}/list"
+          "\#{AdminController.mount_path}/\#{self.class.name.underscore.gsub(/::/, '_').pluralize}/list"
         }
                       
         # to_admin_href
         # ex: admin/articles/list
 
         define_class_method klass, :to_admin_href, %{
-          "\#{AdminController.mount_path}/\#{self.name.underscore.pluralize}/list"
+          "\#{AdminController.mount_path}/\#{self.name.underscore.gsub(/::/, '_').pluralize}/list"
         }
       end
     end
@@ -97,7 +97,7 @@ module Scaffold
     #++
     
     def define_instance_method klass, meth, body, force = false
-      unless force or klass.instance_methods.include? meth.to_s
+      if force or (!klass.instance_methods.include? meth.to_s)
         klass.module_eval %{
           def #{meth}
             #{body}
@@ -112,8 +112,8 @@ module Scaffold
     # does not already respond to it.
     #++
     
-    def define_class_method klass, meth, body
-      unless klass.respond_to? meth.to_s
+    def define_class_method klass, meth, body, force = false
+      if force or (!klass.respond_to? meth.to_s)
         klass.module_eval %{
           def self.#{meth}
             #{body}
@@ -137,5 +137,3 @@ module Scaffold
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/scaffold/controller.rb

@@ -0,0 +1,25 @@
+module Nitro
+
+module Scaffold
+
+  # Automatically creates a scaffold controller to handle the
+  # given models.
+  
+  def self.controller(*models)
+    for m in models
+      scaffold_controller(m)
+    end
+  end
+  
+  def self.enchant_controller(model)
+    eval %{
+    
+    }  
+  end
+
+end
+
+class Controller
+end
+
+end

data/lib/nitro/scaffold/model.rb

@@ -0,0 +1,150 @@
+module Nitro
+
+# Scaffolding is one facet of Nitro's Rapid Application 
+# Develpoment (RAD) features. The scaffolder automatically 
+# generates common code for managed object and their 
+# controllers.
+
+module Scaffold
+
+  # Automatically enchant all models ?
+  
+  setting :enchant_all_models, :default => true, :doc => 'Automatically enchant all models?'
+
+  # 'Enchant' a model class (typically a managed class, 
+  # entity). A collection of useful methods are magically 
+  # added to the class and/or the class instances.
+  #
+  # * to_s
+  # * to_href
+  # * to_link
+  # * to_edit_href
+  # * to_admin_href
+  #--
+  # to_xxx is used instead of xxx in an attempt to avoid 
+  # colisions with user defined methods.
+  #++
+  
+  def self.model(*classes)
+    for c in classes
+      enchant_model c
+    end
+  end
+  
+  #--
+  # Actually enchant the given class. Override this method
+  # to customize for your application. The string calculation
+  # code is deliberatly dynamic to work with Ruby's OO 
+  # features.
+  #++
+  
+  def self.enchant_model(klass)
+    # Find the controller that handles this model. Unless no
+    # controller annotation is defined, try to find a controller
+    # of the form: Model::Controller. Some examples:
+    #
+    # class Ticket
+    #   ann self, :controller => SpecialTicketController
+    #   ..
+    # end
+    #
+    # or try to find a Ticket::Controller class. 
+
+    controller = klass.ann.self[:controller] || klass.constant('Controller')
+
+    # If the class defines a text_key use it to create more
+    # readable (and SEO friendly) urls.
+    
+    key = klass.ann.self[:text_key] || 'oid' 
+
+    # to_s
+          
+    if klass.instance_methods.include? 'title'
+      define_instance_method klass, :to_s, %{ title }, force = true      
+    elsif klass.instance_methods.include? 'name'
+      define_instance_method klass, :to_s, %{ name }, force = true      
+    end
+  
+    # to_href
+    # ex: /articles/23
+
+    define_instance_method klass, :to_href, %{
+      "\#{#{controller}.mount_path}/read/\#{#{key}}".squeeze('/')
+    }
+
+    # to_link
+    # ex: <a href="/articles/23">The article's title</a>
+    
+    define_instance_method klass, :to_link, %{
+      %|<a href="\#{to_href}">\#{to_s}</a>|
+    }
+
+    # to_link
+    # ex: <a href="/articles/23">The article's title</a>
+    
+    define_class_method klass, :controller, %{
+      #{controller}
+    }
+                  
+    if defined? OgSystemController
+      self.extend(OgSystemHelper)
+
+      # to_edit_href
+      # ex: admin/update/Article/23
+
+      define_instance_method klass, :to_edit_href, %{
+        "\#{OgSystemController.mount_path}/update/#{class_to_name(klass)}/\#{oid}"
+      }
+
+      # to_admin_href
+      # ex: admin/list/Article
+
+      define_instance_method klass, :to_admin_href, %{
+        "\#{AdminController.mount_path}/list/#{class_to_name(klass)}"
+      }
+                    
+      # to_admin_href
+      # ex: admin/list/Article
+
+      define_class_method klass, :to_admin_href, %{
+        "\#{AdminController.mount_path}/list/#{class_to_name(klass)}"
+      }
+    end
+  end
+
+
+  #--
+  # This helper defines an instance method for the 
+  # scaffolded class. The method is only defined if the klass
+  # does not already respond to it.
+  #++
+  
+  def self.define_instance_method(klass, meth, body, force = false)
+    if force or (!klass.instance_methods.include? meth.to_s)
+      klass.module_eval %{
+        def #{meth}
+          #{body}
+        end
+      }
+    end
+  end
+
+  #--
+  # This helper defines an class method for the 
+  # scaffolded class. The method is only defined if the klass
+  # does not already respond to it.
+  #++
+  
+  def self.define_class_method(klass, meth, body, force = false)
+    if force or (!klass.respond_to? meth.to_s)
+      klass.module_eval %{
+        def self.#{meth}
+          #{body}
+        end
+      }
+    end
+  end
+    
+end
+
+end

data/lib/nitro/scaffolding.rb

@@ -261,7 +261,7 @@ module Scaffolding
     end
     
     def action_path(sym)
-      action = "#{@base}/#{sym}"
+      action = "#{AdminController.mount_path}/#{@base}/#{sym}"
       action << @suffix unless @suffix.nil? or sym == :index
       return action
     end
@@ -389,5 +389,3 @@ module Scaffolding
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/server.rb

@@ -11,11 +11,11 @@ class Server
 
   # The server listening port.
 
-  setting :port, :default => 9999, :doc => 'The server listening port'
+  setting :port, :default => 9000, :doc => 'The server listening port'
 
-  # The map.
+  # The controller map.
   
-  setting :map, :default => { '/' => Controller }, :doc => 'The server map'
+  setting :controller_map, :default => { '/' => Controller }, :doc => 'The controller map'
 
   # The public files root directory.
   
@@ -28,8 +28,16 @@ class Server
   # Additional server options. Useful to pass options to 
   # Webrick for example.
   
-  setting :options, :default => {}, :doc => "Additional server options"
+  setting :options, :default => {}, :doc => 'Additional server options'
 
+  # Handle static files? Typically this setting is true while 
+  # debuging and when the server is running in stand alone mode.
+  # In production environments, the webapplication runs behind
+  # a front end proxy (for example apache, lighttpd, etc) that
+  # should handle static files.
+  
+  setting :handle_static_files, :default => true, :doc => 'Handle static files?'
+  
   # The name of the application.
 
   attr_accessor :name
@@ -87,7 +95,8 @@ class Server
   def start(options = {})    
     @map['/'] = options[:controller] if options[:controller]
     @dispatcher = options[:dispatcher] || Dispatcher.new(@map)
-
+    @dispatcher.server = self
+    
     return self
   end
 
@@ -99,37 +108,53 @@ class Server
     Mounter.new(self)
   end
 
-  # Helper method.
-  #
-  # Available options: 
-  #
-  # :dispatcher, :controller
-  #
-  # Altetnatively you can pass a single Controller class instead
-  # of the options hash.
-
-  def self.run(options = {})
-    unless options.is_a?(Hash)
-      options = { :controller => options }
+  class << self
+  
+    # Helper to set the default controller map for a Server.
+    
+    def map(ctrl_map = nil)
+      unless ctrl_map
+        Server.controller_map
+      else
+        Server.controller_map ||= {}
+        Server.controller_map.update(ctrl_map)
+      end
     end
+    alias map= map
+
+    # Helper method.
+    #
+    # Available options: 
+    #
+    # :dispatcher, :controller
+    #
+    # Altetnatively you can pass a single Controller class instead
+    # of the options hash.
+
+    def run(options = {})
+      unless options.is_a?(Hash)
+        options = { :controller => options }
+      end
 
-    runner = Runner.new
-    runner.setup_options
-    runner.setup_mode
-    runner.daemonize if runner.daemon  
-
-    unless Session.cache
-      require 'nitro/session/memory'
+      runner = Runner.new
+      runner.setup_options
+      runner.setup_mode
+      runner.daemonize if runner.daemon  
+
+      Global.setup
+      Session.setup
+      Part.setup
+          
+      server = Server.new
+      server.start(options)
+       
+      runner.invoke(server) unless $NITRO_NO_INVOKE
+      
+      return server
     end
-    
-    server = Server.new
-    server.start(options)
-     
-    runner.invoke(server) unless $NITRO_NO_INVOKE
-    
-    return server
+  
   end
-
+  
   # A Helper class used for CherryPy-style publishing.
   
   class Mounter # :nodoc: all