ramaze 2009.01 → 2009.02

data/README.markdown

@@ -401,7 +401,7 @@ For help you can:
 
 - Visit us in the channel #ramaze on irc.freenode.net
 
-- Join the Mailinglist at http://ramaze.rubyforge.org
+- Join the Mailinglist at http://groups.google.com/group/ramaze
 
 
 # Appendix

data/cache.yaml

@@ -0,0 +1,7 @@
+--- 
+foo:foobar: 
+  :value: foo
+  :expires: 
+bar:foobar: 
+  :value: bar
+  :expires: 

data/doc/CHANGELOG

@@ -1,3 +1,137 @@
+commit 8191be770086ec4741cb420765b39efcf419d3d2
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Fri Feb 13 22:24:58 2009 -0500
+
+    Added more to the post-install message.
+
+commit 13f56f5e608e7f8a36acfde69858a2946f8eafe9
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Fri Feb 13 22:13:49 2009 -0500
+
+    Bumped version to 2009.02.
+
+commit f73a2b3d6ee54b612fd411816940c991712c9dbe
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Fri Feb 13 22:13:19 2009 -0500
+
+    Freshened URLs throughout documentation and examples.
+
+commit cda6f1e92e2b962c69041f22fa54a8116187ac42
+Merge: 5b5cb75... 244b7a6...
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Fri Feb 13 21:25:00 2009 -0500
+
+    Merge branch 'master' of git://github.com/manveru/ramaze
+
+commit 244b7a6e97ea1c196e9a3302d43c98e5de469843
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Fri Feb 13 15:40:48 2009 +0900
+
+    Fix strange behaviour when using Fiber
+
+commit 947f1c6e6ca8b670d9d6541c03f5bbba042b0d4c
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Fri Feb 13 15:40:30 2009 +0900
+
+    Remove cruft
+
+commit 4a2cb9d2908e8c252fa82533b0ff1bc302bee62e
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Tue Feb 10 10:33:43 2009 +0900
+
+    Fix typo
+
+commit e8a062f35716327ad46247cb04b4e0a6b0ac56cb
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Sun Feb 8 13:55:27 2009 +0900
+
+    Fix Tool::Localize, would mess up body on 1.9
+
+commit 5b5cb750bd81e635c347b81eed1b4a90bc5c44ed
+Merge: 73419a5... 59ac9f6...
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Thu Feb 5 23:08:07 2009 -0500
+
+    Merge branch 'master' of git://github.com/manveru/ramaze
+
+commit 59ac9f647e548fb62472df6e8d5f02ced09b9681
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Wed Feb 4 22:40:59 2009 +0900
+
+    engine should be inherited
+
+commit 73419a572f1feca51fd70eb087bd5fda680ecae2
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Thu Jan 29 19:18:07 2009 -0500
+
+    Updated copyright years in README and version.rb.
+
+commit 213d7021a2594bd04444c3a1c5c19caecee97a1a
+Merge: 3c92cd3... 76c8b4a...
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Thu Jan 29 19:15:23 2009 -0500
+
+    Merge branch 'master' of git://github.com/manveru/ramaze
+
+commit 76c8b4a5968b17baa9d086bf56f619622348a2d7
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Sun Jan 25 03:06:33 2009 +0900
+
+    Show more examples of configuring flashbox
+
+commit ec0ab78612d01c0b4044da7147ee8a1ec0204290
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Sun Jan 25 02:41:39 2009 +0900
+
+    Fix bug uncovered by innate specs
+
+commit 3c92cd35eb153244e47990eeb84297e94ef02d39
+Merge: d5d3aeb... 01ad163...
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Mon Jan 19 13:59:59 2009 -0500
+
+    Merge branch 'master' of git@github.com:Pistos/ramaze
+
+commit 01ad163a53942bbf9b23cf70c4fd5c69090e7fe9
+Merge: 674943e... 23592e3...
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Mon Jan 19 14:07:51 2009 -0500
+
+    Merge branch 'master' of git://github.com/manveru/ramaze
+
+commit d5d3aeb141596cf6159644dd7a4b9e7fe8d83a72
+Merge: 69bd599... 23592e3...
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Mon Jan 19 13:36:53 2009 -0500
+
+    Merge branch 'master' of git://github.com/manveru/ramaze
+
+commit 23592e37557128fc1066b59b73bc526168e43e5a
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Fri Jan 16 11:59:00 2009 +0900
+
+    s/\t/  /g
+
+commit b0a5bccc768981c85f8fa395d59441c531517606
+Author: sean <sean@sean-t61p.(none)>
+Date:   Fri Sep 12 02:27:20 2008 -0400
+
+    fixed https redirect
+
+commit 7be54038cc81d9ce4051a82b489b732d3eda5323
+Author: Michael Fellinger <m.fellinger@gmail.com>
+Date:   Tue Jan 13 23:43:03 2009 +0900
+
+    Update gemspec
+
+commit 6b10ef8bae15b3d626d3d2745b85c2e879e5c8eb
+Author: Pistos <gitsomegrace.5.pistos@geoshell.com>
+Date:   Mon Jan 12 23:59:58 2009 +0800
+
+    Updated Ramaze::VERSION to 2009.01.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
 commit 69bd599a5eb0ca96f1c99de9cf87a3c6ca4018a6
 Merge: 701211d... 674943e...
 Author: Pistos <gitsomegrace.5.pistos@geoshell.com>

