manveru-ramaze 2008.07 → 2008.08

data/Rakefile

@@ -28,8 +28,8 @@ load 'rake_tasks/git.rake'
 load 'rake_tasks/gem.rake'
 load 'rake_tasks/metric.rake'
 
-# task :default => ['spec']
-# task :test => ['spec']
+task :default => ['spec']
+task :test => ['spec']
 # task :package => ['jquery']
 
 desc 'download latest jquery and put in /lib/proto/public/js/jquery.js'
@@ -48,6 +48,35 @@ task :jquery do
   end
 end
 
+desc 'Check gemspec file list against real file list'
+task :check_gemspec do
+  base_dir = File.expand_path(File.dirname(__FILE__))
+  gemspec_files = eval(File.read(File.join(base_dir,'ramaze.gemspec'))).files.map{|file|File.join(base_dir,file)}
+
+  deleted_files = gemspec_files.select{|file|!File.exists?(file)}.map{|file|file[(base_dir.size+1)..-1]}
+
+  added_files = Dir.glob(File.join(File.dirname(__FILE__),'**/*')).select do |file|
+    !gemspec_files.index(file)
+  end.map do |file|
+    file[(base_dir.size+1)..-1]
+  end.select do |file|
+    !( file == 'pkg' or file =~ /.*\.gem/ )
+  end
+
+  unless deleted_files.empty?
+    puts "The following files appear in the gemspec but cannot be found:"
+    deleted_files.each do |file|
+      puts "\t#{file}"
+    end
+  end
+  unless added_files.empty?
+    puts "The following files exist, but cannot be found in the gemspec:"
+    added_files.each do |file|
+      puts "\t#{file}"
+    end
+  end
+end
+
 task :rcov_dir do
   mkdir_p 'doc/output/tools/rcov/'
 end

data/doc/meta/announcement.txt

@@ -1,4 +1,4 @@
-This time we are proud to announce Version 2008.06 of Ramaze, the light and
+This time we are proud to announce Version 2008.07 of Ramaze, the light and
 modular open source web framework.
 
 This release features a lot of work directly from our community and we are
@@ -36,41 +36,25 @@ Simple example:
   Ramaze.start
 
 
-This is a special release, and the first of the upcoming new series of monthly releases.
-As you may have noticed, Ramaze has changed to a date base versioning system,
-although this means that people who have waited for a 1.0 for the past years
-may be disappointed it provides much larger flexibility in detecting new
-versions and comparing them with nightly builds.
+Some of 52 patches since 2008.06:
 
-Another change is the switch from darcs to git and moving our primary
-repository to github. There have been serious performance issues regarding
-darcs as Ramaze gathered a longer history, using git allows us to move on at a
-faster pace again.
-
-Please regard this release as a major step from the previous one, over 450
-patches have been applied and there were changes in the internal API.
-
-We are unable to nicely summarize these changes, so this release will not have
-a list of the most important ones, if you are concerned about a specific area
-feel free to ask on the Mailing list or stop by on IRC.
+  - Loggers are now in Ramaze::Logger namespace
+  - Global.prefix for nested deployment via webserver in front
+  - Binding#locals fixed for Ruby 1.9
+  - Redirects now use HTTP status 302 instead of 303
+  - Logger::Syslog works again
 
 Special (alphabetic) thanks go to:
 
