ramaze 0.3.5 → 0.3.9

data/lib/ramaze/action.rb

@@ -15,8 +15,11 @@ module Ramaze
   end
 
   require 'ramaze/action/render'
+  require 'ramaze/helper/link'
 
   class Action
+    include Helper::Link
+
     class << self
 
       # Instantiate with given Hash, takes both string/symbol keys.
@@ -30,10 +33,14 @@ module Ramaze
         i
       end
 
-      # Thread.current[:action] returns the instance of Action you are currently in.
+      # alias for stack.last, returns the instance of Action you are currently in.
 
       def current
-        Thread.current[:action]
+        stack.last
+      end
+
+      def stack
+        Thread.current[:action_stack] ||= []
       end
     end
 

data/lib/ramaze/action/render.rb

@@ -4,6 +4,16 @@
 module Ramaze
   class Action
 
+    def stack
+      Action.stack << self
+      yield self
+    rescue Object => ex
+      Log.error "#{ex} in: #{self}"
+      raise ex
+    ensure
+      Action.stack.pop
+    end
+
     # Render this instance of Action, this will (eventually) pass itself to
     # Action#engine.transform
     # Usage, given that Foo is a Controller and has the method/template
@@ -12,13 +22,14 @@ module Ramaze
     #  #> 'bar'
 
     def render
-      Inform.dev("The Action: #{self}")
-      Thread.current[:action] = self
+      Log.dev("Action: #{self}")
 
-      if should_cache?
-        cached_render
-      else
-        uncached_render
+      stack do
+        if should_cache?
+          cached_render
+        else
+          uncached_render
+        end
       end
     end
 
@@ -62,10 +73,10 @@ module Ramaze
       end
 
       if cache.size > 0 and (cache_opts[:ttl].nil? or cache[:time] + cache_opts[:ttl] > Time.now)
-        Inform.debug("Using Cached version")
+        Log.debug("Using Cached version")
         Response.current['Content-Type'] = cache[:type]
       else
-        Inform.debug("Compiling Action")
+        Log.debug("Compiling Action")
         cache.replace({ :time => Time.now, :content => uncached_render, :type => Response.current['Content-Type'] })
       end
 
@@ -77,9 +88,9 @@ module Ramaze
     # Layout will be found and rendered in this step after self was rendered.
 
     def uncached_render
-      content = [before_process,
-                 engine.transform(self),
-                 after_process].join
+      before_process
+
+      content = engine.transform(self)
 
       if path and tlayout = layout
         [instance, tlayout.instance].each do |i|
@@ -87,34 +98,39 @@ module Ramaze
         end
 
         content = tlayout.render
-
-        # restore Action.current after render above
-        Thread.current[:action] = self
       end
 
       content
+
+    ensure
+      after_process unless $!
     end
 
     # Determine whether or not we have a layout to process and sets it up
-    # correctly to be rendered in the same context as current action.
-    # Will return false if the layout is the same as current action to avoid
-    # infinite recursion and also if no layout on this controller was found.
+    # correctly to be rendered in the same context as current action.  Will
+    # return false if the layout is the same as current action to avoid
+    # infinite recursion and also if no layout on this controller or its
+    # ancestors was found.
 
     def layout
-      return false unless layouts = controller.trait[:layout]
+      return false unless layouts = controller.ancestral_trait[:layout]
 
-      possible = [layouts[:all], layouts[path]].compact
+      possible = [layouts[path], layouts[:all]].compact
       denied = layouts[:deny].to_a
 
       if layout = possible.first
-        layout_action = Ramaze::Controller.resolve(layout)
-
-        if denied.include?(path) or layout_action.path == path
-          return false
+        if layout.to_s !~ /\A\// # late bind layout action to current controller
+          layout = R(controller, layout)
         end
+        layout_action = Controller.resolve(layout)
+
+        return false if denied.any?{|deny| deny === path} or layout_action.path == path
 
-        unless layout_action.controller == controller
+        if layout_action.controller != controller
           instance.instance_variables.each do |x|
+            if layout_action.instance.instance_variable_defined?(x)
+              Log.warn "overwriting instance variable #{x} from layout controller with instance variable from action controller."
+            end
             layout_action.instance.instance_variable_set(x, instance.instance_variable_get(x))
           end
         else

data/lib/ramaze/adapter.rb

