merb-core 0.9.4 → 0.9.5

data/Rakefile

@@ -59,13 +59,16 @@ spec = Gem::Specification.new do |s|
   #s.rdoc_options     += RDOC_OPTS + ["--exclude", "^(app|uploads)"]
 
   # Dependencies
-  s.add_dependency "extlib", ">=0.9.3"
+  s.add_dependency "extlib", ">=0.9.4"
   s.add_dependency "erubis"
   s.add_dependency "rake"
   s.add_dependency "json_pure"
   s.add_dependency "rspec"
   s.add_dependency "rack"
   s.add_dependency "mime-types"
+  s.add_dependency "hpricot"  
+  s.add_development_dependency "libxml-ruby"
+  s.add_development_dependency "memcache-client"
   # Requirements
   s.requirements << "install the json gem to get faster json parsing"
   s.required_ruby_version = ">= 1.8.6"
@@ -80,6 +83,11 @@ task :install => :package do
   sh %{#{sudo} gem install #{install_home} --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
 end
 
+desc "Install Merb with development dependencies"
+task :dev_install => :package do
+  sh %{#{sudo} gem install #{install_home} --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri --development}  
+end
+
 desc "Run :package and install the resulting .gem with jruby"
 task :jinstall => :package do
   sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
@@ -176,7 +184,7 @@ task :aok => [:specs, :rcov]
 #   t.spec_files = Dir["spec/**/*_spec.rb"].sort
 # end
 
-def setup_specs(name, spec_cmd='spec', run_opts = "-c -f s")
+def setup_specs(name, spec_cmd='spec', run_opts = "-c")
   desc "Run all specs (#{name})"
   task "specs:#{name}" do
     run_specs("spec/**/*_spec.rb", spec_cmd, ENV['RSPEC_OPTS'] || run_opts)
@@ -212,9 +220,9 @@ end
 setup_specs("mri", "spec")
 setup_specs("jruby", "jruby -S spec")
 
-task "specs" => ["specs:mri"]
-task "specs:private" => ["specs:mri:private"]
-task "specs:public" => ["specs:mri:public"]
+task "specs" => ["dev_install", "specs:mri"]
+task "specs:private" => ["dev_install", "specs:mri:private"]
+task "specs:public" => ["dev_install", "specs:mri:public"]
 
 desc "Run coverage suite"
 task :rcov do
@@ -233,7 +241,7 @@ end
 
 desc "Run a specific spec with TASK=xxxx"
 Spec::Rake::SpecTask.new("spec") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_opts = ["--colour"]
   t.libs = ["lib", "server/lib" ]
   t.spec_files = (ENV["TASK"] || '').split(',').map do |task|
     "spec/**/#{task}_spec.rb"
@@ -313,9 +321,10 @@ namespace :repo do
 
 end
 
-def git_log(since_release = nil, log_format = "format:%an")
-  git_log_query = "git log --pretty='format:#{log_format}' --no-merges"
-  git_log_query << " --since='#{since_release}'" if since_release
+def git_log(since_release = nil, log_format = "%an")
+  git_log_query = "git log"
+  git_log_query << " v#{since_release}..HEAD" if since_release
+  git_log_query << " --pretty='format:#{log_format}' --no-merges"
   puts
   puts "Running #{git_log_query}"
   puts
@@ -323,10 +332,10 @@ def git_log(since_release = nil, log_format = "format:%an")
 end
 
 def contributors(since_release = nil)
-  @merb_contributors ||= git_log(since_release).split("\n").uniq.sort
+  git_log(since_release).split("\n").uniq.sort
 end
 
-PREVIOUS_RELEASE = '0.9.3'
+PREVIOUS_RELEASE = '0.9.4'
 namespace :history do
   namespace :update do
     desc "updates contributors list"
@@ -360,7 +369,7 @@ namespace :history do
   namespace :current_release do
     desc "show changes since previous release"
     task :changes do
-      puts git_log(PREVIOUS_RELEASE, "format:* %s")
+      puts git_log(PREVIOUS_RELEASE, "* %s")
     end
 
 
@@ -399,7 +408,7 @@ rule "" do |t|
 
     example = " -e '#{spec_name}'" unless spec_name.empty?
 
-    sh "#{spec_cmd} #{run_file_name} --format specdoc --colour #{example}"
+    sh "#{spec_cmd} #{run_file_name} --colour #{example}"
   end
 end
 

data/lib/merb-core/bootloader.rb

@@ -542,7 +542,7 @@ class Merb::BootLoader::MimeTypes < Merb::BootLoader
     Merb.add_mime_type(:yaml, :to_yaml, %w[application/x-yaml text/yaml], :charset => "utf-8")
     Merb.add_mime_type(:text, :to_text, %w[text/plain], :charset => "utf-8")
     Merb.add_mime_type(:html, :to_html, %w[text/html application/xhtml+xml application/html], :charset => "utf-8")
-    Merb.add_mime_type(:xml,  :to_xml,  %w[application/xml text/xml application/x-xml], :charset => "utf-8")
+    Merb.add_mime_type(:xml,  :to_xml,  %w[application/xml text/xml application/x-xml], {:charset => "utf-8"}, 0.9998)
     Merb.add_mime_type(:js,   :to_json, %w[text/javascript application/javascript application/x-javascript], :charset => "utf-8")
     Merb.add_mime_type(:json, :to_json, %w[application/json text/x-json], :charset => "utf-8")
   end
@@ -673,6 +673,7 @@ class Merb::BootLoader::RackUpApplication < Merb::BootLoader
          run Merb::Rack::Application.new
        }.to_app
     end
+    
   end
 end
 
@@ -727,4 +728,4 @@ class Merb::BootLoader::ReloadTemplates < Merb::BootLoader
       Merb::Config[:reload_templates] = (Merb.environment == "development")
     end
   end
-end
+end

data/lib/merb-core/config.rb

@@ -1,5 +1,4 @@
 require "optparse"
-require "yaml"
 
 module Merb
 
@@ -93,6 +92,7 @@ module Merb
       # ==== Returns
       # String:: The config as YAML.
       def to_yaml
+        require "yaml"
         @configuration.to_yaml
       end
 

data/lib/merb-core/constants.rb

@@ -23,6 +23,8 @@ module Merb
     FORM_URL_ENCODED_REGEXP  = %r{^application/x-www-form-urlencoded}.freeze
     UPCASE_CONTENT_TYPE      = 'CONTENT_TYPE'.freeze
     CONTENT_TYPE             = "Content-Type".freeze
+    DATE                     = 'Date'.freeze
+    ETAG                     = 'ETag'.freeze
     LAST_MODIFIED            = "Last-Modified".freeze
     SLASH                    = "/".freeze
     REQUEST_METHOD           = "REQUEST_METHOD".freeze
@@ -40,4 +42,4 @@ module Merb
     REQUEST_PATH             = "REQUEST_PATH".freeze
     REMOTE_ADDR              = "REMOTE_ADDR".freeze
   end
-end
+end

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

@@ -26,38 +26,41 @@
 # ===== Examples
 #   before :some_filter
 #   before :authenticate, :exclude => [:login, :signup]
-#   before :has_role, :with => ["Admin"], :exclude => [:index,:show]
+#   before :has_role, :with => ["Admin"], :exclude => [:index, :show]
 #   before Proc.new {|c| c.some_method }, :only => :foo
-#   before :authorize, :unless => logged_in?  
+#   before :authorize, :unless => :logged_in?  
 #
-# You can use either :only => :actionname or :exclude => [:this, :that]
-# but not both at once. :only will only run before the listed actions
-# and :exclude will run for every action that is not listed.
+# You can use either <code>:only => :actionname</code> or 
+# <code>:exclude => [:this, :that]</code> but not both at once. 
+# <code>:only</code> will only run before the listed actions and 
+# <code>:exclude</code> will run for every action that is not listed.
 #
 # Merb's before filter chain is very flexible. To halt the filter chain you
-# use throw :halt. If throw is called with only one argument of :halt the
-# return of the method filters_halted will be what is rendered to the view.
-# You can overide filters_halted in your own controllers to control what it
-# outputs. But the throw construct is much more powerful then just that.
-# throw :halt can also take a second argument. Here is what that second arg
-# can be and the behavior each type can have:
+# use <code>throw :halt</code>. If <code>throw</code> is called with only one 
+# argument of <code>:halt</code> the return value of the method 
+# <code>filters_halted</code> will be what is rendered to the view. You can 
+# override <code>filters_halted</code> in your own controllers to control what 
+# it outputs. But the <code>throw</code> construct is much more powerful than 
+# just that.
+#
+# <code>throw :halt</code> can also take a second argument. Here is what that 
+# second argument can be and the behavior each type can have:
 #
 # * +String+:
-#   when the second arg is a string then that string will be what
-#   is rendered to the browser. Since merb's render method returns
+#   when the second argument is a string then that string will be what
+#   is rendered to the browser. Since merb's <code>#render</code> method returns
 #   a string you can render a template or just use a plain string:
 #
 #     throw :halt, "You don't have permissions to do that!"
 #     throw :halt, render(:action => :access_denied)
 #
 # * +Symbol+:
-#   If the second arg is a symbol then the method named after that
+#   If the second arg is a symbol, then the method named after that
 #   symbol will be called
 #
-#   throw :halt, :must_click_disclaimer
+#     throw :halt, :must_click_disclaimer
 #
 # * +Proc+:
-#
 #   If the second arg is a Proc, it will be called and its return
 #   value will be what is rendered to the browser:
 #
@@ -86,9 +89,9 @@
 # Filter:: <Array[Symbol, (Symbol, String, Proc)]>
 #
 # ==== params[:action] and params[:controller] deprecated
-# params[:action] and params[:controller] have been deprecated as of
+# <code>params[:action]</code> and <code>params[:controller]</code> have been deprecated as of
 # the 0.9.0 release. They are no longer set during dispatch, and
-# have been replaced by action_name and controller_name respectively.
+# have been replaced by <code>action_name</code> and <code>controller_name</code> respectively.
 class Merb::AbstractController
   include Merb::RenderMixin
   include Merb::InlineTemplates
@@ -96,7 +99,7 @@ class Merb::AbstractController
   class_inheritable_accessor :_layout, :_template_root, :template_roots
   class_inheritable_accessor :_before_filters, :_after_filters
 
-  cattr_accessor :_abstract_subclasses, :_template_path_cache
+  cattr_accessor :_abstract_subclasses
 
   #---
   # @semipublic
@@ -157,7 +160,7 @@ class Merb::AbstractController
   # of controller/action.mime.type
   #---
   # @public
-  def _template_location(context, type = nil, controller = controller_name)
+  def _template_location(context, type, controller)
     controller ? "#{controller}/#{context}" : context
   end
 
@@ -234,7 +237,7 @@ class Merb::AbstractController
   #
   # ==== Raises
   # MerbControllerError:: Invalid body content caught.
-  def _dispatch(action=:to_s)
+  def _dispatch(action)
     setup_session
     self.action_name = action
     
@@ -252,7 +255,7 @@ class Merb::AbstractController
     when Symbol                   then __send__(caught)
     when Proc                     then caught.call(self)
     else
-      raise MerbControllerError, "The before filter chain is broken dude. wtf?"
+      raise ArgumentError, "Threw :halt, #{caught}. Expected String, nil, Symbol, Proc."
     end
     start = Time.now
     _call_filters(_after_filters)
@@ -417,23 +420,6 @@ class Merb::AbstractController
   # Method stub for finalizing up the session. This will be overriden by
   # session modules.
   def finalize_session() end  
-
-  # Handles the template cache (which is used by BootLoader to cache the list
-  # of all templates).
-  #
-  # ==== Parameters
-  # template<String>::
-  #   The full path to a template to add to the list of available templates
-  def self.add_path_to_template_cache(template)
-    return false if template.blank? || template.split("/").last.split(".").size != 3
-    key = template.match(/(.*)\.(.*)$/)[1]
-    self._template_path_cache[key] = template
-  end
-  
-  # Resets the template_path_cache to an empty hash
-  def self.reset_template_path_cache!
-    self._template_path_cache = {}
-  end  
   
   # ==== Parameters
   # name<~to_sym, Hash>:: The name of the URL to generate.

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

@@ -24,14 +24,14 @@ end
 
 module Merb
   # ControllerExceptions are a way of simplifying controller code by placing
-  # exceptional logic back into the MVC pattern.
+  # exception logic back into the MVC pattern.
   #
   # When a ControllerException is raised within your application merb will
   # attempt to re-route the request to your Exceptions controller to render
-  # the error in a friendly mannor.
+  # the error in a friendly manor.
   #
   # For example you might have an action in your app that raises NotFound
-  # if a some resource was not available
+  # if a resource was not available
   #
 
   #   def show
@@ -41,7 +41,7 @@ module Merb
   #   end
   #
   # This would halt execution of your action and re-route it over to your
-  # Exceptions controller which might look something like
+  # Exceptions controller which might look something like:
   #
   # class Exceptions < Application
 
@@ -50,16 +50,16 @@ module Merb
   #   end
   # end
   #
-  # As usual the not_found action will look for a template in
+  # As usual, the not_found action will look for a template in
   #   app/views/exceptions/not_found.html.erb
   #
   # Note: All standard ControllerExceptions have an HTTP status code associated 
-  # with them which is sent to the browser when the action it is rendered.
+  # with them which is sent to the browser when the action is rendered.
   #
   # Note: If you do not specifiy how to handle raised ControllerExceptions 
   # or an unhandlable exception occurs within your customised exception action
-  # then they will be rendered using the built-in error template
-  # in development mode this "built in" template will show stack-traces for
+  # then they will be rendered using the built-in error template.
+  # In development mode this "built in" template will show stack-traces for
   # any of the ServerError family of exceptions (you can force the stack-trace
   # to display in production mode using the :exception_details config option in 
   # merb.yml)
@@ -68,13 +68,13 @@ module Merb
   # ==== Internal Exceptions 
   #
   # Any other rogue errors (not ControllerExceptions) that occur during the 
-  # execution of you app will be converted into the ControllerException 
-  # InternalServerError, and like all ControllerExceptions can be caught
-  # on your Exceptions controller.
+  # execution of your app will be converted into the ControllerException 
+  # InternalServerError. And like all other exceptions, the ControllerExceptions  
+  # can be caught on your Exceptions controller.
   #
-  # InternalServerErrors return status 500, a common use for cusomizing this
+  # InternalServerErrors return status 500, a common use for customizing this
   # action might be to send emails to the development team, warning that their
-  # application have exploded. Mock example:
+  # application has exploded. Mock example:
   #
 
   #   def internal_server_error
@@ -82,7 +82,7 @@ module Merb
   #       "team@cowboys.com", 
   #       "Exception occured at #{Time.now}", 
   #       params[:exception])
-  #     render 'Something is wrong, but the team are on it!'
+  #     render 'Something is wrong, but the team is on it!'
   #   end
   #
   # Note: The special param[:exception] is available in all Exception actions 
@@ -290,10 +290,8 @@ module Merb
 
       class InternalServerError         < Merb::ControllerExceptions::ServerError #:doc: 
         self.status = 500;
-        # DEFAULT_TEMPLATE = ::Merb::Dispatcher::DEFAULT_ERROR_TEMPLATE
         def initialize(exception = nil)
           @exception = exception
-          @coderay = CodeRay rescue nil
         end
 
         def backtrace

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

@@ -137,7 +137,7 @@ class Merb::Controller < Merb::AbstractController
   #
   #---
   # @public
-  def _template_location(context, type = nil, controller = controller_name)
+  def _template_location(context, type, controller)
     _conditionally_append_extension(controller ? "#{controller}/#{context}" : "#{context}", type)
   end
   
@@ -256,7 +256,7 @@ class Merb::Controller < Merb::AbstractController
   private
 
   # If not already added, add the proper mime extension to the template path.
-  def _conditionally_append_extension(template, type = nil)
+  def _conditionally_append_extension(template, type)
     type && !template.match(/\.#{type.to_s.escape_regexp}$/) ? "#{template}.#{type}" : template
   end
 

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

@@ -38,7 +38,7 @@ module Merb
     #   correctly appended to the mimetype itself.
     # &block:: a block which recieves the current controller when the format
     #   is set (in the controller's #content_type method)
-    def add_mime_type(key, transform_method, mimes, new_response_headers = {}, &block) 
+    def add_mime_type(key, transform_method, mimes, new_response_headers = {}, default_quality = 1, &block) 
       enforce!(key => Symbol, mimes => Array)
       
       content_type = new_response_headers["Content-Type"] || mimes.first
@@ -52,6 +52,7 @@ module Merb
          :transform_method  => transform_method,
          :content_type      => content_type,
          :response_headers  => new_response_headers,
+         :default_quality   => default_quality,
          :response_block    => block })
 
       mimes.each do |mime|

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

