nitro 0.25.0 → 0.26.0

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

@@ -1,12 +1,6 @@
-<SystemPage name="System">
-
-  <style>
-    th {
-      border: 1px solid #ccc;
-      background: #eee;
-      text-align: left;
-    }
-  </style>
+<SystemPage>
+  <?r base = "#{@base}/%base%" ?>
+  <h1><a href='/'>Home</a> > System</h1>
   
   <h2>Og managed classes</h2>
   
@@ -14,12 +8,15 @@
     <tr>
       <th>Class</th>
       <th>Count</th>
+      <th colspan="2">Cleanup</th>
       <th>Properties</th>
     </tr>
   <?r for c in @classes ?>
     <tr>
-      <td><a href="#@base/#{c.name.plural.underscore}">#{c.name}</a></td>
+      <td><a href="#@base/#{c.name.plural.underscore}/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>
       <td width="100%">#{c.properties.values.join(', ')}</td>
     </tr>
   <?r end ?>
@@ -43,5 +40,4 @@
     </tr>
   <?r end ?>
   </table>
-  
-</SystemPage>
+</SystemPage>  

data/test/nitro/caching/tc_stores.rb

@@ -0,0 +1,17 @@
+$:.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>

data/test/nitro/tc_caching.rb

@@ -13,10 +13,7 @@ class TC_Caching < Test::Unit::TestCase # :nodoc: all
 
   def test_all
     # bug:
-    #--
-    # FIXME: no module_options should be here!!
-    #++
-    assert_equal ['module_options'], Caching.public_instance_methods
+    assert_equal [], Caching.public_instance_methods
     assert_equal [], DummyCa.public_instance_methods.grep(/caching/)
   end
 end

data/test/nitro/tc_dispatcher.rb

@@ -3,11 +3,20 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 require 'test/unit'
 
 require 'nitro'
-require 'nitro/dispatcher/general'
 
 class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
   include Nitro
 
+  Template.root = File.expand_path(File.join('..', 'public'))
+
+  class MyContext
+    attr_accessor :headers
+    
+    def initialize
+      @headers = {}
+    end
+  end
+  
   class MainController < Controller
   end
 
@@ -26,10 +35,12 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
       # FIXME: this is a hack!
       'xml:blog' => BlogController
     })
+    
+    @ctx = MyContext.new
   end
   
   def teardown
-    @d = @dxml = nil
+    @d = @dxml = @ctx = nil
   end
 
   def test_initialize
@@ -38,29 +49,30 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
   end
   
   def test_dispatch
-    klass, action = @d.dispatch('/blog/list')
+    klass, action = @d.dispatch('/blog/list', @ctx)
     assert_equal BlogController, klass
     assert_equal 'list_action', action
     
-    klass, action = @d.dispatch('/blog/another/very_litle/list')
+    klass, action = @d.dispatch('/blog/another/very_litle', @ctx)
     assert_equal BlogController, klass
-    assert_equal 'another__very_litle__list_action', action
-    
-    klass, action = @d.dispatch('/another/litle/list')
+    assert_equal 'another__very_litle_action', action
+=begin
+    klass, action = @d.dispatch('/another/litle/list', @ctx)
     assert_equal MainController, klass
     assert_equal 'another__litle__list_action', action
     
-    klass, action = @d.dispatch('/blog')
+    klass, action = @d.dispatch('/blog', @ctx)
     assert_equal BlogController, klass
     assert_equal 'index_action', action
     
-    klass, action, ctype = @d.dispatch('/login')
+    klass, action, ctype = @d.dispatch('/login', @ctx)
     assert_equal MainController, klass
     assert_equal 'login_action', action
     
-    klass, action = @d.dispatch('/')
+    klass, action = @d.dispatch('/', @ctx)
     assert_equal MainController, klass
     assert_equal 'index_action', action
+=end
   end
 
 end

data/test/nitro/tc_element.rb

@@ -2,7 +2,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
 require 'test/unit'
 
-require 'nitro/element'
+require 'nitro/compiler/elements'
 
 include Nitro
 

data/test/nitro/tc_session.rb

@@ -5,11 +5,14 @@ $NITRO_NO_ENVIRONMENT = true
 require 'ostruct'
 require 'test/unit'
 
+require 'glue'
 require 'nitro/session'
 
 class TC_Session < Test::Unit::TestCase # :nodoc: all
   include Nitro
 
+  STORES = [:memory, :file, :og]
+
   def test_create_id
     sid = Session.new.session_id
     assert_not_equal sid, Session.new.session_id
