merb-core 0.9.10 → 0.9.11

data/Rakefile

@@ -230,6 +230,12 @@ end
 setup_specs("mri", "spec")
 setup_specs("jruby", "jruby -S spec")
 
+task "specs:core_ext" do
+  require "lib/merb-core/test/run_specs"
+  run_specs("spec/public/core_ext/*_spec.rb", "spec", "-c -f o")
+end
+
+task "spec"           => ["specs:mri"]
 task "specs"          => ["specs:mri"]
 task "specs:private"  => ["specs:mri:private"]
 task "specs:public"   => ["specs:mri:public"]

data/lib/merb-core.rb

@@ -110,12 +110,14 @@ module Merb
     #
     # @api public
     def start(argv = ARGV)
-      Merb::Config[:log_stream] = STDOUT
+      Merb::Config[:original_log_stream] = Merb::Config[:log_stream]
+      Merb::Config[:log_stream] ||= STDOUT
       if Hash === argv
         Merb::Config.setup(argv)
-      else
+      elsif !argv.nil?
         Merb::Config.parse_args(argv)
       end
+
       Merb::Config[:log_stream] = STDOUT
       
       Merb.environment = Merb::Config[:environment]
@@ -277,7 +279,7 @@ module Merb
     #
     # @api public
     def root=(value)
-      @root = File.expand_path(value) + File::SEPARATOR
+      @root = value
     end
 
     # ==== Parameters
@@ -400,7 +402,12 @@ module Merb
       Merb.logger.fatal!
 
       print_colorized_backtrace(e) if e && Merb::Config[:verbose]
-      exit(1)
+      
+      if Merb::Config[:show_ugly_backtraces]
+        raise e
+      else
+        exit(1)
+      end
     end
     
     # Print a colorized backtrace to the merb logger.

data/lib/merb-core/autoload.rb

@@ -14,6 +14,7 @@ module Merb
   autoload :Rack,                     "merb-core/rack"
   autoload :RenderMixin,              "merb-core/controller/mixins/render"
   autoload :Request,                  "merb-core/dispatch/request"
+  autoload :Parse,                    "merb-core/dispatch/request_parsers.rb"
   autoload :ResponderMixin,           "merb-core/controller/mixins/responder"
   autoload :Router,                   "merb-core/dispatch/router"
   autoload :Test,                     "merb-core/test"

data/lib/merb-core/bootloader.rb

@@ -167,10 +167,28 @@ module Merb
         before_load_callbacks << block
       end
 
+      # Execute a block of code before master process is shut down.
+      # Only makes sense on platforms where Merb server can use forking.
+      #
+      # ==== Parameters
+      # &block::
+      #   A block to be added to the callbacks that will be executed
+      #   before master process is shut down.
+      #
+      # @api public
       def before_master_shutdown(&block)
         before_master_shutdown_callbacks << block
       end
 
+      # Execute a block of code before worker process is shut down.
+      # Only makes sense on platforms where Merb server can use forking.
+      #
+      # ==== Parameters
+      # &block::
+      #   A block to be added to the callbacks that will be executed
+      #   before worker process is shut down.
+      #
+      # @api public
       def before_worker_shutdown(&block)
         before_worker_shutdown_callbacks << block
       end
@@ -201,7 +219,8 @@ class Merb::BootLoader::Logger < Merb::BootLoader
       end
     end
 
-    Merb::Config[:log_stream] = Merb.log_stream
+    Merb::Config[:log_stream] = 
+      Merb::Config[:original_log_stream] || Merb.log_stream
 
     print_warnings
 
@@ -366,6 +385,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
       load_initfile
       load_env_config
     end
+    expand_ruby_path
     enable_json_gem unless Merb::disabled?(:json)
     load_dependencies
     update_logger
@@ -497,6 +517,27 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
       end
       nil
     end
+
+    # Expands Ruby path with framework directories (for models, lib, etc). Only run once.
+    #
+    # ==== Returns
+    # nil
+    #
+    # @api private
+    def self.expand_ruby_path
+      # Add models, controllers, helpers and lib to the load path
+      unless @ran
+        Merb.logger.info "Expanding RUBY_PATH..." if Merb::Config[:verbose]
+
+        $LOAD_PATH.unshift Merb.dir_for(:model)
+        $LOAD_PATH.unshift Merb.dir_for(:controller)
+        $LOAD_PATH.unshift Merb.dir_for(:lib)
+        $LOAD_PATH.unshift Merb.dir_for(:helper)
+      end
+
+      @ran = true
+      nil
+    end
 end
 
 class Merb::BootLoader::MixinSession < Merb::BootLoader