@@ -478,4 +478,16 @@ module Merb::RenderMixin
     @_caught_content[obj] << string.to_s << (block_given? ? capture(&block) : "")
   end
 
+  # Called when renderers need to be sure that existing thrown content is cleared
+  # before throwing new content. This prevents double rendering of content when
+  # multiple templates are rendered after each other.
+  #
+  # ==== Parameters
+  # obj<Object>:: The key in the thrown_content hash. Defaults to :for_layout.
+  #---
+  # @public
+  def clear_content(obj = :for_layout)
+    @_caught_content.delete(obj) unless @_caught_content[obj].nil?
+  end
+
 end

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

@@ -352,6 +352,30 @@ module Merb
 
   class Responder
   
+    # def self.parse(accept_header)
+    #   headers = accept_header.split(/,/)
+    # 
+    #   ret = {}
+    #   headers.each do |header|
+    #     header =~ /\s*([^;\s]*)\s*(;\s*q=\s*([\d\.]+))?/
+    #     quality = $3.to_f || 0 if $1 == "*/*"
+    #     quality = quality ? quality.to_f : 1
+    #     mime = mime(range)
+    #     ret[mime] = [mime_name(range), quality * mime[:default_quality]]
+    #   end
+    #   ret.sort_by {|k,v| [v.last]}
+    # end
+    #   
+    # def self.mime_name(range)
+    #   @mime_names ||= {}
+    #   @mime_names[range] ||= Merb::ResponderMixin::MIMES[@media_range]
+    # end
+    #   
+    # def self.mime(range)
+    #   @mime ||= {}
+    #   @mime[range] ||= Merb.available_mime_types[mime_name(range)]
+    # end
+  
     protected
 
     # Parses the raw accept header into an array of sorted AcceptType objects.
