nitro 0.13.0 → 0.14.0

data/lib/nitro/request.rb

@@ -52,7 +52,7 @@ module Request
 	# The path is the uri without the query string.
 
   def path
-		uri ? uri.split('?').first : ''
+		path = uri ? uri.split('?').first : ''
 	end
 
 	def path_info
@@ -71,6 +71,12 @@ module Request
 		@headers['REQUEST_METHOD'].downcase.intern
 	end
 
+	# Is this a post method?
+	
+	def post?
+		method == :post
+	end
+		
 	# Return the referer. For the initial page in the
 	# clickstream there is no referer, set "/" by default.
 		
@@ -78,6 +84,12 @@ module Request
 		return @headers['HTTP_REFERER'] || '/'
 	end
 
+	# The content_length
+	
+	def content_length
+		return @headers['CONTENT_LENGTH'].to_i
+	end
+
 	# The remote IP address. REMOTE_ADDR is the standard
   # but will fail if the user is behind a proxy.  
 	# HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR are set by 

data/test/nitro/tc_controller.rb

@@ -10,7 +10,7 @@ require 'nitro/controller'
 class TC_Controller < Test::Unit::TestCase # :nodoc: all
 	include N
 	
-	class BlogController < Controller
+	class Blog2Controller < Controller
 		attr_reader :aflag, :tflag
 
 		def initialize(context)
@@ -25,7 +25,7 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 	
 	def setup
 		@disp = Dispatcher.new({
-			'blog' => BlogController,
+			'blog' => Blog2Controller,
 		})
 		@disp.template_root = File.join(File.dirname(__FILE__), '..', 'public')
 		@conf = OpenStruct.new
@@ -39,6 +39,8 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 		ctx.headers['REQUEST_URI'] = '/blog/list'
 		klass, action = ctx.dispatcher.dispatch(ctx.path, ctx)
 		c = klass.new(ctx)
+		p klass.before_filters, klass.after_filters
+		p '--', Controller.before_filters, Controller.after_filters
 		begin
 			c.send(action)
 		rescue RenderExit
@@ -52,8 +54,8 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 
 	def test_action_methods
 		# aflag/tflag are counted too!
-		assert_equal 3, BlogController.action_methods.size
-		assert BlogController.action_methods.include?('list')
+		assert_equal 3, Blog2Controller.action_methods.size
+		assert Blog2Controller.action_methods.include?('list')
 	end
 
 end

data/test/nitro/tc_filters.rb

@@ -0,0 +1,111 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'nitro/dispatcher'
+require 'nitro/context'
+require 'nitro/controller'
+require 'nitro/filters'
+
+class TestCaseFilters < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	class MyController < Controller
+	
+		attr_accessor :login_f, :pre_f, :post_f
+
+		before_filter :pre, :only => :login
+		after_filter :post, :except => :login
+		
+		def initialize(*args)
+			super
+			@login_f = @pre_f = @post_f = 0
+		end
+		
+		def login
+			@login_f = @pre_f + @post_f + 1
+			render_nothing
+		end
+
+		def logout
+			@login_f = @pre_f + @post_f + 1
+			render_nothing
+		end
+
+		private
+
+		def pre 
+			@pre_f += 1
+		end
+
+		def post 
+			@post_f += 1
+		end
+	end
+
+	class AnotherController < MyController
+		before_filter :more
+
+		def register
+			@login_f = @pre_f + @post_f + 1
+			render_nothing
+		end
+
+		private
+
+		def more
+			@a = 2
+		end
+	end
+
+	def setup
+		@disp = Dispatcher.new(
+			'my' => MyController,
+			'another' => AnotherController
+		)
+		@conf = OpenStruct.new
+		@conf.dispatcher = @disp
+		@ctx = Context.new(@conf)
+		@ctx.headers = {}
+		@ctx.params = {}
+	end
+
+	def teardown
+		@conf = @ctx = nil
+	end
+
+	def test_options
+		c = MyController.new(@ctx)
+		
+		c.__xhtml__login
+		assert_equal 2, c.login_f
+		assert_equal 1, c.pre_f
+		assert_equal 0, c.post_f
+
+		c.__xhtml__logout
+		assert_equal 2, c.login_f
+		assert_equal 1, c.pre_f
+		assert_equal 1, c.post_f
+	end
+
+	def test_inheritable
+		c = AnotherController.new(@ctx)
+		
+		c.__xhtml__register
+		assert_equal 1, c.login_f
+		assert_equal 0, c.pre_f
+		assert_equal 1, c.post_f
+
+		# bug: test filters not propageted.
+
+		assert_equal 0, Controller.before_filters.size
+		assert_equal 1, MyController.before_filters.size
+		assert_equal 2, AnotherController.before_filters.size
+
+		assert_equal 0, Controller.after_filters.size
+		assert_equal 1, MyController.after_filters.size
+		assert_equal 1, AnotherController.after_filters.size
+	end
+	
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.10
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.13.0
-date: 2005-03-17
+  version: 0.14.0
+date: 2005-03-28
 summary: Nitro Web Engine
 require_paths: 
   - lib