@@ -564,20 +605,12 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     #
     # @api plugin
     def run
-      # Add models, controllers, helpers and lib to the load path
-      unless @ran
-        $LOAD_PATH.unshift Merb.dir_for(:model)
-        $LOAD_PATH.unshift Merb.dir_for(:controller)
-        $LOAD_PATH.unshift Merb.dir_for(:lib)
-        $LOAD_PATH.unshift Merb.dir_for(:helper)
-      end
-
-      @ran = true
       # process name you see in ps output
       $0 = "merb#{" : " + Merb::Config[:name] if Merb::Config[:name]} : master"
 
       # Log the process configuration user defined signal 1 (SIGUSR1) is received.
       Merb.trap("USR1") do
+        require "yaml"
         Merb.logger.fatal! "Configuration:\n#{Merb::Config.to_hash.merge(:pid => $$).to_yaml}\n\n"
       end
 
@@ -797,7 +830,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
       # Ignore the file for syntax errors. The next time
       # the file is changed, it'll be reloaded again
       begin
-        load file
+        require file
       rescue SyntaxError => e
         Merb.logger.error "Cannot load #{file} because of syntax error: #{e.message}"
       ensure

data/lib/merb-core/config.rb

@@ -350,6 +350,13 @@ module Merb
             begin
               require "ruby-debug"
               Debugger.start
+
+              # Load up any .rdebugrc files we find
+              [".", ENV["HOME"], ENV["HOMEPATH"]].each do |script_dir|
+                script_file = "#{script_dir}/.rdebugrc"
+                Debugger.run_script script_file, StringIO.new if File.exists?(script_file)
+              end
+
               if Debugger.respond_to?(:settings)
                 Debugger.settings[:autoeval] = true
               end

data/lib/merb-core/controller/abstract_controller.rb

@@ -661,7 +661,7 @@ class Merb::AbstractController
       # get appended
       filters << [filter, opts]
     when Symbol, String
-      if existing_filter = filters.find {|f| f.first.to_s[filter.to_s]}
+      if existing_filter = filters.find {|f| f.first.to_s == filter.to_s}
         filters[ filters.index(existing_filter) ] = [filter, opts]
       else
         filters << [filter, opts]

data/lib/merb-core/controller/merb_controller.rb

@@ -113,7 +113,6 @@ class Merb::Controller < Merb::AbstractController
     callables.flatten.reject{|action| action =~ /^_.*/}
   end
 
-
   # The location to look for a template for a particular controller, context,
   # and mime-type. This is overridden from AbstractController, which defines a
   # version of this that does not involve mime-types.

data/lib/merb-core/controller/mixins/controller.rb

@@ -133,7 +133,7 @@ module Merb
       default_redirect_options = { :message => nil, :permanent => false }
       opts = default_redirect_options.merge(opts)
       if opts[:message]
-        notice = Merb::Request.escape([Marshal.dump(opts[:message])].pack("m"))
+        notice = Merb::Parse.escape([Marshal.dump(opts[:message])].pack("m"))
         url = url =~ /\?/ ? "#{url}&_message=#{notice}" : "#{url}?_message=#{notice}"
       end
       self.status = opts[:permanent] ? 301 : 302

data/lib/merb-core/core_ext/kernel.rb

@@ -2,7 +2,7 @@ require 'rubygems/dependency'
 
 module Gem
   class Dependency
-    attr_accessor :require_block
+    attr_accessor :require_block, :require_as
   end
 end
 
@@ -18,18 +18,16 @@ module Kernel
   #
   # @api private
   def track_dependency(name, *ver, &blk)
-    dep = Gem::Dependency.new(name, ver.empty? ? nil : ver)
-    dep.require_block = blk
+    options = ver.pop if ver.last.is_a?(Hash)
+    new_dep = Gem::Dependency.new(name, ver.empty? ? nil : ver)
+    new_dep.require_block = blk
+    new_dep.require_as = (options && options[:require_as]) || name
     
