nitro 0.22.0 → 0.23.0

data/proto/public/js/cookies.js

@@ -0,0 +1,122 @@
+// From Typo (http://www.leetsoft.com)
+
+/**
+ * Sets a Cookie with the given name and value.
+ *
+ * name       Name of the cookie
+ * value      Value of the cookie
+ * [expires]  Expiration date of the cookie (default: end of current session)
+ * [path]     Path where the cookie is valid (default: path of calling document)
+ * [domain]   Domain where the cookie is valid
+ *              (default: domain of calling document)
+ * [secure]   Boolean value indicating if the cookie transmission requires a
+ *              secure transmission
+ */
+function setCookie(name, value, expires, path, domain, secure) {
+  document.cookie= name + "=" + escape(value) +
+    ((expires) ? "; expires=" + expires.toGMTString() : "") +
+    ((path) ? "; path=" + path : "") +
+    ((domain) ? "; domain=" + domain : "") +
+    ((secure) ? "; secure" : "");
+}
+
+/**
+ * Gets the value of the specified cookie.
+ *
+ * name  Name of the desired cookie.
+ *
+ * Returns a string containing value of specified cookie,
+ *   or null if cookie does not exist.
+ */
+function getCookie(name) {
+  var dc = document.cookie;
+  var prefix = name + "=";
+  var begin = dc.indexOf("; " + prefix);
+  if (begin == -1) {
+    begin = dc.indexOf(prefix);
+    if (begin != 0) return null;
+  } else {
+    begin += 2;
+  }
+  var end = document.cookie.indexOf(";", begin);
+  if (end == -1) {
+    end = dc.length;
+  }
+  return unescape(dc.substring(begin + prefix.length, end));
+}
+
+/**
+ * Deletes the specified cookie.
+ *
+ * name      name of the cookie
+ * [path]    path of the cookie (must be same as path used to create cookie)
+ * [domain]  domain of the cookie (must be same as domain used to create cookie)
+ */
+function deleteCookie(name, path, domain) {
+  if (getCookie(name)) {
+    document.cookie = name + "=" + 
+      ((path) ? "; path=" + path : "") +
+      ((domain) ? "; domain=" + domain : "") +
+      "; expires=Thu, 01-Jan-70 00:00:01 GMT";
+  }
+}
+/**
+ * Sets a Cookie with the given name and value.
+ *
+ * name       Name of the cookie
+ * value      Value of the cookie
+ * [expires]  Expiration date of the cookie (default: end of current session)
+ * [path]     Path where the cookie is valid (default: path of calling document)
+ * [domain]   Domain where the cookie is valid
+ *              (default: domain of calling document)
+ * [secure]   Boolean value indicating if the cookie transmission requires a
+ *              secure transmission
+ */
+function setCookie(name, value, expires, path, domain, secure) {
+  document.cookie= name + "=" + escape(value) +
+    ((expires) ? "; expires=" + expires.toGMTString() : "") +
+    ((path) ? "; path=" + path : "") +
+    ((domain) ? "; domain=" + domain : "") +
+    ((secure) ? "; secure" : "");
+}
+
+/**
+ * Gets the value of the specified cookie.
+ *
+ * name  Name of the desired cookie.
+ *
+ * Returns a string containing value of specified cookie,
+ *   or null if cookie does not exist.
+ */
+function getCookie(name) {
+  var dc = document.cookie;
+  var prefix = name + "=";
+  var begin = dc.indexOf("; " + prefix);
+  if (begin == -1) {
+    begin = dc.indexOf(prefix);
+    if (begin != 0) return null;
+  } else {
+    begin += 2;
+  }
+  var end = document.cookie.indexOf(";", begin);
+  if (end == -1) {
+    end = dc.length;
+  }
+  return unescape(dc.substring(begin + prefix.length, end)).split("+").join(" ");
+}
+
+/**
+ * Deletes the specified cookie.
+ *
+ * name      name of the cookie
+ * [path]    path of the cookie (must be same as path used to create cookie)
+ * [domain]  domain of the cookie (must be same as domain used to create cookie)
+ */
+function deleteCookie(name, path, domain) {
+  if (getCookie(name)) {
+    document.cookie = name + "=" + 
+      ((path) ? "; path=" + path : "") +
+      ((domain) ? "; domain=" + domain : "") +
+      "; expires=Thu, 01-Jan-70 00:00:01 GMT";
+  }
+}

data/proto/public/scaffold/edit.xhtml

