RubyGems - nitro - Versions diffs - 0.27.0 → 0.28.0 - Mend

nitro 0.27.0 → 0.28.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 (56) hide show

data/CHANGELOG +276 -0
data/ProjectInfo +4 -4
data/README +9 -1
data/Rakefile +1 -1
data/doc/AUTHORS +30 -17
data/doc/RELEASES +110 -23
data/lib/glue/sweeper.rb +1 -1
data/lib/glue/webfile.rb +1 -1
data/lib/nitro.rb +1 -1
data/lib/nitro/adapter/acgi.rb +5 -1
data/lib/nitro/adapter/cgi.rb +4 -0
data/lib/nitro/adapter/fastcgi.rb +12 -1
data/lib/nitro/adapter/mongrel.rb +219 -0
data/lib/nitro/adapter/scgi.rb +62 -69
data/lib/nitro/caching.rb +6 -5
data/lib/nitro/caching/actions.rb +14 -8
data/lib/nitro/caching/fragments.rb +32 -17
data/lib/nitro/caching/output.rb +10 -2
data/lib/nitro/cgi.rb +7 -3
data/lib/nitro/cgi/stream.rb +1 -3
data/lib/nitro/compiler.rb +5 -4
data/lib/nitro/compiler/errors.rb +1 -1
data/lib/nitro/compiler/morphing.rb +2 -2
data/lib/nitro/compiler/script.rb +1 -1
data/lib/nitro/context.rb +8 -2
data/lib/nitro/controller.rb +1 -1
data/lib/nitro/dispatcher.rb +0 -2
data/lib/nitro/element.rb +5 -5
data/lib/nitro/flash.rb +1 -1
data/lib/nitro/helper.rb +2 -2
data/lib/nitro/helper/form.rb +1 -1
data/lib/nitro/helper/form/controls.rb +2 -1
data/lib/nitro/helper/javascript.rb +1 -1
data/lib/nitro/helper/javascript/morphing.rb +1 -1
data/lib/nitro/helper/layout.rb +1 -1
data/lib/nitro/helper/pager.rb +7 -3
data/lib/nitro/helper/rss.rb +1 -1
data/lib/nitro/render.rb +1 -1
data/lib/nitro/scaffolding.rb +26 -4
data/lib/nitro/server/drb.rb +106 -0
data/lib/nitro/server/runner.rb +23 -2
data/lib/nitro/session.rb +33 -16
data/lib/nitro/session/drb.rb +6 -20
data/lib/nitro/session/file.rb +4 -49
data/lib/nitro/session/memory.rb +16 -0
data/lib/nitro/session/og.rb +4 -46
data/src/part/admin/controller.rb +2 -3
data/src/part/admin/template/index.xhtml +1 -1
data/test/nitro/tc_cgi.rb +72 -3
data/test/nitro/tc_render.rb +1 -1
data/test/nitro/tc_session.rb +16 -15
metadata +12 -14
data/lib/nitro/caching/invalidation.rb +0 -25
data/lib/nitro/caching/stores.rb +0 -94
data/lib/nitro/helper/form/test.xhtml +0 -0
data/lib/nitro/session/drbserver.rb +0 -84

data/lib/glue/sweeper.rb CHANGED

@@ -60,7 +60,7 @@ private
   # Expire affected cached fragments.
   def expire_affected_fragment(name, options = {})
-    Nitro::Caching::Fragments.store.delete(name, options)
+    Nitro::Caching::Fragments.cache.delete(name, options)
   end
   alias_method :expire_fragment, :expire_affected_fragment

data/lib/glue/webfile.rb CHANGED

@@ -1,6 +1,6 @@
 require 'fileutils'
-require 'mega/inheritor'
+require 'facet/inheritor'
 module Glue

data/lib/nitro.rb CHANGED

@@ -16,7 +16,7 @@ module Nitro
   # The version.
-  Version = '0.27.0'
+  Version = '0.28.0'
   # Library path.

data/lib/nitro/adapter/acgi.rb CHANGED

@@ -14,6 +14,10 @@ require 'glue/flexob'
 Socket.do_not_reverse_lookup = true
+# No multi-threading.
+Og.thread_safe = false
 module Nitro
 # ACGI Adaptor. ACGI is a language independent,
@@ -33,7 +37,7 @@ module Nitro
 # instead of fcgi.rb / cgi.rb
 #
 #--
