RubyGems - ramaze - Versions diffs - 0.0.9 → 0.1.0 - Mend

ramaze 0.0.9 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (193) hide show

data/Rakefile +14 -259
data/bin/ramaze +52 -25
data/doc/AUTHORS +6 -0
data/doc/CHANGELOG +1363 -42
data/doc/INSTALL +1 -1
data/doc/README +48 -35
data/doc/README.html +637 -0
data/doc/TODO +7 -16
data/doc/allison/allison.css +6 -7
data/doc/allison/allison.gif +0 -0
data/doc/allison/cache/STYLE +1 -2
data/doc/changes.txt +3375 -0
data/doc/changes.xml +3378 -0
data/doc/meta/announcement.txt +47 -0
data/doc/meta/configuration.txt +179 -0
data/doc/meta/internals.txt +111 -0
data/doc/readme_chunks/features.txt +8 -16
data/doc/readme_chunks/installing.txt +7 -1
data/doc/tutorial/todolist.txt +2 -3
data/examples/blog/main.rb +9 -8
data/examples/blog/public/styles/blog.css +132 -0
data/examples/blog/src/controller.rb +14 -41
data/examples/blog/src/model.rb +12 -13
data/examples/blog/src/view.rb +16 -0
data/examples/blog/template/edit.xhtml +19 -8
data/examples/blog/template/index.xhtml +14 -22
data/examples/blog/template/new.xhtml +18 -5
data/examples/caching.rb +5 -8
data/examples/element.rb +3 -3
data/examples/hello.rb +3 -5
data/examples/simple.rb +4 -7
data/examples/templates/template/external.haml +8 -7
data/examples/templates/template/external.mab +11 -8
data/examples/templates/template_amrita2.rb +4 -4
data/examples/templates/template_erubis.rb +3 -3
data/examples/templates/template_ezamar.rb +1 -2
data/examples/templates/template_haml.rb +24 -23
data/examples/templates/template_liquid.rb +3 -1
data/examples/templates/template_markaby.rb +15 -9
data/examples/todolist/src/element/page.rb +1 -1
data/lib/proto/conf/benchmark.yaml +6 -20
data/lib/proto/conf/debug.yaml +6 -19
data/lib/proto/conf/live.yaml +7 -19
data/lib/proto/conf/silent.yaml +6 -16
data/lib/proto/conf/stage.yaml +6 -18
data/lib/proto/public/error.zmr +2 -2
data/lib/ramaze.rb +34 -72
data/lib/ramaze/adapter.rb +21 -18
data/lib/ramaze/adapter/mongrel.rb +0 -3
data/lib/ramaze/adapter/webrick.rb +6 -6
data/lib/ramaze/cache/memcached.rb +3 -0
data/lib/ramaze/controller.rb +227 -183
data/lib/ramaze/dispatcher.rb +34 -129
data/lib/ramaze/dispatcher/action.rb +28 -0
data/lib/ramaze/dispatcher/error.rb +43 -0
data/lib/ramaze/dispatcher/file.rb +34 -0
data/lib/ramaze/global.rb +89 -48
data/lib/ramaze/helper/aspect.rb +8 -6
data/lib/ramaze/helper/auth.rb +3 -3
data/lib/ramaze/helper/cache.rb +2 -2
data/lib/ramaze/helper/file.rb +14 -0
data/lib/ramaze/helper/inform.rb +36 -0
data/lib/ramaze/helper/link.rb +7 -3
data/lib/ramaze/helper/markaby.rb +30 -0
data/lib/ramaze/helper/redirect.rb +2 -0
data/lib/ramaze/inform.rb +8 -182
data/lib/ramaze/inform/analogger.rb +19 -0
data/lib/ramaze/inform/growl.rb +28 -0
data/lib/ramaze/inform/hub.rb +26 -0
data/lib/ramaze/inform/informer.rb +92 -0
data/lib/ramaze/inform/informing.rb +44 -0
data/lib/ramaze/inform/syslog.rb +27 -0
data/lib/ramaze/inform/xosd.rb +42 -0
data/lib/ramaze/snippets.rb +6 -2
data/lib/ramaze/snippets/object/traits.rb +13 -1
data/lib/ramaze/snippets/ramaze/autoreload.rb +58 -2
data/lib/ramaze/snippets/string/color.rb +27 -0
data/lib/ramaze/snippets/string/each.rb +6 -0
data/lib/ramaze/snippets/struct/fill.rb +15 -0
data/lib/ramaze/template/ezamar.rb +13 -22
data/lib/ramaze/template/ezamar/element.rb +12 -12
data/lib/ramaze/template/liquid.rb +19 -18
data/lib/ramaze/template/markaby.rb +37 -58
data/lib/ramaze/tool/localize.rb +128 -0
data/lib/ramaze/tool/tidy.rb +51 -21
data/lib/ramaze/trinity.rb +3 -3
data/lib/ramaze/trinity/request.rb +41 -23
data/lib/ramaze/trinity/response.rb +10 -5
data/lib/ramaze/trinity/session.rb +17 -3
data/lib/ramaze/version.rb +2 -2
data/rake_tasks/conf.rake +56 -0
data/rake_tasks/gem.rake +44 -0
data/rake_tasks/maintaince.rake +187 -0
data/spec/all.rb +32 -0
data/spec/examples/caching.rb +19 -0
data/spec/examples/element.rb +15 -0
data/spec/examples/hello.rb +11 -0
data/spec/examples/simple.rb +51 -0
data/spec/examples/templates/template_amrita2.rb +14 -0
data/spec/examples/templates/template_erubis.rb +21 -0
data/spec/examples/templates/template_ezamar.rb +22 -0
data/spec/examples/templates/template_haml.rb +23 -0
data/spec/examples/templates/template_liquid.rb +24 -0
data/spec/examples/templates/template_markaby.rb +21 -0
data/spec/helper.rb +81 -0
data/spec/{spec_helper_context.rb → helper/context.rb} +1 -1
data/spec/helper/layout.rb +55 -0
data/spec/helper/mock_http.rb +66 -0
data/spec/{spec_helper_requester.rb → helper/requester.rb} +0 -6
data/spec/{spec_helper_simple_http.rb → helper/simple_http.rb} +57 -57
data/spec/helper/wrap.rb +193 -0
data/spec/{adapter_spec.rb → ramaze/adapter.rb} +7 -5
data/spec/{tc_adapter_mongrel.rb → ramaze/adapter/mongrel.rb} +2 -2
data/spec/{tc_adapter_webrick.rb → ramaze/adapter/webrick.rb} +2 -2
data/spec/{tc_cache.rb → ramaze/cache.rb} +16 -16
data/spec/ramaze/conf/locale_de.yaml +6 -0
data/spec/ramaze/conf/locale_en.yaml +6 -0
data/spec/ramaze/controller.rb +184 -0
data/spec/ramaze/controller/template/greet.xhtml +1 -0
data/spec/ramaze/controller/template_resolving.rb +54 -0
data/spec/ramaze/dependencies.rb +16 -0
data/spec/{tc_element.rb → ramaze/element.rb} +21 -19
data/spec/ramaze/error.rb +64 -0
data/spec/{tc_gestalt.rb → ramaze/gestalt.rb} +10 -10
data/spec/{tc_global.rb → ramaze/global.rb} +7 -7
data/spec/{tc_helper_aspect.rb → ramaze/helper/aspect.rb} +22 -14
data/spec/{tc_helper_auth.rb → ramaze/helper/auth.rb} +9 -7
data/spec/{tc_helper_cache.rb → ramaze/helper/cache.rb} +14 -24
data/spec/{tc_helper_feed.rb → ramaze/helper/feed.rb} +12 -12
data/spec/ramaze/helper/file.rb +17 -0
data/spec/{tc_helper_flash.rb → ramaze/helper/flash.rb} +16 -17
data/spec/{tc_helper_form.rb → ramaze/helper/form.rb} +25 -26
data/spec/{tc_helper_link.rb → ramaze/helper/link.rb} +9 -9
data/spec/{tc_helper_redirect.rb → ramaze/helper/redirect.rb} +11 -10
data/spec/{tc_helper_stack.rb → ramaze/helper/stack.rb} +10 -11
data/spec/ramaze/inform/informer.rb +40 -0
data/spec/ramaze/inform/syslog.rb +10 -0
data/spec/ramaze/localize.rb +40 -0
data/spec/ramaze/morpher.rb +82 -0
data/spec/ramaze/params.rb +124 -0
data/spec/{public → ramaze/public}/error404.xhtml +0 -0
data/spec/{public → ramaze/public}/favicon.ico +0 -0
data/spec/{public → ramaze/public}/ramaze.png +0 -0
data/spec/{public → ramaze/public}/test_download.css +0 -0
data/spec/ramaze/request.rb +129 -0
data/spec/{tc_request_mongrel.rb → ramaze/request/mongrel.rb} +2 -2
data/spec/{tc_request_webrick.rb → ramaze/request/webrick.rb} +1 -1
data/spec/{tc_session.rb → ramaze/session.rb} +18 -18
data/spec/{tc_store.rb → ramaze/store/default.rb} +10 -10
data/spec/{tc_store_yaml.rb → ramaze/store/yaml.rb} +9 -9
data/spec/ramaze/template.rb +86 -0
data/spec/{tc_template_amrita2.rb → ramaze/template/amrita2.rb} +5 -5
data/spec/{template → ramaze/template}/amrita2/data.amrita +0 -0
data/spec/{template → ramaze/template}/amrita2/index.amrita +0 -0
data/spec/{template → ramaze/template}/amrita2/sum.amrita +0 -0
data/spec/{tc_template_erubis.rb → ramaze/template/erubis.rb} +9 -9
data/spec/{template → ramaze/template}/erubis/sum.rhtml +0 -0
data/spec/ramaze/template/ezamar.rb +62 -0
data/spec/{template → ramaze/template}/ezamar/another/long/action.zmr +0 -0
data/spec/{template → ramaze/template}/ezamar/combined.zmr +0 -0
data/spec/{template → ramaze/template}/ezamar/file_only.zmr +0 -0
data/spec/{template → ramaze/template}/ezamar/index.zmr +0 -0
data/spec/ramaze/template/ezamar/nested.zmr +1 -0
data/spec/{template → ramaze/template}/ezamar/some__long__action.zmr +0 -0
data/spec/{template → ramaze/template}/ezamar/sum.zmr +0 -0
data/spec/{tc_template_haml.rb → ramaze/template/haml.rb} +7 -7
data/spec/{template → ramaze/template}/haml/index.haml +0 -0
data/spec/{template → ramaze/template}/haml/with_vars.haml +0 -0
data/spec/{tc_template_liquid.rb → ramaze/template/liquid.rb} +7 -7
data/spec/{template → ramaze/template}/liquid/index.liquid +0 -0
data/spec/{template → ramaze/template}/liquid/products.liquid +0 -0
data/spec/ramaze/template/markaby.rb +59 -0
data/spec/{template → ramaze/template}/markaby/external.mab +0 -0
data/spec/{template → ramaze/template}/markaby/sum.mab +0 -0
data/spec/ramaze/template/ramaze/external.test +1 -0
data/spec/{tc_tidy.rb → ramaze/tidy.rb} +3 -3
metadata +145 -81
data/examples/blog/public/screen.css +0 -106
data/examples/blog/src/element.rb +0 -58
data/examples/blog/template/view.xhtml +0 -15
data/examples/blog/test/tc_entry.rb +0 -18
data/lib/proto/public/404.jpg +0 -0
data/spec/request_tc_helper.rb +0 -135
data/spec/spec_all.rb +0 -118
data/spec/spec_helper.rb +0 -66
data/spec/tc_controller.rb +0 -49
data/spec/tc_dependencies.rb +0 -13
data/spec/tc_error.rb +0 -43
data/spec/tc_morpher.rb +0 -88
data/spec/tc_params.rb +0 -125
data/spec/tc_template_ezamar.rb +0 -64
data/spec/tc_template_markaby.rb +0 -72
data/spec/template/ezamar/nested.zmr +0 -1

