ramaze 0.2.1 → 0.3.0

data/lib/ramaze/contrib/gettext/po.rb

@@ -0,0 +1,109 @@
+#! /usr/bin/env ruby
+=begin
+  rgettext.rb - Generate a .pot file.
+
+  Copyright (C) 2003-2006  Masao Mutoh
+  Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
+
+      Yasushi Shoji   <yashi at atmark-techno.com>
+      Masao Mutoh     <mutoh at highway.ne.jp>
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+=end
+
+
+module GetText
+
+  module RGetText #:nodoc:
+    extend GetText
+
+    MAX_LINE_LEN = 70 unless defined?(MAX_LINE_LEN)
+
+    module_function
+
+    def generate_pot_header # :nodoc:
+      time = Time.now.strftime("%Y-%m-%d %H:%M")
+      off = Time.now.utc_offset
+      sign = off <= 0 ? '-' : '+'
+      time += sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60))
+
+      <<EOS
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\\n"
+"POT-Creation-Date: #{time}\\n"
+"PO-Revision-Date: #{time}\\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n"
+"Language-Team: LANGUAGE <LL@li.org>\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+EOS
+    end
+
+    def generate_pot(ary) # :nodoc:
+      str = ""
+      result = Array.new
+      ary.each do |key|
+	      msgid = key.shift.dup
+	      curr_pos = MAX_LINE_LEN
+	      key.each do |e|
+	        if curr_pos + e.size > MAX_LINE_LEN
+	          str << "\n#:"
+	          curr_pos = 3
+	        else
+	          curr_pos += (e.size + 1)
+	        end
+	        str << " " << e
+      	end
+      	msgid.gsub!(/"/, '\"')
+      	msgid.gsub!(/\r/, '')
+
+      	str << "\nmsgid \"" << msgid << "\"\n"
+    	  str << "msgstr \"\"\n"
+      end
+      str
+    end
+
+    def generate_translated_po(hash)
+      str = generate_pot_header
+      result = Array.new
+
+      hash.keys.sort.each do |msgid|
+        msgid = msgid.dup
+        msgstr = hash[msgid]
+
+        msgid.gsub!(/"/, '\"')
+      	msgid.gsub!(/\r/, '')
+
+      	if msgstr
+      	  msgstr.gsub!(/"/, '\"')
+        	msgstr.gsub!(/\r/, '')
+      	end
+
+      	str << "\nmsgid \"" << msgid << "\"\n"
+    	  str << "msgstr \"" << msgstr << "\"\n"
+      end
+
+      str
+    end
+
+    def generate(array)  # :nodoc:
+      str = ''
+      str << generate_pot_header
+      str << generate_pot(array)
+    end
+  end
+end
+
+if $0 == __FILE__
+  require 'yaml'
+  puts GetText::RGetText.generate_translated_po(YAML.load_file(ARGV[0]))
+end

data/lib/ramaze/contrib/gzip_filter.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 # gzip_filter.rb

data/lib/ramaze/contrib/route.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 # Usage:
@@ -31,10 +31,20 @@ module Ramaze
     class << self
       def routed(path)
         routes = Contrib::Route.trait[:routes]
-        routes.each do |regex, pattern|
-          if md = path.match(regex)
-            new_path = pattern % md.to_a[1..-1]
-            return resolve(new_path, :routed)
+        routes.each do |key, val|
+          case
+          when key.is_a?(Regexp)
+            regex, pattern = key, val
+            if md = path.match(regex)
+              new_path = pattern % md.to_a[1..-1]
+              return resolve(new_path, :routed)
+            end
+          when val.respond_to?(:call)
+            if new_path = val.call(path, request)
+              return resolve(new_path, :routed)
+            end
+          else
+            Inform.error "Invalid route #{val}"
           end
         end
 

data/lib/ramaze/contrib/sequel/fill.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Sequel

data/lib/ramaze/controller.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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/helper'
@@ -57,9 +57,15 @@ module Ramaze
 
       def startup options = {}
         Inform.dev("found Controllers: #{Global.controllers.inspect}")
-        tr, pr = Global.template_root, Global.public_root
-        Inform.warn("Template root: #{tr} doesn't exist") unless File.directory?(tr)
-        Inform.warn("Public root: #{pr} doesn't exist") unless File.directory?(pr)
+
+        { 'Template' => Global.template_root,
+          'Public'   => Global.public_root }.each do |type, path|
+          unless File.directory?(path)
+            Inform.warn("#{type} root: #{path} doesn't exist")
+          else
+            Inform.info("#{type} root: #{File.expand_path path}")
+          end
+        end
 
         if Global.mapping.empty?
           Inform.warn("No Controllers mapped, will serve /public only.")

data/lib/ramaze/controller/error.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -20,25 +20,17 @@ module Ramaze
         return [title, "", error.backtrace].flatten.join("\n")
       end
 
-      @backtrace = error.backtrace[0..20]
-
-      @colors = []
-      min = 200
-      max = 255
-      step = -((max - min) / @backtrace.size).abs
-      max.step(min, step) do |color|
-        @colors << color
-      end
-
       backtrace_size = Ramaze::Global.backtrace_size
-
-      @backtrace.map! do |line|
+      @backtrace = error.backtrace[0..20].map do |line|
         file, lineno, meth = *Ramaze.parse_backtrace(line)
         lines = Ramaze.caller_lines(file, lineno, backtrace_size)
 
         [ lines, lines.object_id.abs, file, lineno, meth ]
       end
 
+      # for backwards-compat with old error.zmr
+      @colors = [255] * @backtrace.size
+
       @title = CGI.escapeHTML(title)
       @editor = (ENV['EDITOR'] || 'vim')
       title

data/lib/ramaze/controller/main.rb

@@ -0,0 +1,2 @@
+class MainController < Ramaze::Controller
+end

data/lib/ramaze/controller/resolve.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -81,7 +81,7 @@ module Ramaze
       # appropiate template if one exists.
 
       def resolve_action(path, *parameter)
-        path, parameter = path.to_s, parameter.map(&:to_s)
+        path, parameter = path.to_s, parameter.map{|e| e.to_s}
         if alternate_template = trait["#{path}_template"]
           t_controller, t_path = *alternate_template
           template = t_controller.resolve_template(t_path)
@@ -116,17 +116,17 @@ module Ramaze
 
       # Composes an array with the template-paths to look up in the right order.
       # Usually this is composed of Global.template_root and the mapping of the
-      # controller and a second element for Global.public_root, which makes
-      # it possible to convert CSS on the fly and things like that.
+      # controller.
 
       def template_paths
         @template_root ||= Global.template_root / Global.mapping.invert[self]
-        [ @template_root, Global.public_root ].compact
+        [ @template_root ]
       end
 
       # Based on methodname and arity, tries to find the right method on current controller.
       def resolve_method(name, *params)
-        if method = [ name, name.gsub('__','/') ].find{|n| action_methods.delete(n) }
+        if method = [ name, name.gsub('__','/') ].find{|n|
+          cached_action_methods.include?(n) }
           arity = instance_method(method).arity
           if params.size == arity or arity < 0
             return method, params
@@ -135,14 +135,20 @@ module Ramaze
         return nil, []
       end
 
+      def cached_action_methods
+        Cache.action_methods[self] ||= action_methods
+      end
+
       # methodnames that may be used for current controller.
       def action_methods
         exclude = Controller.trait[:exclude_action_modules]
 
-        ancs = (ancestors - exclude).select{|a| a.is_a?(Module)}
-        meths = ancs.map{|a| a.instance_methods(false).map(&:to_s)}.flatten.uniq
+        ancs = (ancestors - exclude).select{|a| a.is_a?(Module) }
+        meths = ancs.map{|a|
+          a.instance_methods(false).map{|iv| iv.to_s }
+        }.flatten.uniq
         # fix for facets/more/paramix
-        meths - ancs.map(&:to_s)
+        meths - ancs.map{|a| a.to_s}
       end
 
       # Generate all possible permutations for given path.
@@ -166,7 +172,9 @@ module Ramaze
 
           until pattern.empty?
             args << pattern.shift
-            patterns << [controller, args.join( '__' ), pattern.dup]
+            joined = args.join('__')
+            patterns << [controller, joined, pattern.dup]
+            patterns << [controller, "#{joined}__index", pattern.dup]
           end
         end
 

data/lib/ramaze/dispatcher.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'timeout'

data/lib/ramaze/dispatcher/action.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/dispatcher/directory.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -36,7 +36,8 @@ module Ramaze
         end
 
         def list_for(path)
-          display = path.gsub(/^#{Regexp.escape(Global.public_root)}\/?/, '/')
+          root = ::File.expand_path(Global.public_root)
+          display = path.gsub(/^#{Regexp.escape(root)}\/?/, '/')
           wrapper =
 %(<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

data/lib/ramaze/dispatcher/error.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -51,12 +51,12 @@ module Ramaze
             end
           end
 
-          unless error.message =~ %r(`#{path.split('/').last}')
+          if path and Global.error_page and error.message !~ /`#{path}'/
             response.status = status
-            return Dispatcher.dispatch_to(path) if path and Global.error_page
+            return Dispatcher.dispatch_to(path)
+          else
+            response.build(error.message, status)
           end
-
-          response.build(error.message, status)
         rescue Object => ex
           Inform.error(ex)
           response.build(ex.message, status)

data/lib/ramaze/dispatcher/file.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -8,6 +8,10 @@ module Ramaze
     # file if found.
 
     class File
+      # These names are checked for serving from public directory.
+      # They take priority over Actions which comes later in the FILTER
+      INDICES = %w[index.htm index.xhtml index.html index]
+
       class << self
         include Trinity
 
@@ -24,6 +28,7 @@ module Ramaze
 
         def open_file(path)
           file = resolve_path(path)
+
           if ::File.file?(file) or ::File.file?(file=file/'index')
             response['Content-Type'] = Tool::MIME.type_for(file) unless ::File.extname(file).empty?
             log(file)
@@ -32,7 +37,13 @@ module Ramaze
         end
 
         def resolve_path(path)
-          ::File.join(Global.public_root, path)
+          joined = ::File.join(Global.public_root, path)
+
+          if ::File.directory?(joined)
+            Dir[joined/"{#{INDICES.join(',')}}"].first || joined
+          else
+            joined
+          end
         end
 
         def log(file)

data/lib/ramaze/error.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/gestalt.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 =begin rdoc
@@ -98,7 +98,7 @@ module Ramaze
       @out << attr.inject(''){ |s,v| s << %{ #{v[0]}="#{_gestalt_escape_entities(v[1])}"} }
       if text != [] or block_given?
         @out << ">"
-        @out << _gestalt_escape_entities(text.to_s)
+        @out << _gestalt_escape_entities([text].join)
         if block_given?
           text = yield
           @out << text.to_str if text != @out and text.respond_to?(:to_str)

data/lib/ramaze/global.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ostruct'
@@ -9,10 +9,10 @@ require 'ramaze/global/dsl'
 module Ramaze
   GlobalDSL.option_dsl do
     o "Set the adapter Ramaze will run on.",
-      :adapter => :webrick, :cli => [:webrick, :mongrel]
+      :adapter => :webrick, :cli => [:webrick, :mongrel, :thin]
 
     o "All running threads of Adapter will be collected here.",
-      :adapters => ThreadGroup.new
+      :adapters => Set.new
 
     o "Set the size of Backtrace shown.",
       :backtrace_size => 10, :cli => 10
@@ -77,7 +77,7 @@ module Ramaze
       :port => 7000, :cli => 7000, :short => :p
 
     o "Specify directory to serve static files",
-      :public_root => APPDIR/'./public', :cli => './template'
+      :public_root => 'public', :cli => 'public'
 
     o "Record all Request objects by assigning a filtering Proc to me.",
       :record => false
@@ -104,7 +104,7 @@ module Ramaze
       :test_connections => true, :cli => true
 
     o "Specify directory to serve dynamic files",
-      :template_root => APPDIR/'./template', :cli => './template'
+      :template_root => 'view', :cli => 'view'
 
     o "Enable directory listing",
       :list_directories => false, :cli => false

data/lib/ramaze/global/dsl.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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