Pistos-ramaze 2008.12 → 2009.01

data/examples/app/blog/model/entry.rb

@@ -23,7 +23,14 @@ class Entry < Sequel::Model(:entry)
   end
 end
 
-Entry.create_table! unless Entry.table_exists?
+begin
+  Entry.create_table!
+rescue Sequel::DatabaseError => e
+  if e.message !~ /table.*already exists/
+    raise e
+  end
+end
+
 
 if Entry.empty?
   Entry.add 'Blog created', 'Exciting news today, this blog was created'

data/examples/app/wikore/src/model.rb

@@ -48,6 +48,12 @@ module Model
   end
 
   [Page, OldPage].each do |klass|
-    klass.create_table unless klass.table_exists?
+    begin
+      klass.create_table
+    rescue Sequel::DatabaseError => e
+      if e.message !~ /table.*already exists/
+        raise e
+      end
+    end
   end
 end

data/lib/proto/public/.htaccess

@@ -0,0 +1,24 @@
+# General Apache options
+Options +FollowSymLinks +ExecCGI
+AddHandler cgi-script cgi rb
+<IfModule mod_fastcgi.c>
+ AddHandler fastcgi-script fcgi
+</IfModule>
+<IfModule mod_fcgid.c>
+ AddHandler fcgid-script fcgi
+</IfModule>
+
+# Redirect all requests not available on the filesystem to Ramaze.
+
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+
+# In case Ramaze experiences terminal errors.
+# Instead of displaying this message you can supply a
+# file here which will be rendered instead.
+#
+# Example:
+#   ErrorDocument 500 /500.html
+
+ErrorDocument 500 "<h2>Application error</h2>Ramaze failed to start properly"

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

@@ -52,22 +52,22 @@ EOS
       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"
