nitro 0.28.0 → 0.29.0

data/src/part/admin/template/index.xhtml

@@ -13,7 +13,7 @@
     </tr>
   <?r for c in @classes ?>
     <tr>
-      <td><a href="#@base/#{c.name.plural.underscore}/list">#{c.name}</a></td>
+      <td><a href="#@base/#{Scaffolding.class_to_path(c).plural}/list">#{c.name}</a></td>
       <td>#{c.count}</td>
       <td><a href="delete_all/#{c.name}" onclick="return confirm('Delete all instances?')">delete</a></td>
       <td><a href="destroy/#{c.name}" onclick="return confirm('Drop the schema?')">destroy</a></td>
@@ -31,7 +31,7 @@
       <th>Type</th>
       <th>Description</th>
     </tr>
-  <?r  for s in Configuration.settings.sort ?>
+  <?r for s in @settings ?>
     <tr>
       <td>#{s.owner}.<strong>#{s.name}</strong></td>
       <td>#{s.value.inspect}</td>

data/test/nitro/compiler/tc_compiler.rb

@@ -0,0 +1,23 @@
+require 'test/unit'
+
+require 'nitro/test/testcase'
+
+require 'nitro'
+require 'nitro/test/context'
+
+class TC_Compiler < Test::Unit::TestCase
+  class TestController < Nitro::Controller
+    def test(arg1, arg2); end
+  end
+
+  def setup
+    Server.map['/'] = TestController
+    reset_context()
+  end
+
+  def test_no_param_specified
+    assert_nothing_raised do
+      process(:uri => '/test//two')
+    end
+  end
+end

data/test/nitro/helper/tc_table.rb

@@ -28,4 +28,39 @@ class TC_TableHelper < Test::Unit::TestCase # :nodoc: all
     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
+  
+  def test_table_footer
+    values = @users.collect { |u| [u.name, u.password, u.email] }
+    footers = ["#{@users.size}users", '', '']
+    
+    table = build_table(:id => 'test2', :headers => @headers, :values => values, :footers => footers)
+    
+    res = %|<table id="test2"><thead><tr><th>Name</th><th>Password</th><th>Email</th></tr></thead><tfoot><tr><td>3users</td><td></td><td></td></tr></tfoot><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
+  
+  def test_table_tbody
+    values = []
+    values << @users[0...1].collect { |u| [u.name, u.password, u.email] }
+    values << @users[1..2].collect { |u| [u.name, u.password, u.email] }
+    table = build_table(:id => 'test', :headers => @headers, :values => values)
+    res = %|<table id="test"><thead><tr><th>Name</th><th>Password</th><th>Email</th></tr></thead><tbody><tr><td>gmosx</td><td>huh?</td><td>gm@nowhere.com</td></tr></tbody><tbody><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></tbody></table>|
+    assert_equal res, table
+  end
+  
+  def test_table_alternating_rows
+    values = @users.collect { |u| [u.name, u.password, u.email] }
+    table = build_table(:id => 'test', :headers => @headers, :values => values, :alternating_rows => true)
+    res = %|<table id="test"><tr><th>Name</th><th>Password</th><th>Email</th></tr><tr class="row_odd"><td>gmosx</td><td>huh?</td><td>gm@nowhere.com</td></tr><tr class="row_even"><td>renos</td><td>nah</td><td>renos@nowhere.com</td></tr><tr class="row_odd"><td>stella</td><td>hoh</td><td>stella@love.com</td></tr></table>|
+    assert_equal res, table
+  end
+  
+  def test_table_alternating_rows_tbody
+    values = []
+    values << @users[0...1].collect { |u| [u.name, u.password, u.email] }
+    values << @users[1..2].collect { |u| [u.name, u.password, u.email] }
+    table = build_table(:id => 'test', :headers => @headers, :values => values, :alternating_rows => true)
+    res = %|<table id="test"><thead><tr><th>Name</th><th>Password</th><th>Email</th></tr></thead><tbody><tr class="row_odd"><td>gmosx</td><td>huh?</td><td>gm@nowhere.com</td></tr></tbody><tbody><tr class="row_even"><td>renos</td><td>nah</td><td>renos@nowhere.com</td></tr><tr class="row_odd"><td>stella</td><td>hoh</td><td>stella@love.com</td></tr></tbody></table>|
+    assert_equal res, table
+  end
 end

