nitro 0.27.0 → 0.28.0

data/src/part/admin/controller.rb

@@ -1,9 +1,8 @@
-require 'nano/kernel/constant'
-require 'nano/time/stamp'
+require 'facet/kernel/constant'
+require 'facet/time/stamp'
 
 require 'nitro/controller'
 
-
 # Provides an automatically generated Administration
 # interface.
 

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

@@ -31,7 +31,7 @@
       <th>Type</th>
       <th>Description</th>
     </tr>
-  <?r  for s in Configuration.settings ?>
+  <?r  for s in Configuration.settings.sort ?>
     <tr>
       <td>#{s.owner}.<strong>#{s.name}</strong></td>
       <td>#{s.value.inspect}</td>

data/test/nitro/tc_cgi.rb

@@ -1,14 +1,26 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
-require 'nano/kernel/assign_with'
-
+require 'stringio'
+require 'tempfile'
 require 'socket'
 require 'ostruct'
 require 'test/unit'
 
+require 'facet/kernel/assign_with'
+
 require 'nitro/cgi'
 require 'nitro/cgi/cookie'
 
+class String
+  class << self  
+    def random(size)
+      s = String.new
+      size.times {|i| s << (Kernel.rand(26)+25) } # ascii range
+      s
+    end
+  end
+end
+
 class TestAdapterCgi < Test::Unit::TestCase # :nodoc: all
   include Nitro
 
@@ -16,7 +28,7 @@ class TestAdapterCgi < Test::Unit::TestCase # :nodoc: all
     attr_accessor :name
     attr_accessor :password
   end
-    
+     
   def test_parse_query_parameters
     qs = 'name=tml;id=12354'
     params = Cgi.parse_query_string(qs)
@@ -100,4 +112,61 @@ class TestAdapterCgi < Test::Unit::TestCase # :nodoc: all
     CgiUtils.parse_multipart(context, boundary)
   end
 =end
+
+  def test_parse_multipart
+    # MIME block close falls on read boundary, also contains an empty field.
+    boundary = "---------------------------15773515131648678014689318540"
+    closure = "#{Cgi::EOL}--#{boundary}--#{Cgi::EOL}"
+    block_size = Cgi.buffer_size
+    
+    input = StringIO.new
+    input << "--#{boundary}#{Cgi::EOL}"
+    input << "Content-Disposition: form-data; name=\"test_file_a\"; filename=\"test_case.txt\"#{Cgi::EOL}Content-Type: application/octet-stream#{Cgi::EOL}#{Cgi::EOL}"
+    fake_file_a = String.random(block_size - input.size - (closure.size/2))
+    input << fake_file_a
+    input_after_fake_file = input.size
+    input << "#{Cgi::EOL}--#{boundary}#{Cgi::EOL}"
+    
+    #Boundary fell inbetween two reads?
+    assert_equal((block_size > input_after_fake_file) && (block_size < input.size),true)
+    
+    input << "Content-Disposition: form-data; name=\"test_file_b\"; filename=\"test_case.txt\"#{Cgi::EOL}Content-Type: application/octet-stream#{Cgi::EOL}#{Cgi::EOL}"
+    fake_file_b = Tempfile.new("TCCGI")
+    
+    i = 0
+    file_size = 1024*1024*10 # 10MB    
+    i += fake_file_b.write String.random(1024*10) while i < file_size
+
+    fake_file_b.rewind
+    input << fake_file_b.read
+    fake_file_b.rewind
+    input << "#{Cgi::EOL}--#{boundary}#{Cgi::EOL}"
+
+    input << "Content-Disposition: form-data; name=\"empty_field\"#{Cgi::EOL}#{Cgi::EOL}"
+    input << closure
+    input.rewind
+    start = Time.now
+    params = Nitro::Cgi.parse_multipart(make_context(input), boundary)
+    duration = Time.now - start
+    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)
+  end
+ 
+
+  def make_context(input)
+    context = OpenStruct.new
+    context.in = input
+    context.content_length = input.size
+    context.env = { 'HTTP_USER_AGENT' => 'TestCase' }
+    context.session = Hash.new
+    class << context.session
+      def sync
+        true
+      end
+    end
+    context
+  end  
 end
+# Tempfile.new("CGI")

data/test/nitro/tc_render.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 
 require 'nitro'
 require 'nitro/render'
-require 'mega/mock'
+require 'facet/mock'
 
 class TestRender < Test::Unit::TestCase # :nodoc: all
   include Nitro

data/test/nitro/tc_session.rb

@@ -11,7 +11,8 @@ require 'nitro/session'
 class TC_Session < Test::Unit::TestCase # :nodoc: all
   include Nitro
 
-  STORES = [:memory, :file, :og]
+#   CACHES = [:memory, :file, :og]
+  CACHES = [:memory, :file]
 
   def test_create_id
     sid = Session.new.session_id
@@ -23,25 +24,25 @@ class TC_Session < Test::Unit::TestCase # :nodoc: all
   end
 
   def test_gc
-    STORES.each do |store_type|
-      Session.store_type = store_type
+    CACHES.each do |cache_type|
+      Session.keepalive = 2
       
-      if store_type == :og
+      Session.cache_type = cache_type
+
+      if cache_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
+      Session.cache[1] = Session.new
+      Session.cache[2] = Session.new
+
+      Session.cache.gc!
+      assert_equal 2, Session.cache.all.size
+      Session.cache.gc!
+      assert_equal 2, Session.cache.all.size
       sleep(3)
-      Session.store.gc!    
-      assert_equal 0, Session.store.all.size
+      Session.cache.gc!    
+      assert_equal 0, Session.cache.all.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.27.0
-date: 2006-01-16 00:00:00 +02:00
+  version: 0.28.0
+date: 2006-02-06 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: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -45,9 +45,9 @@ files:
 - doc/lhttpd.txt
 - doc/faq.txt
 - doc/config.txt
-- doc/RELEASES
 - doc/CHANGELOG.3
 - doc/apache.txt
+- doc/RELEASES
 - doc/MIGRATION
 - doc/LICENSE
 - doc/CHANGELOG.2
@@ -66,8 +66,8 @@ files:
 - lib/nitro/service
 - lib/nitro/session
 - lib/nitro/test
-- lib/nitro/session.rb
 - lib/nitro/test.rb
+- lib/nitro/session.rb
 - lib/nitro/service.rb
 - lib/nitro/server.rb
 - lib/nitro/compiler.rb
@@ -84,14 +84,13 @@ files:
 - 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/caching/fragments.rb
-- lib/nitro/caching/stores.rb
 - lib/nitro/caching/output.rb
-- lib/nitro/caching/invalidation.rb
 - lib/nitro/caching/actions.rb
 - lib/nitro/cgi/response.rb
 - lib/nitro/cgi/utils.rb
@@ -102,19 +101,19 @@ files:
 - lib/nitro/compiler/elements.rb
 - lib/nitro/compiler/xslt.rb
 - lib/nitro/compiler/squeeze.rb
-- lib/nitro/compiler/layout.rb
 - lib/nitro/compiler/markup.rb
 - lib/nitro/compiler/errors.rb
 - lib/nitro/compiler/localization.rb
 - lib/nitro/compiler/css.rb
+- lib/nitro/compiler/layout.rb
 - lib/nitro/compiler/morphing.rb
 - lib/nitro/compiler/include.rb
 - lib/nitro/compiler/cleanup.rb
 - lib/nitro/compiler/script.rb
 - lib/nitro/element/javascript.rb
 - lib/nitro/server/runner.rb
+- lib/nitro/server/drb.rb
 - lib/nitro/service/xmlrpc.rb
-- lib/nitro/session/drbserver.rb
 - lib/nitro/session/memory.rb
 - lib/nitro/session/file.rb
 - lib/nitro/session/drb.rb
@@ -135,10 +134,9 @@ files:
 - lib/nitro/helper/buffer.rb
 - lib/nitro/helper/form
 - lib/nitro/helper/wee.rb
-- lib/nitro/helper/javascript
 - lib/nitro/helper/layout.rb
+- lib/nitro/helper/javascript
 - lib/nitro/helper/form/controls.rb
-- lib/nitro/helper/form/test.xhtml
 - lib/nitro/helper/javascript/scriptaculous.rb
 - lib/nitro/helper/javascript/prototype.rb
 - lib/nitro/helper/javascript/morphing.rb
@@ -254,7 +252,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.27.0
+        version: 0.28.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: gen
@@ -263,7 +261,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.27.0
+        version: 0.28.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: glue
@@ -272,7 +270,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.27.0
+        version: 0.28.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth

data/lib/nitro/caching/invalidation.rb

@@ -1,25 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: invalidation.rb 182 2005-07-22 10:07:50Z gmosx $
-
-module Nitro
-
-module Caching
-
-  # Support for invalidating output/fragment caches.
-  
-  module Invalidation
-
-    def self.append_features(base) #:nodoc:
-      super
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-    end
-
-  end
-
-end
-
-end

data/lib/nitro/caching/stores.rb

@@ -1,94 +0,0 @@
-require 'fileutils'
-
-require 'mega/synchash'
-
-require 'glue/attribute'
-
-module Nitro
-
-# Adds support for caching.
-
-module Caching
-
-  # Cached fragments are stored in memory.
-
-  class MemoryStore < SyncHash
-
-    def read(name, options = {})
-      self[name]
-    end
-    
-    def write(name, content = '', options = {})
-      self[name] = content
-    end
-
-    alias_method :old_delete, :delete
-    
-    def delete(name, options = {}) 
-      old_delete(name)
-    end
-
-  end
-
-  # Cached fragments are stored as html files
-  # on the filesystem.
-
-  class FileStore
-    cattr_accessor :cache_root, 'cache'
-    
-    def initialize(cache_root = FileStore.cache_root)
-      @cache_root = cache_root
-    end
-    
-    def read(name, options = {})
-      begin
-        IO.read(path_for_name(name))
-      rescue
-        nil
-      end
-    end
-
-    def write(name, content = '', options = {})
-      begin
-        path = path_for_name(name)
-        dir = File.dirname(path)
-        FileUtils.makedirs(dir) unless File.exists?(dir)
-        
-        File.open(path, 'w+') { |f| f.write(content) }
-      rescue
-        Logger.error "Could not save cached file '#{path}'"
-      end
-    end
-
-    def delete(name, options = {})
-      path = path_for_name(name)
-      File.delete(path) if File.exist?(path)
-    end
-    
-    private
-
-    def path_for_name(name)
-      "#@cache_root/#{name}"
-    end
-
-  end
-
-  #--
-  # TODO: implement me
-  #++
-  
-  class DrbStrore
-  end
-
-  #--
-  # TODO: implement me
-  #++
-  
-  class MemcacheStore
-  end
-
-end
-
-end
-
-# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/session/drbserver.rb

@@ -1,84 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'drb'
-require 'optparse'
-
-require 'mega/synchash'
-require 'nitro/session'
-
-# A distributes session store implemented as
-# a simple DRb server.
-#--
-# TODO: add daemonize support.
-#++
-
-address = '127.0.0.1'
-port = 9069
-debug = false
-daemon = false
-
-parser = OptionParser.new do |opts|
-
-  opts.banner = 'Usage: drbserver.rb [options]'
-  opts.separator ''
-  opts.separator 'Specific options:'
-
-  opts.on('-a A', '--address A', 'Listening address.') do |a|
-    address = a
-  end
-
-  opts.on('-p P', '--port P', Integer, 'Listening port.') do |p|
-    port = p
-  end
-
-  opts.on('-D', '--debug', 'Run in debug mode.') do |p|
-    debug = true
-  end
-
-  opts.on('-d', '--daemon', 'Run as daemon.') do |p|
-    daemon = true
-  end
-
-  opts.on_tail('-h', '--help', 'Show this message.') do
-    puts opts
-    exit
-  end
-  
-end
-
-begin
-  parser.parse!(ARGV)
-rescue OptionParser::InvalidOption
-  puts 'Invalid option, pass the --help parameter to get help!' 
-  exit
-end
-
-sessions = Nitro::MemorySessionStore.new 
-
-if debug
-
-  class << sessions
-    def []=(k, v)
-      puts "WRITE: #{k} = #{v}"
-      super
-    end
-    
-    def [](k)
-      puts "READ: #{k}"
-      super
-    end
-  end
-  
-end
-
-puts "Drb session server listening at druby://#{address}:#{port}."
-
-if daemon
-  require 'daemons/daemonize'
-  Daemonize.daemonize()
-end
-
-DRb.start_service("druby://#{address}:#{port}", sessions)
-DRb.thread.join
-
-# * George Moschovitis  <gm@navel.gr>