RubyGems - nitro - Versions diffs - 0.20.0 → 0.21.0 - Mend

nitro 0.20.0 → 0.21.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (115) hide show

data/CHANGELOG +752 -543
data/INSTALL +38 -38
data/README +264 -225
data/Rakefile +48 -49
data/bin/nitro +3 -3
data/bin/nitrogen +6 -6
data/doc/AUTHORS +10 -10
data/doc/CHANGELOG.1 +1939 -1939
data/doc/CHANGELOG.2 +954 -954
data/doc/LICENSE +3 -3
data/doc/MIGRATION +28 -0
data/doc/RELEASES +814 -643
data/doc/config.txt +5 -5
data/install.rb +7 -17
data/lib/nitro.rb +38 -9
data/lib/nitro/adapter/cgi.rb +311 -312
data/lib/nitro/adapter/fastcgi.rb +18 -25
data/lib/nitro/adapter/webrick.rb +128 -137
data/lib/nitro/adapter/wee.rb +51 -0
data/lib/nitro/caching.rb +20 -20
data/lib/nitro/caching/actions.rb +43 -43
data/lib/nitro/caching/fragments.rb +46 -46
data/lib/nitro/caching/invalidation.rb +11 -11
data/lib/nitro/caching/output.rb +65 -65
data/lib/nitro/caching/stores.rb +67 -67
data/lib/nitro/compiler.rb +262 -0
data/lib/nitro/compiler/elements.rb +0 -0
data/lib/nitro/compiler/errors.rb +65 -0
data/lib/nitro/compiler/localization.rb +25 -0
data/lib/nitro/compiler/markup.rb +19 -0
data/lib/nitro/compiler/shaders.rb +206 -0
data/lib/nitro/compiler/squeeze.rb +20 -0
data/lib/nitro/compiler/xslt.rb +61 -0
data/lib/nitro/context.rb +87 -88
data/lib/nitro/controller.rb +151 -158
data/lib/nitro/cookie.rb +34 -34
data/lib/nitro/dispatcher.rb +195 -186
data/lib/nitro/element.rb +132 -126
data/lib/nitro/element/java_script.rb +6 -6
data/lib/nitro/flash.rb +66 -66
data/lib/nitro/mail.rb +192 -192
data/lib/nitro/mixin/buffer.rb +66 -0
data/lib/nitro/mixin/debug.rb +16 -16
data/lib/nitro/mixin/form.rb +88 -0
data/lib/nitro/mixin/helper.rb +2 -2
data/lib/nitro/mixin/javascript.rb +108 -108
data/lib/nitro/mixin/markup.rb +144 -0
data/lib/nitro/mixin/pager.rb +202 -202
data/lib/nitro/mixin/rss.rb +67 -0
data/lib/nitro/mixin/table.rb +63 -0
data/lib/nitro/mixin/xhtml.rb +75 -0
data/lib/nitro/mixin/xml.rb +124 -0
data/lib/nitro/render.rb +183 -359
data/lib/nitro/request.rb +140 -140
data/lib/nitro/response.rb +27 -27
data/lib/nitro/routing.rb +21 -21
data/lib/nitro/scaffold.rb +124 -118
data/lib/nitro/server.rb +117 -80
data/lib/nitro/server/runner.rb +341 -0
data/lib/nitro/service.rb +12 -12
data/lib/nitro/service/xmlrpc.rb +22 -22
data/lib/nitro/session.rb +122 -120
data/lib/nitro/session/drb.rb +9 -9
data/lib/nitro/session/drbserver.rb +34 -34
data/lib/nitro/template.rb +171 -155
data/lib/nitro/testing/assertions.rb +90 -90
data/lib/nitro/testing/context.rb +16 -16
data/lib/nitro/testing/testcase.rb +34 -34
data/proto/conf/lhttpd.conf +9 -9
data/proto/public/error.xhtml +75 -75
data/proto/public/index.xhtml +18 -18
data/proto/public/js/behaviour.js +65 -65
data/proto/public/js/controls.js +1 -1
data/proto/public/js/prototype.js +3 -3
data/proto/public/settings.xhtml +61 -61
data/proto/run.rb +1 -5
data/test/nitro/adapter/raw_post1.bin +0 -0
data/test/nitro/adapter/tc_cgi.rb +57 -57
data/test/nitro/adapter/tc_webrick.rb +4 -4
data/test/nitro/mixin/tc_pager.rb +25 -25
data/test/nitro/mixin/tc_rss.rb +24 -0
data/test/nitro/mixin/tc_table.rb +31 -0
data/test/nitro/mixin/tc_xhtml.rb +13 -0
data/test/nitro/tc_caching.rb +10 -10
data/test/nitro/tc_context.rb +8 -8
data/test/nitro/tc_controller.rb +48 -48
data/test/nitro/tc_cookie.rb +6 -6
data/test/nitro/tc_dispatcher.rb +64 -64
data/test/nitro/tc_element.rb +27 -27
data/test/nitro/tc_flash.rb +31 -31
data/test/nitro/tc_mail.rb +63 -63
data/test/nitro/tc_server.rb +26 -26
data/test/nitro/tc_session.rb +9 -9
data/test/nitro/tc_template.rb +19 -19
data/test/public/blog/list.xhtml +1 -1
metadata +31 -37
data/lib/nitro/buffering.rb +0 -45
data/lib/nitro/builder/form.rb +0 -104
data/lib/nitro/builder/rss.rb +0 -104
data/lib/nitro/builder/table.rb +0 -80
data/lib/nitro/builder/xhtml.rb +0 -132
data/lib/nitro/builder/xml.rb +0 -131
data/lib/nitro/conf.rb +0 -36
data/lib/nitro/environment.rb +0 -21
data/lib/nitro/errors.rb +0 -69
data/lib/nitro/localization.rb +0 -153
data/lib/nitro/markup.rb +0 -147
data/lib/nitro/output.rb +0 -24
data/lib/nitro/runner.rb +0 -348
data/lib/nitro/shaders.rb +0 -206
data/test/nitro/builder/tc_rss.rb +0 -23
data/test/nitro/builder/tc_table.rb +0 -30
data/test/nitro/builder/tc_xhtml.rb +0 -39
data/test/nitro/builder/tc_xml.rb +0 -56
data/test/nitro/tc_localization.rb +0 -49