-    existing = Merb::BootLoader::Dependencies.dependencies.find { |d| d.name == dep.name }
-    if existing
-      index = Merb::BootLoader::Dependencies.dependencies.index(existing)
-      Merb::BootLoader::Dependencies.dependencies.delete(existing)
-      Merb::BootLoader::Dependencies.dependencies.insert(index, dep)
-    else
-      Merb::BootLoader::Dependencies.dependencies << dep
-    end
-    return dep
+    deps = Merb::BootLoader::Dependencies.dependencies
+
+    deps.reject! {|current| current.name == new_dep.name }
+    deps << new_dep
+    new_dep
   end
   
   # Loads the given string as a gem. Execution is deferred until
@@ -51,7 +49,7 @@ module Kernel
   #
   # @api public
   def dependency(name, *ver, &blk)
-    immediate = ver.last.is_a?(Hash) && ver.pop[:immediate]
+    immediate = ver.last.delete(:immediate) if ver.last.is_a?(Hash)
     if immediate || Merb::BootLoader.finished?(Merb::BootLoader::Dependencies)
       load_dependency(name, *ver, &blk)
     else
@@ -78,20 +76,21 @@ module Kernel
   #
   # @api private
   def load_dependency(name, *ver, &blk)
-    dep = name.is_a?(Gem::Dependency) ? name : track_dependency(name, *ver)
+    dep = name.is_a?(Gem::Dependency) ? name : track_dependency(name, *ver, &blk)
     gem(dep)
   rescue Gem::LoadError => e
     Merb.fatal! "The gem #{name}, #{ver.inspect} was not found", e
   ensure
-    if block = blk || dep.require_block
+    begin
+      require dep.require_as
+    rescue LoadError => e
+      Merb.fatal! "The file #{dep.require_as} was not found", e
+    end
+
+    if block = dep.require_block
       block.call
-    else
-      begin
-        require dep.name
-      rescue LoadError => e
-        Merb.fatal! "The file #{dep.name} was not found", e
-      end
     end
+
     Merb.logger.verbose!("loading gem '#{dep.name}' ...")
     return dep # ensure needs explicit return
   end
@@ -299,11 +298,18 @@ module Kernel
       lines = File.read(file).split("\n")
       first_line = (f = line - size - 1) < 0 ? 0 : f
       
-      old_lines = lines
-      lines = lines[first_line, size * 2 + 1]
+      if first_line.zero?
+        new_size = line - 1
+        lines = lines[first_line, size + new_size + 1]
+      else
+        new_size = nil
+        lines = lines[first_line, size * 2 + 1]
+      end
 
       lines && lines.each_with_index do |str, index|
-        yield index + line - size, str.chomp
+        line_n = index + line
+        line_n = (new_size.nil?) ? line_n - size : line_n - new_size
+        yield line_n, str.chomp
       end
     end
   end

data/lib/merb-core/dispatch/cookies.rb

@@ -68,7 +68,7 @@ module Merb
           options["expires"] = expiry.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT)
         end
         secure  = options.delete("secure")
-        kookie  = "#{name}=#{Merb::Request.escape(value)}; "
+        kookie  = "#{name}=#{Merb::Parse.escape(value)}; "
         # WebKit in particular doens't like empty cookie options - skip them.
         options.each { |k, v| kookie << "#{k}=#{v}; " unless v.blank? }
         kookie  << 'secure' if secure
@@ -116,7 +116,7 @@ module Merb
       # a Hash of key => value pairs.
       def cookies
         @cookies ||= begin
-          values  = self.class.query_parse(@env[Merb::Const::HTTP_COOKIE], ';,')
+          values  = Merb::Parse.query(@env[Merb::Const::HTTP_COOKIE], ';,')
           cookies = Merb::Cookies.new(values)
           cookies.update(default_cookies) if respond_to?(:default_cookies)
           cookies

data/lib/merb-core/dispatch/request.rb

@@ -179,7 +179,7 @@ module Merb
     #
     # @api private
     def query_params
-      @query_params ||= self.class.query_parse(query_string || '')
+      @query_params ||= Merb::Parse.query(query_string || '')
     end
 
     # Parameters passed in the body of the request. Ajax calls from
@@ -192,7 +192,7 @@ module Merb
     def body_params
       @body_params ||= begin
         if content_type && content_type.match(Merb::Const::FORM_URL_ENCODED_REGEXP) # or content_type.nil?
-          self.class.query_parse(raw_post)
+          Merb::Parse.query(raw_post)
         end
       end
     end
@@ -226,7 +226,7 @@ module Merb
           # if the content-type is multipart
           # parse the multipart. Otherwise return {}
           if (Merb::Const::MULTIPART_REGEXP =~ content_type)