@@ -362,11 +386,6 @@ module Merb
     # ==== Returns
     # Array[AcceptType]:: The accepted types.
     def self.parse(accept_header)
-      # FF2 is broken. If we get FF2 headers, use FF3 headers instead.
-      if accept_header == "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
-        accept_header = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
-      end
-      
       headers = accept_header.split(/,/)
       idx, list = 0, []
       while idx < headers.size
@@ -396,6 +415,7 @@ module Merb
       @type, @sub_type = @media_range.split(%r{/})
       (quality ||= 0.0) if @media_range == "*/*"
       @quality = quality ? (quality.to_f * 100).to_i : 100
+      @quality *= (mime && mime[:default_quality] || 1)
     end
     
     # Compares two accept types for sorting purposes.
@@ -439,12 +459,16 @@ module Merb
     #   All Accept header values, such as "text/html", that match this type.
     def synonyms
       return @syns if @syns
-      if mime = Merb.available_mime_types[Merb::ResponderMixin::MIMES[@media_range]]
-        @syns = mime[:accepts]
+      if _mime = mime
+        @syns = _mime[:accepts]
       else
         @syns = []
       end
     end
+    
+    def mime
+      @mime ||= Merb.available_mime_types[Merb::ResponderMixin::MIMES[@media_range]]
+    end
 
     # ==== Returns
     # String::

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