@@ -0,0 +1,4 @@
+<SystemPage name="Edit %name%">
+  <h2><a href="#@base/%name_plural%">List of %name_plural%</a></h2>
+  #{form_for(@%name%)}
+</SystemPage>

data/proto/public/scaffold/form.xhtml

@@ -0,0 +1,7 @@
+<SystemPage name="Edit %name%">
+  <h2><a href="#@base/%name_plural%">List of %name_plural%</a></h2>
+  <?r if errors = session[:ERRORS] ?>
+    <span class="errors">ERRORS</span>
+  <?r end ?>
+  #{form_for(@%name%)}
+</SystemPage>

data/proto/public/scaffold/list.xhtml

@@ -0,0 +1,15 @@
+<SystemPage name="List of %list_name%">
+  <h2><a href="#@base/new_%name%">New %name%</a></h2>
+  <table>
+  <?r for obj in @%list_name% ?>
+    <tr>
+      <td width="100%">#{obj.to_s}</td>
+      <?r if obj.respond_to?(:update_time) ?>
+        <td nowrap="1">#{obj.update_time.stamp(:db)}</td>
+      <?r end ?>
+      <td><a href="#@base/edit_%name%/#{obj.oid}">edit</a></td>
+      <td><a href="#@base/delete_%name%/#{obj.oid}">del</a></td>
+    </tr>
+  <?r end ?>
+  </table>
+</SystemPage>

data/proto/public/scaffold/new.xhtml

@@ -0,0 +1,4 @@
+<SystemPage name="Edit %name%">
+  <h2><a href="#@base/%name_plural%">List of %name_plural%</a></h2>
+  #{form_for(@%name%)}
+</SystemPage>

data/proto/script/benchmark

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+if ARGV.empty?
+  puts "Usage: benchmark times 'Article.expensive_method' 'Article.another_expensive_method' ..."
+  exit 
+end
+
+require File.dirname(__FILE__) + '/../config/environment'
+require 'benchmark'
+include Benchmark
+
+# Don't include compilation in the benchmark
+ARGV[1..-1].each { |expression| eval(expression) }
+
+bm(6) do |x|
+  ARGV[1..-1].each_with_index do |expression, idx|
+    x.report("##{idx + 1}") { ARGV[0].to_i.times { eval(expression) } }
+  end
+end 

data/test/nitro/adapter/tc_cgi.rb

@@ -1,5 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
+require 'nano/object/assign_with'
+
 require 'socket'
 require 'ostruct'
 require 'test/unit'
@@ -7,9 +9,14 @@ require 'test/unit'
 require 'nitro/cookie'
 require 'nitro/adapter/cgi'
 
-class TC_AdaptersCgi < Test::Unit::TestCase # :nodoc: all
+class TestAdapterCgi < Test::Unit::TestCase # :nodoc: all
   include Nitro
-  
+
+  class User 
+    attr_accessor :name
+    attr_accessor :password
+  end
+    
   def test_parse_query_parameters
     qs = 'name=tml;id=12354'
     params = CgiUtils.parse_query_string(qs)
@@ -30,6 +37,29 @@ class TC_AdaptersCgi < Test::Unit::TestCase # :nodoc: all
     arr = params['arr']
     assert_equal Array, arr.class
     assert_equal 3, arr.size
+    
+    qs = 'other=1;user.name=gmosx;user.password=hello'
+    params = CgiUtils.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']
+
+    user = User.new
+    user.assign_with(params['user'])
+    assert_equal 'gmosx', user.name
+    assert_equal 'hello', user.password
+
+    # Ruby/Scriptaculous compatibility.
+        
+    qs = 'other=1;user[name]=gmosx;user[password]=hello'
+    params = CgiUtils.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
 
   def test_parse_cookies

data/test/nitro/mixin/tc_xhtml.rb

@@ -9,5 +9,11 @@ class TC_XhtmlMixin < Test::Unit::TestCase # :nodoc: all
 
   def test_all
   end