-  Aman 'tmm1' Gupta         - Tons of patches, support
-  andy                      - Cleanup
-  Ara T. Howard             - Tagz templating engine
-  Clive Crous               - Patches, cleanup
-  evaryont                  - Patches for identity helper
-  James Tucker              - OSX compatibility, cleanup and fixes
-  Jonathan 'Kashia' Buch    - Patches, support and the first ramaze paper
-  Keita Yamaguchi           - Much work on the benchmark suite
-  Leo Borisenko             - Fix for SourceReload on windows
-  Pistos                    - Mathetes, patches and lots of friendly support
-  Riku Räisäenen            - Patches for scaffolding example
-  Ryan Grove                - Various fixes and patches
-  Sam Carr                  - Patches and action matching speedup
-  Thomas Leitner            - Patches for identity helper
-  Wang Jinjing              - patches, 1.9/1.8.7 compatibility
+  Pistos                  - The usual Mathetes, patches and lots of friendly support
+  Aman 'tmm1' Gupta       - Time snippets for numeric
+  Clinton R. Nixon        - More REST and some fixes
+  Jean-Francois Chevrette - Restore --console feature
+  raggi                   - Various fixes
+  Rob Lievaart            - Fix Logger::Syslog
+  Sam Carr                - Cleanup of Cache
+  Wang Jinjing            - 1.9 compatibility
+  Yasushi Abe             - First patch!
 
 A complete Changelog is available at
 http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true

data/examples/app/rapaste/controller/paste.rb

@@ -1,4 +1,5 @@
 Ramaze::Route[%r!^/(\d+)\.(?:te?xt|plain|rb|css|js)$!] = '/plain/%d'
+Ramaze::Route[%r!^/(\d+)\.(?:html)$!] = '/html/%d'
 Ramaze::Route[%r!^/(?:te?xt|plain|rb|css|js)/(\d+)$!] = '/plain/%d'
 Ramaze::Route[%r!^/(\d+)\.(\w+)$!] = '/view/%d/%s'
 Ramaze::Route[%r!^/(\d+)$!] = '/view/%d/html'
@@ -64,6 +65,12 @@ class PasteController < Ramaze::Controller
     respond paste.text
   end
 
+  def html(id)
+    paste = paste_for(id)
+    response['Content-Type'] = 'text/html'
+    respond paste.text
+  end
+
   def save_theme( theme_name )
     session[ :theme ] = theme_name
   end

data/examples/app/sourceview/public/sourceview.js

@@ -22,7 +22,7 @@ function setup() {
 
     if (curfile) {
       $('#repourl').empty().append(
-        $('<a/>').attr('href', 'http://darcs.ramaze.net/ramaze'+curfile)
+        $('<a/>').attr('href', 'http://github.com/manveru/ramaze/tree/master'+curfile)
                  .text('download '+curfile.substr(1))
       );
       urchinTracker(curfile);
@@ -49,4 +49,4 @@ $(function(){
   } else {
     setup();
   }
-});
+});

data/lib/proto/view/error.xhtml

@@ -40,9 +40,9 @@ Click on any of them to view the surrounding source code.</p>
 </table>
 
 <?r
