ramaze 0.3.9.1 → 2008.06

data/lib/ramaze/current/session/flash.rb

@@ -11,6 +11,12 @@ module Ramaze
     # to touch this class at all.
     class Flash
       include Enumerable
+
+      def initialize sess
+        @session = sess
+      end
+
+      # iterate over the combined session
       def each(&block)
         combined.each(&block)
       end
@@ -55,12 +61,18 @@ module Ramaze
         current.delete(key)
       end
 
+      # check if combined is empty
+
+      def empty?
+        combined.empty?
+      end
+
       private
 
-      # Session.current or {}
+      # Associated session object
 
       def session
-        Current.session || {}
+        @session
       end
     end
   end

data/lib/ramaze/current/session/hash.rb

@@ -9,7 +9,8 @@ module Ramaze
 
       # Sets @hash to an empty Hash
 
-      def initialize
+      def initialize sess
+        @session = sess
         @hash = {}
       end
 
@@ -20,7 +21,7 @@ module Ramaze
         old = @hash.dup
         result = @hash.send(*args, &block)
         unless old == @hash
-          Cache.sessions[Current.session.session_id] = self
+          Cache.sessions[@session.session_id] = self
         end
         result
       end

data/lib/ramaze/dispatcher.rb

@@ -31,6 +31,11 @@ module Ramaze
       def handle
         path = request.path_info.squeeze('/')
 
+        if new_path = Rewrite.resolve(path)
+          path = new_path
+          Log.dev("Rewriting `#{path}' to `#{path}'")
+        end
+
         case path
         when *Global.ignore
           unless ::File.exist?(Dispatcher::File.resolve_path(path))
@@ -39,11 +44,8 @@ module Ramaze
         end
 
         general_dispatch path
-      rescue Object => error
-        meta = { :path => path,
-                 :request => request,
-                 :controller => Thread.current[:controller] }
-        Dispatcher::Error.process(error, meta)
+      rescue Object => exception
+        error(exception)
       end
 
       # protects against recursive dispatch and reassigns the path_info in the
@@ -103,21 +105,32 @@ module Ramaze
         }
       end
 
-      # Calls .process(path) on every class in Dispatcher::FILTER until one
+      # Calls .call(path) on every object in Dispatcher::FILTER until one
       # returns something else than false/nil.
 
       def filter(path)
         result = nil
         FILTER.each do |dispatcher|
-          result = dispatcher.process(path)
+          result = dispatcher.call(path)
           return result if result and not result.respond_to?(:exception)
         end
 
-        meta = {
-          :path => path,
-          :controller => Thread.current[:controller]
-        }
-        Dispatcher::Error.process(result, meta)
+        error(result, :path => path)
+      end
+
+      def error(obj, meta = {})
+        controller = Thread.current[:controller]
+        meta[:controller] ||= controller if controller
+
+        if Global.middleware
+          message = "No action for '#{meta[:path]}'"
+          message << " on '#{CGI.escapeHTML(controller.to_s)}'" if controller
+
+          raise(obj) if obj.respond_to?(:message)
+          raise(Ramaze::Error, message)
+        else
+          Dispatcher::Error.call(obj, meta)
+        end
       end
     end
   end

data/lib/ramaze/dispatcher/action.rb

@@ -22,18 +22,27 @@ module Ramaze
         # success. The response is then passed to each member of FILTER for
         # post-processing.
 
-        def process(path)
-          Log.info("Dynamic request from #{request.ip}: #{request.request_uri}")
+        def call(path)
+          log(path)
 
           catch(:respond) {
             body = Controller.handle(path)
-            response = Response.current.build(body)
+            Response.current.build(body)
           }
+
           FILTER.each{|f| f.call(response)}
           response
         rescue Ramaze::Error => ex
           ex
         end
+
+        def log(path)
+          case path
+          when *Global.boring
+          else
+            Log.info("Dynamic request from #{request.ip}: #{request.request_uri}")
+          end
+        end
       end
     end
   end

data/lib/ramaze/dispatcher/directory.rb

@@ -12,7 +12,7 @@ module Ramaze
         # Entry point from Dispatcher::filter.
         # Just a forwarder to build_listing, automatticly exiting if there is
         # an error (defined by returning false in build_listing)
-        def process(path)
+        def call(path)
           if Global.list_directories
             response = build_listing(path)
             Response.current.build(*response) if response
@@ -27,6 +27,7 @@ module Ramaze
 
           if ::File.directory?(dir)
             Log.debug("Serving directory listing: #{dir}")
+            Session.current.drop! if Session.current
 
             status = Ramaze::STATUS_CODE['OK']
             header = {'Content-Type' => "text/html"}
@@ -35,6 +36,8 @@ module Ramaze
           end
         end
 