data/lib/ramaze/template/ezamar/element.rb CHANGED

@@ -15,7 +15,7 @@
 #       %{
 #        <html>
 #          <h1>
-#            #{@hash['title']}
+#            #@title
 #          </h1>
 #          #{content}
 #        </html>
@@ -82,10 +82,6 @@ class Ezamar::Element
     # transforms all <Element> tags within the string, takes also
     # a binding to be compatible to the transform-pipeline, won't have
     # any use for it though.
-    #
-    # It also sets a instance-variable for you called @hash, which
-    # contains the parameters you gave the <Element> tag.
-    # See above for an example of writing and using them.
     def transform string = '', options = {}
       binding, path = options.values_at(:binding, :path)
@@ -120,8 +116,9 @@ class Ezamar::Element
     end
     # find the element, create an instance, pass it the content
-    # check if it responds to :render and set an instance-variable
-    # called @hash to hold the parameters passed to the element.
+    # check if it responds to :render and sets instance-variables
+    # that are named after the keys and hold the values of the parameters
+    # you passed to the Element
     #
     # Parameters look like:
     #   <Page foo="true"> bar </Page>
@@ -130,12 +127,13 @@ class Ezamar::Element
     def finish_transform(klass, params, content)
       instance = constant(klass).new(content)
-      hash = demunge_passed_variables(params)
-      instance.instance_variable_set("@hash", hash)
+      demunge_passed_variables(params).each do |key, value|
+        instance.instance_variable_set("@#{key}", value)
+      end
       instance.render
     rescue => ex