data/lib/nitro/adapter/fastcgi.rb CHANGED Viewed

@@ -17,38 +17,31 @@ module Nitro
 # scalable, open extension to CGI that provides high
 # performance without the limitations of server
 # specific APIs.
+#
+# No need for connection pooling, fastcgi uses processes.
 class FastCGI
-	def self.start(conf)
-		conf = Flexob.new(conf) unless conf.is_a?(Flexob)
-		FCGI.each do |cgi|
-			begin
-				context = Context.new(conf)
+  def self.start(server)
+    FCGI.each do |cgi|
+      begin
+        context = Context.new(server)
-				context.in = cgi.in
-				context.headers = cgi.env
+        context.in = cgi.in
+        context.headers = cgi.env
-				CgiUtils.parse_params(context)
-				CgiUtils.parse_cookies(context)
-				# gmosx, TODO: move this into a filter.
-				# Og.db.get_connection if defined?(Og) and Og.db
+        CgiUtils.parse_params(context)
+        CgiUtils.parse_cookies(context)
+        context.render(context.path)
-				context.render(context.path)
+        cgi.out.print(CgiUtils.response_headers(context))
+        cgi.out.print(context.out)
-				# Og.db.put_connection if defined?(Og) and Og.db
-				cgi.out.print(CgiUtils.response_headers(context))
-				cgi.out.print(context.out)
-				cgi.finish
-			ensure
-				# Og.db.put_connection if defined?(Og) and Og.db
-			end
-		end
-	end
+        cgi.finish
+      end
+    end
+  end
 end

data/lib/nitro/adapter/webrick.rb CHANGED Viewed

@@ -8,161 +8,152 @@ require 'nitro/dispatcher'
 # Speeds things up, more comaptible with OSX.
 Socket.do_not_reverse_lookup = true
 module Nitro
 # Helper methods for the WebrickAdapter.
 class Webrick
