RubyGems - nitro - Versions diffs - 0.20.0 → 0.21.0 - Mend

nitro 0.20.0 → 0.21.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (115) hide show

data/CHANGELOG +752 -543
data/INSTALL +38 -38
data/README +264 -225
data/Rakefile +48 -49
data/bin/nitro +3 -3
data/bin/nitrogen +6 -6
data/doc/AUTHORS +10 -10
data/doc/CHANGELOG.1 +1939 -1939
data/doc/CHANGELOG.2 +954 -954
data/doc/LICENSE +3 -3
data/doc/MIGRATION +28 -0
data/doc/RELEASES +814 -643
data/doc/config.txt +5 -5
data/install.rb +7 -17
data/lib/nitro.rb +38 -9
data/lib/nitro/adapter/cgi.rb +311 -312
data/lib/nitro/adapter/fastcgi.rb +18 -25
data/lib/nitro/adapter/webrick.rb +128 -137
data/lib/nitro/adapter/wee.rb +51 -0
data/lib/nitro/caching.rb +20 -20
data/lib/nitro/caching/actions.rb +43 -43
data/lib/nitro/caching/fragments.rb +46 -46
data/lib/nitro/caching/invalidation.rb +11 -11
data/lib/nitro/caching/output.rb +65 -65
data/lib/nitro/caching/stores.rb +67 -67
data/lib/nitro/compiler.rb +262 -0
data/lib/nitro/compiler/elements.rb +0 -0
data/lib/nitro/compiler/errors.rb +65 -0
data/lib/nitro/compiler/localization.rb +25 -0
data/lib/nitro/compiler/markup.rb +19 -0
data/lib/nitro/compiler/shaders.rb +206 -0
data/lib/nitro/compiler/squeeze.rb +20 -0
data/lib/nitro/compiler/xslt.rb +61 -0
data/lib/nitro/context.rb +87 -88
data/lib/nitro/controller.rb +151 -158
data/lib/nitro/cookie.rb +34 -34
data/lib/nitro/dispatcher.rb +195 -186
data/lib/nitro/element.rb +132 -126
data/lib/nitro/element/java_script.rb +6 -6
data/lib/nitro/flash.rb +66 -66
data/lib/nitro/mail.rb +192 -192
data/lib/nitro/mixin/buffer.rb +66 -0
data/lib/nitro/mixin/debug.rb +16 -16
data/lib/nitro/mixin/form.rb +88 -0
data/lib/nitro/mixin/helper.rb +2 -2
data/lib/nitro/mixin/javascript.rb +108 -108
data/lib/nitro/mixin/markup.rb +144 -0
data/lib/nitro/mixin/pager.rb +202 -202
data/lib/nitro/mixin/rss.rb +67 -0
data/lib/nitro/mixin/table.rb +63 -0
data/lib/nitro/mixin/xhtml.rb +75 -0
data/lib/nitro/mixin/xml.rb +124 -0
data/lib/nitro/render.rb +183 -359
data/lib/nitro/request.rb +140 -140
data/lib/nitro/response.rb +27 -27
data/lib/nitro/routing.rb +21 -21
data/lib/nitro/scaffold.rb +124 -118
data/lib/nitro/server.rb +117 -80
data/lib/nitro/server/runner.rb +341 -0
data/lib/nitro/service.rb +12 -12
data/lib/nitro/service/xmlrpc.rb +22 -22
data/lib/nitro/session.rb +122 -120
data/lib/nitro/session/drb.rb +9 -9
data/lib/nitro/session/drbserver.rb +34 -34
data/lib/nitro/template.rb +171 -155
data/lib/nitro/testing/assertions.rb +90 -90
data/lib/nitro/testing/context.rb +16 -16
data/lib/nitro/testing/testcase.rb +34 -34
data/proto/conf/lhttpd.conf +9 -9
data/proto/public/error.xhtml +75 -75
data/proto/public/index.xhtml +18 -18
data/proto/public/js/behaviour.js +65 -65
data/proto/public/js/controls.js +1 -1
data/proto/public/js/prototype.js +3 -3
data/proto/public/settings.xhtml +61 -61
data/proto/run.rb +1 -5
data/test/nitro/adapter/raw_post1.bin +0 -0
data/test/nitro/adapter/tc_cgi.rb +57 -57
data/test/nitro/adapter/tc_webrick.rb +4 -4
data/test/nitro/mixin/tc_pager.rb +25 -25
data/test/nitro/mixin/tc_rss.rb +24 -0
data/test/nitro/mixin/tc_table.rb +31 -0
data/test/nitro/mixin/tc_xhtml.rb +13 -0
data/test/nitro/tc_caching.rb +10 -10
data/test/nitro/tc_context.rb +8 -8
data/test/nitro/tc_controller.rb +48 -48
data/test/nitro/tc_cookie.rb +6 -6
data/test/nitro/tc_dispatcher.rb +64 -64
data/test/nitro/tc_element.rb +27 -27
data/test/nitro/tc_flash.rb +31 -31
data/test/nitro/tc_mail.rb +63 -63
data/test/nitro/tc_server.rb +26 -26
data/test/nitro/tc_session.rb +9 -9
data/test/nitro/tc_template.rb +19 -19
data/test/public/blog/list.xhtml +1 -1
metadata +31 -37
data/lib/nitro/buffering.rb +0 -45
data/lib/nitro/builder/form.rb +0 -104
data/lib/nitro/builder/rss.rb +0 -104
data/lib/nitro/builder/table.rb +0 -80
data/lib/nitro/builder/xhtml.rb +0 -132
data/lib/nitro/builder/xml.rb +0 -131
data/lib/nitro/conf.rb +0 -36
data/lib/nitro/environment.rb +0 -21
data/lib/nitro/errors.rb +0 -69
data/lib/nitro/localization.rb +0 -153
data/lib/nitro/markup.rb +0 -147
data/lib/nitro/output.rb +0 -24
data/lib/nitro/runner.rb +0 -348
data/lib/nitro/shaders.rb +0 -206
data/test/nitro/builder/tc_rss.rb +0 -23
data/test/nitro/builder/tc_table.rb +0 -30
data/test/nitro/builder/tc_xhtml.rb +0 -39
data/test/nitro/builder/tc_xml.rb +0 -56
data/test/nitro/tc_localization.rb +0 -49

