merb-core 1.0.3 → 1.0.4

data/lib/merb-core/bootloader.rb

@@ -402,7 +402,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   #
   # :api: private
   def self.load_dependencies
-    dependencies.each { |dependency| Kernel.load_dependency(dependency) }
+    dependencies.each { |dependency| Kernel.load_dependency(dependency, nil) }
     nil
   end
 
@@ -450,7 +450,10 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   #
   # :api: private
   def self.set_encoding
-    $KCODE = 'UTF8' if $KCODE == 'NONE' || $KCODE.blank?
+    unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("1.9")
+      $KCODE = 'UTF8' if $KCODE == 'NONE' || $KCODE.blank?
+    end
+    
     nil
   end
 
@@ -593,6 +596,7 @@ end
 class Merb::BootLoader::LoadClasses < Merb::BootLoader
   LOADED_CLASSES = {}
   MTIMES = {}
+  FILES_LOADED = {}
 
   class << self
 
@@ -831,10 +835,26 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # nil
     #
     # :api: private
-    def load_file(file)
-      # Don't do this expensive operation unless we need to
-      unless Merb::Config[:fork_for_class_load]
+    def load_file(file, reload = false)
+      Merb.logger.verbose! "#{reload ? "re" : ""}loading #{file}"
+      
+      # If we're going to be reloading via constant remove,
+      # keep track of what constants were loaded and what files
+      # have been added, so that the constants can be removed
+      # and the files can be removed from $LOADED_FEAUTRES
+      if !Merb::Config[:fork_for_class_load]
+        if FILES_LOADED[file]
+          FILES_LOADED[file].each {|lf| $LOADED_FEATURES.delete(lf)}
+        end
+        
         klasses = ObjectSpace.classes.dup
+        files_loaded = $LOADED_FEATURES.dup
+      end
+
+      # If we're in the midst of a reload, remove the file
+      # itself from $LOADED_FEATURES so it will get reloaded
+      if reload
+        $LOADED_FEATURES.delete(file) if reload
       end
 
       # Ignore the file for syntax errors. The next time
@@ -849,9 +869,11 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
         end
       end
 
-      # Don't do this expensive operation unless we need to
+      # If we're reloading via constant remove, store off the details
+      # after the file has been loaded
       unless Merb::Config[:fork_for_class_load]
         LOADED_CLASSES[file] = ObjectSpace.classes - klasses
+        FILES_LOADED[file] = $LOADED_FEATURES - files_loaded
       end
 
       nil
@@ -900,7 +922,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
       if Merb::Config[:fork_for_class_load]
         reap_workers(128)
       else
-        remove_classes_in_file(file) { |f| load_file(f) }
+        remove_classes_in_file(file) { |f| load_file(f, true) }
       end
     end
 

data/lib/merb-core/constants.rb

@@ -26,6 +26,9 @@ module Merb
     COOKIE_SPLIT             = /[;,] */n.freeze
     COOKIE_REGEXP            = /\s*(.+)=(.*)\s*/.freeze
     COOKIE_EXPIRED_TIME      = Time.at(0).freeze
+    ACCEPT_SPLIT             = /,/.freeze
+    SLASH_SPLIT              = %r{/}.freeze
+    MEDIA_RANGE              = /\s*([^;\s]*)\s*(;\s*q=\s*(.*))?/.freeze
     HOUR                     = 60 * 60
     DAY                      = HOUR * 24
     WEEK                     = DAY * 7

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

@@ -414,8 +414,8 @@ class Merb::AbstractController
   # :api: private
   def _evaluate_condition(condition)
     case condition
-    when Symbol : self.send(condition)
-    when Proc : self.instance_eval(&condition)
+    when Symbol then self.send(condition)
+    when Proc then self.instance_eval(&condition)
     else
       raise ArgumentError,
             'Filter condtions need to be either a Symbol or a Proc'

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

@@ -170,7 +170,7 @@ class Merb::Controller < Merb::AbstractController
       callables << (klass.public_instance_methods(false) + klass._shown_actions) - klass._hidden_actions
       klass = klass.superclass
     end until klass == Merb::AbstractController || klass == Object