data/test/nitro/tc_cgi.rb

@@ -148,7 +148,7 @@ class TestAdapterCgi < Test::Unit::TestCase # :nodoc: all
     start = Time.now
     params = Nitro::Cgi.parse_multipart(make_context(input), boundary)
     duration = Time.now - start
-    puts "\nparse_multipart took: #{duration} seconds\n"
+#    puts "\nparse_multipart took: #{duration} seconds\n"
     assert_equal(fake_file_a,params['test_file_a'].to_s)
     assert_equal(fake_file_b.read,params['test_file_b'].to_s)
     assert_equal(String.new,params['empty_field'].to_s)

data/test/nitro/tc_controller.rb

@@ -15,8 +15,8 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
   class Blog2Controller < Controller
     attr_reader :aqflag, :tflag
 
-    def self.template_root
-      File.expand_path(Nitro::LibPath + '../../test/public/blog')    
+    def self.setup_template_root(path)
+      @template_root << File.expand_path(File.join(Nitro::LibPath, "../test/public/#{path}"))
     end   
 
     def list
@@ -40,7 +40,7 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
     ctx.instance_eval '@session = {}'
     klass, action = ctx.dispatcher.dispatch(ctx.path, ctx)
     c = klass.new(ctx)
-
+    
     begin
       c.send(action)
     rescue RenderExit

data/test/nitro/tc_controller_aspect.rb

@@ -10,6 +10,8 @@ class TestControllerAspect < Test::Unit::TestCase # :nodoc: all
   class TestController < Controller
     attr_reader :aflag, :tflag
 
+    @template_root = []
+
     post "@aflag = 25", :on => :list
     
     def list

data/test/nitro/tc_dispatcher.rb

@@ -7,7 +7,7 @@ require 'nitro'
 class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
   include Nitro
 
-  Template.root = File.expand_path(File.join('..', 'public'))
+  Glue::Template.root = File.expand_path(File.join('..', 'public'))
 
   class MyContext
     attr_accessor :headers
@@ -21,6 +21,11 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
   end
 
   class BlogController < Controller
+    def list
+    end
+
+    def another__very_litle
+    end
   end
   
   def setup
@@ -56,6 +61,10 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
     klass, action = @d.dispatch('/blog/another/very_litle', @ctx)
     assert_equal BlogController, klass
     assert_equal 'another__very_litle_action', action
+
+    assert_raises(NoActionError) do
+      @d.dispatch('a/nonexistent/action')
+    end
 =begin
     klass, action = @d.dispatch('/another/litle/list', @ctx)
     assert_equal MainController, klass

data/test/nitro/tc_flash.rb

@@ -42,4 +42,18 @@ class TC_Flash < Test::Unit::TestCase # :nodoc: all
     c.action2
     assert_equal 'Hello world!', c.flag
   end  
+  
+  def test_push
+    f = Flashing::Flash.new
+    f.push :errors, 'Error 1'
+    f.push :errors, 'Error 2'
+    
+    assert_equal 2, f[:errors].size
+    
+    f.push :errors, [1, 2, 3]
+    
+    assert_equal 5, f[:errors].size
+    
+    assert_equal 3, f[:errors].pop
+  end
 end

data/test/nitro/tc_router.rb

