merb-core 1.0.6.1 → 1.0.7

data/lib/merb-core/bootloader.rb

@@ -255,7 +255,7 @@ class Merb::BootLoader::DropPidFile < Merb::BootLoader
     #
     # :api: plugin
     def run
-      Merb::Server.store_pid("main") #if Merb::Config[:daemonize] || Merb::Config[:cluster]
+      Merb::Server.store_pid("main") if Merb::Config[:daemonize] || Merb::Config[:cluster]
       nil
     end
   end

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

@@ -15,6 +15,10 @@ module Merb::RenderMixin
 
   module ClassMethods
 
+    def _templates_for
+      @_templates_for ||= {}
+    end
+
     # Return the default render options.
     #
     # ==== Returns
@@ -293,8 +297,8 @@ module Merb::RenderMixin
       template_path = File.dirname(template) / "_#{File.basename(template)}"
     else
       kontroller = (m = template.match(/.*(?=\/)/)) ? m[0] : controller_name
-      template = "_#{File.basename(template)}"
     end
+    template = "_#{File.basename(template)}"
 
     # This handles no :with as well
     with = [opts.delete(:with)].flatten
@@ -408,28 +412,31 @@ module Merb::RenderMixin
   #
   # :api: private
   def _template_for(context, content_type, controller=nil, template=nil, locals=[])
-    template_method, template_location = nil, nil
-
-    # absolute path to a template (:template => "/foo/bar")
-    if template.is_a?(String) && template =~ %r{^/}
-      template_location = self._absolute_template_location(template, content_type)
-      return [_template_method_for(template_location, locals), template_location]
-    end
+    self.class._templates_for[[context, content_type, controller, template, locals]] ||= begin
+    
+      template_method, template_location = nil, nil
 
-    self.class._template_roots.reverse_each do |root, template_meth|
-      # :template => "foo/bar.html" where root / "foo/bar.html.*" exists
-      if template
-        template_location = root / self.send(template_meth, template, content_type, nil)
-      # :layout => "foo" where root / "layouts" / "#{controller}.html.*" exists        
-      else
-        template_location = root / self.send(template_meth, context, content_type, controller)
+      # absolute path to a template (:template => "/foo/bar")
+      if template.is_a?(String) && template =~ %r{^/}
+        template_location = self._absolute_template_location(template, content_type)
+        return [_template_method_for(template_location, locals), template_location]
       end
+
+      self.class._template_roots.reverse_each do |root, template_meth|
+        # :template => "foo/bar.html" where root / "foo/bar.html.*" exists
+        if template
+          template_location = root / self.send(template_meth, template, content_type, nil)
+        # :layout => "foo" where root / "layouts" / "#{controller}.html.*" exists        
+        else
+          template_location = root / self.send(template_meth, context, content_type, controller)
+        end
       
-      break if template_method = _template_method_for(template_location.to_s, locals)
-    end
+        break if template_method = _template_method_for(template_location.to_s, locals)
+      end
 
-    # template_location is a Pathname
-    [template_method, template_location.to_s]
+      # template_location is a Pathname
+      [template_method, template_location.to_s]
+    end
   end
   
   # Return the template method for a location, and check to make sure the current controller

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

@@ -528,6 +528,15 @@ module Merb
       # ==== Returns
       # Route :: The default route.
       # 
+      # ==== Note
+      # The block takes two parameters, request and params. The params that
+      # are passed into the block are *just* the placeholder params from the
+      # route. If you want the full parsed params, use request.params.
+      #
+      # The rationale for this is that request.params is a fairly slow
+      # operation, and if the full params parsing is not required, we would
+      # rather not do the full parsing.
+      # 
       # ==== Examples
       #   defer_to do |request, params|
       #     params.merge :controller => 'here',

data/lib/merb-core/test/helpers/request_helper.rb

@@ -37,7 +37,7 @@ module Merb
           env["HTTP_COOKIE"] = @__cookie_jar__.for(jar, uri)
         end
         
-        app = Merb::Rack::Application.new
+        app = Merb::Config[:app]
         rack = app.call(::Rack::MockRequest.env_for(uri.to_s, env))
 
         rack = Struct.new(:status, :headers, :body, :url, :original_env).

data/lib/merb-core/version.rb

@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.6.1' unless defined?(Merb::VERSION)
+  VERSION = '1.0.7' unless defined?(Merb::VERSION)
   DM_VERSION = '0.9.8' unless defined?(Merb::DM_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.6.1
+  version: 1.0.7
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -08:00
+date: 2008-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency