nitro 0.24.0 → 0.25.0

data/lib/nitro/adapter/cgi.rb

@@ -15,7 +15,7 @@ class CgiAdapter
   
   def self.start(server)
     cgi = CGI.new
-    CgiUtils.process(server, cgi, cgi, cgi)
+    Cgi.process(server, cgi, cgi, cgi)
 =begin    
     context = Context.new(server)
     context.headers = ENV

data/lib/nitro/adapter/webrick.rb

@@ -134,7 +134,8 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 
           # gmosx: make compatible with fastcgi.
           context.headers['REQUEST_URI'].slice!(/http:\/\/(.*?)\//)
-          context.headers['REQUEST_URI'] << '/'
+          # context.headers['REQUEST_URI'] << '/'
+          context.headers['REQUEST_URI'] = '/' + context.headers['REQUEST_URI']
 
           Cgi.parse_params(context)
           Cgi.parse_cookies(context)
@@ -161,9 +162,9 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
   # Try to rewrite the path to a filename.
 
   def rewrite(req)
-    if req.path == '/'
+    if req.path_info == '/'
       req.instance_variable_set(:@path_info, '/index.html') 
-    elsif req.path =~ /^([^.]+)$/
+    elsif req.path_info =~ /^([^.]+)$/
       req.instance_variable_set(:@path_info, "#{$1}/index.html") 
     end
   end
@@ -171,9 +172,9 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
   # Rewrite back to the original path.
 
   def unrewrite(req)
-    if req.path == '/'
+    if req.path_info == '/index.html'
       req.instance_variable_set(:@path_info, '/') 
-    elsif req.path =~ /^([^.]+).html$/
+    elsif req.path_info =~ /^([^.]+)\/index.html$/    
       req.instance_variable_set(:@path_info, $1) 
     end
   end
@@ -183,3 +184,4 @@ end
 
 # * George Moschovitis <gm@navel.gr>
 # * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>
+# * Bryan Soto <bryan.a.soto@gmail.com>

data/lib/nitro/caching/output.rb

@@ -44,7 +44,7 @@ module Caching
       def output_cache_path(path)
         filename = ((path.empty? || path == '/') ? 'index.html' : path.dup)
 #        filename.gsub!(/\/$/, '')
-        filename << 'index.html' unless (filename.split('/').last || filename).include? '.'
+        filename << '/index.html' unless (filename.split('/').last || filename).include? '.'
         return output_cache_root + '/' + filename                     
       end
       
@@ -66,9 +66,10 @@ module Caching
         # gmosx: is this the right thing to do?
       end
     end
+    alias_method :delete_output, :expire_output
     
     def caching_allowed?
-      !@request.post?
+      not (@request.post? or @request.uri =~ /\?/)
     end
 
   end

data/lib/nitro/cgi/utils.rb

@@ -5,25 +5,29 @@ module Nitro
 module Request
 
   # Some useful mini methods for browser testing.
+  # TODO: add testing for mac IE (an other platforms)
 
+  # Different servers hold user agent in differnet 
+  # strings (unify this).
+  
   def user_agent
    headers['HTTP_USER_AGENT'] || headers['USER-AGENT']
  end
 
   def from_gecko?
-    headers['USER-AGENT'] =~ /Gecko/
+    user_agent =~ /Gecko/
   end
   alias_method :from_mozilla?, :from_gecko?
 
   def from_ie?
-    headers['USER-AGENT'] =~ /MSIE/
+    user_agent =~ /MSIE/
   end
   alias_method :from_msie?, :from_ie?
 
   def from_opera?
-    headers['USER-AGENT'] =~ /Opera/
+    user_agent =~ /Opera/
   end
 
   def from_khtml?
-    headers['USER-AGENT'] =~ /KTHML/
+    user_agent =~ /KTHML/
   end
   alias_method :from_safari?, :from_khtml?
 

data/lib/nitro/compiler.rb

@@ -38,7 +38,7 @@ class Compiler
       # template_root/action/index.xhtml
 
       path = "#{template_root}/#{action.gsub(/__/, '/')}/#{Template.default}.#{ext}".squeeze('/')
-
+      
       unless File.exist?(path)  
         # No template found!
         return nil
@@ -105,7 +105,7 @@ class Compiler
     
     code = %{
       def #{action}_action
-        @parent_action_name = @action_name
+        @parent_action_name = @action_name 
         @action_name = '#{action}'
     }
   
@@ -131,17 +131,21 @@ class Compiler
       param_count = klass.instance_method(action.intern).arity 
       
       if param_count != 0
+        if param_count > 0 
+          code << "params = Array.new(#{param_count}, nil);"
+        else
+          code << "params = [];"
+        end
         code << %{
-          params = []
           if context.query_string
             context.query_string.split(/[&;]/).each_with_index do |qs, i|
         }
         # Don't pass more parameters than the action's arity.
         if param_count > 0 
-          code << "break if i >= #{param_count};"
+          code << "break unless i < #{param_count};"
         end
         code << %{
-              params << CGI.unescape(qs.split(/=/).last)
+              params[i] = CGI.unescape(qs.split(/=/).last)
             end            
           end          
           action_return_value = #{action}(*params)

data/lib/nitro/compiler/include.rb

@@ -0,0 +1,42 @@
+module Nitro
+  
+# Performs static includes. Typically you should include this compiler
+# as the first stage of the compile pipeline.
+# 
+# This compiler is extremely helpful, typically you would want
+# to use static includes in many many cases.
+ 
+class StaticInclude
+  #--
+  # FIXME: use template root of the controller.
+  #++
+  
+  def self.transform(text)
+    # Statically include sub-template files.
+    # The target file is included at compile time.
+    #
+    # gmosx: must be xformed before the <?r pi.
+    #
+    # Example:    
+    # <?include href="root/myfile.sx" ?>
+
+    return text.gsub(/<\?include href=["|'](.*?)["|'](.*)\?>/) do |match|
+      unless File.exist?(filename = "#{Template.root}/#$1")
+       unless File.exist?(filename = "#{Template.root}/#$1.xinc")
+          unless File.exist?(filename = "#{Template.root}/#$1.xhtml")
+            raise "Cannot include '#{Template.root}/#$1'"
+          end
+        end
+      end
+      itext = File.read(filename)
+      itext.gsub!(/<\?xml.*\?>/, '')
+      itext.gsub!(/<\/?root(.*?)>/m, ' ');
+      itext
+    end
+  end
+  
+end
+  
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/compiler/markup.rb

@@ -1,4 +1,4 @@
-require 'nitro/mixin/markup'
+require 'glue/markup'
 
 module Nitro
 

data/lib/nitro/compiler/morphing.rb

@@ -1,66 +1,136 @@
-module Nitro::Compiler
+require 'rexml/document'
+require 'rexml/streamlistener'
 
-# 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 Nitro
 
-module Morphing
+# A compiler that handles these attribute's tags:
+#
+# <tag if="x">..</tag>
+# <tag unless="x">..</tag>
+# <tag each="x">..</tag>
+# <tag times="x">..</tag>
+#
+# by transforming them like that
+#
+# <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 ?>
+#
+#
+# <li times="3">...</li>
+# 
+# becomes
+#
+# <?r 3.times do ?>
+# <li>...</li>
+# <?r end ?>
+#
+#
+# <li each="item in array">my item is #{item}</li>
+#
+# becomes
+#
+# <?r for item in array ?>
+#   <li>my item is #{item}</li>
+# <?r end ?>
 
-  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 ?>
+class Morphing
 
-    text.gsub!(/<(\w*?)([^>]*?)(if|unless)=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
-      %{<?r #$3 #$4 ?>
-        <#$1#$2#$5>#$6</#$1>
-      <?r end ?>}
+  class Listener # :nodoc: all
+    include REXML::StreamListener
+    
+    attr_reader :buffer
+    
+    def initialize
+      super
+      @buffer = ''
+      @stack = []
+      @depth = 0
     end
-
-    # <tag times="x">..</tag>
-
-    text.gsub!(/<(\w*?)([^>]*?)times=["|'](.*?)["|'](.*?)>(.*?)<\/\1>/m) do |match|
-      %{<?r #$3.times do ?>
-        <#$1#$2#$4>#$5</#$1>
-      <?r end ?>}
+    
+    def tag_start(name, attributes)    
+      if attr = attributes.detect { |k, v| %w{if unless for each times}.include?(k) }
+        temp_buffer = 
+          if attr[0] == 'times'
+            "<?r #{attr[1]}.times do ?>"
+          elsif (attr[0] == 'for' or attr[0] == 'each') and attr[1] =~ / in /
+            "<?r for #{attr[1]} ?>"
+          elsif attr[0] == 'if' or attr[0] == 'unless'
+            "<?r #{attr[0]} #{attr[1]} ?>"
+          else
+            Logger.info "Morphing: #{attr[0]} attribute found but was not suitable for morphing" if $DBG
+            false
+        end
+        if temp_buffer
+          @buffer << temp_buffer
+          attributes.delete(attr[0])
+          @stack.push(@depth)
+        end
+      end
+      
+      attrs = attributes.collect do | k, v | 
+        %|#{k}="#{v}"|
+      end
+      
+      attrs = attrs.empty? ? "" : " " + attrs.join(' ')
+      @depth += 1
+      @buffer << "<#{name}#{attrs}>"
     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 ?>}
+    def tag_end(name)    
+      @depth -= 1
+      @buffer << "</#{name}>"
+      if @stack.last == @depth
+        @buffer << "\n<?r end ?>"
+        @stack.pop
+      end
     end
     
-    text
+    def text(str)
+      @buffer << str
+    end
+    
+    def instruction(name, attributes)
+      @buffer << "<?#{name}#{attributes}?>"
+    end
   end
+  
+  def self.transform(source)
+    listener = Listener.new
+    REXML::Document.parse_stream(source, listener)
+    return listener.buffer
+  end
+
+end
 
 end
 
+if __FILE__ == $0
+  puts Nitro::Morphing.transform(<<EOF)
+<body>
+  <child attr1="attr1" if="test" attr2="attr2">
+    <mytag>
+      this is texxt
+      <one if="@qsdf">
+        qqqqq
+      </one>
+    </mytag>
+  </child>
+  <child times="4">
+    <mytag>
+      qqqqq
+    </mytag>
+    <one if="@qsdf">
+      text
+    </one>
+  </child>
+</body>
+EOF
 end
 
 # * George Moschovitis <gm@navel.gr>
+# * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>

data/lib/nitro/compiler/squeeze.rb

@@ -1,4 +1,4 @@
-module Nitro::Compiler
+module Nitro
   
 # Compress the inline xhtml. Does not touch the ruby code.
  
@@ -6,7 +6,7 @@ class Squeeze
   
   # Compresses the inline xhtml. Does not touch the ruby code.
    
-  def transform(text)
+  def self.transform(text)
     return text.gsub(/\@out \<\< \%\^(.*?)\^/m) do |match|
       c = $1.gsub(/^(\s*)/m, '').squeeze(" \t").tr("\n", '').tr("\t", ' ')
       "@out << %{#{c}}"

data/lib/nitro/context.rb

@@ -80,6 +80,15 @@ class Context
     @session || @session = Session.lookup(self)
   end
 
+  # Lookup the controller for this request.
+  #--
+  # FIXME: improve this! BUGGY
+  #++
+
+  def controller
+    @dispatcher.controllers[@base || '/'] 
+  end
+
   # Populate an object from request parameters.
   # This is a truly dangerous method.
   #

data/lib/nitro/controller.rb

@@ -1,14 +1,14 @@
 require 'mega/annotation'
 
 require 'glue/aspects'
-require 'glue/helper'
+require 'glue/markup'
 
 require 'nitro'
 require 'nitro/render'
 require 'nitro/scaffold'
 require 'nitro/caching'
 require 'nitro/flash'
-require 'nitro/mixin/markup'
+require 'nitro/helper'
 
 module Nitro
 
@@ -40,7 +40,7 @@ module Publishable
       include Render
       include Glue::Aspects
       include Flashing
-      include Glue::Helpers
+      include Helpers
     
       # Override this method as needed. Unless overriden
       # this method is initialized by the Dispatcher to 
@@ -136,7 +136,11 @@ class Controller
   include Publishable
   include Scaffolding
   include Caching
-  include Markup  
+  include Helpers
+  helper Markup
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>
+