-            self.class.parse_multipart(@body, $1, content_length)
+            Merb::Parse.multipart(@body, $1, content_length)
           else
             {}
           end
@@ -299,8 +299,8 @@ module Merb
     def message
       return {} unless params[:_message]
       begin
-        Marshal.load(Merb::Request.unescape(params[:_message]).unpack("m").first)
-      rescue ArgumentError
+        Marshal.load(Merb::Parse.unescape(params[:_message]).unpack("m").first)
+      rescue ArgumentError, TypeError
         {}
       end
     end
@@ -539,7 +539,7 @@ module Merb
     #
     # @api public
     def path_info
-      @path_info ||= self.class.unescape(@env[Merb::Const::PATH_INFO])
+      @path_info ||= Merb::Parse.unescape(@env[Merb::Const::PATH_INFO])
     end
 
     # ==== Returns
@@ -555,7 +555,8 @@ module Merb
     #
     # @api public
     def host
-      @env[Merb::Const::HTTP_X_FORWARDED_HOST] || @env[Merb::Const::HTTP_HOST]
+      @env[Merb::Const::HTTP_X_FORWARDED_HOST] || @env[Merb::Const::HTTP_HOST] ||
+        @env[Merb::Const::SERVER_NAME]
     end
 
     # ==== Parameters
@@ -603,227 +604,5 @@ module Merb
       end
     end
 
