nitro 0.21.2 → 0.22.0

data/lib/nitro/server/runner.rb

@@ -21,7 +21,7 @@ module Nitro
 
 class Runner
 
-  # ...
+  # The adapter used.
   
   setting :adapter, :default => :webrick, :doc => 'The web adapter'
   
@@ -43,8 +43,8 @@ class Runner
   #
   # The default mode is :debug
 
-  attr_accessor :mode
-  
+  setting :mode, :default => :debug, :doc => 'The execution mode'
+          
   # :start, :stop, :restart
 
   attr_accessor :action
@@ -69,7 +69,6 @@ class Runner
   # parameters to setup the application.
   
   def setup_options
-    @mode ||= :debug
     @action ||= :start
     @server ||= :webrick
     @daemon = false
@@ -77,7 +76,11 @@ class Runner
 
     # Setup from environment
 
-    @mode = ENV.fetch('NITRO_MODE', 'debug').to_sym
+    if mode = ENV['NITRO_MODE']
+      self.class.mode = mode.to_sym
+    else
+      self.class.mode ||= :debug
+    end
 
     # Setup from command line arguments.
     
@@ -104,15 +107,15 @@ class Runner
       end
       
       opts.on('-D', '--debug', 'Run application in debug mode.') do
-        @mode = :debug
+        self.class.mode = :debug
       end
 
       opts.on('-T', '--stage', 'Run application in stage mode.') do
-        @mode = :stage
+        self.class.mode = :stage
       end
 
       opts.on('-L', '--live', 'Run application in live mode.') do
-        @mode = :live
+        self.class.mode = :live
       end
 
       opts.on('-w', '--webrick', 'Use a webrick server [default].') do
@@ -182,7 +185,7 @@ class Runner
   # using the passed configuration parameters.
   
   def setup_mode
-    case @mode
+    case self.class.mode
       when :debug
         setup_debug
 
@@ -270,7 +273,7 @@ class Runner
 
       @server ||= Runner.adapter
 
-      puts "\n==> Listening at #{server.address}:#{server.port}. (#{@mode} mode)\n\n"
+      puts "\n==> Listening at #{server.address}:#{server.port}. (#{self.class.mode} mode)\n\n"
 
       case @server
         when :webrick
@@ -348,6 +351,8 @@ class Runner
 
 end
 
+Run = Runner
+
 end
 
 # * George Moschovitis <gm@navel.gr>

data/lib/nitro/service/xmlrpc.rb

@@ -20,6 +20,7 @@ module XmlRpc
   
   def decode_request(request)
     method, args = XMLRPC::Marshal.load_call(request)
+    Logger.debug "Calling XML-RPC method '#{method}'" if $DBG
     return method.gsub(/\./, '__'), args
   end
 

data/lib/nitro/test.rb

@@ -0,0 +1,5 @@
+$NITRO_NO_ENVIRONMENT = true
+$NITRO_NO_INVOKE = true
+
+require 'nitro/test/assertions'
+require 'nitro/test/testcase'

data/lib/nitro/test/assertions.rb