-  { 'Session'   => Thread.current[:session],
-    'Request'   => Thread.current[:request],
-    'Response'  => Thread.current[:response],
+  { 'Session'   => Ramaze::STATE[:session],
+    'Request'   => Ramaze::STATE[:request],
+    'Response'  => Ramaze::STATE[:response],
     'Global'    => Global,
   }.each do |title, content|
     hash = [title, content].object_id.abs

data/lib/ramaze/action.rb

@@ -41,7 +41,7 @@ module Ramaze
 
       # Return the stacked actions for the current request
       def stack
-        Thread.current[:action_stack] ||= []
+        STATE[:action_stack] ||= []
       end
     end
 
@@ -116,7 +116,7 @@ module Ramaze
 
     # combined path to current action, from path and params
     def extended_path
-      Array[path, *params].join('/')
+      (path == "index" && !params.empty? ? params : Array[path, *params]).join('/')
     end
 
     def full_path

data/lib/ramaze/adapter/base.rb

@@ -7,14 +7,17 @@ module Ramaze
     # (Rack) middleware injected around Adapter::Base::call
     MIDDLEWARE = OrderedSet.new(
       Ramaze::Current,
+      Ramaze::Reloader,
       Rack::ShowStatus,
       Rack::ShowExceptions
     )
 
+    trait :middleware => MIDDLEWARE.inject{|app, middleware| middleware.new(app) }
+
     # Helper to assign a new block to before_call
     # Usage:
     #   Ramaze::Adapter.before do |env|
-    #     if env['PATH_INFO'] =~ /suerpfast/
+    #     if env['PATH_INFO'] =~ /superfast/
     #       [200, {'Content-Type' => 'text/plain'}, ['super fast!']]
     #     end
     #   end
@@ -30,10 +33,10 @@ module Ramaze
       class << self
         attr_reader :thread
 
-        # For the specified host and for all given ports call run_server and
-        # add the returned thread to the Global.adapters ThreadGroup.
-        # Afterwards adds a trap for the value of Global.shutdown_trap which
-        # calls Ramaze.shutdown when triggered (usually by SIGINT).
+        # Call ::startup with the given host and port.
+        # Sets Global.server to itself.
+        # Adds a trap that is triggered by the value of Global.shutdown_trap,
+        # which is SIGINT by default.
 
         def start(host = nil, port = nil)
           @thread = startup(host, port)
@@ -98,20 +101,8 @@ module Ramaze
         # Then goes on and calls Dispatcher::handle with request and response.
 
         def respond(env)
-          if Global.server.respond_to?(:thread) and Global.server.thread == Thread.current
-            Thread.new{ middleware_respond(env) }.value
-          else
-            middleware_respond(env)
-          end
-        end
-
-        def middleware_respond(env)
-          Thread.current.priority = 1
-
-          if Global.middleware
-            MIDDLEWARE.inject{|app, middleware| middleware.new(app) }.call(env)
-          else
-            Current.call(env)
+          Ramaze::STATE.wrap do
+            Adapter.trait[:middleware].call(env)
           end
         end
       end

data/lib/ramaze/cache/memcached.rb

@@ -43,13 +43,11 @@ module Ramaze
       nil
     end
 
-    # out of some reason MemCache sometimes doesn't respond to
-    # get_multi, have to investigate this further.
-    #
-    # for now, i'll just use the dumbed down version and ask it
-    # whether it implements this functionality or not.
+    # Fetch for multiple keys at once.
 
     def get_multi(*keys)
+      # MemCache only responds to get_multi if the memcache-client_extensions gem
+      # is installed, so we check first and resort to another approach if not.
       if @cache.respond_to?(:get_multi)
         @cache.get_multi(*keys)
       else

data/lib/ramaze/controller/resolve.rb

@@ -104,10 +104,13 @@ module Ramaze
 
       def resolve_action(path, *parameter)
         path, parameter = path.to_s, parameter.map{|e| e.to_s}
-        if info = trait["#{path}_template"]
+        # Use ancestral_trait so if template is set in superclass, it is still found.
+        if info = ancestral_trait["#{path}_template"]
           template = info[:file]
           unless template
             controller, action = info.values_at :controller, :action
+            # Controller may not have been explicitly set, in which case use self.
+            controller ||= self
             template = controller.resolve_template(action)
           end
         end
@@ -184,8 +187,7 @@ module Ramaze
 
       # methodnames that may be used for current controller.
       def action_methods
-        ancs = relevant_ancestors + Helper::LOOKUP.to_a
-
+        ancs = relevant_ancestors + action_modules
         ancs.reverse.inject [] do |meths, anc|
           meths +
             anc.public_instance_methods(false).map{|im| im.to_s } -
@@ -193,6 +195,14 @@ module Ramaze
         end
       end
 
+      # Array of all modules (so including Ramaze helpers) that are included in
+      # this controller and where the module is also in the Helper::LOOKUP set.
+      # Hence this is the included modules whose public methods may be exposed
+      # as actions of this controller.
+      def action_modules
+        Helper::LOOKUP.find_all {|mod| self.include?(mod)}
+      end
+
       # Iterator that yields potential ways in which a given path could be mapped
       # to controller, action and params. It produces them in strict order, with
       # longest controller path favoured, then longest action path.
@@ -255,7 +265,7 @@ module Ramaze
       # Raises Ramaze::Error::NoAction
 
       def raise_no_action(controller, path)
-        Thread.current[:controller] = controller
+        STATE[:controller] = controller
         raise Ramaze::Error::NoAction, "No Action found for `#{path}' on #{controller}"
       end
     end

data/lib/ramaze/controller.rb

@@ -85,7 +85,7 @@ module Ramaze
       def map(*syms)
         Global.mapping.delete_if{|k,v| v == self}
 
-        syms.each do |sym|
+        syms.compact.each do |sym|
           Global.mapping[sym.to_s] = self
         end
       end
@@ -150,12 +150,10 @@ module Ramaze
       # Runs every given path through Controller::check_path
 
       def view_root *args
-        if args.empty?
-          @view_root
-        else
-          check_path("#{self}.view_root: '%s' doesn't exist", *args)
-          @view_root = args.flatten
-        end
+        return @view_root if args.empty?
+
+        check_path("#{self}.view_root: '%s' doesn't exist", *args)
+        @view_root = args.flatten
       end
 
       # This is used for template rerouting, takes action, optionally a
@@ -218,9 +216,15 @@ module Ramaze
           end
           trait "#{this}_template" => info
         else
-          controller, action, *ignored = argv
-          controller, action = self, controller unless action
-          trait "#{this}_template" => {:controller => controller, :action => action}
+          # Only explicitly set the controller to use, if it was explicitly given.
+          # This helps ensure that template mappings still work in subclasses
+          # of this controller.
+          first, second, *ignored = argv
+          if second
+            trait "#{this}_template" => {:controller => first, :action => second}
+          else
+            trait "#{this}_template" => {:action => first}
+          end
         end
       end
 
@@ -254,7 +258,7 @@ module Ramaze
 
       def handle path
         action = resolve(path)
-        Thread.current[:controller] = action.controller
+        STATE[:controller] = action.controller
         action.render
       end
 

data/lib/ramaze/current/request.rb

@@ -11,7 +11,7 @@ module Ramaze
   class Request < ::Rack::Request
     class << self
 
-      # get the current request out of Thread.current[:request]
+      # get the current request out of STATE[:request]
       #
       # You can call this from everywhere with Ramaze::Request.current
 
@@ -33,7 +33,11 @@ module Ramaze
     end
 
     def ip
-      env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR']
+      if addr = env['HTTP_X_FORWARDED_FOR']
+        addr.split(',').last.strip
+      else
+        env['REMOTE_ADDR']
+      end
     end
 
     # Request is from a local network?
@@ -48,7 +52,6 @@ module Ramaze
     # ++
 
     def local_net?(address = ip)
-      address = address.to_s.split(',').first
       addr = IPAddr.new(address)
       LOCAL.find{|range| range.include?(addr) }
     rescue ArgumentError => ex

data/lib/ramaze/current/session/flash.rb

@@ -67,6 +67,14 @@ module Ramaze
         combined.empty?
       end
 
+      def merge!(hash)
+        current.merge!(hash)
+      end
+
+      def merge(hash)
+        current.merge(hash)
+      end
+
       private
 
       # Associated session object

data/lib/ramaze/dispatcher/error.rb

@@ -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.rb

@@ -54,7 +54,7 @@ module Ramaze
       # 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}"
@@ -121,17 +121,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 '#{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/gestalt.rb

@@ -48,7 +48,7 @@ module Ramaze
     #     end
     #
 
-    def self.build &block
+    def self.build(&block)
       self.new(&block).to_s
     end
 
@@ -58,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
@@ -88,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?
@@ -117,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

@@ -29,7 +29,7 @@ module Ramaze
 
     # safely escape all HTML and code
     def h(string)
-      Rack::Utils.escape_html(string).gsub(/#/, '#')
+      Rack::Utils.escape_html(string).gsub(/#([{@$]@?)/, '#\1')
     end
 
     # one-letter versions help in case like #{h foo.inspect}

data/lib/ramaze/helper/formatting.rb

@@ -108,11 +108,18 @@ module Ramaze
         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
   end
 end

data/lib/ramaze/helper/thread.rb

@@ -0,0 +1,17 @@
+#          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
+  module Helper::Thread
+    def thread &block
+      parent_thread = Thread.current
+      Thread.new do
+        begin
+          block.call
+        rescue Exception => e
+          parent_thread.raise(e)
+        end
+      end
+    end
+  end
+end

data/lib/ramaze/helper/ultraviolet.rb

@@ -0,0 +1,44 @@
+module Ramaze
+  module Helper
+    module Ultraviolet
+      trait :ultraviolet => {
+        :output       => 'xhtml',
+        :syntax       => nil, # syntax_name, nil|false indicates automatic detection
+        :line_numbers => false,
+        :style        => 'classic', # render_style
+        :headers      => false, # ouput document with all headers
+      }
+
+      # Parse and output the file at the given path.
+      # Please head over to the Ultraviolet documentation for more information
+      # on possible options.
+      def ultraviolet(path, options = {})
+        o = ancestral_trait[:ultraviolet].merge(options)
+        output, syntax, lines, style, headers =
+          o.values_at(:output, :syntax, :line_numbers, :style, :headers)
+
+        syntax ||= Uv.syntax_for_file(path).first.first
+        code = File.read(path)
+
+        p [code, output, syntax, lines, style, headers]
+        Uv.parse(code, output, syntax, lines, style, headers)
+      end
+
+      # Return absolute path to the css of given name.
+      #
+      # Usually this will point to somewhere in the gem tree.
+      #
+      # It seems like Uv will add support for user-defined PATH in the future,
+      # so we will, to be future-proof, traverse the Uv.path even though it
+      # currently will only have one directory.
+
+      def ultraviolet_css(theme)
+        Uv.path.each do |path|
+          Dir[path/"render/xhtml/files/css/*.css"].each do |css|
+            return css if File.basename(css, '.css') == theme
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ramaze/helper/user.rb

@@ -25,7 +25,7 @@ module Ramaze
       def user
         model = ancestral_trait[:user_model] ||= ::User
         callback = ancestral_trait[:user_callback] ||= nil
-        Thread.current[:user] ||= Wrapper.new(model, callback)
+        STATE[:user] ||= Wrapper.new(model, callback)
       end
 
       # shortcut for user.user_login but default argument are request.params
@@ -51,12 +51,7 @@ module Ramaze
       # In order to not interfere with the wrapped instance/model we start our
       # methods with an underscore.
       # Suggestions on improvements as usual welcome.
-      class Wrapper
-        # make it a BlankSlate
-        instance_methods.each do |meth|
-          undef_method(meth) unless meth.to_s =~ /^__.+__$/
-        end
-
+      class Wrapper < BlankSlate
         attr_accessor :_model, :_callback, :_user
 
         def initialize(model, callback)
@@ -82,14 +77,14 @@ module Ramaze
           elsif _model.respond_to?(:authenticate)
             _model.authenticate(creds)
           else
-            Log.warn("Helper::User has no callback and model doesn't respond to #authenticate")
+            Log.warn("Helper::User has no callback and %p doesn't respond to #authenticate" % _model)
             nil
           end
         end
 
         def _logout
           _persistence.clear
-          Thread.current[:user] = nil
+          STATE[:user] = nil
         end
 
         def _logged_in?

data/lib/ramaze/option/holder.rb

@@ -104,17 +104,7 @@ module Ramaze
       end
 
       def sourcereload=(interval)
-        if interval
-          if interval.is_a?(Numeric)
-            @sourcereload = interval
-            Ramaze::SourceReload.restart
-          else
-            Log.warn("sourcereload= %p not Numeric, ignoring." % interval)
-          end
-        else
-          @sourcereload = interval
-          Ramaze::SourceReload.shutdown
-        end
+        Ramaze::Reloader::OPTIONS[:cooldown] = interval
       end
 
       private