@@ -20,17 +23,26 @@ class TC_Session < Test::Unit::TestCase # :nodoc: all
   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
+    STORES.each do |store_type|
+      Session.store_type = store_type
+      
+      if store_type == :og
+        Og.setup(:store => :sqlite, :name => "/tmp/test", :destroy => true)
+      end
+      
+      Session.keepalive = 2
+      
+      Session.store[1] = Session.new
+      Session.store[2] = Session.new
+      
+      Session.store.gc!
+      assert_equal 2, Session.store.all.size
+      Session.store.gc!
+      assert_equal 2, Session.store.all.size
+      sleep(3)
+      Session.store.gc!    
+      assert_equal 0, Session.store.all.size
+    end
   end
   
 end

data/test/public/blog/another/very_litle/index.xhtml

@@ -0,0 +1 @@
+<html>hello</html>

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.25.0
-date: 2005-11-17
-summary: Everyhting you need to create Web 2.0 applications with Ruby and Javascript
+  version: 0.26.0
+date: 2005-12-21
+summary: Everything you need to create Web 2.0 applications with Ruby and Javascript
 require_paths: 
   - lib
 email: gm@navel.gr
@@ -55,8 +55,10 @@ files:
   - doc/MIGRATION
   - doc/RELEASES
   - doc/tutorial.txt
+  - lib/glue
   - lib/nitro
   - lib/nitro.rb
+  - lib/glue/sweeper.rb
   - lib/nitro/adapter
   - lib/nitro/caching
   - lib/nitro/caching.rb
@@ -66,7 +68,6 @@ files:
   - lib/nitro/compiler.rb
   - lib/nitro/context.rb
   - lib/nitro/controller.rb
-  - lib/nitro/dispatcher
   - lib/nitro/dispatcher.rb
   - lib/nitro/element
   - lib/nitro/element.rb
@@ -76,7 +77,7 @@ files:
   - lib/nitro/render.rb
   - lib/nitro/routing.rb
   - lib/nitro/scaffold
-  - lib/nitro/scaffold.rb
+  - lib/nitro/scaffolding.rb
   - lib/nitro/server
   - lib/nitro/server.rb
   - lib/nitro/service
@@ -101,6 +102,7 @@ files:
   - lib/nitro/cgi/response.rb
   - lib/nitro/cgi/stream.rb
   - lib/nitro/cgi/utils.rb
+  - lib/nitro/compiler/cleanup.rb
   - lib/nitro/compiler/css.rb
   - lib/nitro/compiler/elements.rb
   - lib/nitro/compiler/errors.rb
@@ -108,23 +110,27 @@ files:
   - lib/nitro/compiler/localization.rb
   - lib/nitro/compiler/markup.rb
   - lib/nitro/compiler/morphing.rb
+  - lib/nitro/compiler/script_generator.rb
   - lib/nitro/compiler/shaders.rb
   - lib/nitro/compiler/squeeze.rb
   - lib/nitro/compiler/xslt.rb
-  - lib/nitro/dispatcher/general.rb
-  - lib/nitro/dispatcher/nice.rb
   - lib/nitro/element/java_script.rb
   - lib/nitro/helper/benchmark.rb
   - lib/nitro/helper/buffer.rb
   - lib/nitro/helper/debug.rb
   - lib/nitro/helper/default.rb
+  - lib/nitro/helper/dojo.rb
+  - lib/nitro/helper/form
   - lib/nitro/helper/form.rb
   - lib/nitro/helper/javascript.rb
   - lib/nitro/helper/pager.rb
+  - lib/nitro/helper/prototype.rb
   - lib/nitro/helper/rss.rb
+  - lib/nitro/helper/scriptaculous.rb
   - lib/nitro/helper/table.rb
   - lib/nitro/helper/xhtml.rb
   - lib/nitro/helper/xml.rb
+  - lib/nitro/helper/form/controls.rb
   - lib/nitro/scaffold/relations.rb
   - lib/nitro/server/runner.rb
   - lib/nitro/service/xmlrpc.rb
@@ -132,6 +138,7 @@ files:
   - lib/nitro/session/drbserver.rb
   - lib/nitro/session/file.rb
   - lib/nitro/session/memory.rb
+  - lib/nitro/session/og.rb
   - lib/nitro/test/assertions.rb
   - lib/nitro/test/context.rb
   - lib/nitro/test/testcase.rb
@@ -145,12 +152,10 @@ files:
   - proto/public/cgi.rb
   - proto/public/error.xhtml
   - proto/public/fcgi.rb