-    callables.flatten.reject{|action| action =~ /^_.*/}
+    callables.flatten.reject{|action| action =~ /^_.*/}.map {|x| x.to_s}
   end
 
   # The location to look for a template for a particular controller, context,
@@ -246,7 +246,7 @@ class Merb::Controller < Merb::AbstractController
   #
   # :api: plugin
   def _dispatch(action=:index)
-    Merb.logger.info("Params: #{self.class._filter_params(request.params).inspect}")
+    Merb.logger.info { "Params: #{self.class._filter_params(request.params).inspect}" }
     start = Time.now
     if self.class.callable_actions.include?(action.to_s)
       super(action)

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

@@ -63,6 +63,8 @@ module Merb::ConditionalGetMixin
   #
   # :api: public
   def last_modified=(time)
+    time = time.to_time if time.is_a?(DateTime)
+    # time.utc.strftime("%a, %d %b %Y %X") if we could rely on locale being American
     headers[Merb::Const::LAST_MODIFIED] = time.httpdate
   end
 
@@ -72,7 +74,8 @@ module Merb::ConditionalGetMixin
   #
   # :api: public
   def last_modified
-    Time.rfc2822(headers[Merb::Const::LAST_MODIFIED])
+    last_mod = headers[Merb::Const::LAST_MODIFIED]
+    Time.rfc2822(last_mod) if last_mod
   end
 
   # ==== Returns

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

@@ -513,7 +513,7 @@ module Merb::RenderMixin
     unless string || block_given?
       raise ArgumentError, "You must pass a block or a string into append_content"
     end
-    @_caught_content[obj] = [] if @_caught_content[obj].nil?
+    @_caught_content[obj] = "" if @_caught_content[obj].nil?
     @_caught_content[obj] << string.to_s << (block_given? ? capture(&block) : "")
   end
 

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

@@ -99,6 +99,8 @@ module Merb
     
     TYPES = Dictionary.new
     MIMES = {}
+    MIME_MUTEX = Mutex.new
+    ACCEPT_RESULTS = {}
 
     class ContentTypeAlreadySet < StandardError; end
     
@@ -257,6 +259,35 @@ module Merb
       @_provided_formats -= formats.flatten
     end
     
+    def _accept_types
+      accept = request.accept
+      
+      MIME_MUTEX.synchronize do
+        return ACCEPT_RESULTS[accept] if ACCEPT_RESULTS[accept]
+      end
+      
+      types = request.accept.split(Merb::Const::ACCEPT_SPLIT).map do |entry|
+        entry =~ Merb::Const::MEDIA_RANGE
+        media_range, quality = $1, $3
+        
+        kind, sub_type = media_range.split(Merb::Const::SLASH_SPLIT)
+        mime_sym = Merb.available_accepts[media_range]
+        mime = Merb.available_mime_types[mime_sym]
+        (quality ||= 0.0) if media_range == "*/*"          
+        quality = quality ? (quality.to_f * 100).to_i : 100
+        quality *= (mime && mime[:default_quality] || 1)
+        [quality, mime_sym, media_range, kind, sub_type, mime]
+      end
+    
+      accepts = types.sort_by {|x| x.first }.reverse!.map! {|x| x[1]}      
+      
+      MIME_MUTEX.synchronize do
+        ACCEPT_RESULTS[accept] = accepts.freeze
+      end
+      
+      accepts
+    end
+    
     # Do the content negotiation:
     # 1. if params[:format] is there, and provided, use it
     # 2. Parse the Accept header
@@ -266,16 +297,12 @@ module Merb
     #
     # :api: private
     def _perform_content_negotiation
-      if (fmt = params[:format]) && !fmt.empty?
+      if fmt = params[:format]
         accepts = [fmt.to_sym]
-      elsif request.accept =~ %r{^(text/html|\*/\*)} && _provided_formats.first == :html
-        # Handle the common case of text/html and :html provided after checking :format
-        return :html
       else