@@ -0,0 +1,171 @@
+require 'test/unit'
+require 'test/unit/assertions'
+require 'rexml/document'
+
+module Test::Unit::Assertions
+
+  STATUS_MAP = {
+    :success => 200,
+    :ok => 200,
+    :redirect => 307
+  }
+  
+  # :section: General assertions.
+
+  # Check the status of the response.
+  
+  def assert_response(options = {})
+    unless options.is_a? Hash
+      options = { :status => options }
+    end
+    msg = options[:msg]
+    if status = options.fetch(:status, :success)
+      status = STATUS_MAP[status] if STATUS_MAP.has_key?(status)
+      assert_status(status, msg)
+    end
+  end
+
+  def assert_status(status, msg)
+    msg = format_msg("Status not '#{status}'", msg)
+    assert_block(msg) { @context.status == status }
+  end
+    
+  #--
+  # Compile some helpers.
+  #++
+  
+  for m in [:get, :post, :put, :delete, :head]
+    eval %{
+      def assert_#{m}(uri, headers = {}, params = {}, session = nil)
+        #{m}(uri, headers, params, session)
+        assert_response :success
+      end 
+    }
+  end
+  
+  def assert_output(options = {})
+    msg = options[:msg]
+    if re = options[:match] || options[:contains]
+      assert_output_match(re, msg)
+    end
+    if re = options[:no_match] || options[:contains_no]
+      assert_output_not_match(re, msg)
+    end
+    if content_type = options[:content_type]
+      assert_content_type(content_type, msg)
+    end
+  end
+  
+  def assert_output_match(re, msg)
+    msg = format_msg("Rendered output does not match '#{re.source}'", msg)
+    assert_block(msg) { @context.body =~ Regexp.new(re) }
+  end
+  alias_method :assert_output_contains, :assert_output_match
+
+  def assert_output_not_match(re, msg)
+    msg = format_msg("Rendered output matches '#{re.source}'", msg)
+    assert_block(msg) { @context.out =~ Regexp.new(re) }
+  end
+  alias_method :assert_output_contains_not, :assert_output_match
+
+  def assert_content_type(ctype, msg)
+    msg = format_msg("Content type is not '#{ctype}' as expected", msg)
+    assert_block(msg) { @context.content_type == ctype }
+  end    
+  
+  # :section: Session related assertions.
+
+  def assert_session(options = {})
+    msg = options[:msg]
+    if key = options[:has]
+      assert_session_has(key, msg)
+    end
+    if key = options[:has_no] || options[:no]
+      assert_session_has_no(key, msg)
+    end
+    if key = options[:key] and value = options[:value]
+      assert_session_equal(key, value, msg)
+    end    
+  end
+
+  def assert_session_has(key, msg = nil)
+    msg = format_msg("Object '#{key}' not found in session", msg)
+    assert_block(msg) {  @context.session[key] }
+  end
+
+  def assert_session_has_no(key, msg = nil)
+    msg = format_msg("Unexpected object '#{key}' found in session", msg)
+    assert_block(msg) { !@context.session[key] }
+  end
+  
+  def assert_session_equal(key, value, msg = nil)
+    msg = format_msg("The value of session object '#{key}' is '#{@context.session[key]}' but was expected '#{value}'", msg)
+    assert_block(msg) { @context.session[key] == value }
+  end
+
+  # :section: Cookies related assertions.
+
+  def assert_cookie(options = {})
+    msg = options[:msg]
+    if key = options[:has]
+      assert_cookie_has(key, msg)
+    end
+    if key = options[:has_no] || options[:no]
+      assert_cookie_has_no(key, msg)
+    end
+    if key = options[:key] and value = options[:value]
+      assert_cookie_equal(key, value, msg)
+    end    
+  end
+
+  def assert_cookie_has(name, msg = nil)
+    msg = format_msg("Cookie '#{name}' not found", msg)
+    assert_block(msg) { @context.response_cookie(name) }
+  end
+
+  def assert_cookie_has_no(name, msg = nil)
+    msg = format_msg("Unexpected cookie '#{name}' found", msg)
+    assert_block(msg) { !@context.response_cookie(name) }
+  end
+  
+  def assert_cookie_equal(name, value, msg = nil)
+    unless cookie = @context.response_cookie(name)
+      msg = format_msg("Cookie '#{name}' not found", msg)
+      assert_block(msg) { false }
+    end
+    msg = format_msg("The value of cookie '#{name}' is '#{cookie.value}' but was expected '#{value}'", msg)
+    assert_block(msg) { cookie.value == value }
+  end
+
+  # :section: Template related assertions.
+  
+  # :section: Redirection assertions.
+
+  def assert_redirected(options = {})
+    msg = options[:msg]
+    
+    msg = format_msg("No redirection (status = #{@context.status})", msg)
+    assert_block(msg) { @context.redirect? }
+    
+    if to = options[:to]
+      msg = format_msg("Not redirected to '#{to}'", msg)
+      assert_block(msg) { @context.response_headers['location'] == "http://#{to}" }
+    end
+  end
+
+  def assert_not_redirected(options = {})
+    msg = options[:msg]
+    msg = format_msg("Unexpected redirection (location = '#{@context.response_headers['location']}')", msg)
+    assert_block(msg) { !@context.redirect? }
+  end
+  
+  # :section: Utility methods 
+
+  def format_msg(message, extra) # :nodoc:
+    extra += ', ' if extra
+    return "#{extra}#{message}"
+  end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/test/testcase.rb