-	class << self
-		attr_accessor :server
-		def start(conf)
-			conf = Conf.new(conf) unless conf.is_a?(Conf)
-			if RUBY_PLATFORM !~ /mswin32/
-				accesslog = WEBrick::BasicLog::new('/dev/null')
-				refererlog = WEBrick::BasicLog::new('/dev/null')
-			elsif (conf.accesslog || conf.refererlog)
-				accesslog = WEBrick::BasicLog::new(conf.accesslog || 'log/access.log')
-				refererlog = WEBrick::BasicLog::new(conf.refererlog || 'log/referer.log')
-			else
-				accesslog = STDERR
-				refererlog = STDERR
-			end
-			@server = WEBrick::HTTPServer.new(
-				:BindAddress => conf.host,
-				:Port => conf.port,
-				:DocumentRoot => conf.dispatcher.public_root,
-				:AccessLog => [
-					[accesslog, WEBrick::AccessLog::COMMON_LOG_FORMAT],
-					[refererlog, WEBrick::AccessLog::REFERER_LOG_FORMAT]
-				]
-			)
-			trap('INT') { @server.shutdown }
-			@server.mount('/', WebrickAdapter, conf)
-			@server.start
-		end
-	end
+  class << self
+    attr_accessor :webrick
+    def start(server)
+      if RUBY_PLATFORM !~ /mswin32/
+        wblog = WEBrick::BasicLog::new('/dev/null')
+      elsif server.access_log
+        wblog = WEBrick::BasicLog::new(server.access_log || 'log/access.log')
+      else
+        wblog = STDERR
+      end
+      @webrick = WEBrick::HTTPServer.new(
+        :BindAddress => server.address,
+        :Port => server.port,
+        :DocumentRoot => server.public_root,
+        :AccessLog => [
+          [wblog, WEBrick::AccessLog::COMMON_LOG_FORMAT],
+          [wblog, WEBrick::AccessLog::REFERER_LOG_FORMAT]
+        ]
+      )
+      trap('INT') { @webrick.shutdown }
+      @webrick.mount('/', WebrickAdapter, server)
+      @webrick.start
+    end
+  end
 end
 # A special handler for Xhtml files.
 class XhtmlFileHandler < WEBrick::HTTPServlet::DefaultFileHandler
-	def do_GET(req, res)
+  def do_GET(req, res)
     res['content-type'] = 'text/html'
     res.body = '<html><body>Permission denied</body></html>'
-	end
+  end
 end
 # A Webrick Adapter for Nitro.
-#--
-# TODO: optimize the conversion from WEBrick's
-# parameters to the Nitro parameters.
-#++
 class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