@@ -0,0 +1,58 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'glue/configuration'
+require 'nitro/router'
+
+class IdController; end
+class AdminController; end
+
+class AbstractRouter
+  include Nitro::Router
+end
+
+class TC_Router < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+
+  def setup
+    @r = AbstractRouter.new
+
+    @r.add_route(%r{rewritten/url/(.*)}, :controller => IdController, :action => :register, :param => :name)
+    @r.add_route(%r{another/zelo/(.*)/(.*)}, :controller => AdminController, :action => :kick, :params => [:name, :age])
+    @r.add_route(%r{cool/(.*)_(.*).html}, :controller => AdminController, :action => :long, :params => [:name, :age])
+  end
+  
+  def teardown
+    @r = nil
+  end
+    
+  def test_decode
+    c, a, params = @r.decode_route('rewritten/url/gmosx')
+    assert_equal IdController, c   
+    assert_equal :register, a 
+    assert_equal 'gmosx', params['name']  
+    
+    c, a, params = @r.decode_route('another/zelo/gmosx/32')
+    assert_equal AdminController, c   
+    assert_equal :kick, a 
+    assert_equal 'gmosx', params['name']      
+    assert_equal '32', params['age']
+
+    c, a, params = @r.decode_route('cool/gmosx_32.html')
+    assert_equal AdminController, c   
+    assert_equal :long, a 
+    assert_equal 'gmosx', params['name']      
+    assert_equal '32', params['age']
+    
+    assert_equal false, @r.decode_route('this/doesnt/decode')      
+  end
+
+  def test_encode
+    assert_equal 'rewritten/url/gmosx', @r.encode_route(IdController, :register, :name, 'gmosx')
+    assert_equal 'cool/gmosx_32.html', @r.encode_route(AdminController, :long, :name, 'gmosx', :age, 32)
+    assert_equal false, @r.encode_route(AdminController, :invalid, :gender, 'male')
+  end
+
+end

data/test/nitro/tc_session.rb

@@ -6,13 +6,21 @@ require 'ostruct'
 require 'test/unit'
 
 require 'glue'
+require 'glue/cache/file'
 require 'nitro/session'
 
 class TC_Session < Test::Unit::TestCase # :nodoc: all
   include Nitro
 
-#   CACHES = [:memory, :file, :og]
-  CACHES = [:memory, :file]
+  CACHES = [:memory, :file, :og]
+  begin
+    require 'glue/cache/memcached'
+    Glue::MemCached.new
+    CACHES << :memcached
+  rescue Object # Errno::EBADF => e
+    Logger.warn "skipping memcached test: server not running"
+  end
+
 
   def test_create_id
     sid = Session.new.session_id
@@ -27,22 +35,31 @@ class TC_Session < Test::Unit::TestCase # :nodoc: all
     CACHES.each do |cache_type|
       Session.keepalive = 2
       
+      if :file == cache_type
+        path = File.join(File.dirname(__FILE__), '..', 'cache')
+        Glue::FileCache.basedir = path
+        FileUtils.rm_r path if File.exists? path
+      end
+
       Session.cache_type = cache_type
 
       if cache_type == :og
-        Og.setup(:store => :sqlite, :name => "/tmp/test", :destroy => true)
+        Og.setup(:store => :sqlite, :destroy => true)
+      end
+
+      sessions = (1..2).collect do
+        s = Session.new
+  s.sync
+  s
       end
-      
-      Session.cache[1] = Session.new
-      Session.cache[2] = Session.new
 
       Session.cache.gc!
-      assert_equal 2, Session.cache.all.size
+      sessions.each { |s| assert_not_nil(Session.cache[s.session_id]) }
       Session.cache.gc!
-      assert_equal 2, Session.cache.all.size
+      sessions.each { |s| assert_not_nil(Session.cache[s.session_id]) }
       sleep(3)
       Session.cache.gc!    
-      assert_equal 0, Session.cache.all.size
+      sessions.each { |s| assert_nil(Session.cache[s.session_id]) }
     end
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.28.0
-date: 2006-02-06 00:00:00 +02:00
+  version: 0.29.0
+date: 2006-03-07 00:00:00 +02:00
 summary: Everything you need to create Web 2.0 applications with Ruby and Javascript
 require_paths: 
 - lib
@@ -15,7 +15,7 @@ description:
 autorequire: 
 default_executable: 
 bindir: bin
-has_rdoc: false
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -61,6 +61,7 @@ files:
 - lib/nitro/caching
 - lib/nitro/cgi
 - lib/nitro/compiler
+- lib/nitro/part.rb
 - lib/nitro/element
 - lib/nitro/server
 - lib/nitro/service
@@ -71,7 +72,6 @@ files:
 - lib/nitro/service.rb
 - lib/nitro/server.rb
 - lib/nitro/compiler.rb