@@ -0,0 +1,7 @@
+class Hash
+  def extract!(*args)
+    args.map do |arg|
+      self.delete(arg)
+    end
+  end
+end

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

@@ -113,7 +113,7 @@ module Kernel
   # Mapper) you wish to use. Currently Merb has plugins to support
   # ActiveRecord, DataMapper, and Sequel.
   #
-  # @param orm<#to_s> The ORM to use.
+  # @param orm<Symbol> The ORM to use.
   #
   # @example
   #   use_orm :datamapper
@@ -124,9 +124,10 @@ module Kernel
   # @note
   #   If for some reason this is called more than once, latter
   #   call takes over other.
+  # @api public
   def use_orm(orm)
     begin
-      register_orm(orm)
+      Merb.orm = orm
       orm_plugin = "merb_#{orm}"
       Kernel.dependency(orm_plugin)
     rescue LoadError => e
@@ -135,17 +136,6 @@ module Kernel
     end
   end
 
-
-  # Registers ORM at generator scope.
-  #
-  # @param orm<#to_sym>
-  #   ORM alias, like :activerecord, :datamapper or :sequel.
-  #
-  # @api private
-  def register_orm(orm)
-    Merb.orm_generator_scope = orm
-  end
-
   # Used in Merb.root/config/init.rb to tell Merb which testing framework to
   # use. Currently Merb has plugins to support RSpec and Test::Unit.
   #