@@ -98,7 +98,6 @@ files:
   - examples/no_xsl_blog/lib/blog/template.rb
   - examples/no_xsl_blog/lib/blog/model.rb
   - examples/no_xsl_blog/lib/blog/controller.rb
-  - examples/why_wiki/wiki.yml
   - examples/why_wiki/run.rb
   - examples/why_wiki/README
   - examples/flash/log
@@ -126,14 +125,18 @@ files:
   - examples/wee_style/README
   - examples/blog/log
   - examples/blog/conf
+  - examples/blog/cache
   - examples/blog/public
   - examples/blog/src
   - examples/blog/run.rb
   - examples/blog/README
   - examples/blog/log/apache.error_log
+  - examples/blog/log/rewrite_log
   - examples/blog/log/README
   - examples/blog/conf/apache.conf
   - examples/blog/conf/lhttpd.conf
+  - examples/blog/conf/apache.conf.new
+  - examples/blog/cache/entriesadmin
   - examples/blog/public/style.css
   - examples/blog/public/m
   - examples/blog/public/fcgi.rb
@@ -181,9 +184,13 @@ files:
   - doc/RELEASES
   - doc/tutorial.txt
   - doc/architecture.txt
+  - doc/CHANGELOG.2
   - doc/bugs.txt
   - lib/nitro
   - lib/nitro.rb
+  - lib/nitro/caching.rb
+  - lib/nitro/caching
+  - lib/nitro/testing
   - lib/nitro/localization.rb
   - lib/nitro/cookie.rb
   - lib/nitro/session.rb
@@ -213,6 +220,11 @@ files:
   - lib/nitro/component.rb
   - lib/nitro/markup.rb
   - lib/nitro/filters.rb
+  - lib/nitro/caching/invalidation.rb
+  - lib/nitro/caching/output.rb
+  - lib/nitro/caching/fragments.rb
+  - lib/nitro/caching/actions.rb
+  - lib/nitro/caching/stores.rb
   - lib/nitro/adapters/cgi.rb
   - lib/nitro/adapters/fastcgi.rb
   - lib/nitro/adapters/webrick.rb
@@ -239,6 +251,7 @@ files:
   - test/nitro/ui
   - test/nitro/tc_mail.rb
   - test/nitro/tc_context.rb
+  - test/nitro/tc_filters.rb
   - test/nitro/tc_dispatcher.rb
   - test/nitro/adapters/tc_webrick.rb
   - test/nitro/adapters/tc_cgi.rb
@@ -252,29 +265,6 @@ files:
   - test/public/dummy_mailer
   - test/public/blog/list.xhtml
   - test/public/dummy_mailer/registration.xhtml
-  - vendor/breakpoint_client.rb
-  - vendor/extensions
-  - vendor/binding_of_caller.rb
-  - vendor/blankslate.rb
-  - vendor/breakpoint.rb
-  - vendor/README
-  - vendor/extensions/enumerable.rb
-  - vendor/extensions/all.rb
-  - vendor/extensions/hash.rb
-  - vendor/extensions/continuation.rb
-  - vendor/extensions/module.rb
-  - vendor/extensions/binding.rb
-  - vendor/extensions/ostruct.rb
-  - vendor/extensions/kernel.rb
-  - vendor/extensions/class.rb
-  - vendor/extensions/numeric.rb
-  - vendor/extensions/_base.rb
-  - vendor/extensions/io.rb
-  - vendor/extensions/string.rb
-  - vendor/extensions/object.rb
-  - vendor/extensions/array.rb
-  - vendor/extensions/symbol.rb
-  - vendor/extensions/_template.rb
 test_files: []
 rdoc_options: 
   - "--main"
