ramaze 2008.06 → 2008.11

data/lib/ramaze/dispatcher.rb

@@ -14,10 +14,13 @@ module Ramaze
   # The Dispatcher receives requests from adapters and sets up the proper environment
   # to process them and respond.
 
-  module Dispatcher
+  class Dispatcher
+    def initialize(*args)
+      Dispatcher.call(*args)
+    end
 
     # requests are passed to every
-    FILTER = [ Dispatcher::File, Dispatcher::Action ] unless defined?(FILTER)
+    FILTER = OrderedSet[ Dispatcher::File, Dispatcher::Action ]
 
     # Response codes to cache the output of for repeated requests.
     trait :shielded => [ STATUS_CODE["Not Found"] ]
@@ -28,8 +31,12 @@ module Ramaze
       # Entry point for Adapter#respond, takes a Rack::Request and
       # Rack::Response, sets up the environment and the goes on to dispatch
       # for the given path from rack_request.
-      def handle
+      #
+      # +env+ will be ignored, it's just for compatibility with rack middleware
+      def call(env = nil)
         path = request.path_info.squeeze('/')
+        path.sub!(/^#{Regexp.escape(Global.prefix)}/, '/')
+        path.squeeze!('/')
 
         if new_path = Rewrite.resolve(path)
           path = new_path
@@ -47,12 +54,13 @@ module Ramaze
       rescue Object => exception
         error(exception)
       end
+      alias handle call
 
       # protects against recursive dispatch and reassigns the path_info in the
       # request, the rest of the request is kept intact.
       def dispatch_to(path)
         if request.path_info == path
-          if error = Thread.current[:exception]
+          if error = STATE[:exception]
             raise error
           else
             raise "Recursive redirect from #{path} to #{path}"
@@ -119,17 +127,17 @@ module Ramaze
       end
 
       def error(obj, meta = {})
-        controller = Thread.current[:controller]
+        controller = STATE[:controller]
         meta[:controller] ||= controller if controller
 
-        if Global.middleware
+        if Global.error_page
+          Dispatcher::Error.call(obj, meta)
+        else
           message = "No action for '#{meta[:path]}'"
-          message << " on '#{CGI.escapeHTML(controller.to_s)}'" if controller
+          message << " on '#{Rack::Utils.escape_html(controller)}'" if controller
 
           raise(obj) if obj.respond_to?(:message)
           raise(Ramaze::Error, message)
-        else
-          Dispatcher::Error.call(obj, meta)
         end
       end
     end

data/lib/ramaze/dispatcher/action.rb

@@ -2,7 +2,7 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
-  module Dispatcher
+  class Dispatcher
 
     # This dispatcher is responsible for relaying requests to Controller::handle
     # and filtering the results using FILTER.
@@ -11,9 +11,9 @@ module Ramaze
 
       # The response is passed to each filter by sending .call(response) to it.
 
-      FILTER = OrderedSet.new(
+      FILTER = OrderedSet[
         # Ramaze::Tool::Localize,
-      ) unless defined?(FILTER)
+      ] unless defined?(FILTER)
 
       class << self
         include Trinity
@@ -26,8 +26,7 @@ module Ramaze
           log(path)
 
           catch(:respond) {
-            body = Controller.handle(path)
-            Response.current.build(body)
+            response.write Controller.handle(path)
           }
 
           FILTER.each{|f| f.call(response)}

data/lib/ramaze/dispatcher/directory.rb

@@ -2,7 +2,7 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
-  module Dispatcher
+  class Dispatcher
 
     # Generates a directory listing, see Ramaze::Controller::Directory for more
     # information and how to create your own directory listing page

data/lib/ramaze/dispatcher/error.rb

@@ -2,7 +2,7 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
-  module Dispatcher
+  class Dispatcher
 
     # Last resort dispatcher, tries to recover as much information as possible
     # from the past request and takes the appropiate actions.
@@ -32,7 +32,7 @@ module Ramaze
         def call(error, metainfo = {})
           log_error(error)
 
-          Thread.current[:exception] = error
+          STATE[:exception] = error
           response = Response.current
 
           key = error.class.ancestors.find{|a| HANDLE_ERROR[a]}
@@ -51,7 +51,7 @@ module Ramaze
             end
           end
 
-          if path and Global.error_page and error.message !~ /`#{path}'/
+          if path and error.message !~ /`#{path}'/
             response.status = status
             return Dispatcher.dispatch_to(path)
           else
@@ -99,7 +99,7 @@ module Ramaze
         # Handle to current exception.
         # Only works inside request/response cycle.
         def current
-          Thread.current[:exception]
+          STATE[:exception]
         end
 
       end

data/lib/ramaze/dispatcher/file.rb

@@ -5,7 +5,7 @@ require "time"
 require 'digest/md5'
 
 module Ramaze
-  module Dispatcher
+  class Dispatcher
 
     # First of the dispatchers, looks up the public path and serves the
     # file if found.
@@ -22,7 +22,7 @@ module Ramaze
         # searches for the file and builds a response with status 200 if found.
 
         def call(path)
-          return unless file = open_file(CGI.unescape(path))
+          return unless file = open_file(Rack::Utils.unescape(path))
           Session.current.drop! if Session.current
           if file == :NotModified
             return response.build([], STATUS_CODE['Not Modified'])
@@ -35,7 +35,7 @@ module Ramaze
 
         def open_file(path)
           file = resolve_path(path)
-          
+
           if ::File.file?(file)
             return unless in_public?(file)
             response['Content-Type'] = Tool::MIME.type_for(file) unless ::File.extname(file).empty?
@@ -59,7 +59,7 @@ module Ramaze
         # 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)
 

data/lib/ramaze/gestalt.rb

@@ -7,21 +7,16 @@ Example:
   require 'ramaze'
   require 'ramaze/gestalt'
 
-  def random_color
-    ('#' << '%02x' * 3) % (1..3).map{ rand(255) }
-  end
+  page = Ramaze::Gestalt.build{
+    title = 'Hello, World!'
 
-  puts Ramaze::Gestalt.build{
     html do
-      head do
-        title{"Hello World"}
-      end
+      head{ title(title) }
       body do
-        h1{"Hello, World!"}
-        div(:style => 'width:100%') do
-          10.times do
-            div(:style => "width:#{rand(100)}%;height:#{rand(100)}%;background:#{random_color}"){ '&nbsp;' }
-          end
+        h1(title)
+        p 'I count to 10'
+        ('1'..'10').each do |count|
+          div(:style => 'width: 25px; height: 25px'){ count }
         end
       end
     end
@@ -53,7 +48,7 @@ module Ramaze
     #     end
     #
 
-    def self.build &block
+    def self.build(&block)
       self.new(&block).to_s
     end
 
@@ -63,24 +58,24 @@ module Ramaze
     #
     # Useful for distributed building of one page.
 
-    def initialize &block
-      @out = ''
+    def initialize(&block)
+      @out = []
       instance_eval(&block) if block_given?
     end
 
     # catching all the tags. passing it to _gestalt_build_tag
 
-    def method_missing meth, *args, &block
+    def method_missing(meth, *args, &block)
       _gestalt_call_tag meth, args, &block
     end
 
     # workaround for Kernel#p to make <p /> tags possible.
 
-    def p *args, &block
+    def p(*args, &block)
       _gestalt_call_tag :p, args, &block
     end
 
-    def _gestalt_call_tag name, args, &block
+    def _gestalt_call_tag(name, args, &block)
       if args.size == 1 and args[0].kind_of? Hash
         # args are just attributes, children in block...
         _gestalt_build_tag name, args[0], &block
@@ -93,7 +88,7 @@ module Ramaze
     # build a tag for `name`, using `args` and an optional block that
     # will be yielded
 
-    def _gestalt_build_tag name, attr={}, text=[]
+    def _gestalt_build_tag(name, attr = {}, text = [])
       @out << "<#{name}"
       @out << attr.map{|k,v| %[ #{k}="#{_gestalt_escape_entities(v)}"] }.join
       if text != [] or block_given?
@@ -122,7 +117,7 @@ module Ramaze
     end
 
     def to_s
-      @out.to_s
+      @out.join
     end
     alias to_str to_s
   end

data/lib/ramaze/helper/cgi.rb

@@ -6,38 +6,30 @@ module Ramaze
   # Shortcuts to some CGI methods
 
   module Helper::CGI
-    # shortcut for CGI.escape
 
+    # shortcut for Rack::Utils.escape
     def url_encode(*args)
-      ::CGI.escape(*args.map{|arg| arg.to_s})
+      Rack::Utils.escape(*args.map{|a| a.to_s })
     end
 
-    # shortcut for CGI.unescape
-
+    # shortcut for Rack::Utils.unescape
     def url_decode(*args)
-      ::CGI.unescape(*args.map{|arg| arg.to_s})
+      Rack::Utils.unescape(*args.map{|a| a.to_s })
     end
 
-    # shortcut for CGI.escapeHTML
-
+    # shortcut for Rack::Utils.escape_html
     def html_escape(string)
-      ::CGI.escapeHTML(string.to_s)
+      Rack::Utils.escape_html(string)
     end
 
     # shortcut for CGI.unescapeHTML
-
     def html_unescape(string)
       ::CGI.unescapeHTML(string.to_s)
     end
 
     # safely escape all HTML and code
     def h(string)
-      ::CGI.escapeHTML(string.to_s).gsub(/#/, '#')
-    end
-
-    def c(string)
-      Ramaze::deprecated("Helper::CGI#c", "Helper::CGI#h")
-      h(string)
+      Rack::Utils.escape_html(string).gsub(/#([{@$]@?)/, '#\1')
     end
 
     # one-letter versions help in case like #{h foo.inspect}

data/lib/ramaze/helper/formatting.rb

@@ -104,15 +104,55 @@ module Ramaze
           all
         else
           text = b + c
+          text = yield(text) if block_given?
           %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}"#{html_options}>#{text}</a>#{d})
         end
       end
     end
-    alias :autolink :auto_link
+    alias autolink auto_link
 
     def nl2br(string, xhtml = true)
       br = xhtml ? '<br />' : '<br>'
       string.gsub(/\n/, br)
     end
+
+    # Maybe port to ruby < 1.8.7 ?
+    def obfuscate_email(string)
+      string = string.to_s
+      text = string.each_byte.map{|c| "&#%03d" % c}.join
+      %(<a href="mailto:#{string}">#{text}</a>)
+    end
+
+    # Returns Hash with tags as keys and their weight as value.
+    #
+    # Example:
+    #     tags = %w[ruby ruby code ramaze]
+    #     tagcloud(tags)
+    #     # => {"code"=>0.75, "ramaze"=>0.75, "ruby"=>1.0}
+    #
+    # The weight can be influenced by adjusting the +min+ and +max+ parameters,
+    # please make sure that +max+ is larger than +min+ to get meaningful output.
+    #
+    # This is not thought as immediate output to your template but rather to
+    # help either implementing your own algorithm or using the result as input
+    # for your tagcloud.
+    #
+    # Example:
+    #     - tagcloud(tags).each do |tag, weight|
+    #       - style = "font-size: %0.2fem" % weight
+    #       %a{:style => style, :href => Rs(tag)}= h(tag)
+
+    def tagcloud(tags, min = 0.5, max = 1.5)
+      result = {}
+      total = tags.size.to_f
+      diff = max - min
+
+      tags.uniq.each do |tag|
+        count = tags.respond_to?(:count) ? tags.count(tag) : tags.select{|t| t==tag }.size
+        result[tag] = ((count / total) * diff) + min
+      end
+
+      result
+    end
   end
 end

data/lib/ramaze/helper/httpdigest.rb

@@ -4,15 +4,23 @@ require 'md5'
 module Ramaze
   module Helper
     module HttpDigest
+
+      UUID_GENERATOR = UUID.new
+
+      @session_nonce = "authentication_digest_nonce"
+
+      def httpdigest_logout
+        session.delete( @session_nonce )
+      end
+
       def httpdigest(uid, realm)
         session_opaque = "authentication_digest_opaque_#{uid}"
-        session_nonce = "authentication_digest_nonce"
 
-        session[session_opaque] ||= UUID.new
+        session[session_opaque] ||= UUID_GENERATOR.generate
 
         authorized = false
 
-        if session[session_nonce] and request.env['HTTP_AUTHORIZATION']
+        if session[@session_nonce] and request.env['HTTP_AUTHORIZATION']
 
           auth_split = request.env['HTTP_AUTHORIZATION'].split
           authentication_type = auth_split[0]
@@ -21,7 +29,7 @@ module Ramaze
             authorization.values_at(*%w[response username nonce nc cnonce qop])
 
           if authentication_type == 'Digest'
-            if nonce == session[session_nonce]
+            if nonce == session[@session_nonce]
               ha1 = yield(username)
               ha2 = MD5.hexdigest("#{request.request_method}:#{request.fullpath}")
               md5 = MD5.hexdigest([ha1, nonce, nc, cnonce, qop, ha2].join(':'))
@@ -32,17 +40,22 @@ module Ramaze
         end
 
         unless authorized
-          session[session_nonce] = UUID.new
+          session[@session_nonce] = UUID_GENERATOR.generate
           response['WWW-Authenticate'] =
             %|Digest realm="#{realm}",| +
             %|qop="auth,auth-int",| +
-            %|nonce="#{session[session_nonce]}",| +
+            %|nonce="#{session[@session_nonce]}",| +
             %|opaque="#{session[session_opaque]}"|
-          respond('Unauthorized', 401)
+          if respond_to?( :httpdigest_failure )
+            httpdigest_failure
+          else
+            respond('Unauthorized', 401)
+          end
         end
 
         authorization["username"]
       end
+
     end
   end
 end

data/lib/ramaze/helper/link.rb

@@ -7,13 +7,11 @@ module Ramaze
   # Usage is shown in spec/ramaze/helper/link.rb and the rdocs below.
 
   module Helper::Link
-  private
-
     # Builds a basic <a> tag.
     #
     # `text` is mandatory, the second hash of options will be transformed into
     # arguments of the tag, :href is a special case and its segments will be
-    # CGI.escaped.
+    # escaped.
     #
     # If you pass no :href, the text will be run through Rs and its result is
     # used instead. If you really want an empty href, use :href => ''
@@ -30,7 +28,7 @@ module Ramaze
 
       hash[:href] ||= Rs(*args)
       text = hash.delete(:text) || args.last || hash[:title] || hash[:href]
-      hash[:href] = hash[:href].to_s.gsub(/[^\/?;=]+/) {|m| CGI.escape(m) }
+      hash[:href] = hash[:href].to_s.gsub(/[^\/?;=]+/){|m| Rack::Utils.escape(m) }
 
       args = ['']
       hash.each {|k,v| args << %(#{k}="#{v}") if k and v }
@@ -69,10 +67,10 @@ module Ramaze
         end or atom.to_s
       end
 
-      front = atoms.join('/').squeeze('/')
+      front = [Global.prefix, *atoms].join('/').squeeze('/')
 
       if args
-        rear = args.inject('?'){|s,(k,v)| s << "#{CGI.escape k.to_s}=#{CGI.escape v.to_s};"}[0..-2]
+        rear = args.inject('?'){|s,(k,v)| s << "#{Rack::Utils.escape(k)}=#{Rack::Utils.escape(v)};"}[0..-2]
         front + rear
       else
         front