@@ -157,32 +147,39 @@ module Kernel
   #
   #   # This will now use the RSpec generator for tests
   #   $ merb-gen model ActivityEvent
+  # @api public
   def use_test(test_framework, *test_dependencies)
-    raise "use_test only supports :rspec and :test_unit currently" unless supported_test_framework?(test_framework)
-    register_test_framework(test_framework)
-
-    dependencies test_dependencies if Merb.env == "test" || Merb.env.nil?
+    Merb.test_framework = test_framework
+    
+    Kernel.dependencies test_dependencies if Merb.env == "test" || Merb.env.nil?
   end
-
-  # Check whether Merb supports test framework. Currently Merb has plugins to support RSpec and Test::Unit.
+  
+  # Used in Merb.root/config/init.rb to tell Merb which template engine to
+  # prefer.
   #
-  # @param test_framework<Symbol>
-  #   The test framework to check. Currently only supports :rspec and :test_unit.
+  # @param template_engine<Symbol>
+  #   The template engine to use.
   #
-  # @api plugin
-  def supported_test_framework?(test_framework)
-    [:rspec, :test_unit].include?(test_framework.to_sym)
-  end
-
-  # Register test framework at generator scope. Currently Merb has plugins to support RSpec and Test::Unit.
-  #
-  # @param test_framework<Symbol>
-  #   The test framework to check. Currently only supports :rspec and :test_unit but the 
-  #   check is performed before registration if you use API.
+  # @example
+  #   use_template_engine :haml
   #