+  
+  def test_popup
+    res = popup :text => 'Pop', :url => 'add-comment', :scrollbars => true
+    exp = %{<a href="#" onclick="javascript: var pwl = (screen.width - 320) / 2; var pwt = (screen.height - 240) / 2; window.open('add-comment', 'Popup', 'width=320,height=240,top='+pwt+',left='+pwl+', resizable=noscrollbars=yes'); return false;"">Pop</a>}
+    assert_equal exp, res    
+  end
 
 end

data/test/nitro/tc_dispatcher.rb

@@ -61,23 +61,6 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
     klass, action = @d.dispatch('/')
     assert_equal MainController, klass
     assert_equal 'index_action', action
-
-=begin
-    # gmosx: this functionality is deprecated. Use multiple
-    # controller to define multiple apis.
-      
-    # multi-api dispatcher. 
-
-    # no xml prefix, use xhtml api.
-    klass, action = @dxml.dispatch('/blog/list')
-    assert_equal BlogController, klass
-    assert_equal 'list_action', action
-
-    # xml prefix, use xml api.
-    klass, action = @dxml.dispatch('/xml:blog/list')
-    assert_equal BlogController, klass
-    assert_equal 'list_action', action
-=end
   end
 
 end

data/test/nitro/tc_render.rb

@@ -0,0 +1,58 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'nitro'
+require 'nitro/render'
+require 'glue/mock'
+
+class TestRender < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+
+  class ContextMock < Mock
+    mock :response_headers, {}
+    mock :host_url, 'http://www.nitrohq.com'
+  end
+  
+  class TestController
+    include Nitro::Render
+  end
+  
+  def setup
+    ctx =  ContextMock.new
+    @controller = TestController.new(ContextMock.new, '/base')
+  end
+  
+  def teardown
+    @controller = nil
+  end
+  
+  def test_redirect
+    # relative url, the controller base_url is prepended
+    redirect 'hello'
+    assert_equal 'http://www.nitrohq.com/base/hello', @controller.context.response_headers['location']
+    
+    # absolute url, use as is.
+    redirect '/main'
+    assert_equal 'http://www.nitrohq.com/main', @controller.context.response_headers['location']
+
+    # http://, use as is.
+    redirect 'http://www.gmosx.com/info'
+    assert_equal 'http://www.gmosx.com/info', @controller.context.response_headers['location']
+
+    # bug.
+    redirect 'edit/Home'
+    assert_equal 'http://www.nitrohq.com/base/edit/Home', @controller.context.response_headers['location']
+    
+    @controller.base = nil
+    redirect 'edit/Home'
+    assert_equal 'http://www.nitrohq.com/edit/Home', @controller.context.response_headers['location']    
+  end
+  
+  def redirect(*args)
+    begin
+      @controller.send :redirect, *args
+    rescue Nitro::RenderExit
+    end
+  end
+end

data/test/nitro/tc_server.rb

@@ -1,5 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
+$NITRO_NO_ENVIRONMENT = true
+
 require 'test/unit'
 
 require 'nitro/server'

data/test/nitro/tc_session.rb

@@ -1,5 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
+$NITRO_NO_ENVIRONMENT = true
+
 require 'ostruct'
 require 'test/unit'
 
@@ -17,4 +19,18 @@ class TC_Session < Test::Unit::TestCase # :nodoc: all
     assert_not_equal sid, Session.new.session_id
   end
 
+  def test_gc
+    Session.keepalive = 2
+    
+    Session.store[1] = Session.new
+    Session.store[2] = Session.new
+    
+    assert_equal 2, Session.store.values.size
+    Session.gc!
+    assert_equal 2, Session.store.values.size
+    sleep(3)
+    Session.gc!    
+    assert_equal 0, Session.store.values.size
+  end
+  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.22.0
-date: 2005-08-07 00:00:00 +03:00
+  version: 0.23.0
+date: 2005-08-31 00:00:00 +03:00
 summary: Nitro Web Engine
 require_paths: 
   - lib
@@ -30,156 +30,175 @@ cert_chain:
 authors: 
   - George Moschovitis
 files: 
-  - CHANGELOG
   - Rakefile
-  - INSTALL
   - README
+  - INSTALL
+  - CHANGELOG
   - install.rb
   - bin/nitrogen
   - bin/nitro
-  - benchmark/tiny-webrick-n-200-c-5.txt
-  - benchmark/tiny-webrick-n-200.txt
-  - benchmark/bench.rb
   - benchmark/tiny2-webrick-n-200.txt
-  - benchmark/tiny-lhttpd-n-200-c-5.txt
+  - benchmark/tiny-webrick-n-200.txt
   - benchmark/static-webrick-n-200.txt
   - benchmark/simple-webrick-n-200.txt
+  - benchmark/tiny-webrick-n-200-c-5.txt
+  - benchmark/tiny-lhttpd-n-200-c-5.txt
+  - benchmark/bench.rb
   - examples/README
-  - doc/architecture.txt
-  - doc/apache.txt
   - doc/tutorial.txt
-  - doc/LICENSE
-  - doc/RELEASES
-  - doc/config.txt
   - doc/faq.txt
-  - doc/AUTHORS
-  - doc/CHANGELOG.1
-  - doc/CHANGELOG.2
+  - doc/config.txt
   - doc/bugs.txt
+  - doc/architecture.txt
+  - doc/apache.txt
+  - doc/RELEASES
   - doc/MIGRATION
-  - proto/log
+  - doc/LICENSE
+  - doc/CHANGELOG.2
+  - doc/CHANGELOG.1
+  - doc/AUTHORS
+  - doc/CHANGELOG.3
   - proto/conf
   - proto/doc
+  - proto/log
   - proto/public
+  - proto/script
   - proto/src
   - proto/run.rb
   - proto/README
-  - proto/script
   - proto/conf/lhttpd.conf
   - proto/conf/apache.conf
   - proto/doc/README
+  - proto/public/js
   - proto/public/media
   - proto/public/scaffold
-  - proto/public/js
   - proto/public/settings.xhtml
+  - proto/public/robots.txt
   - proto/public/index.xhtml
-  - proto/public/cgi.rb
-  - proto/public/error.xhtml
   - proto/public/fcgi.rb
-  - proto/public/robots.txt
-  - proto/public/media/nitro.png
+  - proto/public/error.xhtml
+  - proto/public/cgi.rb
   - proto/public/js/prototype.js
+  - proto/public/js/effects.js
   - proto/public/js/dragdrop.js
-  - proto/public/js/behaviour.js
+  - proto/public/js/cookies.js
   - proto/public/js/controls.js
-  - proto/public/js/effects.js
+  - proto/public/js/behaviour.js
+  - proto/public/media/nitro.png
+  - proto/public/scaffold/view.xhtml
+  - proto/public/scaffold/new.xhtml
+  - proto/public/scaffold/list.xhtml
+  - proto/public/scaffold/form.xhtml
+  - proto/public/scaffold/edit.xhtml
   - proto/script/runner
+  - proto/script/benchmark
   - lib/nitro
+  - lib/part
   - lib/nitro.rb
-  - lib/nitro/server
-  - 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/dispatcher.rb
-  - lib/nitro/context.rb
+  - lib/nitro/compiler
   - lib/nitro/dispatcher
-  - lib/nitro/request.rb
+  - lib/nitro/element
   - lib/nitro/mixin
-  - lib/nitro/caching.rb
+  - lib/nitro/scaffold
+  - lib/nitro/server
+  - lib/nitro/service
+  - lib/nitro/session
+  - lib/nitro/test
   - lib/nitro/test.rb
-  - lib/nitro/compiler
-  - lib/nitro/cookie.rb
-  - lib/nitro/render.rb
   - lib/nitro/session.rb
+  - lib/nitro/service.rb
+  - lib/nitro/server.rb
+  - lib/nitro/scaffold.rb
   - lib/nitro/routing.rb
   - lib/nitro/response.rb
-  - lib/nitro/element.rb
-  - lib/nitro/service.rb
-  - lib/nitro/service
+  - lib/nitro/request.rb
+  - lib/nitro/render.rb
   - lib/nitro/flash.rb
-  - lib/nitro/server.rb
+  - lib/nitro/element.rb
+  - lib/nitro/dispatcher.rb
+  - lib/nitro/cookie.rb
+  - lib/nitro/controller.rb
+  - lib/nitro/context.rb
   - lib/nitro/compiler.rb
-  - lib/nitro/server/runner.rb
-  - lib/nitro/session/drbserver.rb
-  - lib/nitro/session/drb.rb
-  - lib/nitro/session/memory.rb
+  - lib/nitro/caching.rb
   - lib/nitro/adapter/wee.rb
-  - lib/nitro/adapter/fastcgi.rb
-  - lib/nitro/adapter/cgi.rb
   - lib/nitro/adapter/webrick.rb
   - lib/nitro/adapter/scgi.rb
-  - lib/nitro/caching/invalidation.rb
+  - lib/nitro/adapter/fastcgi.rb
+  - lib/nitro/adapter/cgi.rb
   - lib/nitro/caching/stores.rb
-  - lib/nitro/caching/actions.rb
   - lib/nitro/caching/output.rb
+  - lib/nitro/caching/invalidation.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/caching/actions.rb
+  - lib/nitro/compiler/xslt.rb
+  - lib/nitro/compiler/squeeze.rb
+  - lib/nitro/compiler/shaders.rb
+  - lib/nitro/compiler/markup.rb
+  - lib/nitro/compiler/localization.rb
+  - lib/nitro/compiler/errors.rb
+  - lib/nitro/compiler/elements.rb
   - lib/nitro/dispatcher/nice.rb
   - lib/nitro/dispatcher/general.rb
-  - lib/nitro/mixin/debug.rb
+  - lib/nitro/element/java_script.rb
+  - lib/nitro/mixin/xml.rb
+  - lib/nitro/mixin/xhtml.rb
+  - lib/nitro/mixin/table.rb
+  - lib/nitro/mixin/rss.rb
   - lib/nitro/mixin/pager.rb
   - lib/nitro/mixin/markup.rb
   - lib/nitro/mixin/javascript.rb
   - lib/nitro/mixin/helper.rb
   - lib/nitro/mixin/form.rb
-  - lib/nitro/mixin/rss.rb
-  - lib/nitro/mixin/table.rb
-  - lib/nitro/mixin/xml.rb
-  - lib/nitro/mixin/xhtml.rb
+  - lib/nitro/mixin/debug.rb
   - lib/nitro/mixin/buffer.rb
-  - lib/nitro/compiler/xslt.rb
-  - lib/nitro/compiler/elements.rb
-  - lib/nitro/compiler/localization.rb
-  - lib/nitro/compiler/errors.rb
-  - lib/nitro/compiler/squeeze.rb
-  - lib/nitro/compiler/shaders.rb
-  - lib/nitro/compiler/markup.rb
+  - lib/nitro/mixin/benchmark.rb
+  - lib/nitro/scaffold/relations.rb
+  - lib/nitro/server/runner.rb
   - lib/nitro/service/xmlrpc.rb
+  - lib/nitro/session/memory.rb
+  - lib/nitro/session/drbserver.rb
+  - lib/nitro/session/drb.rb
+  - lib/nitro/test/testcase.rb
+  - lib/nitro/test/context.rb
+  - lib/nitro/test/assertions.rb
+  - lib/part/admin
+  - lib/part/admin.rb
+  - lib/part/admin/template
+  - lib/part/admin/skin.rb
+  - lib/part/admin/controller.rb
+  - lib/part/admin/template/index.xhtml
   - test/nitro
   - test/public
+  - test/nitro/adapter
   - test/nitro/mixin
   - test/nitro/ui
-  - test/nitro/adapter
-  - test/nitro/tc_controller.rb
   - test/nitro/tc_session.rb
-  - test/nitro/tc_context.rb
-  - test/nitro/tc_dispatcher.rb
-  - test/nitro/tc_element.rb
-  - test/nitro/tc_caching.rb
-  - test/nitro/tc_flash.rb
   - test/nitro/tc_server.rb
   - test/nitro/tc_request.rb
+  - test/nitro/tc_render.rb
+  - test/nitro/tc_flash.rb
+  - test/nitro/tc_element.rb
+  - test/nitro/tc_dispatcher.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
-  - test/nitro/mixin/tc_xhtml.rb
-  - test/nitro/adapter/raw_post1.bin
-  - test/nitro/adapter/tc_cgi.rb
+  - test/nitro/tc_controller.rb
+  - test/nitro/tc_context.rb
+  - test/nitro/tc_caching.rb
   - test/nitro/adapter/tc_webrick.rb
+  - test/nitro/adapter/tc_cgi.rb
+  - test/nitro/adapter/raw_post1.bin
+  - test/nitro/mixin/tc_xhtml.rb
+  - test/nitro/mixin/tc_table.rb
+  - test/nitro/mixin/tc_rss.rb
+  - test/nitro/mixin/tc_pager.rb
   - test/public/blog
   - test/public/dummy_mailer
-  - test/public/blog/inc1.xhtml
-  - test/public/blog/inc2.xhtml
   - test/public/blog/list.xhtml
+  - test/public/blog/inc2.xhtml
+  - test/public/blog/inc1.xhtml
   - test/public/dummy_mailer/registration.xhtml
 test_files: []
 rdoc_options: 
@@ -190,10 +209,10 @@ rdoc_options:
   - "--all"
   - "--inline-source"
 extra_rdoc_files: 
-  - CHANGELOG
   - Rakefile
-  - INSTALL
   - README
+  - INSTALL
+  - CHANGELOG
 executables: 
   - nitro
   - nitrogen
@@ -208,7 +227,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.22.0
+            version: 0.23.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: og
@@ -218,7 +237,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.22.0
+            version: 0.23.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: ruby-breakpoint