@@ -1,13 +1,6 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'socket'
-require 'timeout'
-require 'benchmark'
-
-require 'rack'
-require 'rack/utils'
-
 require 'ramaze/trinity'
 require 'ramaze/tool/record'
 require 'ramaze/adapter/base'
@@ -47,7 +40,7 @@ module Ramaze
       rescue SystemExit
         Ramaze.shutdown
       rescue Object => ex
-        Inform.error(ex)
+        Log.error(ex)
         Ramaze.shutdown
       end
 
@@ -61,17 +54,19 @@ module Ramaze
         if adapter = Global.adapter
           host, ports = Global.host, Global.ports
 
-          Inform.info("Adapter: #{adapter}, testing connection to #{host}:#{ports}")
-          test_connections(host, ports)
+          if Global.test_connections
+            Log.info("Adapter: #{adapter}, testing connection to #{host}:#{ports}")
+            test_connections(host, ports)
+            Log.info("and we're running: #{host}:#{ports}")
+          end
 
-          Inform.info("and we're running: #{host}:#{ports}")
           adapter.start(host, ports)
         else # run dummy
           Global.adapters.add Thread.new{ sleep }
-          Inform.warn("Seems like Global.adapter is turned off", "Continue without adapter.")
+          Log.warn("Seems like Global.adapter is turned off", "Continue without adapter.")
         end
       rescue LoadError => ex
-        Inform.warn(ex, "Continue without adapter.")
+        Log.warn(ex, "Continue without adapter.")
       end
 
       # Calls ::shutdown on all running adapters and waits up to 1 second for
@@ -94,11 +89,9 @@ module Ramaze
       # Shuts down if no connection is possible.
 
       def test_connections host, ports
-        return unless Global.test_connections
-
         ports.each do |port|
           unless test_connection(host, port)
-            Inform.error("Cannot open connection on #{host}:#{port}")
+            Log.error("Cannot open connection on #{host}:#{port}")
             Ramaze.shutdown
           end
         end
@@ -114,7 +107,7 @@ module Ramaze
           true
         end
       rescue => ex
-        Inform.error(ex)
+        Log.error(ex)
         false
       end
     end

data/lib/ramaze/adapter/base.rb

@@ -24,7 +24,7 @@ module Ramaze
         # Does nothing
 
         def stop
-          Inform.debug("Stopping #{self.class}")
+          Log.debug("Stopping #{self.class}")
         end
 
         # This is called by Rack with the usual env, subsequently calls
@@ -34,14 +34,14 @@ module Ramaze
         # calls .finish on the current response after ::respond has finished.
 
         def call(env)
-          if Ramaze::Global.benchmarking
-            time = Benchmark.measure{ respond(env) }
-            Inform.debug('request took %.5fs [~%.0f r/s]' % [time.real, 1.0/time.real])
+          returned = nil
+          if Global.benchmarking
+            time = Benchmark.measure{ returned = respond(env) }
+            Log.debug('request took %.5fs [~%.0f r/s]' % [time.real, 1.0/time.real])
           else
-            respond env
+            returned = respond env
           end
-
-          Thread.current[:response].finish
+          returned
         end
 
         # Initializes Request with env and an empty Response. Records the
@@ -49,11 +49,7 @@ module Ramaze
         # Then goes on and calls Dispatcher::handle with request and response.
 
         def respond env
-          request, response = Request.new(env), Response.new
-          if filter = Global.record
-            Record << request if filter[request]
-          end
-          Dispatcher.handle(request, response)
+          Current.call env
         end
       end
     end

data/lib/ramaze/adapter/cgi.rb

@@ -1,21 +1,22 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'ramaze/adapter'
+module Ramaze
+  Global.test_connections = false
 
-module Ramaze::Adapter
+  module Adapter
+    # Our CGI adapter acts as wrapper for the Rack::Handler::CGI.
+    class Cgi < Base
+      class << self
 
-  # Our CGI adapter acts as wrapper for the Rack::Handler::CGI.
-  class Cgi < Base
-    class << self
-
-      # start CGI in a new thread, host and port parameter are only taken
-      # to make it compatible with other adapters but have no influence and
-      # can be omitted
-      def start host = nil, ports = nil
-        Thread.new do
-          Thread.current[:task] = :cgi
-          Rack::Handler::CGI.run(self)
+        # start CGI in a new thread, host and port parameter are only taken
+        # to make it compatible with other adapters but have no influence and
+        # can be omitted
+        def start host = nil, ports = nil
+          Thread.new do
+            Thread.current[:task] = :cgi
+            Rack::Handler::CGI.run(self)
+          end
         end
       end
     end