-  # @api private
-  def register_test_framework(test_framework)
-    Merb.test_framework_generator_scope = test_framework
+  #   # This will now use haml templates in generators where available.
+  #   $ merb-gen resource_controller Project 
+  # @api public
+  def use_template_engine(template_engine)
+    Merb.template_engine = template_engine
+
+    if template_engine != :erb
+      if template_engine.in?(:haml, :builder)
+        template_engine_plugin = "merb-#{template_engine}"
+      else
+        template_engine_plugin = "merb_#{template_engine}"
+      end
+      Kernel.dependency(template_engine_plugin)
+    end
+  rescue LoadError => e
+    Merb.logger.warn!("The #{template_engine_plugin} gem was not found.  You may need to install it.")
+    raise e
   end
 
   # @param i<Fixnum> The caller number. Defaults to 1.

data/lib/merb-core/core_ext.rb

@@ -6,3 +6,4 @@ rescue LoadError => e
 end
 
 require File.dirname(__FILE__) / "core_ext" / "kernel"
+require File.dirname(__FILE__) / "core_ext" / "hash"

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

@@ -18,10 +18,10 @@ module Merb
         filename, lineno, location = line.split(":")
         if filename.index(Merb.framework_root)
           type = "framework"
-          shortname = Pathname.new(filename).relative_path_from(Merb.framework_root)
+          shortname = Pathname.new(filename).relative_path_from(Pathname.new(Merb.framework_root))
         elsif filename.index(Merb.root)
           type = "app"
-          shortname = Pathname.new(filename).relative_path_from(Merb.root)
+          shortname = Pathname.new(filename).relative_path_from(Pathname.new(Merb.root))
         elsif path = Gem.path.find {|p| filename.index(p)}
           type = "gem"
           shortname = Pathname.new(filename).relative_path_from(Pathname.new(path))
@@ -90,4 +90,4 @@ module Merb
       end
     end
   end
-end
+end