-# gmosx: not tested
+# gmosx: not tested! Use at your own risk!
 #++
 class ACGI < ::CGI

data/lib/nitro/adapter/cgi.rb CHANGED

@@ -16,6 +16,10 @@ end
 Socket.do_not_reverse_lookup = true
+# No multi-threading.
+Og.thread_safe = false
 module Nitro
 # A plain CGI adapter. To be used only in development

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

@@ -11,6 +11,10 @@ require 'glue/flexob'
 Socket.do_not_reverse_lookup = true
+# No multi-threading.
+Og.thread_safe = false
 module Nitro
 # FastCGI Adaptor. FastCGI is a language independent,
@@ -18,7 +22,12 @@ module Nitro
 # performance without the limitations of server
 # specific APIs.
 #
-# No need for connection pooling, fastcgi uses processes.
+# === Sessions
+#
+# As FCGI is process based, you have cant use the default
+# in-memory session store. For production web sites you should
+# use the drb session store. Moreover, there is no need for
+# DB connection pooling in Og.
 class FastCGI
@@ -34,3 +43,5 @@ class FastCGI
 end
 end
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/adapter/mongrel.rb ADDED

@@ -0,0 +1,219 @@
+require 'stringio'
+require 'mongrel'
+require 'glue/flexob'
+require 'nitro/cgi'
+require 'nitro/context'
+require 'nitro/dispatcher'
+# Speeds things up, more comaptible with OSX.
+Socket.do_not_reverse_lookup = true
+#--
+# Fix for Nitro.
+#++
+module Mongrel # :nodoc: all
+  class HttpRequest
+    def method_missing(name, *args)
+      if @params.has_key?(name.to_s.upcase)
+        return @params[name.to_s.upcase]
+      elsif name.to_s =~ /\A(.*)=\Z/ && @params.has_key?($1.upcase)
+        @params[$1.upcase] = args[0]
+      else
+        super
+      end
+    end
+  end
+end
+module Nitro
+class Mongrel
+  class << self
+    attr_accessor :mongrel
+    # Start the Webrick adapter.
+    def start(server)
+      # TODO add logging.
+     mongrel_options = server.options.dup
+     mongrel_options.update(
+        :BindAddress => server.address,
+        :Port => server.port,
+        :DocumentRoot => server.public_root
+      )
+      @mongrel = ::Mongrel::HttpServer.new(mongrel_options[:BindAddress],
+        mongrel_options[:Port])
+      trap('INT') { stop } # will this work?
+      @mongrel.register('/', MongrelAdapter.new(server))
+      initialize_mongrel(server)
+      @mongrel_thread = @mongrel.run
+      @mongrel_thread.join
+    end
+    # Stop the Mongrel adapter.
+    def stop
+        @mongrel_thread.kill
+    end
+    # Override this method to perform customized mongrel
+    # initialization.
+    def initialize_mongrel(server)
+    end
+  end
+end
+# A special handler for Xhtml files.
+#class XhtmlFileHandler < WEBrick::HTTPServlet::DefaultFileHandler
+#  def do_GET(req, res)
+#    res['content-type'] = 'text/html'
+#    res.body = '<html><body>Permission denied</body></html>'
+#  end
+#end
+# A Mongrel Adapter for Nitro.
+class MongrelAdapter < ::Mongrel::HttpHandler
+  attr_accessor :server
+  STATUS_CODES = {
+    200 => "OK", "304" => "Not Modified",
+    "404" => "Not found", "500" => "Server Error"
+  }
+  def initialize(server)
+    @server = server
+  end
+  def process(req, res)
+    handle(req, res)
+  end
+  # Handle a static file. Also handles cached pages.
+  def handle_file(req, res)
+    begin
+      rewrite(req)
+      # TODO handle If-Modified-Since and add Last-Modified headers
+      filename = [@server.public_root, req.path_info].join("/")
+      File.open(filename, "r") { |f|
+        # TODO look up mime type
+        # TODO check whether path circumvents public_root directory?
+        size = File.size(filename)
+        res.socket << "HTTP/1.1 200 OK\r\n"
+        res.socket << "Content-type: text/plain\r\n"
+        res.socket << "Content-length: #{size}\r\n"
+        res.socket << "\r\n"
+        res.socket << f.read # XXX inefficient for large files, may cause leaks
+      }
+      return true
+    rescue Object => ex
+      return false
+    ensure
+      unrewrite(req)
+    end
+  end
+  # Handle the request.
+  def handle(req, res)
+    unless handle_file(req, res)
+      path = req.path_info
+      unless path =~ /\./
+        begin
+          context = Context.new(@server)
+          context.in = StringIO.new(req.body || "")
+          context.headers = {}
+          req.params.each { |h, v|
+            if h =~ /\AHTTP_(.*)\Z/
+                context.headers[$1.gsub("_", "-")] = v
+            end
+            context.headers[h] = v
+          }
+          # context.headers.update(req.meta_vars)
+          context.headers['REQUEST_URI'] = context.headers['SCRIPT_NAME']
+          if context.headers['PATH_INFO'].blank?
+            context.headers['REQUEST_URI'] = '/'
+          else
+            context.headers['REQUEST_URI'] = '/' + context.headers['PATH_INFO']
+          end
+          # gmosx: make compatible with fastcgi.
+          #context.headers['REQUEST_URI'].slice!(/http:\/\/(.*?)\//)
+          # context.headers['REQUEST_URI'] << '/'
+          Cgi.parse_params(context)
+          Cgi.parse_cookies(context)
+          context.render(path)
+          res.socket << "HTTP/1.1 #{context.status.to_s} "
+          if STATUS_CODES.has_key? context.status
+            res.socket << STATUS_CODES[context.status]
+          else
+            res.socket << "Unknown Status Code"
+          end
+          res.socket << "\r\n"
+          headers = context.response_headers
+          headers["Content-length"] = context.out.size
+          headers.each { |h,v| res.socket << "#{h}: #{v}\r\n" }
+          res.socket << "\r\n"
+          # TODO handle setting cookies
+          res.socket << context.out
+          context.close
+        ensure
+          Og.manager.put_store if defined?(Og) and Og.respond_to?(:manager)
+        end
+      end
+    end
+  end
+  def rewrite(req)
+    if req.path_info == '/' || req.path_info == ''
+      req.path_info = '/index.html'
+    elsif req.path_info =~ /^([^.]+)$/
+      req.path_info = "#{$1}/index.html"
+    end
+  end
+  # Rewrite back to the original path.
+  def unrewrite(req)
+    if req.path_info == '/index.html'
+      req.path_info = '/'
+    elsif req.path_info =~ /^([^.]+)\/index.html$/
+      req.path_info = $1
+    end
+  end
+end
+end
+# * Joshua Hoke
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/adapter/scgi.rb CHANGED