data/lib/ramaze/adapter/ebb.rb

@@ -0,0 +1,34 @@
+require 'ebb'
+
+module Ramaze
+  Global.test_connections = true
+
+  module Adapter
+    class Ebb < Base
+      class << self
+
+        # start server on given host and port.
+        def run_server host, port
+          server = ::Ebb::Server.new(self, :port => port)
+
+          thread = Thread.new{ server.start }
+          thread[:adapter] = server
+          thread
+        end
+      end
+    end
+  end
+
+  class Response
+    def finish(&block)
+      @block = block
+
+      if [201, 204, 304].include?(status.to_i)
+        header.delete "Content-Type"
+        [status.to_i, header.to_hash, '']
+      else
+        [status.to_i, header.to_hash, [body].flatten.join]
+      end
+    end
+  end
+end

data/lib/ramaze/adapter/evented_mongrel.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-Ramaze::Inform.debug "Using Evented Mongrel"
+Ramaze::Log.debug "Using Evented Mongrel"
 
 require 'swiftcore/evented_mongrel'
 require 'ramaze/adapter/mongrel'

data/lib/ramaze/adapter/fcgi.rb

@@ -1,24 +1,24 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'ramaze/adapter'
+module Ramaze
+  Global.test_connections = false
 
-module Ramaze::Adapter
+  module Adapter
+    # Our Fcgi adapter acts as wrapper for the Rack::Handler::FastCGI.
+    class Fcgi < Base
+      class << self
 
-  # Our Fcgi adapter acts as wrapper for the Rack::Handler::FastCGI.
-  class Fcgi < Base
-    class << self
-
-      # start FastCGI in a new thread, host and port parameter are only taken
-      # to make it compatible with other adapters but have no influence and
-      # can be omitted
-      def run_server host = nil, ports = nil
-        Thread.new do
-          Thread.current[:task] = :cgi
-          Rack::Handler::FastCGI.run(self)
+        # start FastCGI in a new thread, host and port parameter are only taken
+        # to make it compatible with other adapters but have no influence and
+        # can be omitted
+        def run_server host = nil, ports = nil
+          Thread.new do
+            Thread.current[:task] = :cgi
+            Rack::Handler::FastCGI.run(self)
+          end
         end
       end
     end
   end
 end
-

data/lib/ramaze/adapter/lsws.rb

@@ -1,17 +1,21 @@
-require 'ramaze/adapter'
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
 
-module Ramaze::Adapter
+module Ramaze
+  Global.test_connections = false
 
-  # Our Lsws adapter acts as wrapper for the Rack::Handler::LSWS.
-  class Lsws < Base
-    class << self
+  module Adapter
+    # Our Lsws adapter acts as wrapper for the Rack::Handler::LSWS.
+    class Lsws < Base
+      class << self
 
-      # start Lsws in a new thread, host and port parameter are only taken
-      # to make it compatible with other adapters but have no influence and
-      # can be omitted
-      def run_server host = nil, ports = nil
-        Thread.new do
-          Rack::Handler::LSWS.run(self)
+        # start Lsws in a new thread, host and port parameter are only taken
+        # to make it compatible with other adapters but have no influence and
+        # can be omitted
+        def run_server host = nil, ports = nil
+          Thread.new do
+            Rack::Handler::LSWS.run(self)
+          end
         end
       end
     end

data/lib/ramaze/adapter/mongrel.rb

@@ -2,10 +2,11 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'mongrel'
-require 'ramaze/adapter'
 require 'rack/handler/mongrel'
 
 module Ramaze
+  Global.test_connections = true
+
   module Adapter
 
     # Our Mongrel adapter acts as wrapper for the Rack::Handler::Mongrel.

data/lib/ramaze/adapter/scgi.rb

@@ -0,0 +1,24 @@
+#          Copyright (c) 2008 Jeremy Evans  code@jeremyevans.net
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'rack/handler/scgi'
+
+module Ramaze
+  Global.test_connections = true
+
+  module Adapter
+    # Our Scgi adapter acts as wrapper for the Rack::Handler::SCGI.
+    class Scgi < Base
+      class << self
+
+        # start SCGI in a new thread
+        def run_server host, port
+          Thread.new do
+            Thread.current[:task] = :cgi
+            Rack::Handler::SCGI.run(self, :Host=>host, :Port=>port)
+          end
+        end
+      end
+    end
+  end
+end