nitro 0.40.0 → 0.41.0

data/bin/nitro

@@ -84,7 +84,7 @@ class NitroCommand < Console::Command
     ENV['NITRO_INVOKE'] = 'irb'
     
     if f = application_file
-      ENV['CONFIGURATION_MODE'] = $DBG ? 'debug' : 'live'
+      ENV['NITRO_MODE'] = $DBG ? 'debug' : 'live'
       exec "#{irb_name} -r #{f} -r irb/completion --noinspect"  
     end
     
@@ -114,18 +114,18 @@ class NitroCommand < Console::Command
 
   def __debug
     ARGV.delete('--debug')
-    ENV['CONFIGURATION_MODE'] = 'debug'
+    ENV['NITRO_MODE'] = 'debug'
   end
   alias __devel __debug
 
   def __stage
     ARGV.delete('--stage')
-    ENV['CONFIGURATION_MODE'] = 'stage'
+    ENV['NITRO_MODE'] = 'stage'
   end
 
   def __live
     ARGV.delete('--live')
-    ENV['CONFIGURATION_MODE'] = 'live'
+    ENV['NITRO_MODE'] = 'live'
   end
   alias __production __live
   

data/doc/MIGRATION

@@ -10,6 +10,13 @@ For more help, send your question to the mailing list:
 http://rubyforge.org/mailman/listinfo/nitro-general
 
 
+== 0.41.0 <- 0.40.0
+
+This release is backwards compatible with 0.40.0. But please
+prefer to use the NITRO_MODE env variable instead of the 
+deprecated CONFIGURATION_MODE env variable.
+
+
 == 0.40.0 <- 0.31.0
 
 This version was in the making for ages, so there are some changes

data/doc/RELEASES

@@ -1,3 +1,32 @@
+== Version 0.41.0
+
+This is a bug fix release. As it fixes some important bugs of the
+previous release, including a DOS vulnurability you are strongly
+advised to update your version. However, you will also find 
+a couple of new features:
+
+* Extended entity .finder method can now handle relations.
+
+  Post.find_by_title_and_forum_name(title,forumName)
+  
+  class Forum
+    property :name, String
+    has_many :posts, Post
+  end
+  
+  class Post
+    property :title, String
+    property :message, String
+    belongs_to :forum, Forum
+  end
+  
+  'forum' is the :forum from belongs_to, 'name' is a property from the
+  relations.  It creates a SQL subquery to find the correct forum_oid.
+
+* Added a simple call/answer mechanism that may be useful in some
+  cases. Will be improved in future versions.
+  
+
 == Version 0.40.0
 
 This is the biggest release yet! Tons of new wonderful features,

data/doc/TODO

@@ -3,6 +3,8 @@
 
 h2. Nitro
 
+* send error code on not found!
+* support this: <?include href="/comment/list" with="obj = article" ?>
 * the examples require *serious* updating.
 * move markup back to glue.
 * Optimize settings lookup.

data/lib/glue/webfile.rb

@@ -14,7 +14,7 @@ module Glue
 #     File.join(Uploads.public_root, request.user.name, 'icon.png')
 #   end      
 #
-#   property :file, WebFile, :magick => { :small => '64x64', :medium => '96x96' }    
+#   attr_accessor :file, WebFile, :magick => { :small => '64x64', :medium => '96x96' }    
 # end
 #--
 # TODO: webfile_path customization sucks, should be improved!