@@ -0,0 +1,66 @@
+require 'test/unit'
+require 'test/unit/assertions'
+require 'rexml/document'
+
+require 'glue'
+require 'nitro/test/context'
+
+module Test::Unit
+  
+class TestCase
+  include Nitro
+
+  def controller(klass)
+    @server = Server.run(klass)
+  end
+
+  # Send a request to the controller. Alternatively you can use
+  # the request method helpers (get, post, ...)
+  #
+  # === Options
+  #
+  # :uri, :method, :headers/:env, :params, :session
+  
+  def process(options = {})
+    unless options.is_a? Hash
+      options = { :uri => options.to_s }
+    end
+
+    uri = options[:uri]
+    uri = "/#{uri}" unless uri =~ /^\//
+   
+    context = @context = Context.new(@server)
+
+    context.params = options[:params] || {}
+    context.headers = options[:headers] || options[:env] || {}
+    context.headers['REQUEST_URI'] = uri
+    context.headers['REQUEST_METHOD'] = options[:method].to_s.upcase
+    context.cookies = options[:cookies]
+    context.session = options[:session] if options[:session]
+    
+    context.render(context.path)
+    
+    return context.body
+  end
+
+  #--
+  # Compile some helpers.
+  #++
+  
+  for m in [:get, :post, :put, :delete, :head]
+    eval %{
+      def #{m}(options = {})
+        unless options.is_a? Hash
+          options = { :uri => options.to_s }
+        end
+        options[:method] = :#{m}
+        process(options)
+      end 
+    }
+  end
+
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/proto/public/error.xhtml

@@ -31,6 +31,8 @@
   <body>
     <h1>Error</h1>
 
+<?r if Run.mode == :debug ?>
+
     <?r  for error, path in @context.rendering_errors ?>
       <div class="path"><strong>Path:</strong> #{path}</div>
       <div class="error"><strong>#{error.to_s}</strong></div>
@@ -41,7 +43,7 @@
         <?r 
           extract = error.source_extract.split("\n")
           extract.each_with_index do |line, idx|
-            line = Nitro::Markuper.instance.send(:expand, line)
+            line = sanitize(line)
             if 4 == idx
         ?>
             <div style="background: #eee">#{line}</div>
@@ -74,8 +76,9 @@
     <div id="session" style="display: none">
       <p><strong>Values:</strong> #{session.inspect}</p>  
     </div>
-    
+
     <br /><br />
     Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}
+<?r end ?>    
   </body>
 </html>

data/proto/public/settings.xhtml

@@ -39,6 +39,7 @@
     </style>
   </head>
   <body>
+<?r if Run.mode == :debug ?>
     <h1>Settings</h1>
 
     <table width="100%">
@@ -60,5 +61,6 @@
     
     <br /><br />
     Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}
+<?r end ?>
   </body>
 </html>

data/proto/script/runner

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+
+ARGV.options do |opts|
+  opts.banner = "Usage: #{File.basename($0)} 'puts Person[1].name' [options]"
+  opts.separator '' 
+  opts.on('-h', '--help', 'Show this help message.') { puts opts; exit }
+  opts.parse!
+end
+
+code = ARGV.shift
+
+$NITRO_NO_INVOKE = true
+$:.unshift File.join(File.dirname(__FILE__), '..')
+$:.unshift '/home/gmosx/public/glue/lib', '/home/gmosx/public/og/lib', '/home/gmosx/public/nitro/lib'
+require 'rubygems'
+require 'run.rb'
+
+eval(code)

data/test/nitro/tc_controller.rb

@@ -1,13 +1,13 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
+$NITRO_NO_ENVIRONMENT = true
+
 require 'test/unit'
 require 'ostruct'
 
 require 'glue'
 require 'glue/logger'
-require 'nitro/context'
-require 'nitro/dispatcher'
-require 'nitro/controller'
+require 'nitro'
 
 class TC_Controller < Test::Unit::TestCase # :nodoc: all
   include Nitro

data/test/nitro/tc_controller_aspect.rb

@@ -0,0 +1,29 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'nitro/controller'
+
+class TestControllerAspect < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+  
+  class TestController < Controller
+    attr_reader :aflag, :tflag
+
+    post "@aflag = 25", :on => :list
+    
+    def list
+      @aflag = 3
+    end
+  end
+  
+  def test_aspect
+    ctx = Context.new(Server.new)
+    ctx.instance_variable_set '@session', {}
+    c = TestController.new(ctx)
+    c.list_action
+    
+    assert_equal 25, c.aflag
+  end
+
+end