-      Ramaze::Informer.debug(ex.message)
+      Ramaze::Inform.debug(ex.message)
       ''
     end
@@ -154,8 +152,10 @@ class Ezamar::Element
       string.scan(/\s?(.*?)="(.*?)"/).inject({}) do |hash, (key, value)|
         value =
         case value
-        when 'true'  : true
-        when 'false' : false
+        when 'true'
+          true
+        when 'false'
+          false
         else
           Integer(value) rescue Float(value) rescue value
         end

data/lib/ramaze/template/liquid.rb CHANGED

@@ -3,31 +3,32 @@
 require 'liquid'
-module Ramaze::Template
-  class Liquid < Template
+module Ramaze
+  module Template
+    class Liquid < Template
+      Controller.register_engine self, %w[ liquid ]
-    Ramaze::Controller.register_engine self, %w[ liquid ]
+      class << self
-    class << self
+        # initializes the handling of a request on the controller.
+        # Creates a new instances of itself and sends the action and params.
+        # Also tries to render the template.
+        # In Theory you can use this standalone, this has not been tested though.
-      # initializes the handling of a request on the controller.
-      # Creates a new instances of itself and sends the action and params.
-      # Also tries to render the template.
-      # In Theory you can use this standalone, this has not been tested though.
+        def transform controller, options = {}
+          action, parameter, file, bound = *super
-      def transform controller, options = {}
-        action, parameter, file, bound = *super
+          reaction = controller.send(action, *parameter)
+          template = reaction_or_file(reaction, file)
-        reaction = controller.send(action, *parameter)
-        template = reaction_or_file(reaction, file)
+          return '' unless template
-        return '' unless template
+          hash     = controller.instance_variable_get("@hash") || {}
+          template = ::Liquid::Template.parse(template)
+          options  = controller.ancestral_trait[:liquid_options]
-        hash     = controller.instance_variable_get("@hash") || {}
-        template = ::Liquid::Template.parse(template)
-        options  = controller.ancestral_trait[:liquid_options]
-        template.render(hash, options)
+          template.render(hash, options)
+        end
       end
     end
   end

