nitro 0.23.0 → 0.24.0

data/lib/nitro/cgi/http.rb

@@ -0,0 +1,62 @@
+module Nitro
+
+# Various HTTP related constants and utilities.
+
+module Http
+  
+  # HTTP protocol EOL constants.
+
+  CR = "\x0d"
+  LF = "\x0a"
+  CRLF = "\x0d\x0a"
+  EOL = CRLF
+
+  # Constants for readable code.
+
+  STATUS_OK = 200
+  STATUS_PARTIAL_CONTENT = 206
+  STATUS_MOVED = 301
+  STATUS_REDIRECT = 302
+  STATUS_SEE_OTHER = 303        
+  STATUS_SEE_OTHER_307 = 307    
+  STATUS_NOT_MODIFIED = 304
+  STATUS_BAD_REQUEST = 400
+  STATUS_AUTH_REQUIRED = 401       
+  STATUS_FORBIDDEN = 403           
+  STATUS_NOT_FOUND = 404           
+  STATUS_METHOD_NOT_ALLOWED = 405  
+  STATUS_NOT_ACCEPTABLE = 406      
+  STATUS_LENGTH_REQUIRED = 411     
+  STATUS_PRECONDITION_FAILED = 412 
+  STATUS_SERVER_ERROR = 500        
+  STATUS_NOT_IMPLEMENTED = 501    
+  STATUS_BAD_GATEWAY = 502         
+  STATUS_VARIANT_ALSO_VARIES = 506 
+
+  # Hash to allow id to description maping.
+
+  STATUS_STRINGS = {
+    200 => "OK",
+    206 => "Partial Content",
+    300 => "Multiple Choices",
+    301 => "Moved Permanently",
+    302 => "Found",
+    303 => "See other", # gmosx: VERIFY THIS
+    304 => "Not Modified",
+    307 => "See other 07", # gmosx: VERIFY THIS
+    400 => "Bad Request",
+    401 => "Authorization Required",
+    403 => "Forbidden",
+    404 => "Not Found",
+    405 => "Method Not Allowed",
+    406 => "Not Acceptable",
+    411 => "Length Required",
+    412 => "Precondition Failed",
+    500 => "Internal Server Error",
+    501 => "Method Not Implemented",
+    502 => "Bad Gateway",
+    506 => "Variant Also Negotiates"
+  }
+end
+  
+end

data/lib/nitro/{request.rb → cgi/request.rb}

@@ -49,7 +49,7 @@ module Request
   # The path is the uri without the query string.
 
   def path
-    path = uri ? uri.split('?').first : ''
+    uri ? uri.split('?').first : ''
   end
 
   def path_info
@@ -79,6 +79,9 @@ module Request
   end
 
   # The request query string.
+  #--
+  # gmosxi, FIXME: handles some fcgi problems.
+  #++
 
   def query_string 
     @headers['QUERY_STRING']

data/lib/nitro/cgi/stream.rb

@@ -0,0 +1,43 @@
+require 'nitro/render'
+
+module Nitro
+
+module Render
+
+  # Enable streaming mode for the current
+  # HTTP Response.
+  # You can optionally provide an existing IO 
+  # object for streaming.
+  #--
+  # This code is considered a hack fix.
+  # But it still is useful so for the moment
+  # it stays in the distribution.
+  #++
+  
+  def stream(io = nil)
+    if io
+      # Reuse an existing IO if it exists.
+      @context.out = io
+    else  
+      r, w = IO.pipe
+      
+      @context.out = r
+      @out = w
+      r.sync = true    
+      w.class.send(:define_method, :empty?) { false }
+  
+      Thread.new do 
+        begin
+          yield
+        rescue Object => ex
+          p ex
+        ensure
+          w.close
+        end
+      end
+    end
+  end
+  
+end
+
+end

data/lib/nitro/cgi/utils.rb

@@ -0,0 +1,38 @@
+require 'nitro/context'
+
+module Nitro
+
+module Request
+
+  # Some useful mini methods for browser testing.
+
+  def user_agent
    headers['HTTP_USER_AGENT'] || headers['USER-AGENT']
  end
+
+  def from_gecko?
+    headers['USER-AGENT'] =~ /Gecko/
+  end
+  alias_method :from_mozilla?, :from_gecko?
+
+  def from_ie?
+    headers['USER-AGENT'] =~ /MSIE/
+  end
+  alias_method :from_msie?, :from_ie?
+
+  def from_opera?
+    headers['USER-AGENT'] =~ /Opera/
+  end
+
+  def from_khtml?
+    headers['USER-AGENT'] =~ /KTHML/
+  end
+  alias_method :from_safari?, :from_khtml?
+
+  def from_w3c?
+    from_gecko? or from_khtml? or from_opera?
+  end
+
+end
+
+end
+
+# * Chris Farmiloe <chris.farmiloe@farmiloe.com>

data/lib/nitro/compiler.rb

@@ -1,4 +1,4 @@
-require 'nano/object/singleton_class'
+require 'nano/kernel/singleton'
 
 require 'glue/template'
 require 'nitro/compiler/errors'
