0
@@ -1,4 +1,9 @@
0
 test_log
0
 pkg
0
 pkg/*
0
-*.log
0
\ No newline at end of file
0
+*.log
0
+log
0
+!log*.rb
0
+*/log
0
+log/*
0
+*/log/*

0
@@ -144,6 +144,7 @@ task :specs do
0
           examples += e.to_i; failures += f.to_i; pending += p.to_i          
0
         end
0
       end
0
+      STDOUT.puts e.read if e.is_a?(IO)
0
     end
0
   end
0
   puts

0
@@ -6,7 +6,7 @@ require 'set'
0
 require 'fileutils'
0
 require 'socket'
0
 
0
-$LOAD_PATH.push File.dirname(__FILE__) unless 
0
+$LOAD_PATH.unshift File.dirname(__FILE__) unless 
0
   $LOAD_PATH.include?(File.dirname(__FILE__)) || 
0
   $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
0
 

0
@@ -341,6 +341,7 @@ class Merb::AbstractController
0
   end
0
   
0
   def method_missing(sym, *args, &blk)
0
-    (@_merb_partial_locals || {})[sym] || super
0
+    return @_merb_partial_locals[sym] if @_merb_partial_locals && @_merb_partial_locals.key?(sym)
0
+    super
0
   end  
0
 end
0
\ No newline at end of file

0
@@ -28,7 +28,7 @@ class Merb::Controller < Merb::AbstractController
0
     # *names<~to-s>:: Actions that should be added to the list 
0
     #
0
     # ==== Returns
0
-    # Array<String::
0
+    # Array[String]::
0
     #   An array of actions that should not be possible to dispatch to
0
     # 
0
     #---
0
@@ -36,21 +36,70 @@ class Merb::Controller < Merb::AbstractController
0
     def hide_action(*names)
0
       self._hidden_actions = self._hidden_actions | names.map { |n| n.to_s }
0
     end
0
-    
0
+
0
+    # Makes each of the given methods being callable as actions.
0
+    # You can use this to make methods included from modules callable
0
+    # as actions.
0
+    #
0
+    # ==== Example
0
+    # {{[
0
+    #   module Foo
0
+    #     def self.included(base)
0
+    #       base.show_action(:foo)
0
+    #     end
0
+    #     
0
+    #     def foo
0
+    #       # some actiony stuff
0
+    #     end
0
+    #   
0
+    #     def foo_helper
0
+    #       # this should not be an action
0
+    #     end
0
+    #   end
0
+    # ]}}
0
+    #
0
+    # ==== Parameters
0
+    # *names<~to-s>:: Actions that should be added to the list 
0
+    #
0
+    # ==== Returns
0
+    # Array[String]::
0
+    #   An array of actions that should be dispatched to even if they
0
+    #   would not otherwise be.
0
+    # 
0
+    #---
0
+    # @public    
0
     def show_action(*names)
0
       self._shown_actions = self._shown_actions | names.map {|n| n.to_s}
0
     end
0
 
0
+    # This list of actions that should not be callable
0
+    # 
0
+    # ==== Returns
0
+    # Array[String]::
0
+    #   An array of actions that should not be dispatchable
0
     def _hidden_actions
0
       actions = read_inheritable_attribute(:_hidden_actions)
0
       actions ? actions : write_inheritable_attribute(:_hidden_actions, [])
0
     end
0
-    
0
+
0
+    # This list of actions that should be callable
0
+    # 
0
+    # ==== Returns
0
+    # Array[String]::
0
+    #   An array of actions that should be dispatched to even if they
0
+    #   would not otherwise be.
0
     def _shown_actions
0
       actions = read_inheritable_attribute(:_shown_actions)
0
       actions ? actions : write_inheritable_attribute(:_shown_actions, [])      
0
     end
0
 
0
+    # The list of actions that are callable, after taking defaults, _hidden_actions
0
+    # and _shown_actions into consideration. It is calculated once, the first time 
0
+    # an action is dispatched for this controller.
0
+    #
0
+    # ==== Returns
0
+    # Array[String]::
0
+    #   A list of actions that should be callable.
0
     def callable_actions
0
       @callable_actions ||= Merb::SimpleSet.new(begin
0
         callables = []
0
@@ -65,6 +114,21 @@ class Merb::Controller < Merb::AbstractController
0
     
0
   end
0
   
0
+  # The location to look for a template for a particular controller, action, and
0
+  # mime-type. This is overridden from AbstractController, which defines a version
0
+  # of this that does not involve mime-types.
0
+  #
0
+  # ==== Parameters
0
+  # action<~to_s>:: The name of the action that will be rendered
0
+  # type<~to_s>:: The mime-type of the template that will be rendered
0
+  # controller<~to_s>:: The name of the controller that will be rendered
0
+  #
0
+  # ==== Note
0
+  # By default, this renders ":controller/:action.:type". To change this, override
0
+  # it in your application class or in individual controllers.
0
+  #
0
+  #---
0
+  # @public
0
   def _template_location(action, type = nil, controller = controller_name)
0
     "#{controller}/#{action}.#{type}"
0
   end  
0
@@ -127,8 +191,26 @@ class Merb::Controller < Merb::AbstractController
0
   
0
   attr_reader :request, :response, :headers
0
   attr_accessor :status
0
+  
0
+  # ==== Returns
0
+  # Hash:: The parameters from the request object
0
   def params()  request.params  end
0
+    
0
+  # ==== Returns
0
+  # Merb::Cookies:: 
0
+  #   A new Merb::Cookies instance representing the cookies that came in
0
+  #   from the request object
0
+  #
0
+  # ==== Note
0
+  # headers are passed into the cookie object so that you can do:
0
+  #   cookies[:foo] = "bar"
0
   def cookies() @_cookies ||= ::Merb::Cookies.new(request.cookies, @_headers)  end
0
+    
0
+  # ==== Returns
0
+  # Hash:: The session that was extracted from the request object
0
   def session() request.session end
0
+
0
+  # ==== Returns
0
+  # Hash:: The route that was extracted from the request object    
0
   def route()   request.route   end
0
 end
0
\ No newline at end of file

0
@@ -197,7 +197,8 @@ module Merb::RenderMixin
0
     # Get the method name from the previously inlined list
0
     template_method = Merb::Template.template_for(template_location)    
0
 
0
-    if with = opts.delete(:with)
0
+    if opts.key?(:with)
0
+      with = opts.delete(:with)
0
       as = opts.delete(:as) || template_location.match(%r[.*/_([^\.]*)])[1]