-- lib/nitro/routing.rb
 - lib/nitro/render.rb
 - lib/nitro/flash.rb
 - lib/nitro/element.rb
@@ -80,15 +80,16 @@ files:
 - lib/nitro/controller.rb
 - lib/nitro/helper
 - lib/nitro/cgi.rb
+- lib/nitro/router.rb
 - lib/nitro/caching.rb
 - lib/nitro/helper.rb
 - lib/nitro/scaffolding.rb
 - lib/nitro/adapter/scgi.rb
-- lib/nitro/adapter/mongrel.rb
 - lib/nitro/adapter/acgi.rb
 - lib/nitro/adapter/webrick.rb
 - lib/nitro/adapter/fastcgi.rb
 - lib/nitro/adapter/cgi.rb
+- lib/nitro/adapter/mongrel.rb
 - lib/nitro/caching/fragments.rb
 - lib/nitro/caching/output.rb
 - lib/nitro/caching/actions.rb
@@ -114,6 +115,7 @@ files:
 - lib/nitro/server/runner.rb
 - lib/nitro/server/drb.rb
 - lib/nitro/service/xmlrpc.rb
+- lib/nitro/session/memcached.rb
 - lib/nitro/session/memory.rb
 - lib/nitro/session/file.rb
 - lib/nitro/session/drb.rb
@@ -172,17 +174,16 @@ files:
 - test/nitro/tc_context.rb
 - test/nitro/tc_cgi.rb
 - test/nitro/tc_caching.rb
-- test/nitro/caching
-- test/nitro/tc_table.rb
+- test/nitro/tc_router.rb
 - test/nitro/adapter/tc_webrick.rb
 - test/nitro/adapter/raw_post1.bin
 - test/nitro/cgi/tc_request.rb
 - test/nitro/cgi/tc_cookie.rb
-- test/nitro/helper/tc_xhtml.rb
+- test/nitro/compiler/tc_compiler.rb
 - test/nitro/helper/tc_table.rb
+- test/nitro/helper/tc_xhtml.rb
 - test/nitro/helper/tc_rss.rb
 - test/nitro/helper/tc_pager.rb
-- test/nitro/caching/tc_stores.rb
 - test/public/blog
 - test/public/dummy_mailer
 - test/public/blog/another
@@ -252,7 +253,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.28.0
+        version: 0.29.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: gen
@@ -261,7 +262,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.28.0
+        version: 0.29.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: glue
@@ -270,7 +271,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.28.0
+        version: 0.29.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth

data/lib/nitro/routing.rb

@@ -1,41 +0,0 @@
-module Nitro
-
-# Router mixin. Typically used to generate 'nice' urls.
-# Nice urls are considered (?) more Search Engine 
-# friendly.
-#
-# However, due to the power of Nitro'w intelligent dispatching
-# mechanism, routing is almost never used!
-  
-module Router
-  
-  # The route table maps 'nice URLs' to real URLs that
-  # can be handled by the Dispatcher.
-
-  attr_accessor :routes
-  
-  # Strip the beginning of the path, used by cgi adapter.
-  
-  setting :strip_path, :default => nil, :doc => 'Strip the beginning of the path, used by cgi adapter'
-
-  # Apply routing rules to the path.
-
-  def route(path, context)
-    for rule, real_path, *params in @routes
-      if md = path.match(rule)
-        params.each_with_index do |p, idx|
-          context[p] = md.captures[idx]
-        end
-        return real_path
-      end
-    end
-
-    path.sub!(Router.strip_path, '') if Router.strip_path
-    return path
-  end
-
-end
-
-end
-
-# * George Moschovitis  <gm@navel.gr>

data/test/nitro/caching/tc_stores.rb

@@ -1,17 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib')
-
-require 'test/unit'
-
-require 'nitro/caching/stores'
-
-class TC_CachingStores < Test::Unit::TestCase # :nodoc: all
-  
-  def test_memory
-    s = Nitro::Caching::MemoryStore.new
-    s.write('test', 'hello', { :none => 1})
-    s.read('test')
-  end
-  
-end
-
-# * George Moschovitis <gm@navel.gr>