+        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
@@ -81,15 +81,15 @@ EOS
         msgstr = hash[msgid]
 
         msgid.gsub!(/"/, '\"')
-      	msgid.gsub!(/\r/, '')
+        msgid.gsub!(/\r/, '')
 
-      	if msgstr
-      	  msgstr.gsub!(/"/, '\"')
-        	msgstr.gsub!(/\r/, '')
-      	end
+        if msgstr
+          msgstr.gsub!(/"/, '\"')
+          msgstr.gsub!(/\r/, '')
+        end
 
-      	str << "\nmsgid \"" << msgid << "\"\n"
-    	  str << "msgstr \"" << msgstr << "\"\n"
+        str << "\nmsgid \"" << msgid << "\"\n"
+        str << "msgstr \"" << msgstr << "\"\n"
       end
 
       str

data/lib/ramaze/controller/resolve.rb

@@ -16,7 +16,7 @@ module Ramaze
       # instead, in either case with path as argument.
 
       def resolve(path, routed = false)
-        @routed = routed
+        Thread.current[:routed] = routed
 
         FILTER.each do |filter|
           answer = if filter.respond_to?(:call)
@@ -90,7 +90,7 @@ module Ramaze
           end
         end
 
-        if !@routed and new_path = Route.resolve(path)
+        if !Thread.current[:routed] and new_path = Route.resolve(path)
           Log.dev("Routing from `#{path}' to `#{new_path}'")
           return resolve(new_path, true)
         end

data/lib/ramaze/current/request.rb

@@ -196,9 +196,9 @@ module Ramaze
     # Example:
     #   request.params
     #   # => {'name' => 'jason', 'age' => '45', 'job' => 'lumberjack'}
-    #   request.sub('name')
+    #   request.subset('name')
     #   # => {'name' => 'jason'}
-    #   request.sub(:name, :job)
+    #   request.subset(:name, :job)
     #   # => {'name' => 'jason', 'job' => 'lumberjack'}
 
     def subset(*keys)
@@ -206,10 +206,19 @@ module Ramaze
       params.reject{|k,v| not keys.include?(k) }
     end
 
+    # Is this an SSL request?
+    def ssl?
+      env['HTTPS'] == 'on' || env['HTTP_X_FORWARDED_PROTO'] == 'https'
+    end
+
+    # Returns 'https' if this is an SSL request and 'http' otherwise.
+    def protocol
+      ssl? ? 'https' : 'http'
+    end
+
     def domain(path = '/')
-      scheme = env['rack.url_scheme'] || 'http'
       host = env['HTTP_HOST']
-      URI("#{scheme}://#{host}#{path}")
+      URI("#{protocol}://#{host}#{path}")
     end
 
     # Returns and array of locales from env['HTTP_ACCEPT_LANGUAGE].

data/lib/ramaze/helper/bench.rb

@@ -0,0 +1,43 @@
+require 'benchmark'
+
+module Ramaze
+  module Helper
+
+    # Little helper to give you a hand when benching parts of actions
+
+    module Bench
+
+      # Will first run an empty loop to determine the overhead it imposes, then
+      # goes on to yield your block +iterations+ times.
+      #
+      # The last yielded return value will be returned upon completion of the
+      # benchmark and the result of the benchmark itself will be sent to
+      # Log.info
+      #
+      # Example:
+      #
+      #   class MainController < Ramaze::Controller
+      #     def index
+      #       @users = bench{ User.all }
+      #       @tags = bench{ Article.tags }
+      #     end
+      #   end
+      #
+      # This will show something like following in your log:
+      # [..] INFO   Bench ./start.rb:3:in `index': 0.121163845062256
+      # [..] INFO   Bench ./start.rb:4:in `index': 2.234987235098341
+      #
+      # So now we know that the Article.tags call takes the most time and
+      # should be improved.
+
+      def bench(iterations = 1)
+        result = nil
+        from = caller[0]
+        delta = Benchmark.realtime{ iterations.times{ nil }}
+        taken = Benchmark.realtime{ iterations.times{ result = yield }}
+        Log.info "Bench #{from}: #{taken - delta}"
+        return result
+      end
+    end
+  end
+end

data/lib/ramaze/helper/markaby.rb

@@ -15,7 +15,7 @@ module Ramaze
     def markaby(ivs = {}, helpers = nil, &block)
       builder = ::Markaby::Builder
       builder.extend(Ramaze::Helper::Methods)
-      builder.send(:helper, :link)
+      builder.send(:helper, :redirect, :link, :sendfile, :flash, :cgi, :partial)
 
       iv_hash = {}
       instance_variables.each do |iv|

data/lib/ramaze/helper/paginate.rb

@@ -165,7 +165,7 @@ module Ramaze
           text = h(text.to_s)
 
           params = Ramaze::Request.current.params.merge(@var.to_s => n)
-          name = Ramaze::Request.current.request_path
+          name = Ramaze::Request.current.path_info
           hash[:href] = R(name, params)
 
           g.a(hash){ text }

data/lib/ramaze/helper/redirect.rb

@@ -47,7 +47,7 @@ module Ramaze
       unless target =~ %r!^https?://!
         target[0,0] = '/' unless target =~ %r!^/!
         if host = request.env['HTTP_HOST']
-          target[0,0] = "http://#{host}"
+          target[0,0] = "#{request.protocol}://#{host}"
         end
       end
 

data/lib/ramaze/log/syslog.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 #          Copyright (c) 2008 rob@rebeltechnologies.nl
 # All files in this distribution are subject to the terms of the Ruby license.
 
@@ -6,46 +6,46 @@ require 'syslog'
 
 # Add aliases for the levelnames used by Ramaze logging
 module Syslog
-    alias dev debug
-    alias warn warning
-    alias error err
-    module_function :dev, :warn, :error 
+  alias dev debug
+  alias warn warning
+  alias error err
+  module_function :dev, :warn, :error
 end
 
 module Ramaze
-    module Logger
-        # Logger class for writing to syslog. It is a *very* thin wrapper
-        # around the Syslog library.
-        class Syslog
-		    include Logging
+  module Logger
+    # Logger class for writing to syslog. It is a *very* thin wrapper
+    # around the Syslog library.
+    class Syslog
+      include Logging
 
-            # Open the syslog library, if it is allready open, we reopen it using the
-            # new argument list.  The argument list is passed on to the Syslog library
-            # so please check that, and man syslog for detailed information.  
-            # There are 3 parameters:
-            #
-            #   ident:  The identification used in the log file, defaults to $0
-            #   options:  defaults to  Syslog::LOG_PID | Syslog::LOG_CONS
-            #   facility: defaults to Syslog::LOG_USER
-            #
-            def initialize( *args )
-	    	    ::Syslog.close if ::Syslog.opened?
-	    	    ::Syslog.open( *args )
-            end
+      # Open the syslog library, if it is allready open, we reopen it using the
+      # new argument list.  The argument list is passed on to the Syslog library
+      # so please check that, and man syslog for detailed information.
+      # There are 3 parameters:
+      #
+      #   ident:  The identification used in the log file, defaults to $0
+      #   options:  defaults to  Syslog::LOG_PID | Syslog::LOG_CONS
+      #   facility: defaults to Syslog::LOG_USER
+      #
+      def initialize( *args )
+        ::Syslog.close if ::Syslog.opened?
+        ::Syslog.open( *args )
+      end
 
-            # just sends all messages received to ::Syslog
-            # We simply return if the log was closed for some reason, this behavior
-            # was copied from Informer.  We do not handle levels here. This will
-            # be done by te syslog daemon based on it's configuration.
-            def log(tag, *messages)
-			    return if !::Syslog.opened?
-              	::Syslog.send(tag, *messages)
-            end
+      # just sends all messages received to ::Syslog
+      # We simply return if the log was closed for some reason, this behavior
+      # was copied from Informer.  We do not handle levels here. This will
+      # be done by te syslog daemon based on it's configuration.
+      def log(tag, *messages)
+        return if !::Syslog.opened?
+        ::Syslog.send(tag, *messages)
+      end
 
-            # Has to call the modules singleton-method.
-            def inspect
-              ::Syslog.inspect
-            end
-        end
+      # Has to call the modules singleton-method.
+      def inspect
+        ::Syslog.inspect
+      end
     end
+  end
 end

data/lib/ramaze/version.rb

@@ -2,5 +2,5 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
-  VERSION = "2008.10"
+  VERSION = "2009.01"
 end