-    class << self
-
-      # ==== Parameters
-      # value<Array, Hash, Dictionary ~to_s>:: The value for the query string.
-      # prefix<~to_s>:: The prefix to add to the query string keys.
-      #
-      # ==== Returns
-      # String:: The query string.
-      #
-      # ==== Alternatives
-      # If the value is a string, the prefix will be used as the key.
-      #
-      # ==== Examples
-      #   params_to_query_string(10, "page")
-      #     # => "page=10"
-      #   params_to_query_string({ :page => 10, :word => "ruby" })
-      #     # => "page=10&word=ruby"
-      #   params_to_query_string({ :page => 10, :word => "ruby" }, "search")
-      #     # => "search[page]=10&search[word]=ruby"
-      #   params_to_query_string([ "ice-cream", "cake" ], "shopping_list")
-      #     # => "shopping_list[]=ice-cream&shopping_list[]=cake"
-      #
-      # @api private
-      def params_to_query_string(value, prefix = nil)
-        case value
-        when Array
-          value.map { |v|
-            params_to_query_string(v, "#{prefix}[]")
-          } * "&"
-        when Hash, Dictionary
-          value.map { |k, v|
-            params_to_query_string(v, prefix ? "#{prefix}[#{Merb::Request.escape(k)}]" : Merb::Request.escape(k))
-          } * "&"
-        else
-          "#{prefix}=#{Merb::Request.escape(value)}"
-        end
-      end
-
-      # ==== Parameters
-      # s<String>:: String to URL escape.
-      #
-      # ==== returns
-      # String:: The escaped string.
-      #
-      # @api private
-      def escape(s)
-        s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-          '%'+$1.unpack('H2'*$1.size).join('%').upcase
-        }.tr(' ', '+')
-      end
-
-      # ==== Parameter
-      # s<String>:: String to URL unescape.
-      #
-      # ==== returns
-      # String:: The unescaped string.
-      #
-      # @api private
-      def unescape(s)
-        s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
-          [$1.delete('%')].pack('H*')
-        }
-      end
-
-      # ==== Parameters
-      # query_string<String>:: The query string.
-      # delimiter<String>:: The query string divider. Defaults to "&".
-      # preserve_order<Boolean>:: Preserve order of args. Defaults to false.
-      #
-      # ==== Returns
-      # Mash:: The parsed query string (Dictionary if preserve_order is set).
-      #
-      # ==== Examples
-      #   query_parse("bar=nik&post[body]=heya")
-      #     # => { :bar => "nik", :post => { :body => "heya" } }
-      #
-      # @api private
-      def query_parse(query_string, delimiter = '&;', preserve_order = false)
-        query = preserve_order ? Dictionary.new : {}
-        for pair in (query_string || '').split(/[#{delimiter}] */n)
-          key, value = unescape(pair).split('=',2)
-          next if key.nil?
-          if key.include?('[')
-            normalize_params(query, key, value)
-          else
-            query[key] = value
-          end
-        end
-        preserve_order ? query : query.to_mash
-      end
-
-      NAME_REGEX = /Content-Disposition:.* name="?([^\";]*)"?/ni.freeze
-      CONTENT_TYPE_REGEX = /Content-Type: (.*)\r\n/ni.freeze
-      FILENAME_REGEX = /Content-Disposition:.* filename="?([^\";]*)"?/ni.freeze
-      CRLF = "\r\n".freeze
-      EOL = CRLF
-
-      # ==== Parameters
-      # request<IO>:: The raw request.
-      # boundary<String>:: The boundary string.
-      # content_length<Fixnum>:: The length of the content.
-      #
-      # ==== Raises
-      # ControllerExceptions::MultiPartParseError:: Failed to parse request.
-      #
-      # ==== Returns
-      # Hash:: The parsed request.
-      #
-      # @api private
-      def parse_multipart(request, boundary, content_length)
-        boundary = "--#{boundary}"
-        paramhsh = {}
-        buf = ""
-        input = request
-        input.binmode if defined? input.binmode
-        boundary_size = boundary.size + EOL.size
-        bufsize = 16384
-        content_length -= boundary_size
-        status = input.read(boundary_size)
-        return {} if status == nil || status.empty?
-        raise ControllerExceptions::MultiPartParseError, "bad content body:\n'#{status}' should == '#{boundary + EOL}'"  unless status == boundary + EOL
-        rx = /(?:#{EOL})?#{Regexp.quote(boundary,'n')}(#{EOL}|--)/
-        loop {
-          head = nil
-          body = ''
-          filename = content_type = name = nil
-          read_size = 0
-          until head && buf =~ rx
-            i = buf.index("\r\n\r\n")
-            if( i == nil && read_size == 0 && content_length == 0 )
-              content_length = -1
-              break
-            end
-            if !head && i
-              head = buf.slice!(0, i+2) # First \r\n
-              buf.slice!(0, 2)          # Second \r\n
-              filename = head[FILENAME_REGEX, 1]
-              content_type = head[CONTENT_TYPE_REGEX, 1]
-              name = head[NAME_REGEX, 1]
-
-              if filename && !filename.empty?
-                body = Tempfile.new(:Merb)
-                body.binmode if defined? body.binmode
-              end
-              next
-            end
-
-            # Save the read body part.
-            if head && (boundary_size+4 < buf.size)
-              body << buf.slice!(0, buf.size - (boundary_size+4))
-            end
-
-            read_size = bufsize < content_length ? bufsize : content_length
-            if( read_size > 0 )
-              c = input.read(read_size)
-              raise ControllerExceptions::MultiPartParseError, "bad content body"  if c.nil? || c.empty?
-              buf << c
-              content_length -= c.size
-            end
-          end
-
-          # Save the rest.
-          if i = buf.index(rx)
-            body << buf.slice!(0, i)
-            buf.slice!(0, boundary_size+2)
-
-            content_length = -1  if $1 == "--"
-          end
-
-          if filename && !filename.empty?
-            body.rewind
-            data = {
-              :filename => File.basename(filename),
-              :content_type => content_type,
-              :tempfile => body,
-              :size => File.size(body.path)
-            }
-          else
-            data = body
-          end
-          paramhsh = normalize_params(paramhsh,name,data)
-          break  if buf.empty? || content_length == -1
-        }
-        paramhsh
-      end
-
-      # Converts a query string snippet to a hash and adds it to existing
-      # parameters.
-      #
-      # ==== Parameters
-      # parms<Hash>:: Parameters to add the normalized parameters to.
-      # name<String>:: The key of the parameter to normalize.
-      # val<String>:: The value of the parameter.
-      #
-      # ==== Returns
-      # Hash:: Normalized parameters
-      #
-      # @api private
-      def normalize_params(parms, name, val=nil)
-        name =~ %r([\[\]]*([^\[\]]+)\]*)
-        key = $1 || ''
-        after = $' || ''
-
-        if after == ""
-          parms[key] = val
-        elsif after == "[]"
-          (parms[key] ||= []) << val
-        elsif after =~ %r(^\[\]\[([^\[\]]+)\]$)
-          child_key = $1
-          parms[key] ||= []
-          if parms[key].last.is_a?(Hash) && !parms[key].last.key?(child_key)
-            parms[key].last.update(child_key => val)
-          else
-            parms[key] << { child_key => val }
-          end
-        else
-          parms[key] ||= {}
-          parms[key] = normalize_params(parms[key], after, val)
-        end
-        parms
-      end
-    end
   end
 end