+        # Nicely formatted listing for given path, template is "stolen" from
+        # lighttpd
         def list_for(path)
           root = ::File.expand_path(Global.public_root)
           display = path.gsub(/^#{Regexp.escape(root)}\/?/, '/')

data/lib/ramaze/dispatcher/error.rb

@@ -29,7 +29,7 @@ module Ramaze
         # In case metainfo has a controller we try to get the action for the
         # path on it, dispatching there if we find one.
         # Otherwise a plain-text error message is set as response.
-        def process(error, metainfo = {})
+        def call(error, metainfo = {})
           log_error(error)
 
           Thread.current[:exception] = error
@@ -41,7 +41,7 @@ module Ramaze
 
           if controller = metainfo[:controller]
             newpath = (controller.mapping + path).squeeze('/')
-            action_response = Dispatcher::Action.process(newpath)
+            action_response = Dispatcher::Action.call(newpath)
             case action_response
             when Ramaze::Error
               Log.debug("No custom error page found on #{controller}, going to #{path}")
@@ -62,7 +62,7 @@ module Ramaze
           begin
             m = ex.message
             c = ex.class
-            b = (ex.backtrace || []).join("\n")
+            b = [ex.backtrace].flatten.join("\n")
             body = <<-html
             ==== Error ====\n
               #{ m } (#{ c })

data/lib/ramaze/dispatcher/file.rb

@@ -21,8 +21,9 @@ module Ramaze
         # Entry point from Dispatcher::filter.
         # searches for the file and builds a response with status 200 if found.
 
-        def process(path)
+        def call(path)
           return unless file = open_file(CGI.unescape(path))
+          Session.current.drop! if Session.current
           if file == :NotModified
             return response.build([], STATUS_CODE['Not Modified'])
           end
@@ -34,8 +35,8 @@ module Ramaze
 
         def open_file(path)
           file = resolve_path(path)
-
-          if ::File.file?(file) or ::File.file?(file=file/'index')
+          
+          if ::File.file?(file)
             return unless in_public?(file)
             response['Content-Type'] = Tool::MIME.type_for(file) unless ::File.extname(file).empty?
             mtime = ::File.mtime(file)
@@ -54,6 +55,11 @@ module Ramaze
           end
         end
 
+        # If path matches a directory in public_root, return that directory path, unless
+        # there is an index file in that directory, in which case return path for that.
+        # If path is not a directory, simply return given path in public_root.
+        # Either way, the returned path always starts with public_root.
+        
         def resolve_path(path)
           joined = ::File.join(Global.public_root, path)
 
@@ -64,6 +70,8 @@ module Ramaze
           end
         end
 
+        # Determine whether a path is in the public directory for better
+        # security.
         def in_public?(path)
           expand(path).start_with?(expand(Global.public_root))
         end

data/lib/ramaze/gestalt.rb

@@ -95,7 +95,7 @@ module Ramaze
 
     def _gestalt_build_tag name, attr={}, text=[]
       @out << "<#{name}"
-      @out << attr.inject(''){ |s,v| s << %{ #{v[0]}="#{_gestalt_escape_entities(v[1])}"} }
+      @out << attr.map{|k,v| %[ #{k}="#{_gestalt_escape_entities(v)}"] }.join
       if text != [] or block_given?
         @out << ">"
         @out << _gestalt_escape_entities([text].join)

data/lib/ramaze/helper.rb

@@ -11,12 +11,23 @@ module Ramaze
 
   module Helper
     LOOKUP = Set.new
+    PATH = ['']
     trait :ignore => [
       /#{Regexp.escape(File.expand_path(BASEDIR/'../spec/ramaze/helper/'))}\//
     ]
 
     module Methods
-      private
+      def self.included other
+        other.send :extend, Trinity
+        other.send :extend, Methods
+        other.send :include, Trinity
+        super
+      end
+
+      def self.extend_object other
+        other.send :extend, Trinity
+        super
+      end
 
       # This loads the helper-files from /ramaze/helper/helpername.rb and
       # includes it into Ramaze::Template (or wherever it is called)
@@ -39,22 +50,19 @@ module Ramaze
         end
       end
 
-      # Will be going to be much simpler after deprecation *sigh*
+      private
+
       def find_helper(name)
+        name = name.to_s.camel_case
         ramaze_helper_consts = ::Ramaze::Helper.constants.grep(/^#{name}$/i)
-        ramaze_consts = ::Ramaze.constants.grep(/^#{name}Helper$/i)
         if mod_name = ramaze_helper_consts.first
           ::Ramaze::Helper.const_get(mod_name)
-        elsif mod_name = ramaze_consts.first
-          mod = ::Ramaze.const_get(mod_name)
-          new_name = "Ramaze::Helper::" << mod_name.split('::').last[/^(.*)Helper$/, 1]
-          Log.warn "#{mod_name} is being deprecated, use #{new_name} instead"
-          mod
         end
       end
 
       def require_helper(name)
-        glob = "{,#{APPDIR},#{BASEDIR/:ramaze}}/helper/#{name}.{so,bundle,rb}"
+        paths = (PATH + [Global.root, BASEDIR/:ramaze]).join(',')
+        glob = "{#{paths}}/helper/#{name}.{so,bundle,rb}"
         files = Dir[glob]
         ignore = Helper.trait[:ignore]
         files.reject!{|f| ignore.any?{|i| f =~ i }}
@@ -66,18 +74,6 @@ module Ramaze
         include mod
         extend mod
       end
-
-      def Methods.included other
-        other.send :extend, Trinity
-        other.send :include, Trinity
-        other.send :extend, Methods
-        super
-      end
-
-      def Methods.extend_object other
-        other.send :extend, Trinity
-        super
-      end
     end
   end
 end

data/lib/ramaze/helper/aspect.rb

@@ -8,10 +8,6 @@ module Ramaze
   #
   # For examples please look at the spec/ramaze/helper/aspect.rb
   #
-  # This is not a default helper due to the possible performance-issues.
-  # However, it should be only an overhead of about 6-8 calls, so if you
-  # want this feature it shouldn't have too large impact ;)
-  #
   # Like every other helper, you can use it in your controller with:
   #
   #   helper :aspect
@@ -21,7 +17,7 @@ module Ramaze
     private
 
     # lazily and smartly inherit copy of aspects trait from parent, or
-    # bootstrap our own 
+    # bootstrap our own
     def aspects
       trait[:aspects] ||= (
         if hash = ancestral_trait[:aspects]
@@ -80,21 +76,31 @@ module Ramaze
   class Action
 
     # overwrites the default Action hook and runs the neccesary blocks in its
-    # scope.
+    # scope. before actions are run starting from Ramaze::Controller down the
+    # ancestor chain.
     def before_process
-      return unless path and aspects = controller.ancestral_trait[:aspects]
-      [ aspects[:before][name], aspects[:before][:all] ].compact.map do |block|
-        instance.instance_eval(&block) if block
-      end
+      common_aspect(:before)
     end
 
+
     # overwrites the default Action hook and runs the neccesary blocks in its
-    # scope.
+    # scope. before actions are run starting from Ramaze::Controller down the
+    # ancestor chain.
     def after_process
-      return unless path and aspects = controller.ancestral_trait[:aspects]
-      [ aspects[:after][name], aspects[:after][:all] ].compact.map do |block|
-        instance.instance_eval(&block) if block
+      common_aspect(:after)
+    end
+
+    def common_aspect(aspect)
+      return unless path
+
+      controller.relevant_ancestors.reverse_each do |controller|
+        next unless aspects = controller.trait[:aspects]
+
+        [ aspects[aspect][name], aspects[aspect][:all] ].compact.map do |block|
+          instance.instance_eval(&block) if block
+        end
       end
     end
+
   end
 end

data/lib/ramaze/helper/auth.rb

@@ -32,7 +32,7 @@ module Ramaze
         session[:username] = username
         inside_stack? ? answer : redirect_referrer
       else
-        if AUTH_ELEMENT and AUTH_ELEMENT.to_s.split.any?
+        if defined? AUTH_ELEMENT and AUTH_ELEMENT.to_s.split.any?
           open_element = "<#{AUTH_ELEMENT}>"
           close_element = "</#{AUTH_ELEMENT}>"
         end

data/lib/ramaze/helper/cache.rb

@@ -44,13 +44,10 @@ module Ramaze
     def cache *args
       return value_cache if args.size == 0
 
-      if args.last.is_a? Hash
-        opts = args.pop
-      end
-      opts ||= {}
+      opts = args.last.is_a?(Hash) ? args.pop : {}
 
-      args.each do |arg|
-        actions_cached[arg.to_sym] = opts unless arg.nil?
+      args.compact.each do |arg|
+        actions_cached[arg.to_sym] = opts
       end
     end
 

data/lib/ramaze/helper/cgi.rb

@@ -31,13 +31,17 @@ module Ramaze
     end
 
     # safely escape all HTML and code
-    def c(string)
+    def h(string)
       ::CGI.escapeHTML(string.to_s).gsub(/#/, '#')
     end
 
+    def c(string)
+      Ramaze::deprecated("Helper::CGI#c", "Helper::CGI#h")
+      h(string)
+    end
+
     # one-letter versions help in case like #{h foo.inspect}
     # ERb/ERuby/Rails compatible
     alias u url_encode
-    alias h c
   end
 end

data/lib/ramaze/helper/flash.rb

@@ -23,7 +23,7 @@ module Ramaze
   # On the request after this, flash[:error] is gone.
 
   module Helper::Flash
-    trait :tag => "<div class='flash' id='flash_%key'>%value</div>"
+    trait :flashbox => "<div class='flash' id='flash_%key'>%value</div>"
     # answers with Session.current.flash
 
     def flash
@@ -48,12 +48,12 @@ module Ramaze
     # Where any occurrence of %key and %value will be replaced by the actual
     # contents of each element of flash
 
-    def flashbox(tag = Helper::Flash.trait[:tag])
-      flash.map{|key, value|
-        [key.to_s, value.to_s]
-      }.sort.map{|(key, value)|
-        tag.gsub(/%key/, key.to_s).gsub(/%value/, value.to_s)
-      }.join("\n")
+    def flashbox(tag = ancestral_trait[:flashbox])
+      flash.map{|key, *values|
+        values.flatten.map do |value|
+          tag.gsub(/%key/, key.to_s).gsub(/%value/, value.to_s)
+        end
+      }.flatten.join("\n")
     end
   end
 end