@@ -10,57 +10,6 @@ require 'singleton'
 module SCGI # :nodoc: all
-    class LogFactory < Monitor
-        include Singleton
-        def initialize
-            super()
-            @@logs = {}
-        end
-        def create(file)
-            result = nil
-            synchronize do
-                result = @@logs[file]
-                if not result
-                    result = Log.new(file)
-                    @@logs[file] = result
-                end
-            end
-            return result
-        end
-    end
-    class Log < Monitor
-        def initialize(file)
-            super()
-            @out = open(file, "a+")
-            @out.sync = true
-            @pid = Process.pid
-            @info = "[INF][#{Process.pid}] "
-            @error = "[ERR][#{Process.pid}] "
-        end
-        def info(msg)
-            synchronize do
-                @out.print @info, msg,"\n"
-            end
-        end
-        def error(msg, exc=nil)
-            if exc
-                synchronize do
-                    @out.print @error, "#{msg}: #{exc}\n"
-                    @out.print @error, exc.backtrace.join("\n"), "\n"
-                end
-            else
-                synchronize do
-                    @out.print @error, msg,"\n"
-                end
-            end
-        end
-    end
     # Modifies CGI so that we can use it.
     class SCGIFixed < ::CGI # :nodoc: all
         public :env_table
@@ -78,6 +27,8 @@ module SCGI # :nodoc: all
         def env_table
             @env_table
         end
+        alias_method :env, :env_table
         def stdinput
             @input
         end
@@ -86,14 +37,14 @@ module SCGI # :nodoc: all
         end
     end
     class SCGIProcessor < Monitor # :nodoc: all
         attr_reader :settings
-        def initialize(settings = {})
+        def initialize(server, settings = {})
             @conns = 0
             @shutdown = false
             @dead = false
+      @server = server
             super()
             configure(settings)
@@ -101,15 +52,18 @@ module SCGI # :nodoc: all
         def configure(settings)
             @settings = settings