-  - proto/public/index.xhtml
   - proto/public/js
   - proto/public/media
   - proto/public/robots.txt
   - proto/public/scaffold
-  - proto/public/settings.xhtml
   - proto/public/js/behaviour.js
   - proto/public/js/builder.js
   - proto/public/js/controls.js
@@ -158,7 +163,6 @@ files:
   - proto/public/js/dragdrop.js
   - proto/public/js/effects.js
   - proto/public/js/prototype.js
-  - proto/public/js/scaffold.js
   - proto/public/js/scriptaculous.js
   - proto/public/js/slider.js
   - proto/public/js/unittest.js
@@ -166,8 +170,10 @@ files:
   - proto/public/media/nitro.png
   - proto/public/scaffold/edit.xhtml
   - proto/public/scaffold/form.xhtml
+  - proto/public/scaffold/index.xhtml
   - proto/public/scaffold/list.xhtml
   - proto/public/scaffold/new.xhtml
+  - proto/public/scaffold/search.xhtml
   - proto/public/scaffold/view.xhtml
   - proto/script/benchmark
   - proto/script/runner
@@ -179,13 +185,16 @@ files:
   - src/part/admin.rb
   - src/part/admin/controller.rb
   - src/part/admin/skin.rb
+  - src/part/admin/system.css
   - src/part/admin/template
   - src/part/admin/template/denied.xhtml
   - src/part/admin/template/index.xhtml
   - test/nitro
   - test/public
   - test/nitro/adapter
+  - test/nitro/caching
   - test/nitro/cgi
+  - test/nitro/compiler
   - test/nitro/helper
   - test/nitro/tc_caching.rb
   - test/nitro/tc_cgi.rb
@@ -199,9 +208,9 @@ files:
   - test/nitro/tc_render.rb
   - test/nitro/tc_server.rb
   - test/nitro/tc_session.rb
-  - test/nitro/ui
   - test/nitro/adapter/raw_post1.bin
   - test/nitro/adapter/tc_webrick.rb
+  - test/nitro/caching/tc_stores.rb
   - test/nitro/cgi/tc_cookie.rb
   - test/nitro/cgi/tc_request.rb
   - test/nitro/helper/tc_pager.rb
@@ -210,14 +219,19 @@ files:
   - test/nitro/helper/tc_xhtml.rb
   - test/public/blog
   - test/public/dummy_mailer
+  - test/public/blog/another
   - test/public/blog/inc1.xhtml
   - test/public/blog/inc2.xhtml
   - test/public/blog/list.xhtml
+  - test/public/blog/another/very_litle
+  - test/public/blog/another/very_litle/index.xhtml
   - test/public/dummy_mailer/registration.xhtml
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []
-executables: []
+executables: 
+  - nitro
+  - nitrogen
 extensions: []
 requirements: []
 dependencies: 
@@ -229,7 +243,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.25.0
+            version: 0.26.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: gen
@@ -239,7 +253,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.25.0
+            version: 0.26.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: glue
@@ -249,7 +263,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.25.0
+            version: 0.26.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: RedCloth

data/lib/nitro/dispatcher/general.rb

@@ -1,62 +0,0 @@
-require 'nitro/dispatcher'
-
-module Nitro
-
-# Specialize the Dispatcher to handle general urls. This is 
-# useful for PHP/ASP style programming.
-
-class Dispatcher
-  
-  # An alternative dispatching algorithm that handles
-  # general urls. Action containing '/' separators look for
-  # templates in subdirectories. The '/' char is converted
-  # to '__' to find the actual action.
-  
-  def dispatch(path, context = nil)
-    path = route(path, context)
-
-    parts = path.split('/')
-    parts.shift
-
-    case parts.size
-      when 0
-        # / -> root.index
-        base = '/' 
-        klass = controller_class_for(base)
-        action = 'index'
-      
-      when 1 
-        base = "/#{parts[0]}"
-        if klass = controller_class_for(base)
-          # controller/ -> controller.index
-          action = 'index'
-        else
-          # action/ -> root.action
-          base = '/'
-          klass = controller_class_for(base)
-          action = parts[0]
-        end
-        
-      else
-        base = "/#{parts[0]}"
-        if klass = controller_class_for(base)
-          # controller/action -> controller.action
-          parts.shift
-          action = parts.join('__')
-        else
-          # action/ -> root.action
-          base = '/'
-          klass = controller_class_for(base)
-          action = parts.join('__')
-        end
-    end
-
-    return klass, "#{action}_action", base
-  end
-end
-
-Dispatcher.mode = :general
-
-end
-
-# * George Moschovitis <gm@navel.gr>