-        accepts = Responder.parse(request.accept).map {|t| t.to_sym}.compact
+        accepts = _accept_types
       end
-      
-      # no need to make a bunch of method calls to _provided_formats
+
       provided_formats = _provided_formats
       
       specifics = accepts & provided_formats
@@ -289,6 +316,8 @@ module Merb
       raise Merb::ControllerExceptions::NotAcceptable,
         (message % [accepts.join(', '), provided_formats.join(', ')])
     end
+    
+    
 
     # Returns the output format for this request, based on the 
     # provided formats, <tt>params[:format]</tt> and the client's HTTP

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

@@ -51,7 +51,8 @@ module Merb::Template
     # :api: plugin
     # @overridable
     def load_template_io(path)
-      File.open(path, "r")
+      file = Dir["#{path}.{#{template_extensions.join(',')}}"].first
+      File.open(file, "r") if file
     end
 
     # Get the name of the template method for a particular path.
@@ -69,8 +70,8 @@ module Merb::Template
       path = File.expand_path(path)
       
       if needs_compilation?(path, locals)
-        file = Dir["#{path}.{#{template_extensions.join(',')}}"].first
-        METHOD_LIST[path] = file ? inline_template(load_template_io(file), locals) : nil
+        template_io = load_template_io(path)
+        METHOD_LIST[path] = inline_template(template_io, locals) if template_io
       end
       
       METHOD_LIST[path]

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

@@ -3,7 +3,7 @@ require 'rubygems/dependency'
 module Gem
   class Dependency
     # :api: private
-    attr_accessor :require_block, :require_as
+    attr_accessor :require_block, :require_as, :original_caller
   end
 end
 
@@ -18,11 +18,12 @@ module Kernel
   # @return <Gem::Dependency> Dependency information
   #
   # :api: private
-  def track_dependency(name, *ver, &blk)
+  def track_dependency(name, clr, *ver, &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
+    new_dep.original_caller = clr
     
     deps = Merb::BootLoader::Dependencies.dependencies
 
@@ -110,9 +111,9 @@ module Kernel
   def dependency(name, *opts, &blk)
     immediate = opts.last.delete(:immediate) if opts.last.is_a?(Hash)
     if immediate || Merb::BootLoader.finished?(Merb::BootLoader::Dependencies)
-      load_dependency(name, *opts, &blk)
+      load_dependency(name, caller, *opts, &blk)
     else
-      track_dependency(name, *opts, &blk)
+      track_dependency(name, caller, *opts, &blk)
     end
   end
 
@@ -134,15 +135,19 @@ module Kernel
   # @return <Gem::Dependency> The dependency information.
   #
   # :api: private
-  def load_dependency(name, *ver, &blk)
-    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
+  def load_dependency(name, clr, *ver, &blk)
+    begin
+      dep = name.is_a?(Gem::Dependency) ? name : track_dependency(name, clr, *ver, &blk)
+      Gem.activate(dep)
+    rescue Gem::LoadError => e
+      e.set_backtrace dep.original_caller
+      Merb.fatal! "The gem #{name}, #{ver.inspect} was not found", e
+    end
+  
     begin
       require dep.require_as
     rescue LoadError => e
+      e.set_backtrace dep.original_caller
       Merb.fatal! "The file #{dep.require_as} was not found", e
     end
 

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

@@ -20,21 +20,27 @@ module Merb
 
       # :api: private
       def frame_details(line)
-        filename, lineno, location = line.split(":")
-        if filename.index(Merb.framework_root)
-          type = "framework"
-          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(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))
+        if (match = line.match(/^(.+):(\d+):(.+)$/))
+          filename = match[1]
+          lineno = match[2]
+          location = match[3]
+          if filename.index(Merb.framework_root) == 0
+            type = "framework"
+            shortname = Pathname.new(filename).relative_path_from(Pathname.new(Merb.framework_root))
+          elsif filename.index(Merb.root) == 0
+            type = "app"
+            shortname = Pathname.new(filename).relative_path_from(Pathname.new(Merb.root))
+          elsif path = Gem.path.find {|p| filename.index(p) == 0}
+            type = "gem"
+            shortname = Pathname.new(filename).relative_path_from(Pathname.new(path))
+          else
+            type = "other"
+            shortname = filename
+          end
+          [type, shortname, filename, lineno, location]
         else