@@ -99,12 +99,12 @@ class WebFile
         }
       else
         code << %{
-          path = File.join(WebFile.upload_root, param.original_filename)
+          path = File.join(WebFile.upload_root, WebFile.sanitize(param.original_filename))
         }
       end
       
       code << %{ 
-          @#{name} = WebFile.sanitize(path)
+          @#{name} = path
           @#{name}_size = param.size
           
           real_path = #{name}_real_path
@@ -144,15 +144,15 @@ class WebFile
     end
   end
   
-  # Sanitize a filename.
-  #--
-  # TODO: implement me!
-  #++
+  # Sanitize a filename. You can override this method to make 
+  # this suit your needs.
   
   def self.sanitize(filename)
-    filename
+    ext = File::extname(filename)
+    base = File::basename(filename, ext).gsub(/[\\\/\? !@$\(\)]/, '-')[0..64]
+    return "#{base}.#{ext}"
   end
-
+  
 end
 
 # An alias, implies thumbnailing.

data/lib/nitro/cgi.rb

@@ -214,8 +214,11 @@ class Cgi
     
     params = Hash.new()
     boundary = "--" + boundary
+    quoted_boundary = Regexp.quote(boundary, "n")
     buf = ""
-
+    boundary_end=""
+    
+    # start multipart/form-data
     input.binmode if defined? input.binmode
     boundary_size = boundary.size + EOL.size
     content_length -= boundary_size
@@ -234,6 +237,7 @@ class Cgi
         body = Tempfile.new("CGI")
       else
         begin
+          require "stringio"
           body = StringIO.new
         rescue LoadError
           body = Tempfile.new("CGI")
@@ -241,7 +245,7 @@ class Cgi
       end
       body.binmode if defined? body.binmode
 
-      until head and /#{boundary}(?:#{EOL}|--)/n.match(buf)
+      until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
 
         if (not head) and /#{EOL}#{EOL}/n.match(buf)
           buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
@@ -268,11 +272,12 @@ class Cgi
         content_length -= c.size
       end
 
-      buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{boundary}([\r\n]{1,2}|--)/n) do
+      buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do
         body.print $1
         if "--" == $2
           content_length = -1
         end
+        boundary_end = $2.dup
         ""
       end
 
@@ -308,6 +313,7 @@ class Cgi
       break if buf.size == 0
       break if content_length === -1
     end
+    raise EOFError, "bad boundary end of body" unless boundary_end =~ /--/
 
     return params
   end

data/lib/nitro/compiler/elements.rb

@@ -139,11 +139,19 @@ class Elements # :nodoc: all
       @buffer << "<?#{name}#{attributes}?>"
     end
 
+    def cdata(content)
+      @buffer << "<![CDATA[#{content}]]>"
+    end
+
     def comment(c)
       unless Template.strip_xml_comments
         @buffer << "<!--#{c}-->"
       end
     end
+    
+    def doctype(name, pub_sys, long_name, uri)   
+      @buffer << "<!DOCTYPE #{name} #{pub_sys} #{long_name} #{uri}>\n"
+    end
   end
   
   class << self

data/lib/nitro/compiler/morphing.rb

@@ -202,6 +202,10 @@ class Morphing
       @buffer << "<?#{name}#{attributes}?>"
     end
 
+    def cdata(content)
+      @buffer << "<![CDATA[#{content}]]>"
+    end
+
     def comment(c)
       unless Nitro::Template.strip_xml_comments
         @buffer << "<!--#{c}-->"
@@ -209,7 +213,7 @@ class Morphing
     end    
 
     def doctype(name, pub_sys, long_name, uri)   
-      @buffer << "<!DOCTYPE #{name} #{pub_sys} #{long_name} #{uri}>"
+      @buffer << "<!DOCTYPE #{name} #{pub_sys} #{long_name} #{uri}>\n"
     end
   end
 

data/lib/nitro/helper.rb

@@ -70,6 +70,7 @@ module Helpers
             raise "helper #{modname} not found (module not defined), check name"
           end
           symbols = mod.instance_methods.collect { |m| m.to_sym }
+          
           self.send(:include, mod)
           self.send(:private, *symbols)
           self.send(:private, mod.to_s[/[^:]+$/].to_sym)

data/lib/nitro/helper/pager.rb

@@ -1,4 +1,3 @@
-require 'glue/uri'
 require 'glue/configuration'
 
 require 'og/collection'
@@ -232,8 +231,15 @@ private
   # Generate the target URI.
    
   def target_uri(page)