@@ -120,8 +120,7 @@ class Compiler
 
       # Annotated parameters.
 
-      if meta = klass.action_metadata[action.intern]
-        params = meta.params.keys
+      if params = klass.ann(action.to_sym).params and (!params.nil?)
         params = params.collect { |p| "@#{p} = @context['#{p}']" }
         code << "#{params.join(';')}"
       end
@@ -142,7 +141,7 @@ class Compiler
           code << "break if i >= #{param_count};"
         end
         code << %{
-              params << qs.split(/=/).last            
+              params << CGI.unescape(qs.split(/=/).last)
             end            
           end          
           action_return_value = #{action}(*params)
@@ -167,13 +166,10 @@ class Compiler
     # better practice to place the output related code in an 
     # external template file.
 
-    # Take :view metadata into account.
-
-    view = nil
-    if md = klass.action_metadata[action.intern] 
-      view = md[:view]
-    end
-    view ||= action
+    # Take :view annotation into account.
+    
+    view = klass.ann(action.to_sym).view # FIXME
+    view = action if view.nil?
 
     cklass = klass    
     template_path = nil
@@ -258,6 +254,22 @@ class Compiler
     end
     alias_method :setup_template_transform, :setup_transform_template
     alias_method :setup_template_transformation, :setup_transform_template
+    
+    # Typically used to precompile css templates.
+    
+    def precompile(filename)
+      src = File.join(Template.root, "#{filename}t")
+      dst = File.join(Server.public_root, filename)
+      
+      if (!File.exist?(dst)) or (File.mtime(src) > File.mtime(dst))
+        Logger.info "Compiling template '#{src}' to '#{dst}'."
+        template = FileTemplate.new(src)
+        File.open(dst, 'w') do |f|
+          f << template.process
+        end
+      end
+    end
+    
   end
       
 end

data/lib/nitro/compiler/css.rb

@@ -0,0 +1,8 @@
+# 
+
+
+
+__END__
+
+Compiler.precompile('style.xcss')
+

data/lib/nitro/compiler/morphing.rb

@@ -0,0 +1,66 @@
+module Nitro::Compiler
+
+# A module that expand xhtml tags to ruby code
+# according to some tag attributes. (if, unless, each)
+#--
+# FIXME: nested tags are not handled correctly. We should
+# reimplement this using REXML or something.
+#++
+
+module Morphing
+
+  def self.transform(input_text)
+    text = input_text.dup
+    # <tag if="x">..</tag>
+    # <tag unless="x">..</tag>
+    #
+    # example: 
+    #
+    # <div prop1="one" if="@mycond" prop2="two">@mycond is true</div>
+    #
+    # becomes
+    #
+    # <?r if @mycond ?>
+    #   <div prop1="one" prop2="two">@mycond is true</div>
+    # <?r end ?>
+
+    text.gsub!(/<(\w*?)([^>]*?)(if|unless)=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
+      %{<?r #$3 #$4 ?>
+        <#$1#$2#$5>#$6</#$1>
+      <?r end ?>}
+    end
+
+    # <tag times="x">..</tag>
+
+    text.gsub!(/<(\w*?)([^>]*?)times=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
+      %{<?r #$3.times do ?>
+        <#$1#$2#$4>#$5</#$1>
+      <?r end ?>}
+    end
+
+    # <tag each="x">..</tag>
+    #
+    # example:
+    #
+    # <li each="item in array">my item is #{item}</li>
+    #
+    # becomes
+    #
+    # <?r for item in array ?>
+    #   <li>my item is #{item}</li>
+    # <?r end ?>
+
+    text.gsub!(/<(\w*?)([^>]*?)each=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
+      %{<?r for #$3 ?>
+        <#$1#$2#$4>#$5</#$1>
+      <?r end ?>}
+    end
+    
+    text
+  end
+
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/context.rb

@@ -1,15 +1,20 @@
-require 'nano/object/assign_with'
+require 'nano/kernel/assign_with'
 
-require 'nitro/request'
-require 'nitro/response'
+require 'nitro/cgi'
+require 'nitro/cgi/request'
+require 'nitro/cgi/response'
 require 'nitro/render'
 require 'nitro/session'
-require 'nitro/adapter/cgi.rb'
 
 module Nitro
   
 # Encapsulates an HTTP processing cycle context.
-# Integrates the Request and the Response.
+# Integrates the HTTP Request, the HTTP Response
+# and the Render used to generate the response
+# body.
+# The Context object can be accessed by the
+# context, request or response aliases. You can
+# use the alias that makes sense every time.
 
 class Context
   include Request
@@ -38,12 +43,12 @@ class Context
 
     # initialize response.
     
-    @status = CgiUtils::STATUS_OK
+    @status = Http::STATUS_OK
     @response_headers = { 'Content-Type' => 'text/html' }
 
     # initialize the output buffer.
 
-    @out = OutputBuffer.new
+    @out ||= OutputBuffer.new
   end
 
   # Close the context, should be called at the 
@@ -77,32 +82,18 @@ class Context
 
   # Populate an object from request parameters.
   # This is a truly dangerous method.
+  #
+  # === Options
+  #
+  # * name
+  # * force_boolean
   
-  EXCLUDED_PARAMETERS = %w{ oid name }
-
-  def fill(obj, name = nil)
-    # If an class is passed create an instance.
-    obj = obj.new if obj.is_a?(Class)
-  
-    @params.each do |param, val|
-      begin
-        # gmosx: DO NOT escape by default !!!
-        if not EXCLUDED_PARAMETERS.include?(param)
-          if val.is_a? Hash
-            obj.send("__force_hash_#{param}", val)
-          else
-            obj.send("__force_#{param}", val)
-          end
-        end
-      rescue NameError => ex
-        next
-      end
-    end
-
-    return obj
-  end    
+  def fill(obj, options = {})
+    Property.populate_object(obj, @params, options)
+  end
   alias_method :populate, :fill
   alias_method :assign, :fill  
+  
 end
 
 end

data/lib/nitro/controller.rb

@@ -1,3 +1,5 @@
+require 'mega/annotation'
+
 require 'glue/aspects'
 require 'glue/helper'
 
@@ -26,61 +28,13 @@ unless const_defined? :ActionParam
   ActionParam = Struct.new(:default, :format, :required)
 end
 
-# Encapsulates metadata that describe an action.
-
-class ActionMeta < Hash
-
-  # The arguments of the given method.
-  
-  attr_accessor :params
-
-  # Initialize the metadata.
-
-  def initialize(options = {})
-    @params = {}
-    update(options)
-  end
-
-  # Update the metadata.
-  # 
-  # [+options+]
-  #    A hash containing the metadata. Options with Symbol
-  #    keys are considered metadata, options with
-  #    String keys are the named parameters for the action.
-  
-  def update(options)
-    options.each do |k, v|
-      case k
-        when String
-          # A key of type String denotes a parameter.
-          case v
-            when Regexp
-              @params[k] = ActionParam.new(nil, v, nil)
-            when ActionParam
-              @params[k] = v
-            else  
-              if v == :required
-                @params[k] = ActionParam.new(nil, nil, true)
-              else
-                @params[k] = ActionParam.new(v, nil, nil)
-              end
-          end
-        when Symbol
-          self[k] = v
-        else
-          raise TypeError.new('The keys must be either Symbols or Strings.')
-      end
-    end
-  end
-
-end
-
 # Include this Mixin to a class to make objects of this class
 # publishable, ie accessible through a standard web (REST) 
 # interface.
 
 module Publishable
   def self.append_features(base)
+    super
 
     base.module_eval do
       include Render
@@ -88,35 +42,33 @@ module Publishable
       include Flashing
       include Glue::Helpers
     
-      class << self
-        attr_accessor :template_root
-      end      
-    end
-
-    # Define metadata for an action. This is a helper
-    # macro.
-
-    base.module_eval do
-      def self.action(name, options)
-        if meta = action_metadata[name]
-          meta.update(options)
-        else
-          action_metadata[name] = ActionMeta.new(options)
-        end
+      # Override this method as needed. Unless overriden
+      # this method is initialized by the Dispatcher to 
+      # point to Template.root/path for each Controller.
+      
+      def self.template_root
+        nil
+      end
+      
+      private
+      
+      # Helper method.
+      
+      def template_root
+        self.class.template_root || Template.root
       end
     end
 
     # Aliases an action
     #--
     # gmosx, FIXME: better implementation needed.
+    # gmosx, FIXME: copy all annotations.
     #++
 
     base.module_eval do
       def self.alias_action(new, old)
         alias_method new, old
-        md = action_metadata[old] || ActionMeta.new
-        md[:view] = old
-        action_metadata[new] = md
+        ann new, :view => old        
       end
     end
 
@@ -142,17 +94,6 @@ module Publishable
         return methods
       end
     end
-    
-    # A hash containing metadata for the action
-    # methods.
-
-    base.module_eval do
-      def self.action_metadata
-        # FIXME: improve this.
-        @action_metadata ||= {}
-        @action_metadata
-      end
-    end    
         
     # Use the method_missing hook to compile the actions
     # for this controller.
@@ -168,6 +109,9 @@ module Publishable
     end    
 
     # Cookie helpers.
+    #--
+    # TODO: move elsewhere.
+    #++
   
     base.module_eval do
       private
@@ -192,28 +136,7 @@ class Controller
   include Publishable
   include Scaffolding
   include Caching
-  include Markup
-  
-  # The default action.
-=begin  
-  def index
-    print %{
-      This is the placeholder action is provided as a default for #{self.class.name}.<br />
-      You probably want to <b>implement your custom action</b> here.
-    }
-  end
-=end
-end
-
-# A simple controller, only handles templates.
-# Useful to implement php/asp/jsp style applications.
-# The Dispatcher uses this as the default Controller.
-#--
-# gmosx: At the moment used to have a separate 
-# template_root.
-#++
-
-class SimpleController < Controller
+  include Markup  
 end
 
 end