-          type = "other"
-          shortname = filename
+          ['', '', '', nil, nil]
         end
-        [type, shortname, filename, lineno, location]
       end
 
       # :api: private
@@ -57,6 +63,10 @@ module Merb
         ret.join("\n")
       end
       
+      def jar?(filename)
+        filename.match(/jar\!/)
+      end
+      
       # :api: private
       def textmate_url(filename, line)
         "<a href='txmt://open?url=file://#{filename}&amp;line=#{line}'>#{line}</a>"
@@ -82,6 +92,10 @@ module Merb
         ret   << "</tr>"
         ret.join("\n")
       end
+
+      def jar?(filename)
+        filename.match(/jar\!/)
+      end
     end
     
     # :api: private

data/lib/merb-core/dispatch/default_exception/views/index.html.erb

@@ -53,6 +53,8 @@
         <sup class="error_<%= exception.class.status %>"><%= exception.class.status %></sup>
       </h1>
       <%= error_codes(exception) %>
+    
+    <% if @show_details %>
       <p class="options">
         <label class="all">All<input type="checkbox" autocomplete="off" /></label>
         <span class="all">
@@ -63,7 +65,6 @@
         </span>
       </p>
 
-    <% if @show_details %>
     <table class="trace">
       <% exception.backtrace.each_with_index do |line, index| %>
         <% type, shortname, filename, lineno, location = frame_details(line) %>
@@ -79,10 +80,10 @@
               <% end %>
             </td>
             <td class="line">
-              <%= textmate_url(filename, lineno) %>
+              <%= textmate_url(filename, lineno) unless jar?(filename) %>
             </td>
           </tr>
-          <%= render_source(filename, lineno) %>
+          <%= render_source(filename, lineno) unless jar?(filename) %>
         </tbody>
       <% end %>
     </table>

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

@@ -51,13 +51,13 @@ module Merb
     # :api: private
     def handle
       start = Time.now
-      Merb.logger.info "Started request handling: #{start.to_s}"
+      Merb.logger.info { "Started request handling: #{start.to_s}" }
       
       find_route!
       return rack_response if handled?
       
       klass = controller
-      Merb.logger.debug("Routed to: #{params.inspect}")
+      Merb.logger.debug { "Routed to: #{params.inspect}" }
       
       unless klass < Controller
         raise NotFound, 
@@ -73,7 +73,7 @@ module Merb
       
       controller = dispatch_action(klass, params[:action])
       controller._benchmarks[:dispatch_time] = Time.now - start
-      Merb.logger.info controller._benchmarks.inspect
+      Merb.logger.info { controller._benchmarks.inspect }
       Merb.logger.flush
       controller.rack_response
     rescue Object => exception

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

@@ -318,7 +318,12 @@ module Merb
       # :api: private
       def compile
         if routes.any?
-          eval(compiled_statement, binding, "Generated Code for Router", 1)
+          begin
+            eval(compiled_statement, binding, "Generated Code for Router", 1)
+          rescue SyntaxError => e
+            puts "\nGenerated code failed:\n #{compiled_statement}"
+            raise e
+          end
         else
           reset!
         end

data/lib/merb-core/logger.rb

@@ -163,7 +163,10 @@ module Merb
       # ==== Returns
       # self:: The logger object for chaining.
       def #{name}(message = nil)
-        self << message if #{number} >= level
+        if #{number} >= level
+          message = block_given? ? yield : message
+          self << message if #{number} >= level
+        end
         self
       end
 
@@ -177,8 +180,11 @@ module Merb
       # ==== Returns
       # self:: The logger object for chaining.
       def #{name}!(message = nil)
-        self << message if #{number} >= level
-        flush if #{number} >= level
+        if #{number} >= level
+          message = block_given? ? yield : message
+          self << message if #{number} >= level
+          flush if #{number} >= level
+        end
         self
       end