@@ -301,7 +291,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.13.0
+            version: 0.14.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: og
@@ -311,7 +301,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.13.0
+            version: 0.14.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: ruby-breakpoint

data/examples/why_wiki/wiki.yml

@@ -1 +0,0 @@
---- {}

data/vendor/README

@@ -1,11 +0,0 @@
-= Extensions and Libraries from other vendors.
-
-Libraries from other vendors belong here. This file
-
-=== Included libraries
-
-* extensions
-* breakpointer
-* dev-utils
-* postgres-pr
-

data/vendor/binding_of_caller.rb

@@ -1,81 +0,0 @@
-begin
-  require 'simplecc'
-rescue LoadError
-  def Continuation.create(*args, &block)
-    cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
-    result ||= args
-    return *[cc, *result]
-  end
-end
-
-# This method returns the binding of the method that called your
-# method. It will raise an Exception when you're not inside a method.
-#
-# It's used like this:
-#   def inc_counter(amount = 1)
-#     Binding.of_caller do |binding|
-#       # Create a lambda that will increase the variable 'counter'
-#       # in the caller of this method when called.
-#       inc = eval("lambda { |arg| counter += arg }", binding)
-#       # We can refer to amount from inside this block safely.
-#       inc.call(amount)
-#     end
-#     # No other statements can go here. Put them inside the block.
-#   end
-#   counter = 0
-#   2.times { inc_counter }
-#   counter # => 2
-#
-# Binding.of_caller must be the last statement in the method.
-# This means that you will have to put everything you want to
-# do after the call to Binding.of_caller into the block of it.
-# This should be no problem however, because Ruby has closures.
-# If you don't do this an Exception will be raised. Because of
-# the way that Binding.of_caller is implemented it has to be
-# done this way.
-def Binding.of_caller(&block)
-  old_critical = Thread.critical
-  Thread.critical = true
-  count = 0
-  cc, result, error, extra_data = Continuation.create(nil, nil)
-  error.call if error
-
-  tracer = lambda do |*args|
-    type, context, extra_data = args[0], args[4], args
-    if type == "return"
-      count += 1
-      # First this method and then calling one will return --
-      # the trace event of the second event gets the context
-      # of the method which called the method that called this
-      # method.
-      if count == 2
-        # It would be nice if we could restore the trace_func
-        # that was set before we swapped in our own one, but
-        # this is impossible without overloading set_trace_func
-        # in current Ruby.
-        set_trace_func(nil)
-        cc.call(eval("binding", context), nil, extra_data)
-      end
-    elsif type == "line" then
-      nil
-    elsif type == "c-return" and extra_data[3] == :set_trace_func then
-      nil
-    else
-      set_trace_func(nil)
-      error_msg = "Binding.of_caller used in non-method context or " +
-        "trailing statements of method using it aren't in the block."
-      cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
-    end
-  end
-
-  unless result
-    set_trace_func(tracer)
-    return nil
-  else
-    Thread.critical = old_critical
-    case block.arity
-      when 1 then yield(result)
-      else yield(result, extra_data)        
-    end
-  end
-end

data/vendor/blankslate.rb

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-module Builder #:nodoc:
-
-  # BlankSlate provides an abstract base class with no predefined
-  # methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
-  # BlankSlate is useful as a base class when writing classes that
-  # depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
-  class BlankSlate #:nodoc:
-    class << self
-      def hide(name)
-	      undef_method name if
-	        instance_methods.include?(name.to_s) and
-	        name !~ /^(__|instance_eval)/
-      end
-    end
-
-    instance_methods.each { |m| hide(m) }
-  end
-end
-
-# Since Ruby is very dynamic, methods added to the ancestors of
-# BlankSlate <em>after BlankSlate is defined</em> will show up in the
-# list of available BlankSlate methods.  We handle this by defining a hook in the Object and Kernel classes that will hide any defined 
-module Kernel #:nodoc:
-  class << self
-    alias_method :blank_slate_method_added, :method_added
-    def method_added(name)
-      blank_slate_method_added(name)
-      return if self != Kernel
-      Builder::BlankSlate.hide(name)
-    end
-  end
-end
-
-class Object #:nodoc:
-  class << self
-    alias_method :blank_slate_method_added, :method_added
-    def method_added(name)
-      blank_slate_method_added(name)
-      return  if self != Object
-      Builder::BlankSlate.hide(name)
-    end
-  end
-end