data/lib/ramaze/template/markaby.rb CHANGED

@@ -3,68 +3,47 @@
 require 'markaby'
-module Ramaze::Template
-  class Markaby < Template
-    Ramaze::Controller.register_engine self, %w[ mab ]
-    class << self
-      # initializes the handling of a request on the controller.
-      # Creates a new instances of itself and sends the action and params.
-      # Also tries to render the template.
-      # In Theory you can use this standalone, this has not been tested though.
-      def transform controller, options = {}
-        action, parameter, file, bound = *super
-        unless controller.private_methods.include?(action)
-          mixed_in = controller.class.ancestors === MarkabyMixin
-          controller.class.send(:include, MarkabyMixin) unless mixed_in
-          reaction = controller.send(action, *parameter)
-          mab = ::Markaby::Builder.new
-          template =
-            if file
-              transform_file(controller, file)
-            elsif reaction.respond_to? :to_str
-              reaction
-            end
+module Ramaze
+  module Template
+    class Markaby < Template
+      Controller.register_engine self, %w[ mab ]
+      class << self
+        # initializes the handling of a request on the controller.
+        # Creates a new instances of itself and sends the action and params.
+        # Also tries to render the template.
+        # In Theory you can use this standalone, this has not been tested though.
+        def transform controller, options = {}
+          action, parameter, file, bound = *super
+          unless controller.private_methods.include?(action)
+            reaction = controller.__send__(action, *parameter)
+            template =
+              if file
+                transform_file(controller, file)
+              elsif reaction.respond_to?(:to_str)
+                reaction
+              end
+            return template if template
+          end
+          raise Error::NoAction, "No Action found for `#{action}' on #{controller.class}"
         end