-	include WEBrick
-	# REQUEST_MUTEX = Mutex.new
-	def initialize(server, conf)
-		@conf = conf
-		@conf.webrick_options ||= {}
-		@conf.webrick_options[:HandlerTable] = { 'xhtml' => XhtmlFileHandler }
-		# Handles static resources. Useful when running
-		# a stand-alone webrick server.
-		@file_handler = WEBrick::HTTPServlet::FileHandler.new(server, conf.dispatcher.public_root, @conf.webrick_options)
-	end
-	# Handle a static file. Also handles cached pages.
-	def handle_file(req, res)
-		begin
-			rewrite(req)
-			@file_handler.do_GET(req, res)
-			return true
-		rescue WEBrick::HTTPStatus::PartialContent, WEBrick::HTTPStatus::NotModified => err
-			res.set_error(err)
-			return true
-		rescue
-			return false
-		ensure
-			unrewrite(req)
-		end
-	end
-	# Handle the request.
-	def handle(req, res)
-		unless handle_file(req, res)
-			path = req.request_uri.path
-			unless path =~ /\./
-				begin
-					path = req.request_uri.path
-					# REQUEST_MUTEX.lock
-					context = Context.new(@conf)
-					context.in = StringIO.new(req.body || "")
-					context.headers = {}
-					req.header.each { |h, v| context.headers[h.upcase] = v.first }
-					context.headers.update(req.meta_vars)
-					# gmosx: make compatible with fastcgi.
-					context.headers['REQUEST_URI'].slice!(/http:\/\/(.*?)\//)
-					context.headers['REQUEST_URI'] << '/'
-					CgiUtils.parse_params(context)
-					CgiUtils.parse_cookies(context)
-					context.render(path)
-					res.status = context.status
-					res.instance_variable_set(:@header, context.response_headers || {})
-					res.instance_variable_set(:@cookies, context.response_cookies || {})
-					res.body = context.out
-					context.close
-				ensure
-					# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
-					Og.manager.put_store if defined?(Og) and Og.manager
-				end
-			end
-		end
-	end
-	alias do_GET handle
-	alias do_POST handle
-	# Try to rewrite the path to a filename.
-	def rewrite(req)
-		if req.path == '/'
-			req.instance_variable_set(:@path_info, '/index.html')
-		elsif req.path =~ /^([^.]+)$/
-			req.instance_variable_set(:@path_info, "#{$1}/index.html")
-		end
-	end
-	# Rewrite back to the original path.
-	def unrewrite(req)
-		if req.path == '/'
-			req.instance_variable_set(:@path_info, '/')
-		elsif req.path =~ /^([^.]+).html$/
-			req.instance_variable_set(:@path_info, $1)
-		end
-	end
+  include WEBrick
+  def initialize(webrick, server)
+    @server = server
+    @server.options[:HandlerTable] = { 'xhtml' => XhtmlFileHandler }
+    # Handles static resources. Useful when running
+    # a stand-alone webrick server.
+    @file_handler = WEBrick::HTTPServlet::FileHandler.new(
+      webrick,
+      server.public_root,
+      server.options
+    )
+  end
+  # Handle a static file. Also handles cached pages.
+  def handle_file(req, res)
+    begin
+      rewrite(req)
+      @file_handler.do_GET(req, res)
+      return true
+    rescue WEBrick::HTTPStatus::PartialContent, WEBrick::HTTPStatus::NotModified => err
+      res.set_error(err)
+      return true
+    rescue
+      return false
+    ensure
+      unrewrite(req)
+    end
+  end
+  # Handle the request.
+  def handle(req, res)
+    unless handle_file(req, res)
+      path = req.request_uri.path
+      unless path =~ /\./
+        begin
+          path = req.request_uri.path
+          # REQUEST_MUTEX.lock
+          context = Context.new(@server)
+          context.in = StringIO.new(req.body || "")
+          context.headers = {}
+          req.header.each { |h, v| context.headers[h.upcase] = v.first }
+          context.headers.update(req.meta_vars)
+          # gmosx: make compatible with fastcgi.
+          context.headers['REQUEST_URI'].slice!(/http:\/\/(.*?)\//)
+          context.headers['REQUEST_URI'] << '/'
+          CgiUtils.parse_params(context)
+          CgiUtils.parse_cookies(context)
+          context.render(path)
+          res.status = context.status
+          res.instance_variable_set(:@header, context.response_headers || {})
+          res.instance_variable_set(:@cookies, context.response_cookies || {})
+          res.body = context.out
+          context.close
+        ensure
+          Og.manager.put_store if defined?(Og) and Og.manager
+        end
+      end
+    end
+  end
+  alias do_GET handle
+  alias do_POST handle
+  # Try to rewrite the path to a filename.
+  def rewrite(req)
+    if req.path == '/'
+      req.instance_variable_set(:@path_info, '/index.html')
+    elsif req.path =~ /^([^.]+)$/
+      req.instance_variable_set(:@path_info, "#{$1}/index.html")
+    end
+  end
+  # Rewrite back to the original path.
+  def unrewrite(req)
+    if req.path == '/'
+      req.instance_variable_set(:@path_info, '/')
+    elsif req.path =~ /^([^.]+).html$/
+      req.instance_variable_set(:@path_info, $1)
+    end
+  end
 end
 end

data/lib/nitro/adapter/wee.rb ADDED Viewed

@@ -0,0 +1,51 @@
+require 'nitro/controller'
+require 'wee'
+require 'wee/adaptors/nitro'
+module Nitro
+module WeeMixin
+  include Wee::Nitro::ControllerMixin
+  # Returns the output of the component.
+  def component(klass, options = {})
+    out = ''
+    name = options[:name] || klass.to_s
+    cb = Wee::CallbackRegistry.new(Wee::SequentialIdGenerator.new)
+    rctx = Wee::RenderingContext.new(context(), cb, Wee::HtmlWriter.new(out))
+    rctx.component_name = name
+    rctx.controller = self
+    rctx.redirect_action = options[:redirect_action]
+    unless c = components[name]
+      unless block = self.class.registered_components[name]
+        block = proc { klass.new }
+        self.class.register_component(name, &block)
+      end
+      make_component name, block.call
+      c = components[name]
+    end
+    raise "Component #{name} not found" if c.nil?
+    c.render(rctx)
+    c.callbacks = cb
+    return out
+  end
+end
+# Add Wee-related helper methods to published objects.
+class Controller
+  include Wee::Nitro::ControllerMixin
+  include WeeMixin
+end
+end
+# * George Moschovitis <gm@navel.gr>
+# * Michael Neumann <mneumann@ntecs.de>

data/lib/nitro/caching.rb CHANGED Viewed

@@ -15,26 +15,26 @@ module Nitro
 module Caching
-	# Globaly enable/disable caching.
-	setting :caching_enabled, :default => true, :doc => 'Globaly enable/disable caching'
-	def self.append_features(base) #:nodoc:
-		super
-		base.send :include, Output, Actions, Fragments
-		base.module_eval do
-#			@caching_enabled = true
-			def self.caching_enabled?
-				Caching.caching_enabled # and @caching_enabled
-			end
-			private
-			def caching_enabled?
-				Caching.caching_enabled # and self.class.get_instance_variable(:caching_enabled)
-			end
-		end
-	end
+  # Globaly enable/disable caching.
+  setting :caching_enabled, :default => true, :doc => 'Globaly enable/disable caching'
+  def self.append_features(base) #:nodoc:
+    super
+    base.send :include, Output, Actions, Fragments
+    base.module_eval do
+#      @caching_enabled = true
+      def self.caching_enabled?
+        Caching.caching_enabled # and @caching_enabled
+      end
+      private
+      def caching_enabled?
+        Caching.caching_enabled # and self.class.get_instance_variable(:caching_enabled)
+      end
+    end
+  end
 end
 end

data/lib/nitro/caching/actions.rb CHANGED Viewed

@@ -6,57 +6,57 @@ module Nitro
 module Caching
-	# Action caching.
+  # Action caching.
-	module Actions
+  module Actions
-		def self.append_features(base) # :nodoc:
-			super
-			base.extend(ClassMethods)
-		end
+    def self.append_features(base) # :nodoc:
+      super
+      base.extend(ClassMethods)
+    end
-		module ClassMethods
+    module ClassMethods
-			def cache_action(*actions)
-				return unless caching_enabled?
-				before_filter(
-					%{
-						fragment_name = "\#\{@action_name\}\#{@request.query_string}"
-						if fragment = Fragment.get(fragment_name)
-							@out = fragment
-							return
-						end
-					},
-					:only => actions
-				)
-				after_filter(
-					%{
-						fragment_name = "\#\{@action_name\}\#{@request.query_string}"
-						Fragment.put(fragment_name, @out)
-					},
-					:only => actions
-				)
-			end
-		end
+      def cache_action(*actions)
+        return unless caching_enabled?
+        before_filter(
+          %{
+            fragment_name = "\#\{@action_name\}\#{@request.query_string}"
+            if fragment = Fragment.get(fragment_name)
+              @out = fragment
+              return
+            end
+          },
+          :only => actions
+        )
+        after_filter(
+          %{
+            fragment_name = "\#\{@action_name\}\#{@request.query_string}"
+            Fragment.put(fragment_name, @out)
+          },
+          :only => actions
+        )
+      end
+    end
-		private
+    private
-		#--
-		# FIXME: not implemented.
-		#++
-		def expire_action(*actions)
-			return unless caching_enabled?
+    #--
+    # FIXME: not implemented.
+    #++
+    def expire_action(*actions)
+      return unless caching_enabled?
-			for action in [actions].flatten
-				expire_fragment(action)
-			end
-		end
+      for action in [actions].flatten
+        expire_fragment(action)
+      end
+    end
-	end
+  end
 end