nitro 0.21.0 → 0.21.2

data/CHANGELOG

@@ -1,5 +1,53 @@
+28-07-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/dispatcher/nice.rb (#dispatch): fixed.
+  
+  * doc/RELEASES: updated.
+  
+  * doc/MIGRATION: updated.
+
+27-07-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/mixin/markup.rb: cleaned up,
+  added setup_xxx_transformation helpers.
+  
+  * lib/nitro/server/runner.rb: added scgi support (--lhttpd-scgi)
+
+  * lib/nitro/adapter/scgi.rb: implemented.
+  
+  * lib/nitro/controller.rb: added some cookie helpers.
+  
+  * lib/nitro.rb: use nice dispatcher by default.
+  
+  * lib/nitro/dispatcher.rb: mode setting.
+
+  * lib/nitro/dispatcher/general.rb: introduced.
+  
+  * lib/nitro/dispatcher/nice.rb: introduced.
+  
+27-07-2005  Deborah Hooker <deb@ysabel.org>
+
+  * lib/nitro/server.rb: access_log attr_accessor.
+
+26-07-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/compiler.rb: more clever implicit nice urls.
+  
+  * lib/nitro/controller.rb (#alias_action): made standalone.
+  
+  * lib/nitro/dispatcher.rb (#dispatch): new algorithm,
+  more clever implicit nice urls.
+  
 25-07-2005  George Moschovitis <gm@navel.gr>
 
+  * lib/nitro/mixin/markup.rb (#escape/#unescape): added.
+  
+  * proto/public/error.xhtml: temp fix, use ..markuper (ugh),
+  
+  * proto/public/robots.txt added.
+
+  * --- VERSION 0.21.0 ---
+
   * doc/MIGRATION: updated.
 
 24-07-2005  George Moschovitis <gm@navel.gr>

data/README

@@ -1,4 +1,4 @@
-= Nitro 0.21.0 README
+= Nitro 0.21.2 README
 
 Nitro provides everything you need to develop professional Web
 applications using Ruby and Javascript. 
@@ -503,7 +503,7 @@ http://rubyforge.org/mailman/listinfo/nitro-general
 
 == Licence
 
-Copyright (c) 2004-2005, George 'tml' Moschovitis.
+Copyright (c) 2004-2005, George 'gmosx' Moschovitis (http://www.nitrohq.com)
 Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
 
 Nitro (http://www.nitrohq.com) is copyrighted free software 

data/doc/MIGRATION

@@ -9,6 +9,16 @@ For more help, send your question to the mailing list:
 
 http://rubyforge.org/mailman/listinfo/nitro-general
 
+
+== 0.21.2 <- 0.21.0
+
+1. The new 'nice' dispatching alogirthm is enabled by default. If
+your app needs more general url dispatching you can enable the
+old dispatcher with the following line:
+
+require 'nitro/dispatcher/general'
+
+
 == 0.21.0 <- 0.20.0
 
 1. The helper methods for starting the application and defining

data/doc/RELEASES

@@ -1,4 +1,20 @@
-== Version 0.21.0
+== Version 0.21.2
+
+This is mainly a bug fix release. Some minor features are 
+implemented:
+
+* Plugable dispatchers. A new dispatcher that implicitly handles
+nice urls is enabled by default. You can easily change to the
+old general dispatcher though.
+
+* Better markup setup.
+
+* Cookie Helpers.
+
+* Important bug fixes in Og.
+
+
+== Version 0.21.0 was released on 25-07-2005
 
 Nitro goes from strength to strength as the community gets bigger.
 Great new features were introduced and a lot of effort 

data/doc/config.txt

@@ -1,7 +1,13 @@
 = Configuration parameters
 
 This file presents a complete list of Nitro Configuration 
-Parameters.
+Parameters. 
+
+INFO: To browse a documented listing of an application's settings
+point your browser to:
+
+http://www.myapp.com/settings.
+
 
 === Session.store_type = :memory
 

data/lib/nitro.rb

@@ -25,7 +25,7 @@ module Nitro
   
   # The version.
 
-  Version = '0.21.0'
+  Version = '0.21.2'
 
   # Library path.
 
@@ -43,7 +43,7 @@ end
 
 require 'nitro/context'
 require 'nitro/controller'
-require 'nitro/dispatcher'
+require 'nitro/dispatcher/nice'
 require 'nitro/render'
 require 'nitro/server'
 

data/lib/nitro/adapter/scgi.rb

@@ -0,0 +1,78 @@
+# WARNING: Does not work yet!
+
+require 'cgi'
+require 'scgi'
+require 'stringio'
+
+require 'nitro/context'
+require 'nitro/dispatcher'
+require 'nitro/adapter/cgi'
+
+# Speeds things up, more comaptible with OSX.
+
+Socket.do_not_reverse_lookup = true
+
+module Nitro
+
+# SCGI Adaptor.
+# No need for connection pooling, SCGI uses processes.
+
+class Scgi
+
+  # A special modification so that we can make the socket and then pass it in.
+  # Should generalize this since it will be pretty common.
+
+  class Listener < Myriad::Listener
+    def initialize(socket, server_class, *params)
+      @socket = socket
+      @server_class = server_class
+      @params = params
+      @tick = [3,0]  # this is just here until I can figure out the signals crap
+      Event::set(self, @socket.fileno, Event::READ | Event::TIMEOUT)
+      Event::add(self, @tick)
+    end
+  end    
+
+  class SCGINitro < ::SCGI::SCGIServer
+    def process_request(data)
+      context = Context.new(Nitro::Server.new)
+
+      context.in = SCGIFixed.new(@request, data)
+      context.headers = cgi.env
+
+      CgiUtils.parse_params(context)
+      CgiUtils.parse_cookies(context)
+      
+      context.render(context.path)
+
+      body = ''
+      body << CgiUtils.response_headers(context)
+      body << context.out
+
+      @trans.write(body)
+
+      super(data)
+    end
+  end
+  
+  def self.start(server)
+    children = "5"
+    host = "127.0.0.0"
+    port = "8888"
+
+    socket = TCPServer.new(host, port)
+    socket.fcntl(Fcntl::F_SETFL, socket.fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
+
+    children.to_i.times do
+      pid = fork do
+        Event::init(10)
+        server = Listener.new(socket, SCGINitro)
+        Event::dispatch
+      end
+      Process.detach(pid)
+    end
+  end
+  
+end
+
+end

data/lib/nitro/compiler.rb

@@ -126,21 +126,19 @@ class Compiler
         code << "#{params.join(';')}"
       end
                                                                 
-      # Try to resolve action parameters.
+      # Try to resolve action parameters. Returns negative
+      # numbers for arbitrary parameters.
 
       param_count = klass.instance_method(action.intern).arity 
       
-      # gmosx, FIXME: REIMPLEMENT THIS!!!!
-      
-      if param_count > 0
+      if param_count != 0
         code << %{
           params = []
-          qs = context.query_string.split(/[&;]/)
-          
-          #{param_count}.times do |i|
-            params << qs.shift.split(/=/).last
-          end
-          
+          if context.query_string
+            context.query_string.split(/[&;]/).each do |qs|
+              params << qs.split(/=/).last            
+            end            
+          end          
           action_return_value = #{action}(*params)
         }
       else

data/lib/nitro/controller.rb

@@ -36,7 +36,7 @@ class ActionMeta < Hash
 
   # Initialize the metadata.
 
-  def initialize(options)
+  def initialize(options = {})
     @params = {}
     update(options)
   end
@@ -114,7 +114,7 @@ module Publishable
     base.module_eval do
       def self.alias_action(new, old)
         alias_method new, old
-        md = action_metadata[old] || ActionMetadata.new
+        md = action_metadata[old] || ActionMeta.new
         md[:view] = old
         action_metadata[new] = md
       end
@@ -166,8 +166,22 @@ module Publishable
         end
       end
     end    
-    
+
+    # Cookie helpers.
+  
+    base.module_eval do
+      private
+      
+      def cookies
+        @context.cookies
+      end  
+      
+      def send_cookie(name, value = nil)
+        @context.add_cookie(name, value)
+      end
+    end
   end
+  
 end
 
 # The Controller part in the MVC paradigm. The controller's 

data/lib/nitro/dispatcher.rb

@@ -12,9 +12,9 @@ class Dispatcher
 
   include Router
 
-  # The map.
+  # The dispatcher specialization used.
   
-  setting :map, :default => { '/' => SimpleController }, :doc => 'The controller map'
+  setting :mode, :default => :nice, :doc => 'The dispatcher specialization used'
 
   unless const_defined? :ROOT
     ROOT = '/'
@@ -149,45 +149,8 @@ class Dispatcher
   #++
 
   def dispatch(path, context = nil)
-    path = route(path, context)
-
-    parts = path.split('/')
-    parts.shift
-
-    case parts.size
-      when 0
-        # / -> root.index
-        base = '/' 
-        klass = controller_class_for(base)
-        action = 'index'
-      
-      when 1 
-        base = "/#{parts[0]}"
-        if klass = controller_class_for(base)
-          # controller/ -> controller.index
-          action = 'index'
-        else
-          # action/ -> root.action
-          base = '/'
-          klass = controller_class_for(base)
-          action = parts[0]
-        end
-        
-      else
-        base = "/#{parts[0]}"
-        if klass = controller_class_for(base)
-          # controller/action -> controller.action
-          parts.shift
-          action = parts.join('__')
-        else
-          # action/ -> root.action
-          base = '/'
-          klass = controller_class_for(base)
-          action = parts.join('__')
-        end
-    end
-
-    return klass, "#{action}_action", base
+    # Specialize in your application or use the default 
+    # specializations in lib/nitro/dispatcher/*
   end
   alias_method :split_path, :dispatch
 

data/lib/nitro/dispatcher/general.rb

@@ -0,0 +1,62 @@
+require 'nitro/dispatcher'
+
+module Nitro
+
+# Specialize the Dispatcher to handle general urls. This is 
+# useful for PHP/ASP style programming.
+
+class Dispatcher
+  
+  # An alternative dispatching algorithm that handles
+  # general urls. Action containing '/' separators look for
+  # templates in subdirectories. The '/' char is converted
+  # to '__' to find the actual action.
+  
+  def dispatch(path, context = nil)
+    path = route(path, context)
+
+    parts = path.split('/')
+    parts.shift
+
+    case parts.size
+      when 0
+        # / -> root.index
+        base = '/' 
+        klass = controller_class_for(base)
+        action = 'index'
+      
+      when 1 
+        base = "/#{parts[0]}"
+        if klass = controller_class_for(base)
+          # controller/ -> controller.index
+          action = 'index'
+        else
+          # action/ -> root.action
+          base = '/'
+          klass = controller_class_for(base)
+          action = parts[0]
+        end
+        
+      else
+        base = "/#{parts[0]}"
+        if klass = controller_class_for(base)
+          # controller/action -> controller.action
+          parts.shift
+          action = parts.join('__')
+        else
+          # action/ -> root.action
+          base = '/'
+          klass = controller_class_for(base)
+          action = parts.join('__')
+        end
+    end
+
+    return klass, "#{action}_action", base
+  end
+end
+
+Dispatcher.mode = :general
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/dispatcher/nice.rb

@@ -0,0 +1,41 @@
+require 'nitro/dispatcher'
+
+module Nitro
+
+# Specialize the Dispatcher to handle implicit 'nice' urls.
+
+class Dispatcher
+  
+  # An alternative dispatching algorithm that handles
+  # implicit nice urls. Subdirectories are not supported.
+  
+  def dispatch(path, context)
+    path = route(path, context)
+    
+    parts = path.split('/')
+    parts.shift # get rid of the leading '/'.
+    
+    if klass = controller_class_for("/#{parts.first}")
+      base = "/#{parts.shift}"
+    else
+      base = ROOT
+      klass = controller_class_for(ROOT)
+    end
+
+    unless action = parts.shift
+      action = 'index'
+    end        
+
+    unless parts.empty?
+      context.headers['QUERY_STRING'] = "#{parts.join(';')}#{context.headers['QUERY_STRING']}"
+    end
+
+    return klass, "#{action}_action", base
+  end
+end
+
+Dispatcher.mode = :nice
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/mixin/markup.rb

@@ -1,58 +1,11 @@
 require 'singleton'
 require 'redcloth'
+require 'cgi'
 
-require 'glue/property'
 require 'glue/sanitize'
 
 module Nitro
 
-#--
-# Override the default PropertyUtils implementation to
-# add markup support.
-#++
-=begin
-module PropertyUtils
-  # Override to add markup code.  
-  #
-  def self.prop_setter(prop)
-    s = prop.symbol
-    if markup = prop.meta[:markup]
-      # if true, set to default Markup
-      markup = Nitro::Markup if true == markup
-
-      code = %{
-        def #{s}=(val)
-      }
-      
-      if Property.type_checking
-        code << %{
-          unless String == val.class
-            raise "Invalid type, expected '#{prop.klass}', is '\#\{val.class\}'."
-          end
-        }
-      end
-
-      code << %{
-          @#{s} = #{markup}.expand(val)
-        end
-
-        def compact_#{s}
-          #{markup}.compact(@#{s})
-        end
-      }
-
-      return code
-    else
-      return %{
-        def #{s}=(val)
-          @#{s} = val
-        end
-      }
-    end
-  end
-end
-=end
-
 # Generalised Markup transformations.
 #
 # The expand methods evaluate (expand) the markup
@@ -68,7 +21,7 @@ end
 #
 # Define your custom markup methods like this:
 #
-# module Markup
+# module MarkupMixin
 #   def markup_simple
 #      ...
 #    end
@@ -130,12 +83,36 @@ private
   
   def clear(str)
   end  
+  
+  def escape(str)
+    CGI.escape(str.gsub(/ /, '_'))
+  end
+
+  def unescape(str)
+    CGI.unescape(str.gsub(/_/, ' '))
+  end      
+  
+  class << self
+    # Helper method for manipulating the sanitize transformation.
+    
+    def setup_sanitize_transform(&block)
+      self.send :define_method, :sanitize, block
+    end
+    alias_method :setup_sanitize_transformation, :setup_sanitize_transform
+
+    # Helper method for manipulating the markup transformation.
+    
+    def setup_markup_transform(&block)
+      self.send :define_method, :markup, block
+    end
+    alias_method :setup_markup_transformation, :setup_markup_transform
+  end  
 end
 
 # An abstract Markup class.
 
-class Markuper
-  include Singleton
+class MarkupKit
+  extend Markup
   include Markup
 end
 

data/lib/nitro/render.rb

@@ -140,11 +140,12 @@ private
     raise RenderExit
   end
   
-  # Redirect to the referer of this method.
+  # Redirect to the referer.
   
   def redirect_referer(postfix = nil, status = 303)
     redirect("#{@context.referer}#{postfix}", status)
   end
+  alias_method :redirect_to_referer, :redirect_referer
 
   # Log a rendering error.
 

data/lib/nitro/server.rb

@@ -56,7 +56,11 @@ class Server
   # Additional server options. Useful to pass options to 
   # Webrick for example.
   
-  attr_accessor :options
+  attr_accessor :options  
+
+  # The access_log for this server, used by Webrick.
+
+  attr_accessor :access_log   
       
   def initialize(name = 'Nitro', options = {})
     @name = name

data/lib/nitro/server/runner.rb

@@ -119,17 +119,22 @@ class Runner
         @server = :webrick
       end
 
-      opts.on('-l', '--lhttpd', 'Use a lighttpd server.') do
+      opts.on('-l', '--lhttpd', 'Use a lighttpd server (FastCGI).') do
         @server = :lhttpd
         Logger.set(Logger.new('log/app.log'))
       end
 
+      opts.on('-l', '--lhttpd-scgi', 'Use the SCGI adapter (Lighttpd).') do
+        @server = :lhttpd_scgi
+        Logger.set(Logger.new('log/app.log'))
+      end
+
       opts.on('-a', '--apache', 'Use an apache server.') do
         @server = :apache
         Logger.set(Logger.new('log/app.log'))
       end
 
-      opts.on('--apache-cgi', 'Run as CGI (Apache)') do
+      opts.on('--apache-cgi', 'Use the CGI adapter (Apache)') do
         @server = :cgi
         Logger.set(Logger.new('log/app.log'))
       end
@@ -225,6 +230,10 @@ class Runner
     if 'fcgi_proc' == ENV['NITRO_INVOKE']
       require 'nitro/adapter/fastcgi'
       FastCGI.start(server)
+
+    elsif 'scgi_proc' == ENV['NITRO_INVOKE']
+      require 'nitro/adapter/scgi'
+      Scgi.start(server)
       
     elsif 'cgi_proc' == ENV['NITRO_INVOKE']
       require 'nitro/adapter/cgi'
@@ -272,6 +281,10 @@ class Runner
           require 'nitro/adapter/fastcgi'
           `lighttpd -f conf/lhttpd.conf`
 
+        when :lhttpd_scgi
+          require 'nitro/adapter/scgi'
+          `lighttpd -f conf/lhttpd_scgi.conf`
+
         when :apache
           require 'nitro/adapter/fastcgi'
           `apachectl -d #{Dir.pwd} -f conf/apache.conf -k start`

data/proto/public/error.xhtml

@@ -41,7 +41,7 @@
         <?r 
           extract = error.source_extract.split("\n")
           extract.each_with_index do |line, idx|
-            line = Nitro::Markup.expand(line)
+            line = Nitro::Markuper.instance.send(:expand, line)
             if 4 == idx
         ?>
             <div style="background: #eee">#{line}</div>

data/test/nitro/tc_dispatcher.rb

@@ -2,6 +2,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
 require 'test/unit'
 require 'nitro/dispatcher'
+require 'nitro/dispatcher/general'
 
 class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
   include Nitro

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.21.0
-date: 2005-07-25 00:00:00 +03:00
+  version: 0.21.2
+date: 2005-07-28 00:00:00 +03:00
 summary: Nitro Web Engine
 require_paths: 
   - lib
@@ -75,6 +75,7 @@ files:
   - proto/public/cgi.rb
   - proto/public/error.xhtml
   - proto/public/fcgi.rb
+  - proto/public/robots.txt
   - proto/public/media/nitro.png
   - proto/public/js/prototype.js
   - proto/public/js/dragdrop.js
@@ -94,6 +95,7 @@ files:
   - lib/nitro/mail.rb
   - lib/nitro/dispatcher.rb
   - lib/nitro/context.rb
+  - lib/nitro/dispatcher
   - lib/nitro/request.rb
   - lib/nitro/mixin
   - lib/nitro/caching.rb
@@ -122,12 +124,15 @@ files:
   - lib/nitro/adapter/fastcgi.rb
   - lib/nitro/adapter/cgi.rb
   - lib/nitro/adapter/webrick.rb
+  - lib/nitro/adapter/scgi.rb
   - lib/nitro/caching/invalidation.rb
   - lib/nitro/caching/stores.rb
   - lib/nitro/caching/actions.rb
   - lib/nitro/caching/output.rb
   - lib/nitro/caching/fragments.rb
   - lib/nitro/element/java_script.rb
+  - lib/nitro/dispatcher/nice.rb
+  - lib/nitro/dispatcher/general.rb
   - lib/nitro/mixin/debug.rb
   - lib/nitro/mixin/pager.rb
   - lib/nitro/mixin/markup.rb
@@ -203,7 +208,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.21.0
+            version: 0.21.2
       version: 
   - !ruby/object:Gem::Dependency 
     name: og
@@ -213,7 +218,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.21.0
+            version: 0.21.2
       version: 
   - !ruby/object:Gem::Dependency 
     name: ruby-breakpoint