-        return template if template
-        raise Ramaze::Error::NoAction, "No Action found for `#{action}' on #{controller.class}"
-      end
-      def transform_file controller, file
-        ivs = {}
-        controller.instance_variables.each do |iv|
-          ivs[iv.gsub('@', '').to_sym] = controller.instance_variable_get(iv)
-        end
-        controller.send(:mab, ivs) do
-          instance_eval(File.read(file))
+        def transform_file controller, file
+          ivs = {}
+          controller.instance_variables.each do |iv|
+            ivs[iv.gsub('@', '').to_sym] = controller.instance_variable_get(iv)
+          end
+          controller.send(:mab, ivs) do
+            instance_eval(File.read(file))
+          end
+        rescue Object => ex
+          raise Error::Template, ex.message, ex.backtrace
         end
-      rescue Object => ex
-        puts ex
-        raise Ramaze::Error::Template, ex.message, ex.backtrace
       end
     end
   end
-  module MarkabyMixin
-    private
-    # use this inside your controller to directly build Markaby
-    # Refer to the Markaby-documentation and testsuite for more examples.
-    # Usage:
-    #   mab { h1 "Apples & Oranges"}                    #=> "<h1>Apples &amp; Oranges</h1>"
-    #   mab { h1 'Apples', :class => 'fruits&floots' }  #=> "<h1 class=\"fruits&amp;floots\">Apples</h1>"
-    def mab(*args, &block)
-      builder = ::Markaby::Builder
-      builder.extend(Ramaze::Helper)
-      builder.send(:helper, :link)
-      builder.new(*args, &block).to_s
-    end
-  end
 end

data/lib/ramaze/tool/localize.rb ADDED

@@ -0,0 +1,128 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+$KCODE = 'UTF-8'
+require 'ya2yaml'
+class Ramaze::Tool::Localize
+  # Enable Localization
+  trait :enable => true
+  # Default language that is used if the browser don't suggests otherwise or
+  # the language requested is not available.
+  trait :default_language => 'en'
+  # languages supported
+  trait :languages => %w[ en ]
+  # YAML files the localizations are saved to and loaded from, %s is substituded
+  # by the values from trait[:languages]
+  trait :file => 'conf/locale_%s.yaml'.freeze
+  # The pattern that is substituted with the translation of the current locale.
+  trait :regex => /\[\[(.*?)\]\]/
+  # Browsers may send different keys for the same language, this allows you to
+  # do some coercion between what you use as keys and what the browser sends.
+  trait :mapping => { 'en-us' => 'en', 'ja' => 'jp'}
+  class << self
+    include Ramaze::Trinity
+    def call(response, options = {})
+      return response unless trait[:enable]
+      return response if response.body.nil?
+      return response if response.body.respond_to?(:read)
+      response.body = localize_body(response.body, options)
+      response
+    end
+    def localize_body(body, options)
+      locale = session[:LOCALE] || set_session_locale
+      body.gsub!(trait[:regex]) do
+        localize($1, locale)
+      end
+      store(locale, trait[:default_language])
+      body
+    end
+    def localize(str, locale)
+      Ramaze::Inform.debug "localizing: #{locale} => '#{str}'"
+      trans = nil
+      default_language = trait[:default_language]
+      dict = dictionary
+      if dict[locale] && trans = dict[locale][str]
+        #
+      elsif trans = dict[default_language][str]
+        dict[locale][str] = str
+      else
+        dict[locale][str] = str
+        dict[default_language][str] = str
+      end
+      trans || str
+    rescue Object => ex
+      Ramaze::Inform.error(ex)
+      str
+    end
+    def set_session_locale
+      session[:LOCALE] = trait[:default_language]
+      accepted_langs = request.http_accept_language rescue 'en'
+      mapping = trait[:mapping]
+      dict = dictionary
+      accepted_langs = accepted_langs.scan(/([^,;]+)(?:;q=[^,]+)?/m)[0]
+      accepted_langs.each do |language|
+        language = mapping[language] || language
+        if dict.key?(language)
+          session[:LOCALE] = language
+          break
+        end
+      end
+      session[:LOCALE]
+    end # end set_session_locale
+    def dictionary
+      trait[:dictionary] || load(*trait[:languages])
+    end
+    def load(*locales)
+      Ramaze::Inform.debug "loading locales: #{locales.inspect}"
+      dict = trait[:dictionary] || {}
+      locales.each do |locale|
+        begin
+          dict[locale] = YAML.load_file(trait[:file] % locale)
+        rescue Errno::ENOENT
+          dict[locale] = {}
+        end
+      end
+      trait[:dictionary] = dict
+    end
+    def store(*locales)
+      locales.uniq.compact.each do |locale|
+        Ramaze::Inform.debug "saving localized to: #{trait[:file] % locale}"
+        data = dictionary[locale].ya2yaml
+        file = trait[:file] % locale
+        File.open(file, File::CREAT|File::TRUNC|File::WRONLY) do |fd|
+          fd.write data
+        end
+      end
+    rescue Errno::ENOENT
+      # bleargh
+    end
+  end
+end