-    params = { @key => page }
-    return Glue::UriUtils.update_query_string(@request.uri.to_s, params)
+    uri = @request.uri.to_s
+    
+    if uri =~ /[?;]#{@key}=(\d*)/
+      return uri.gsub(/([?;]#{@key}=)\d*/) { |m| "#$1#{page}" }
+    elsif uri =~ /\?/
+      return "#{uri};#{@key}=#{page}"
+    else
+      return "#{uri}?#{@key}=#{page}"
+    end   
   end
 
 end

data/lib/nitro/publishable.rb

@@ -12,6 +12,8 @@ require 'nitro/flash'
 require 'nitro/helper'
 require 'nitro/compiler'
 
+require 'nitro/util/encode_url'
+
 module Nitro
 
 # Include this Mixin to a class to make objects of this class
@@ -64,6 +66,8 @@ module Publishable
       end
     end
 
+    base.helper(EncodeUrl)
+
     # Aliases an action
     #--
     # gmosx, FIXME: better implementation needed.
@@ -80,6 +84,9 @@ module Publishable
     # Return the 'action' methods for this Controller.
     # Some dangerous methods from ancestors are removed.
     # All private methods are ignored.
+    #--
+    # gmosx, TODO: maybe we should optimize this method.
+    #++
 
     base.module_eval do
       def self.action_methods
@@ -217,7 +224,7 @@ private
     cookie.expires = Time.now  
     @context.add_cookie(cookie)    
   end
-  
+=begin  
   # Encode controller, action, params into a valid url.
   # Automatically respects nice urls and routing.
   #
@@ -314,6 +321,7 @@ private
     return "#{request.host_url}#{encode_url(*args)}"
   end
   alias RA encode_absolute_url
+=end
   
   # Allows instances of Publishable classes to know where they 
   # are mounted.

data/lib/nitro/render.rb

@@ -238,6 +238,42 @@ private
   end
   alias_method :redirect_to_home, :redirect_home
 
+  # :section: Seaside style call/answer methods.
+  
+  # Call redirects to the given url but push the original
+  # url in a callstack, so that the target can return by 
+  # executing answer.
+  #
+  # === Example
+  #
+  # caller:
+  # color, type = call 'utils/select_color'
+  #
+  # target:
+  # answer color, type
+  #--
+  # FIXME: dont use yet, you have to encode the branch to 
+  # make this safe for use.
+  #++
+  
+  def call(url, status = 303)
+    (session[:CALL_STACK] ||= []) << request.uri
+    redirect(url, status)
+  end
+  
+  # Returns from a call by poping the callstack.
+  #--
+  # FIXME: don't use yet.
+  #++
+    
+  def answer(index = 0, status = 303)
+    if stack = session[:CALL_STACK] and not stack.empty?
+      redirect(stack.pop, status)
+    else
+      raise 'Cannot answer, call stack is empty'
+    end
+  end
+
   # Log a rendering error.
 
   def log_error(error, path, full = true)

data/lib/nitro/scaffold/model.rb

@@ -86,14 +86,14 @@ module Scaffold
       #{controller}
     }
                   
-    if defined? OgSystemController
-      self.extend(OgSystemHelper)
+    if defined? OgAdminController
+      self.extend(OgAdminHelper)
 
       # to_edit_href
       # ex: admin/update/Article/23
 
       define_instance_method klass, :to_edit_href, %{
-        "\#{OgSystemController.mount_path}/update/#{class_to_name(klass)}/\#{oid}"
+        "\#{OgAdminController.mount_path}/update/#{class_to_name(klass)}/\#{oid}"
       }
 
       # to_admin_href

data/lib/nitro/server/runner.rb

@@ -221,7 +221,7 @@ class Runner
   # Setup in debug mode.
   
   def setup_debug
-    $DBG = true
+    $DBG.nil? ? true : $DBG
     Compiler.reload = true
     autoreload(3)
     Caching.caching_enabled = false
@@ -230,16 +230,17 @@ class Runner
   end
 
   def setup_stage
-    $DBG = false
+    $DBG.nil? ? false : $DBG
     Compiler.reload = true
-    autoreload(3)    
-    Logger.set(Logger.new('log/app.log'))
+    autoreload(3)
+    
+#    load_external_configuration(:stage)
     
-#    load_external_configuration(:stage)    
+    Logger.set(Configuration.log)
   end
 
   def setup_live
-    $DBG = false
+    $DBG.nil? ? false : $DBG
     
     # Enable the reloading even on live apps by default.
     # But have a longer thread sleep time.
@@ -247,11 +248,12 @@ class Runner
     # reloading (Compiler.reload = false)
 
     Compiler.reload = true
-    autoreload(2 * 60)    
-    Logger.set(Logger.new('log/app.log'))
+    autoreload(2 * 60)
+    
+#    load_external_configuration(:live)
+#    load_external_configuration(:production)
     
-#    load_external_configuration(:live)        
-#    load_external_configuration(:production)        
+    Logger.set(Configuration.log)
   end
   alias_method :setup_production, :setup_live
 

data/lib/nitro/session.rb

@@ -1,5 +1,4 @@
 require 'md5'
-require 'webrick'
 
 require 'facets/more/synchash'
 require 'facets/more/times'

data/lib/nitro/template.rb

@@ -1,3 +1,4 @@
+require 'digest/md5'
 require 'ostruct'
 require 'facets/more/openobject'
 require 'glue/configuration'
@@ -13,8 +14,9 @@ module TemplateMixin
 
   # Set some pretty safe delimiters for templates.
     
-  START_DELIM = "<<NITRO_TEMPLATE_DELIMETER\n"
-  END_DELIM = "\nNITRO_TEMPLATE_DELIMETER\n"
+  DELIM_HSH = Digest::MD5.hexdigest(Kernel.rand.to_s)
+  START_DELIM = "<<NITRO_TEMPLATE_DELIMETER#{DELIM_HSH}\n"
+  END_DELIM = "\nNITRO_TEMPLATE_DELIMETER#{DELIM_HSH}\n"
 
   # Convert a template to actual Ruby code, ready to be 
   # evaluated.
@@ -39,7 +41,7 @@ module TemplateMixin
 
     # Strip the xml header! (interracts with the following gsub!)
 
-    text.gsub!(/<\?xml.*\?>/, "")
+    text.gsub!(/<\?xml.*\?>/, '')
 
     # Transform include instructions <include href="xxx" />
     # must be transformed before the processinc instructions.
@@ -49,16 +51,12 @@ module TemplateMixin
     # add load_statically_included fixes.
     #++
     
-    text.gsub!(/<include href=["'](.*?)["'](.*)(.?)\/>/) do |match|
-      "<?r File.read( '\#{@dispatcher.root}/#$1' ?>"
-    end
+    text.gsub!(/<include\s+href=["'](.*?)["']\s+\/>/, %[<?r File.read("\#{@dispatcher.root}/\\1") ?>])
     
     # xform render/inject instructions <render href="xxx" />
     # must be transformed before the processinc instructions.
 
-    text.gsub!(/<(render|inject) href=["'](.*?)["'](.*)(.?)\/>/) do |match|
-      "<?r render '#$2' ?>"
-    end
+    text.gsub!(/<(?:render|inject)\s+href=["'](.*?)["']\s+\/>/, %[<?r render "\\1" ?>])
 
     # Remove <root> elements. typically removed by xslt but lets
     # play it safe. The <root> element is typically added to
@@ -69,20 +67,23 @@ module TemplateMixin
     # Transform the processing instructions, use <?r as
     # a marker.
     
-    text.gsub!(/\?>/, "; #{buffer} << #{START_DELIM}")
-    text.gsub!(/<\?r(\s?)/, "#{END_DELIM}; ")
+    text.gsub!(/<\?r\s+(.*?)\s+\?>/m, "#{END_DELIM}; \\1; #{buffer} << #{START_DELIM}")
+    #text.gsub!(/<\?r(\s?)/, "#{END_DELIM}; ")
+    #text.gsub!(/\?>/, "; #{buffer} << #{START_DELIM}")
     
     # Transform alternative code tags. 
     # (very useful in xsl stylesheets)
     
-    text.gsub!(/<\/ruby>/, "; #{buffer} << #{START_DELIM}")
-    text.gsub!(/<ruby>/, "#{END_DELIM}; ")
+    text.gsub!(/<ruby>(.*?)<\/ruby>/m, "#{END_DELIM}; \\1; #{buffer} << #{START_DELIM}")
+    #text.gsub!(/<\/ruby>/, "; #{buffer} << #{START_DELIM}")
+    #text.gsub!(/<ruby>/, "#{END_DELIM}; ")
 
     # Also handle erb/asp/jsp style tags. Those tags
     # *cannot* be used with an xslt stylesheet.
 
-    text.gsub!(/%>/, "; #{buffer} << #{START_DELIM}")
-    text.gsub!(/<%/, "#{END_DELIM}; ")
+    text.gsub!(/<%(.*?)%>/m, "#{END_DELIM}; \\1; #{buffer} << #{START_DELIM}")
+    #text.gsub!(/%>/, "; #{buffer} << #{START_DELIM}")
+    #text.gsub!(/<%/, "#{END_DELIM}; ")
 
     # Alterative versions of interpolation.
     # (very useful in xsl stylesheets)

data/lib/nitro/util/encode_url.rb

@@ -0,0 +1,112 @@
+module Nitro
+
+# A collection of intelligent url encoding methods.
+
+module EncodeUrl
+
+private
+
+  # Encode controller, action, params into a valid url.
+  # Automatically respects nice urls and routing.
+  #
+  # Handles parameters either as a hash or as an array.
+  # Use the array method to pass parameters to 'nice' actions.
+  #
+  # Pass Controller, action, and (param_name, param_value) 
+  # pairs.
+  #
+  # === Examples
+  #
+  # encode_url ForaController, :post, :title, 'Hello', :body, 'World'
+  # encode_url :post, :title, 'Hello', :body, 'World' # => implies controller == self
+  # encode_url :kick, :oid, 4
+  # encode_url article # => article.to_href
+  # 
+  # Alternatively you can pass options with a hash:
+  #
+  # encode_url :controller => ForaController, :action => :delete, :params => { :title => 'Hello' }
+  # encode_url :action => :delete
+  #--
+  # FIXME: better implementation? optimize this?
+  # TODO: move elsewhere.
+  #++
+  
+  def encode_url(*args)
+    f = args.first
+    
+    # A standard url as string, return as is.
+    
+    if f.is_a? String
+      return f
+    end
+  
+    # If the passed param is an object that responds to :to_href
+    # returns the url to this object.
+    
+    if f.respond_to? :to_href
+      return args.first.to_href
+    end
+    
+    if f.is_a? Symbol
+      # no controller passed, try to use self as controller.
+      if self.is_a? Nitro::Controller
+        args.unshift(self.class)
+      else
+        raise 'No controller passed to encode_url'
+      end
+    end
+
+    # Try to encode using the router.
+    
+    if url = Context.current.dispatcher.encode_route(*args)
+      return url
+    end
+    
+    # No routing rule, manual encoding.
+    
+    controller = args.shift
+    action = args.shift.to_sym
+    
+    if action == :index
+      url = "#{controller.mount_path}"
+    else
+      mount_path = controller.mount_path
+      mount_path = nil if mount_path == '/'    
+      url = "#{mount_path}/#{action}"
+    end
+      
+    unless args.empty?
+      if controller.respond_to_action_or_template? action
+        param_count = controller.instance_method(action).arity
+        if param_count != 0
+          param_count.times do
+            args.shift # name 
+            url << "/#{CGI.escape(args.shift.to_s)}"
+          end        
+        end
+      end
+      
+      unless args.empty?
+        url << '?'
+        params = []
+        (args.size / 2).times do
+          params << "#{args.shift}=#{args.shift}" 
+        end
+        url << params.join(';')
+      end
+    end
+    
+    return url  
+  end
+  alias R encode_url
+
+  # Just like encode_url, but generates an absolute url instead.
+  
+  def encode_absolute_url(*args)
+    return "#{request.host_url}#{encode_url(*args)}"
+  end
+  alias RA encode_absolute_url
+  
+end
+
+end

data/lib/nitro/version.rb

@@ -2,5 +2,5 @@
 module Nitro
   # The version of Nitro.
 
-  Version = '0.40.0'
+  Version = '0.41.0'
 end

data/lib/part/admin/controller.rb

@@ -4,7 +4,7 @@ require 'part/admin/helper'
 # The main Controller for the Admin part.
 
 class AdminController < Nitro::Controller
-  helper :table, :sitemap
+  helper :table
   helper AdminHelper
   ann :self, :element_namespace => AdminSkin
   

data/lib/part/admin/og/controller.rb

@@ -24,7 +24,7 @@ end
 
 class OgAdminController < Nitro::Controller
 
-  helper :table, :sitemap
+  helper :table
   helper AdminHelper, OgAdminHelper
 
   ann :self, :element_namespace => AdminSkin

data/test/nitro/tc_cgi.rb

@@ -100,14 +100,12 @@ class TestAdapterCgi < Test::Unit::TestCase # :nodoc: all
     params = Cgi.parse_query_string(qs)
     assert_equal 2, params.size
     arr = params['arr']
-    assert_equal Array, arr.class
     assert_equal 3, arr.size
 
     qs = 'other=1;user.name=gmosx;user.password=hello'
     params = Cgi.parse_query_string(qs)
     assert_equal 2, params.size    
     u = params['user']
-    assert_equal Hash, u.class
     assert_equal 'gmosx', u['name']
     assert_equal 'hello', u['password']
 
@@ -122,7 +120,6 @@ class TestAdapterCgi < Test::Unit::TestCase # :nodoc: all
     params = Cgi.parse_query_string(qs)
     assert_equal 2, params.size    
     u = params['user']
-    assert_equal Hash, u.class
     assert_equal 'gmosx', u['name']
     assert_equal 'hello', u['password']
   end

data/test/nitro/tc_helper.rb

@@ -21,6 +21,12 @@ module AnotherHelper
   end
 end
 
+module Funny
+  def funny_world
+    return 1
+  end
+end
+
 class MyBase < Base
   helper :my
   helper AnotherHelper
@@ -32,5 +38,10 @@ class TC_Helper < Test::Unit::TestCase # :nodoc: all
     assert MyBase.private_instance_methods.include?('hello_world')
     assert !MyBase.public_instance_methods.include?('bye_world')
     assert MyBase.private_instance_methods.include?('bye_world')
+
+    # test a bug.
+    MyBase.helper(Funny)
+    assert !MyBase.public_instance_methods.include?('funny_world')
+    assert MyBase.private_instance_methods.include?('funny_world')    
   end  
 end

data/test/nitro/tc_render.rb

@@ -4,6 +4,8 @@ require 'test/unit'
 
 require 'nitro'
 require 'nitro/render'
+require 'nitro/session'
+require 'nitro/context'
 require 'facet/mock'
 
 class TestRender < Test::Unit::TestCase # :nodoc: all
@@ -17,6 +19,60 @@ class TestRender < Test::Unit::TestCase # :nodoc: all
   class TestController < Controller
   end
 
+  class CallController < Controller
+    def return_session
+      session[:CALL_STACK].inspect
+    end
+
+    def needs_login
+      call "login"
+    end
+    
+    def login
+      answer()
+    end
+  end
+
+  @@session = Session.new
+  def handle_request(url, value)
+    conf = OpenStruct.new
+    disp = Nitro::Dispatcher.new('/' => CallController)
+    conf.dispatcher = disp
+    @ctx = Nitro::Context.new(conf)
+    @ctx.headers = { 'REQUEST_METHOD' => 'GET' }
+    @ctx.params = {}
+    @ctx.instance_variable_set '@session', @@session
+    
+    if value[:in]
+      @ctx.in = value.delete(:in)
+      @ctx.headers['CONTENT_LENGTH'] = value.delete(:in_size) || @ctx.in.size
+    end
+    
+    if value[:method]
+      @ctx.headers['REQUEST_METHOD'] = value[:method].to_s
+    end
+    
+    if value['CONTENT_TYPE']
+      @ctx.headers['CONTENT_TYPE'] = value.delete('CONTENT_TYPE')
+    end
+    
+    @ctx.headers['REQUEST_URI'] = url
+    
+    if (!@ctx.query_string || @ctx.query_string.empty?) and @ctx.uri =~ /\?/
+      @ctx.headers['QUERY_STRING'] = @ctx.uri.split('?').last
+    end
+
+    Nitro::Cgi.parse_params(@ctx)
+    Nitro::Cgi.parse_cookies(@ctx)
+    
+    @ctx.render url
+
+    #retrieve the stuff from @out again as a hash
+    result = @ctx.out
+    
+    return result
+  end
+
   def setup
     ctx =  ContextMock.new
     @controller = TestController.new(ctx)
@@ -52,4 +108,12 @@ class TestRender < Test::Unit::TestCase # :nodoc: all
     rescue Nitro::RenderExit
     end
   end
+  
+  def test_call
+    handle_request('/needs_login', {})
+    assert_equal ['/needs_login'], eval(handle_request('/return_session', {}))
+    handle_request('/login', {})
+    assert_equal [], eval(handle_request('/return_session', {}))
+  end
+  
 end

data/test/nitro/tc_template.rb

@@ -6,13 +6,13 @@ require 'nitro/template'
 
 class TestTemplate < Test::Unit::TestCase # :nodoc: all
   include Nitro
-    
+
   def test_all
     template = %q{
       Hello #{user}
 
       dont forget the following todo items:
-      
+
       <?r for item in items ?>
         <li>#{item}</li>
       <?r end ?>
@@ -26,9 +26,46 @@ class TestTemplate < Test::Unit::TestCase # :nodoc: all
 
     assert_match %r{\<li\>nitro\</li\>}, out
     assert_match %r{\<li\>really\</li\>}, out
-    assert_match %r{Hello gmosx}, out    
-    
+    assert_match %r{Hello gmosx}, out
+
     # TODO: add test for static inclusion.
-    
+
+  end
+
+  def test_interpolation
+    template = %q[
+      <% user1 = 'one' %>
+      <%
+        user2 = 'two'
+      %>
+      <?r user3 = 'three' ?>
+      <?r
+        user4 = 'four'
+      ?>
+      <ruby>user5 = 'five'</ruby>
+      <ruby>
+        user6 = 'six'
+      </ruby>
+      user1: #\user1\
+      user2: #{user2}
+      user3: #{ user3 }
+      user4: #\ user4\
+      user5: #\user5 \
+      user6: #\ user6\
+    ]
+
+    out = ''
+    Nitro::Template.process(template, :out, binding)
+
+    {
+      :user1 => 'one',
+      :user2 => 'two',
+      :user3 => 'three',
+      :user4 => 'four',
+      :user5 => 'five',
+      :user6 => 'six'
+    }.each do |key, val|
+      assert_match "#{key}: #{val}", out
+    end
   end
 end

data/test/nitro/util/tc_encode_url.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'glue'
+require 'glue/logger'
+require 'nitro'
+require 'nitro/util/encode_url'
+
+class TC_EncodeUrl < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+
+  class FirstController < Controller
+    def list
+    end
+    public :encode_url
+  end
+
+  class SecondController < Controller
+    attr_reader :aqflag, :tflag
+
+    def self.setup_template_root(path)
+      @template_root << File.expand_path(File.join(Nitro::LibPath, "../test/public/#{path}"))
+    end   
+
+    def list
+      @aqflag = true 
+    end
+
+    def another(oid)
+      # nop
+    end
+  end
+
+  class TestEncoder
+    include Nitro::EncodeUrl
+    public :encode_url
+  end
+
+  def setup
+    @disp = Dispatcher.new '/first'  => FirstController,
+                           '/second' => SecondController
+    @conf = OpenStruct.new
+    @conf.dispatcher = @disp
+    Thread.current[:CURRENT_CONTEXT] = @conf
+  end
+
+  def test_encode
+    t = TestEncoder.new
+    
+    assert_equal 'test', t.encode_url('test')
+    assert_equal '/first/list', t.encode_url(FirstController, :list)
+  
+  end
+
+  def test_controller_encode
+    t = FirstController.new(@conf)
+    
+    assert_equal '/first/list', t.encode_url(:list)
+  end  
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.40.0
-date: 2006-11-13 10:56:16 +02:00
+  version: 0.41.0
+date: 2006-12-12 12:36:44 +02:00
 summary: Everything you need to create Web 2.0 applications with Ruby and Javascript
 require_paths: 
 - lib
@@ -76,6 +76,7 @@ files:
 - lib/nitro/test
 - lib/nitro/test.rb
 - lib/nitro/version.rb
+- lib/nitro/util
 - lib/nitro/adapter/cgi.rb
 - lib/nitro/adapter/console.rb
 - lib/nitro/adapter/fastcgi.rb
@@ -160,6 +161,7 @@ files:
 - lib/nitro/test/assertions.rb
 - lib/nitro/test/context.rb
 - lib/nitro/test/testcase.rb
+- lib/nitro/util/encode_url.rb
 - lib/part/admin.rb
 - lib/part/admin
 - lib/part/admin/controller.rb
@@ -201,6 +203,7 @@ files:
 - test/nitro/tc_server.rb
 - test/nitro/tc_session.rb
 - test/nitro/tc_template.rb
+- test/nitro/util
 - test/nitro/adapter/raw_post1.bin
 - test/nitro/adapter/tc_webrick.rb
 - test/nitro/cgi/tc_cookie.rb
@@ -212,6 +215,7 @@ files:
 - test/nitro/helper/tc_pager.rb
 - test/nitro/helper/tc_table.rb
 - test/nitro/helper/tc_xhtml.rb
+- test/nitro/util/tc_encode_url.rb
 - test/public/blog
 - test/public/dummy_mailer
 - test/public/blog/another
@@ -279,7 +283,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.40.0
+        version: 0.41.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: gen
@@ -288,7 +292,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.40.0
+        version: 0.41.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: glue
@@ -297,7 +301,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.40.0
+        version: 0.41.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth