nitro 0.21.2 → 0.22.0

data/test/nitro/tc_dispatcher.rb

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

data/test/nitro/tc_element.rb

@@ -28,6 +28,12 @@ $source = %{
 </html>
 }
 
+$source2 = %{
+  <x:box color="#ff0">
+    xhtml mode
+  </x:box>  
+}
+
 class Box < Nitro::Element
   def open
     %|<div style="color: #@color">|
@@ -41,5 +47,8 @@ end
 class TC_Element < Test::Unit::TestCase # :nodoc: all
   def test_all
     res = ElementProcessor.transform($source)
+    assert_match /div style/, res
+    res = ElementProcessor.transform($source2)
+    assert_match /div style/, res
   end
 end

data/test/nitro/tc_request.rb

@@ -0,0 +1,38 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'nitro/request'
+
+class TC_Request < Test::Unit::TestCase # :nodoc: all
+  class DummyRequest 
+    include Nitro::Request
+    
+    def initialize
+      @headers = {}
+    end
+  end
+  
+  def test_all
+    req = DummyRequest.new
+
+    req.headers['HTTP_HOST'] = 'www.nitrohq.com'
+    assert_equal 'nitrohq.com', req.domain
+    assert_equal 'www', req.subdomains.first
+    
+    req.headers['HTTP_HOST'] = 'www.nitrohq.co.uk'
+    assert_equal 'nitrohq.co.uk', req.domain(2)
+
+    req.headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+    assert req.xhr?
+
+    req.headers['REQUEST_METHOD'] = 'POST'
+    
+    req.headers['CONTENT_TYPE'] = 'application/x-yaml'
+    assert req.yaml_post?
+    
+    req.instance_variable_set '@post_format', nil
+    req.headers['CONTENT_TYPE'] = 'text/xml'
+    assert req.xml_post?
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.21.2
-date: 2005-07-28 00:00:00 +03:00
+  version: 0.22.0
+date: 2005-08-07 00:00:00 +03:00
 summary: Nitro Web Engine
 require_paths: 
   - lib
@@ -64,6 +64,7 @@ files:
   - proto/src
   - proto/run.rb
   - proto/README
+  - proto/script
   - proto/conf/lhttpd.conf
   - proto/conf/apache.conf
   - proto/doc/README
@@ -82,31 +83,30 @@ files:
   - proto/public/js/behaviour.js
   - proto/public/js/controls.js
   - proto/public/js/effects.js
+  - proto/script/runner
   - lib/nitro
   - lib/nitro.rb
   - lib/nitro/server
-  - lib/nitro/testing
   - lib/nitro/session
   - lib/nitro/adapter
   - lib/nitro/caching
   - lib/nitro/element
+  - lib/nitro/test
   - lib/nitro/controller.rb
   - lib/nitro/scaffold.rb
-  - 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
+  - lib/nitro/test.rb
   - lib/nitro/compiler
   - lib/nitro/cookie.rb
-  - lib/nitro/testing.rb
   - lib/nitro/render.rb
   - lib/nitro/session.rb
   - lib/nitro/routing.rb
   - lib/nitro/response.rb
-  - lib/nitro/template.rb
   - lib/nitro/element.rb
   - lib/nitro/service.rb
   - lib/nitro/service
@@ -114,9 +114,6 @@ files:
   - lib/nitro/server.rb
   - lib/nitro/compiler.rb
   - lib/nitro/server/runner.rb
-  - lib/nitro/testing/assertions.rb
-  - lib/nitro/testing/context.rb
-  - lib/nitro/testing/testcase.rb
   - lib/nitro/session/drbserver.rb
   - lib/nitro/session/drb.rb
   - lib/nitro/session/memory.rb
@@ -131,6 +128,9 @@ files:
   - lib/nitro/caching/output.rb
   - lib/nitro/caching/fragments.rb
   - lib/nitro/element/java_script.rb
+  - lib/nitro/test/assertions.rb
+  - lib/nitro/test/context.rb
+  - lib/nitro/test/testcase.rb
   - lib/nitro/dispatcher/nice.rb
   - lib/nitro/dispatcher/general.rb
   - lib/nitro/mixin/debug.rb
@@ -157,8 +157,6 @@ files:
   - test/nitro/mixin
   - test/nitro/ui
   - test/nitro/adapter
-  - test/nitro/tc_template.rb
-  - test/nitro/tc_mail.rb
   - test/nitro/tc_controller.rb
   - test/nitro/tc_session.rb
   - test/nitro/tc_context.rb
@@ -167,7 +165,9 @@ files:
   - test/nitro/tc_caching.rb
   - test/nitro/tc_flash.rb
   - test/nitro/tc_server.rb
+  - test/nitro/tc_request.rb
   - test/nitro/tc_cookie.rb
+  - test/nitro/tc_controller_aspect.rb
   - test/nitro/mixin/tc_pager.rb
   - test/nitro/mixin/tc_rss.rb
   - test/nitro/mixin/tc_table.rb
@@ -208,7 +208,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.21.2
+            version: 0.22.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: og
@@ -218,7 +218,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.21.2
+            version: 0.22.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: ruby-breakpoint

data/lib/nitro/mail.rb

@@ -1,270 +0,0 @@
-# Based on original code from the RubyOnRails project.
-# http://www.rubyonrails.com
-# Copyright (c) 2004 David Heinemeier Hansson
-
-require 'net/smtp'
-
-require 'glue/attribute'
-require 'nitro/template'
-
-module Nitro
-
-# Encapsulates an email message.
-
-class Mail
-  
-  # Sender, can be an array.
-
-  attr_accessor :from
-
-  # The list of the recipients, can be arrays.
-  
-  attr_accessor :to, :cc, :bcc
-
-  # The subject
-
-  attr_accessor :subject
-
-  # The body of the message.
-
-  attr_accessor :body
-
-  # Reply to.
-
-  attr_accessor :reply_to
-
-  # Sent on
-
-  attr_accessor :sent_on
-
-  # Encode the subject?
-
-  attr_accessor :encode_subject
-  
-  # The charset used to encode the message.
-
-  attr_accessor :charset
-
-  # Additional headers
-
-  attr_accessor :headers
-
-  def initialize(from = nil, to = nil, subject = nil, body = nil)
-    @from, @to, @subject, @body = from, to, subject, body
-    @headers = {}
-  end
-
-  def [](key)
-    @headers[key]
-  end
-
-  def []=(key, value)
-    @headers[key] = value
-  end
-  
-  # Returns the Mail message in encoded format.
-
-  def encoded
-    raise 'No body defined' unless @body
-    raise 'No sender defined' unless @from
-    raise 'No recipients defined' unless @to
-
-    # gmosx: From is typically NOT an array.
-
-    from = @from.is_a?(Array) ? @from.join(', ') : @from
-    buf = "From: #{from}\n"
-    
-    to = @to.is_a?(Array) ? @to.join(', ') : @to
-    buf << "To: #{to}\n"
-    
-    if @cc
-      cc = @cc.is_a?(Array) ? @cc.join(', ') : @cc
-      buf << "Cc: #{cc}\n"
-    end
-    
-    if @bcc
-      bcc = @bcc.is_a?(Array) ? @bcc.join(', ') : @bcc
-      buf << "Bcc: #{bcc}\n"
-    end
-    
-    buf << "Subject: #@subject\n" if @subject
-    
-    buf << "\n"  
-    buf << @body
-
-    return buf
-  end
-end
-
-module MailerMixin
-
-  def self.append_features(base) # :nodoc: 
-    super
-    base.extend(SingletonMethods)
-  end
-
-  module SingletonMethods 
-
-    def mailer(klass)
-    end
-
-  end
-
-end
-
-# A flexible mailing service.
-#--
-# TODO: add callback/observers support.
-#++
-
-class Mailer < Mail
-
-  # The mail server configuration.
-
-  cattr_accessor :server; @@server = {
-    :address => 'localhost',
-    :port => 25,
-    :domain => 'localhost.localdomain',
-    :username => nil,
-    :password => nil,
-    :authentication => nil
-  }
-
-  # The delivery method. The following options are
-  # supported:
-  #
-  # * :smtp
-  # * :sendmail
-  #  * :test
-
-  cattr_accessor :delivery_method; @@delivery_method = :smtp
-
-  # The encode subject.
-
-  cattr_accessor :encode_subject; @@encode_subject = false # true 
-  
-  # The default charset.
-
-  cattr_accessor :default_charset, 'utf-8'
-
-  # An array to store the delivered mails, useful
-  # for testing.
-
-  cattr_accessor :deliveries; @@deliveries = []
-
-  # Disable deliveries, useful for testing.
-
-  cattr_accessor :disable_deliveries, false
-
-  # The root directory where the templates reside
-
-  attr_accessor :template_root
-
-  def initialize(from = nil, to = nil, subject = nil, body = FileTemplate.new)
-    super
-    @charset = @@default_charset.dup
-    @encode_subject = @@encode_subject
-    @template_root = 'public'
-  end
-
-  class << self 
-
-    def method_missing(method_symbol, *params) #:nodoc:
-      case method_symbol.id2name
-        when /^create_([_a-z]*)/
-          create_from_method($1, *params)
-        when /^deliver_([_a-z]*)/
-          begin
-            deliver(send("create_" + $1, *params))
-          rescue Object => e
-            raise e # FIXME
-          end
-      end        
-    end
-
-    def mail(from, to, subject, body, timestamp = nil, headers = {}, encode = @@encode_subject, charset = @@default_charset) #:nodoc:
-      deliver(create(from, to, subject, body, timestamp, headers, charset))
-    end
-
-    def create(from, to, subject, body, timestamp = nil, headers = {}, encode = @@encode_subject, charset = @@default_charset) #:nodoc:
-      m = Mail.new
-      m.to, m.subject, m.body, m.from = to, ( encode ? quoted_printable(subject, charset) : subject ), body, from
-      # m.date = timestamp.respond_to?("to_time") ? timestamp.to_time : (timestamp || Time.now)    
-      # m.set_content_type "text", "plain", { "charset" => charset }
-      headers.each do |k, v|
-        m[k] = v
-      end
-      return m
-    end
-
-    def deliver(mail) #:nodoc:
-      send("perform_delivery_#{delivery_method}", mail) unless disable_deliveries
-    end
-                                  
-    def quoted_printable(text, charset) #:nodoc:
-      text = text.gsub( /[^a-z ]/i ) { "=%02x" % $&[0] }.gsub( / /, "_" )
-      "=?#{charset}?Q?#{text}?="
-    end
-                              
-    private
-
-    def create_from_method(method_name, *params)
-      mailer = new
-
-      mailer.send(method_name, *params)
-
-      unless mailer.body.is_a?(String)
-        mailer.body = render_body(method_name, mailer)
-      end
-
-      mail = create(
-        mailer.from, mailer.to, mailer.subject, 
-        mailer.body, mailer.sent_on, 
-        mailer.headers, mailer.charset
-      )
-
-      mail.cc = mailer.cc if mailer.cc
-      mail.bcc = mailer.bcc if mailer.bcc
-
-      return mail
-    end
-
-    # Render the body by expanfing the template
-    
-    def render_body(method_name, mailer)
-      mailer.body.template_filename = "#{mailer.template_root}/#{method_name.to_s}.xhtml"
-      return mailer.body.process
-    end
-
-    # Deliver emails using SMTP.
-    
-    def perform_delivery_smtp(mail) # :nodoc:
-      c = @@server
-      Net::SMTP.start(c[:address], c[:port], c[:domain], c[:username], c[:password], c[:authentication]) do |smtp|
-        smtp.send_message(mail.encoded, mail.from, mail.to)
-      end
-    end
-
-    # Deliver emails using sendmail.
-    
-    def perform_delivery_sendmail(mail) # :nodoc:
-      IO.popen('/usr/sbin/sendmail -i -t', 'w+') do |sm|
-        sm.print(mail.encoded)
-        sm.flush
-      end                                          
-    end
-    
-    # Used for testing, does not actually send the 
-    # mail.
-    
-    def perform_delivery_test(mail) # :nodoc:
-      deliveries << mail
-    end
-  
-  end
-
-end
-
-end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/template.rb

@@ -1,202 +0,0 @@
-require 'glue/flexob'
-require 'glue/configuration'
-
-module Nitro
-
-# A template is a text file with embeded Ruby code. The template
-# processor converts the original text file to ruby code and
-# then evaluates this code to produce the result of the 
-# template transformation.
-
-module TemplateMixin
-
-  # Convert a template to actual Ruby code, ready to be 
-  # evaluated.
-  #
-  # [+template+] 
-  #    The template as a String.
-  #
-  # [+buffer+]
-  #    The variable to act as a buffer where the ruby code
-  #   for this template will be generated. Passed as a|
-  #    String.
-  #
-  #  [+base_dir+]
-  #    The base directory where the templates reside.
-  
-  def compile_template(template, buffer = '@out', base_dir = Dir.pwd)
-    text = template.dup
-
-    # Strip the xml header! (interracts with the following gsub!)
-    text.gsub!(/<\?xml.*\?>/, "")
-
-    # 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" ?>
-    
-    text.gsub!(/<\?include href=["|'](.*?)["|'](.*)\?>/) do |match|
-      text = File.read("#{base_dir}/#$1")
-      text.gsub!(/<\?xml.*\?>/, '')
-      text.gsub!(/<\/?root(.*?)>/m, ' ');
-      text
-    end
-
-    # Transform include instructions <include href="xxx" />
-    # must be transformed before the processinc instructions.
-    # Useful to include fragments cached on disk
-    #
-    # gmosx, FIXME: NOT TESTED! test and add caching.
-    # add load_statically_included fixes.
-
-    text.gsub!(/<include href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-      "<?r File.read( '\#\{@dispatcher.root\}/#$1' ?>"
-    end
-    
-    # xform render/inject instructions <render href="xxx" />
-    # must be transformed before the processinc instructions.
-
-    text.gsub!(/<inject href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-      "<?r render '/#$1' ?>"
-    end
-    
-    text.gsub!(/<render href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-      "<?r render '/#$1' ?>"
-    end
-
-    # Remove <root> elements. typically removed by xslt but lets
-    # play it safe. The <root> element is typically added to
-    # template files to make them XHTML valid.
-    
-    text.gsub!(/<(\/)?root>/, '')
-    
-    # Transform the processing instructions, use <?r as
-    # a marker.
-    
-    text.gsub!(/\?>/, "; #{buffer} << %^")
-    text.gsub!(/<\?r(\s?)/, "^; ")
-    
-    # Transform alternative code tags. 
-    # (very useful in xsl stylesheets)
-    
-    text.gsub!(/<\/ruby>/, "; #{buffer} << %^")
-    text.gsub!(/<ruby>/, "^; ")
-
-    # Also handle erb/asp/jsp style tags. Those tags
-    # *cannot* be used with an xslt stylesheet.
-
-    text.gsub!(/%>/, "; #{buffer} << %^")
-    text.gsub!(/<%/, "^; ")
-
-    # Alterative versions of interpolation.
-    # (very useful in xsl stylesheets)
-    # Example: #\my_val\
-    
-    text.gsub!(/\#\\(.*?)\\/, '#{\1}')
-
-    # Alternative for entities.
-    # (useful in xsl stylesheets)
-    # Examples: %nbsp;, %rquo;
-
-    text.gsub!(/%(\S*?);/, '&\1;')
-
-    # Compile time ruby code. This code is evaluated when
-    # compiling the template and the result injected directly
-    # into the result. Usefull for example to prevaluate
-    # localization. Just use the #[] marker instead of #{}.
-    
-    text.gsub!(/\#\[(.*?)\]/) do |match|
-      eval($1)
-    end
-    
-    text =  "#{buffer} << %^" + text + "^"
-
-    return text
-  end
-
-  # Render the template.
-  #
-  # [+ruby+]
-  #    A String containing the compiled template
-  #    code.
-  #
-  #  [+binding+]
-  #    The evaluation binding for the rendering.
-
-  def render_template(ruby, the_binding = nil)
-    eval(ruby, the_binding)
-  end
-
-  # Compile and render the template.
-  
-  def process_template(template, buffer = '@out', the_binding = nil)
-    render_template(compile_template(template, buffer), the_binding)
-  end
-
-end
-
-# A helper class that provides access to the Template methods
-# as singleton methods.
-
-class Template
-  
-  # The default root directory where template files reside.
-  
-  setting :root, :default => 'public', :doc => 'The default root directory where template files reside'
-  
-  # The default template name.
-  
-  setting :default, :default => 'index', :doc => 'The default template name'
-  
-  # The default template file extension.
-  
-  setting :extension, :default => 'xhtml', :doc => 'The default template file extension'
-
-  class << self
-    include TemplateMixin
-    alias_method :compile, :compile_template
-    alias_method :transform, :compile_template
-    alias_method :render, :render_template
-    alias_method :process, :process_template
-  end
-  
-end
-
-# A Template that reads from files and also 
-# provides a simple but effective caching scheme.
-# An intuitive binding mechanism provides the
-# expansion environment.
-
-class FileTemplate < Flexob
-  include TemplateMixin
-
-  @@compiled_template_cache = {}
-
-  attr_accessor :template_filename
-
-  def initialize(filename = nil)
-    super
-    @template_filename = filename
-  end
-  
-  def process
-    __out__ = ''
-    
-    unless compiled = @@compiled_template_cache[@template_filename]
-      template = File.read(@template_filename)
-      compiled = compile_template(template, '__out__')
-      @@compiled_template_cache[@template_filename] = compiled
-    end
-    
-    render_template(compiled, binding)  
-    
-    return __out__
-  end
-end
-
-end
-
-# * George Moschovitis <gm@navel.gr>