data/lib/ramaze/tool/tidy.rb CHANGED

@@ -9,8 +9,25 @@ module Ramaze
     module Tidy
+      trait[:enable] ||= false
       # set this to define a custom path to your tidy.so
-      trait[:path] ||= `locate libtidy.so`.strip
+      trait[:paths] ||= %w[
+        /usr/lib/libtidy.so
+        /usr/local/lib/libtidy.so
+      ]
+      trait[:path] ||= nil
+      trait[:options] ||= {
+        :output_xml => true,
+        :input_encoding => :utf8,
+        :output_encoding => :utf8,
+        :indent_spaces => 2,
+        :indent => :auto,
+        :markup => :yes,
+        :wrap => 500
+      }
       # dirty html in, tidy html out
       # To activate Tidy for everything outgoing (given that it is of
@@ -34,31 +51,44 @@ module Ramaze
       #     <body></body>
       #   </html>
-      def self.tidy html, options = {}
-        require 'tidy'
+      class << self
+        def tidy html, options = {}
+          require 'tidy'
-        ::Tidy.path = trait[:path]
+          unless found = trait[:path]
+            found = trait[:paths].find do |path|
+              File.exists?(path)
+            end
+            trait[:path] = found
+          end
-        defaults = {
-          :output_xml => true,
-          :input_encoding => :utf8,
-          :output_encoding => :utf8,
-          :indent_spaces => 2,
-          :indent => :auto,
-          :markup => :yes,
-          :wrap => 500
-        }
+          path = trait[:path]
-        ::Tidy.open(:show_warnings => true) do |tidy|
-          defaults.merge(options).each do |key, value|
-            tidy.options.send("#{key}=", value.to_s)
+          unless path
+            Inform.error("Could not find `libtidy.so' in #{trait[:paths].inspect}")
+            return html
           end
-          tidy.clean(html)
+          ::Tidy.path = path
+          ::Tidy.open(:show_warnings => true) do |tidy|
+            opts = trait[:options].merge(options)
+            opts.each do |key, value|
+              tidy.options.send("#{key}=", value.to_s)
+            end
+            tidy.clean(html)
+          end
+        rescue LoadError => ex
+          puts ex
+          puts "cannot load 'tidy', please `gem install tidy`"
+          puts "you can find it at http://tidy.rubyforge.org/"
+        end
+        def call(response, options = {})
+          return response unless trait[:enable]
+          response.body = tidy(response.body, options)
+          response
         end
-      rescue LoadError => ex
-        puts ex
-        puts "cannot load 'tidy', please `gem install tidy`"
-        puts "you can find it at http://tidy.rubyforge.org/"
       end
       # calls self#tidy

data/lib/ramaze/trinity.rb CHANGED

@@ -18,21 +18,21 @@ module Ramaze
     #   Thread.current[:request]
     def request
-      Thread.current[:request]
+      Request.current
     end
     # same as
     #   Thread.current[:response]
     def response
-      Thread.current[:response]
+      Response.current
     end
     # same as
     #   Thread.current[:session]
     def session
-      Thread.current[:session]
+      Session.current
     end
   end
 end