data/proto/public/js/controls.js CHANGED Viewed

@@ -323,7 +323,7 @@ Ajax.Autocompleter = Class.create();
 Ajax.Autocompleter.prototype = Object.extend(new Autocompleter.Base(),
 Object.extend(new Ajax.Base(), {
   initialize: function(element, update, url, options) {
-	  this.base_initialize(element, update, options);
+    this.base_initialize(element, update, options);
     this.options.asynchronous  = true;
     this.options.onComplete    = this.onComplete.bind(this)
     this.options.method        = 'post';

data/proto/public/js/prototype.js CHANGED Viewed

@@ -121,10 +121,10 @@ function $() {
 if (!Array.prototype.push) {
   Array.prototype.push = function() {
-		var startLength = this.length;
-		for (var i = 0; i < arguments.length; i++)
+    var startLength = this.length;
+    for (var i = 0; i < arguments.length; i++)
       this[startLength + i] = arguments[i];
-	  return this.length;
+    return this.length;
   }
 }

data/proto/public/settings.xhtml CHANGED Viewed

@@ -1,64 +1,64 @@
 <html>
-	<head>
-		<title>Settings</title>
-		<style>
-			.path {
-				padding: 5px;
-				font-size: 140%;
-				background: #ddd;
-			}
-			.error {
-				padding: 5px;
-				padding-top: 15px;
-				font-size: 140%;
-				color: #f00;
-			}
-			.load {
-				padding: 5px;
-				color: #555;
-			}
-			.source {
-				border: 1px solid #ccc;
-				padding: 10px;
-				margin-top: 10px; margin-bottom: 10px;
-			}
-			h2 {
-				padding-left: 5px;
-				background: #eee;
-			}
-			table {
-				border-collapse: collapse;
-				width: 100%;
-			}
-			th {
-				border: 1px solid #ccc; padding: 5px; background: #ff0
-			}
-			td {
-				border: 1px solid #ccc; padding: 5px
-			}
-		</style>
-	</head>
-	<body>
-		<h1>Settings</h1>
+  <head>
+    <title>Settings</title>
+    <style>
+      .path {
+        padding: 5px;
+        font-size: 140%;
+        background: #ddd;
+      }
+      .error {
+        padding: 5px;
+        padding-top: 15px;
+        font-size: 140%;
+        color: #f00;
+      }
+      .load {
+        padding: 5px;
+        color: #555;
+      }
+      .source {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-top: 10px; margin-bottom: 10px;
+      }
+      h2 {
+        padding-left: 5px;
+        background: #eee;
+      }
+      table {
+        border-collapse: collapse;
+        width: 100%;
+      }
+      th {
+        border: 1px solid #ccc; padding: 5px; background: #ff0
+      }
+      td {
+        border: 1px solid #ccc; padding: 5px
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Settings</h1>
-		<table width="100%">
-			<tr>
-				<th>Name</th>
-				<th>Value</th>
-				<th>Type</th>
-				<th>Description</th>
-			</tr>
-		<?r	for s in Configuration.settings ?>
-			<tr>
-				<td>#{s.owner}.<strong>#{s.name}</strong></td>
-				<td>#{s.value.inspect}</td>
-				<td>#{s.type}</td>
-				<td>#{s.options[:doc]}</td>
-			</tr>
-		<?r end ?>
-		</table>
-		<br /><br />
-		Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}
-	</body>
+    <table width="100%">
+      <tr>
+        <th>Name</th>
+        <th>Value</th>
+        <th>Type</th>
+        <th>Description</th>
+      </tr>
+    <?r  for s in Configuration.settings ?>
+      <tr>
+        <td>#{s.owner}.<strong>#{s.name}</strong></td>
+        <td>#{s.value.inspect}</td>
+        <td>#{s.type}</td>
+        <td>#{s.options[:doc]}</td>
+      </tr>
+    <?r end ?>
+    </table>
+    <br /><br />
+    Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}
+  </body>
 </html>

data/proto/run.rb CHANGED Viewed

@@ -1,9 +1,5 @@
 #!/usr/bin/env ruby
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 1 2005-04-11 11:04:30Z gmosx $
 require 'nitro'
-Nitro::Runner.run(:host => '127.0.0.1', :port => 9999)
+Nitro.run

data/test/nitro/adapter/raw_post1.bin CHANGED Viewed

Binary file

data/test/nitro/adapter/tc_cgi.rb CHANGED Viewed

@@ -8,66 +8,66 @@ require 'nitro/cookie'
 require 'nitro/adapter/cgi'
 class TC_AdaptersCgi < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	def test_parse_query_parameters
-		qs = 'name=tml;id=12354'
-		params = CgiUtils.parse_query_string(qs)
-		assert_equal 2, params.size
-		assert_equal 'tml', params['name']
-		qs = ''
-		params = CgiUtils.parse_query_string(qs)
-		assert_equal 0, params.size
-		qs = nil
-		params = CgiUtils.parse_query_string(qs)
-		assert_equal 0, params.size
-		qs = 'name=tml;arr[]=1;arr[]=2;arr[]=3'
-		params = CgiUtils.parse_query_string(qs)
-		assert_equal 2, params.size
-		arr = params['arr']
-		assert_equal Array, arr.class
-		assert_equal 3, arr.size
-	end
+  include Nitro
+  def test_parse_query_parameters
+    qs = 'name=tml;id=12354'
+    params = CgiUtils.parse_query_string(qs)
+    assert_equal 2, params.size
+    assert_equal 'tml', params['name']
+    qs = ''
+    params = CgiUtils.parse_query_string(qs)
+    assert_equal 0, params.size
+    qs = nil
+    params = CgiUtils.parse_query_string(qs)
+    assert_equal 0, params.size
+    qs = 'name=tml;arr[]=1;arr[]=2;arr[]=3'
+    params = CgiUtils.parse_query_string(qs)
+    assert_equal 2, params.size
+    arr = params['arr']
+    assert_equal Array, arr.class
+    assert_equal 3, arr.size
+  end
-	def test_parse_cookies
-		context = OpenStruct.new
-		context.env = {}
-		context.env['HTTP_COOKIE'] = 'nsid=123; nauth=gmosx:passwd'
-		CgiUtils.parse_cookies(context)
-		assert_equal 2, context.cookies.size
-		assert_equal '123', context.cookies['nsid']
-		context.env = {}
-		context.env['HTTP_COOKIE'] = 'nsid=123; nsid=23123'
-		cookies = CgiUtils.parse_cookies(context)
-		assert_equal 1, context.cookies.size
-		assert_equal "123" + "\0" + "23123", context.cookies['nsid']
-	end
+  def test_parse_cookies
+    context = OpenStruct.new
+    context.env = {}
+    context.env['HTTP_COOKIE'] = 'nsid=123; nauth=gmosx:passwd'
+    CgiUtils.parse_cookies(context)
+    assert_equal 2, context.cookies.size
+    assert_equal '123', context.cookies['nsid']
+    context.env = {}
+    context.env['HTTP_COOKIE'] = 'nsid=123; nsid=23123'
+    cookies = CgiUtils.parse_cookies(context)
+    assert_equal 1, context.cookies.size
+    assert_equal "123" + "\0" + "23123", context.cookies['nsid']
+  end
-	def test_response_headers
-		ctx = OpenStruct.new
-		ctx.status = 200
-		ctx.response_cookies = {
-			'nsid' => Cookie.new('nsid', '1233'),
-			'nauth' => Cookie.new('nauth', 'gmosx')
-		}
-		ctx.response_headers = {
-			'Content-Type' => 'text/html'
-		}
+  def test_response_headers
+    ctx = OpenStruct.new
+    ctx.status = 200
+    ctx.response_cookies = {
+      'nsid' => Cookie.new('nsid', '1233'),
+      'nauth' => Cookie.new('nauth', 'gmosx')
+    }
+    ctx.response_headers = {
+      'Content-Type' => 'text/html'
+    }
-		res = "Status: 200 OK\r\nContent-Type: text/html\r\nSet-Cookie: nauthnauth=gmosx; Path=/\r\nSet-Cookie: nsidnsid=1233; Path=/\r\n\r\n"
-		assert_equal res, CgiUtils.response_headers(ctx)
-	end
+    res = "Status: 200 OK\r\nContent-Type: text/html\r\nSet-Cookie: nauthnauth=gmosx; Path=/\r\nSet-Cookie: nsidnsid=1233; Path=/\r\n\r\n"
+    assert_equal res, CgiUtils.response_headers(ctx)
+  end
 =begin
-	def test_parse_multipart
-		context = OpenStruct.new
-		context.in = File.open(File.join(File.dirname(__FILE__), 'raw_post1.bin'))
-		context.headers = { 'CONTENT_LENGTH' => 11963 }
-		boundary = '---------------------------277124474474241471962886717'
-		CgiUtils.parse_multipart(context, boundary)
-	end
+  def test_parse_multipart
+    context = OpenStruct.new
+    context.in = File.open(File.join(File.dirname(__FILE__), 'raw_post1.bin'))
+    context.headers = { 'CONTENT_LENGTH' => 11963 }
+    boundary = '---------------------------277124474474241471962886717'
+    CgiUtils.parse_multipart(context, boundary)
+  end
 =end
 end

data/test/nitro/adapter/tc_webrick.rb CHANGED Viewed

@@ -6,9 +6,9 @@ require 'ostruct'
 require 'nitro/adapter/webrick'
 class TC_AdaptersWebrick < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	def test_adaptor
-	end
+  include Nitro
+  def test_adaptor
+  end
 end

data/test/nitro/mixin/tc_pager.rb CHANGED Viewed

@@ -5,31 +5,31 @@ require 'test/unit'
 require 'nitro/mixin/pager'
 class TC_Pager < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	include Nitro::PagerMixin
+  include Nitro
+  include Nitro::PagerMixin
-	class RequestMock < Hash
-		attr_accessor :query
-		def initialize
-			@query = {}
-		end
-		def get(k, default)
-			return self[k] || default
-		end
-	end
-	def request
-		RequestMock.new
-	end
-	def test_all
-		stuff = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+  class RequestMock < Hash
+    attr_accessor :query
+    def initialize
+      @query = {}
+    end
+    def get(k, default)
+      return self[k] || default
+    end
+  end
+  def request
+    RequestMock.new
+  end
+  def test_all
+    stuff = [1, 2, 3, 4, 5, 6, 7, 8, 9]
-		items, pager = paginate(stuff, :per_page => 2)
-		assert_equal 2, items.size
-		assert_equal 9, pager.total_count
-	end
+    items, pager = paginate(stuff, :per_page => 2)
+    assert_equal 2, items.size
+    assert_equal 9, pager.total_count
+  end
 end

data/test/nitro/mixin/tc_rss.rb ADDED Viewed

@@ -0,0 +1,24 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require 'test/unit'
+require 'nitro/mixin/rss'
+class TC_RssMixin < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+  include RssMixin
+  Blog = Struct.new(:title, :body, :to_href)
+  def test_render
+    blogs = []
+    blogs << Blog.new('Hello1', 'World1', 'uri1');
+    blogs << Blog.new('Hello2', 'World2', 'uri2');
+    blogs << Blog.new('Hello3', 'World3', 'uri3');
+    rss = build_rss(blogs, :link => 'http://www.navel.gr')
+    assert_match %r{<link>http://www.navel.gr/uri1</link>}, rss
+    assert_match %r{<link>http://www.navel.gr/uri2</link>}, rss
+  end
+end

data/test/nitro/mixin/tc_table.rb ADDED Viewed

@@ -0,0 +1,31 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require 'test/unit'
+require 'nitro/mixin/table'
+class TC_TableMixin < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+  include TableMixin
+  User = Struct.new(:name, :password, :email)
+  def setup
+    @headers = %w{Name Password Email}
+    @users = [
+      User.new('gmosx', 'huh?', 'gm@nowhere.com'),
+      User.new('renos', 'nah', 'renos@nowhere.com'),
+      User.new('stella', 'hoh', 'stella@love.com')
+    ]
+  end
+  def teardown
+    @users = nil
+  end
+  def test_table
+    values = @users.collect { |u| [u.name, u.password, u.email] }
+    table = build_table(:id => 'test', :headers => @headers, :values => values)
+    res = %|<table id="test"><tr><th>Name</th><th>Password</th><th>Email</th></tr><tr><td>gmosx</td><td>huh?</td><td>gm@nowhere.com</td></tr><tr><td>renos</td><td>nah</td><td>renos@nowhere.com</td></tr><tr><td>stella</td><td>hoh</td><td>stella@love.com</td></tr></table>|
+    assert_equal res, table
+  end
+end

data/test/nitro/mixin/tc_xhtml.rb ADDED Viewed

@@ -0,0 +1,13 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require 'test/unit'
+require 'nitro/mixin/xhtml'
+class TC_XhtmlMixin < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+  include XhtmlMixin
+  def test_all
+  end
+end

data/test/nitro/tc_caching.rb CHANGED Viewed

@@ -5,15 +5,15 @@ require 'test/unit'
 require 'nitro/caching'
 class TC_Caching < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	class DummyCa
-		include Nitro::Caching
-	end
+  include Nitro
+  class DummyCa
+    include Nitro::Caching
+  end
-	def test_all
-		# bug:
-		assert_equal [], Caching.public_instance_methods
-		assert_equal [], DummyCa.public_instance_methods.grep(/caching/)
-	end
+  def test_all
+    # bug:
+    assert_equal [], Caching.public_instance_methods
+    assert_equal [], DummyCa.public_instance_methods.grep(/caching/)
+  end
 end