0
       @_merb_partial_locals = opts
0
       sent_template = [with].flatten.map do |temp|

0
@@ -21,6 +21,12 @@ module Merb::Test::Fixtures
0
       end
0
     end
0
 
0
+    class WithNilPartial < RenderIt
0
+      def index
0
+        render
0
+      end      
0
+    end
0
+
0
     class WithAsPartial < RenderIt
0
       def index
0
         @foo = "With and As"
0
@@ -35,12 +41,34 @@ module Merb::Test::Fixtures
0
       end
0
     end
0
     
0
+    class PartialWithCollectionsAndAs < RenderIt
0
+      def index
0
+        @foo = %w{ c o l l e c t i o n }
0
+        render
0
+      end
0
+    end    
0
+    
0
     class PartialWithLocals < RenderIt
0
       def index
0
         @foo, @bar = %w{ local variables }
0
         render
0
       end
0
-    end    
0
+    end
0
+    
0
+    class PartialWithBoth < RenderIt
0
+      def index
0
+        @foo = %w{ c o l l e c t i o n }
0
+        @delimiter = "-"
0
+        render
0
+      end
0
+    end
0
+    
0
+    class PartialWithWithAndLocals < RenderIt
0
+      def index
0
+        @foo, @bar = "with", "and locals"
0
+        render
0
+      end
0
+    end
0
     
0
   end
0
 end

0
@@ -1 +1 @@
0
-<%= letter %>
0
\ No newline at end of file
0
+<%= collection %>
0
\ No newline at end of file

0
@@ -1 +1 @@
0
-Partial with <%= partial :collection, :with => @foo, :as => :letter %>
0
\ No newline at end of file
0
+Partial with <%= partial :collection, :with => @foo %>
0
\ No newline at end of file

0
@@ -1 +1 @@
0
-<%= with_partial %>
0
\ No newline at end of file
0
+<%= with_partial || "nil local" %>
0
\ No newline at end of file

0
@@ -9,6 +9,10 @@ describe Merb::AbstractController, " Partials" do
0
   it "should work with :with" do
0
     dispatch_should_make_body("WithPartial", "Partial with With")
0
   end
0
+
0
+  it "should work with nil :with" do
0
+    dispatch_should_make_body("WithNilPartial", "Partial with nil local")
0
+  end
0
   
0
   it "should work with :with and :as" do
0
     dispatch_should_make_body("WithAsPartial", "Partial with With and As")
0
@@ -18,8 +22,20 @@ describe Merb::AbstractController, " Partials" do
0
     dispatch_should_make_body("PartialWithCollections", "Partial with collection")
0
   end
0
   
0
+  it "should work with collections and :as" do
0
+    dispatch_should_make_body("PartialWithCollectionsAndAs", "Partial with collection")
0
+  end
0
+  
0
   it "should work with key/value pairs of locals" do
0
     dispatch_should_make_body("PartialWithLocals", "Partial with local variables")
0
   end
0
   
0
+  it "should work with both collections and locals" do
0
+    dispatch_should_make_body("PartialWithBoth", "Partial with c-o-l-l-e-c-t-i-o-n-")    
0
+  end
0
+  
0
+  it "should work with both :with/:as and regular locals" do
0
+    dispatch_should_make_body("PartialWithWithAndLocals", "Partial with with and locals")    
0
+  end
0
+  
0
 end
0
\ No newline at end of file