-            @log = LogFactory.instance.create(settings[:logfile] || "log/scgi.log")
-            @maxconns = settings[:maxconns] || 2**30-1
+            #@log = LogFactory.instance.create(settings[:logfile])
+            @log = Logger
+      @log = Logger.new(settings[:logfile]) if settings[:logfile]
+            @maxconns = settings[:maxconns]
             @started = Time.now
             if settings[:socket]
                 @socket = settings[:socket]
             else
-                @host = settings[:host] || "127.0.0.1"
-                @port = settings[:port] || "9999"
+                @host = settings[:host]
+                @port = settings[:port]
             end
             @throttle_sleep = 1.0/settings[:conns_second] if settings[:conns_second]
@@ -125,14 +79,14 @@ module SCGI # :nodoc: all
                     break if @shutdown and @conns <= 0
                 end
             rescue Interrupt
-                @log.info("Shutting down from SIGINT.")
+                @log.info("SCGI: Shutting down from SIGINT.")
             rescue Object
-                @log.error("while listening for connections on #@host:#@port -- #{$!.class}", $!)
+                @log.warn("SCGI: while listening for connections on #@host:#@port -- #{$!.class} #$! #{$!.backtrace.join("\n")}" )
             end
             @socket.close if not @socket.closed?
             @dead = true
-            @log.info("Exited accept loop. Shutdown complete.")
+            @log.info("SCGI: Exited accept loop. Shutdown complete.")
         end
@@ -158,14 +112,14 @@ module SCGI # :nodoc: all
                     # we should now either have a payload length to get
                     payload = socket.read(len.to_i)
                     if (c = socket.read(1)) != ','
-                        @log.error("Malformed request, does not end with ','")
+                        @log.warn("SCGI: Malformed request, does not end with ','")
                     else
                         read_header(socket, payload, @conns)
                     end
                 rescue IOError
-                    @log.error("received IOError #$! when handling client.  Your web server doesn't like me.")
+                    @log.warn("SCGI: received IOError #$! when handling client.  Your web server doesn't like me.")
                 rescue Object
-                    @log.error("after accepting client #@host:#@port -- #{$!.class}", $!)
+                    @log.warn("SCGI: after accepting client #@host:#@port -- #{$!.class} #$! #{$!.backtrace.join("\n")}")
                 ensure
                     synchronize { @conns -= 1 if not in_shutdown}
                     socket.close if not socket.closed?
@@ -197,10 +151,26 @@ module SCGI # :nodoc: all
         end
-        def process_request(request, body, socket)
-            raise "You must implement process_request"
-        end
+  def process_request(request, body, socket)
+      return if socket.closed?
+      cgi = SCGIFixed.new(request, body, socket)
+      begin
+    #--
+    # TODO: remove sync, Nitro *is* thread safe!
+    #++
+    # guill: and why not ? ;)
+    #synchronize do
+        #--
+        # FIXME: this is uggly, something better?
+        #++
+        cgi.stdinput.rewind
+        cgi.env["QUERY_STRING"] = (cgi.env["REQUEST_URI"] =~ /^[^?]+\?(.+)$/ and $1).to_s
+        Nitro::Cgi.process(@server, cgi, cgi.stdinput, cgi.stdoutput)
+    #end
+      ensure
+        Og.manager.put_store if defined?(Og) and Og.respond_to?(:manager)
+      end
+  end
         def split_body(data)
             result = {}
@@ -234,12 +204,35 @@ module SCGI # :nodoc: all
             if force
                 @socket.close
-                @log.info("FORCED shutdown requested.  Oh well.")
+                @log.info("SCGI: FORCED shutdown requested.  Oh well.")
             else
-                @log.info("Shutdown requested.  Beginning graceful shutdown with #@conns connected.")
+                @log.info("SCGI: Shutdown requested.  Beginning graceful shutdown with #@conns connected.")
             end
         end
     end
+    class << self
+      def start(server)
+        settings = {
+    :host => server.address,
+    :port => server.port,
+    :logfile => nil, # will use Logger
+    :maxconns => 2**30-1,
+    :socket => nil,
+    :conns_second => nil,
+    :env => nil,
+    :drb_enable => false,
+    :drb_port => server.port - 1000,
+    :drb_password => ""
+        }
+        settings.update(server.options)
+  @nitro = SCGIProcessor.new(server, settings)
+  Logger.info("SCGI: Running on #{settings[:host]}:#{settings[:port]}")
+  @nitro.listen
+      end
+    end
 end
 # * Zed A Shaw <zedshaw@zedshaw.com>