data/doc/readme_chunks/getting_help.txt

@@ -2,4 +2,4 @@ For help you can:
 
 - Visit us in the channel #ramaze on irc.freenode.net
 
-- Join the Mailinglist at http://ramaze.rubyforge.org
+- Join the Mailinglist at http://groups.google.com/group/ramaze

data/doc/tutorial/todolist.html

@@ -92,7 +92,7 @@ pre.iplastic .RegularExpression {
 
 <p>Welcome to our official tutorial, the mandatory to-do list. I&#8217;m writing this while doing the steps to assure it will work for you.</p>
 
-<p>The tutorial assumes that you have Ramaze installed already. The easiest way to do that is <code>gem install ramaze</code>, for other ways of installation please see the documentation at http://ramaze.rubyforge.org</p>
+<p>The tutorial assumes that you have Ramaze installed already. The easiest way to do that is <code>gem install ramaze</code>, for other ways of installation please see the documentation at http://ramaze.net</p>
 
 <p>Should you encounter any problems while doing this tutorial, this might either be because Ramaze changed (which happens very often while it is still young) or I actually made some mistake while writing it.</p>
 

data/doc/tutorial/todolist.mkd

@@ -14,7 +14,7 @@ I'm writing this while doing the steps to assure it will work for you.
 
 The tutorial assumes that you have Ramaze installed already. The easiest way to
 do that is `gem install ramaze`, for other ways of installation please see the
-documentation at http://ramaze.rubyforge.org
+documentation at http://ramaze.net .
 
 Should you encounter any problems while doing this tutorial, this might either
 be because Ramaze changed (which happens very often while it is still young)
@@ -368,7 +368,7 @@ will translate into:
     open('Wash dishes')
 {:lang=ruby}
 
-Which in turn will call 
+Which in turn will call
 
     task_status('Wash dishes', false)
 {:lang=ruby}

data/examples/app/wiktacular/template/html_layout.xhtml

@@ -22,6 +22,6 @@
     <div id="content">
       #@content
     </div>
-    <div id="copyright">Wiktacular is powered by <a href="http://ramaze.rubyforge.org/">Ramaze</a></div>
+    <div id="copyright">Wiktacular is powered by <a href="http://ramaze.net">Ramaze</a></div>
   </body>
 </html>

data/lib/proto/view/index.xhtml

@@ -16,11 +16,11 @@ working.</p>
 </ol>
 </p>
 
-<p>For more documentation, check out <a href="http://ramaze.net">www.ramaze.net</a>, which includes:
+<p>For more documentation, check out <a href="http://ramaze.net">ramaze.net</a>, which includes:
 <ul>
   <li>a <a href="http://ramaze.net/getting-started">getting started</a> guide</li>
   <li>some <a href="http://ramaze.net/screencasts">screencasts</a></li>
-  <li>and an <a href="http://ramaze.rubyforge.org/tutorial/todolist.html">introductory tutorial</a></li>
+  <li>and <a href="http://wiki.ramaze.net/Tutorials">tutorials</a></li>
 </ul>
 </p>
 

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

@@ -244,7 +244,7 @@ module Ramaze
         t_extensions = Template::ENGINES
         all_extensions = t_extensions.values.flatten
 
-        if engine = trait[:engine]
+        if engine = ancestral_trait[:engine]
           c_extensions = t_extensions.select{|k,v| k == engine}.map{|k,v| v}.flatten
           return (c_extensions + all_extensions).uniq
         end

data/lib/ramaze/current.rb

@@ -49,62 +49,3 @@ module Ramaze
     end
   end
 end
-__END__
-
-  module Current
-    class << self
-      include Trinity
-
-      def call(env)
-        setup(env)
-        before_call
-
-        if filter = Global.record
-          request = Current.request
-          Record << request if filter[request]
-        end
-
-        Dispatcher.handle
-
-        finish
-      ensure
-        after_call
-      end
-
-      def setup(env)
-        self.request = Request.new(env)
-        self.response = Response.new
-        self.session = Session.new
-      end
-
-      def finish
-        session.finish if session
-        response.finish
-      end
-
-      def before(&block)
-        @before = block_given? ? block : @before
-      end
-
-      def before_call
-        return unless before
-        before.call
-      rescue Object => e
-        Ramaze::Log.error e
-        raise e
-      end
-
-      def after(&block)
-        @after = block_given? ? block : @after
-      end
-
-      def after_call
-        return unless after
-        after.call
-      rescue Object => e
-        Ramaze::Log.error e
-        raise e
-      end
-    end
-  end
-end

data/lib/ramaze/current/request.rb

@@ -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/current/session/flash.rb

@@ -58,6 +58,7 @@ module Ramaze
       # Delete a key
 
       def delete(key)
+        previous.delete(key)
         current.delete(key)
       end
 

data/lib/ramaze/helper/flash.rb

@@ -41,9 +41,24 @@ module Ramaze
     #   <div class='flash' id='flash_error'>Please enter your name</div>
     #   <div class='flash' id='flash_info'>Do you see the fnords?</div>
     #
-    # This is designed to be customized permanently or per usage:
     #
-    #   flashbox("<div class='flash_%key'>%value</div>")
+    # This can be customized permanently in your controller:
+    #
+    #   class MainController < Ramaze::Controller
+    #     trait :flashbox => "<div class='flash_%key'>%value</div>"
+    #
+    #     def show_flashbox
+    #       flashbox
+    #     end
+    #   end
+    #
+    # or on a per-usage basis in your action:
+    #
+    #   class MainController < Ramaze::Controller
+    #     def show_flashbox
+    #       flashbox("<div class='flash_%key'>%value</div>")
+    #     end
+    #   end
     #
     # Where any occurrence of %key and %value will be replaced by the actual
     # contents of each element of flash

data/lib/ramaze/helper/paginate.rb

@@ -99,7 +99,7 @@ module Ramaze
 
 
         def navigation(limit = 8)
-          out = [ g.div(:class => :pager) ]
+          out = [ '<div class="pager">' ]
 
           if first_page?
             out << g.span(:class => 'first grey'){ h('<<') }

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/helper/user.rb

@@ -16,7 +16,7 @@ module Ramaze
     #   end
     #
     #   def login
-    #     user_login if reuqest.post?
+    #     user_login if request.post?
     #   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