TeX and CSS tweaks.

Sync with latest Instiki Trunk
(Updates Rails to 1.2.2)

vendor/rails/actionpack/lib/action_controller/mime_responds.rb

@@ -8,18 +8,18 @@ module ActionController #:nodoc:
       # Without web-service support, an action which collects the data for displaying a list of people
       # might look something like this:
       #
-      #   def list
+      #   def index
       #     @people = Person.find(:all)
       #   end
       # 
       # Here's the same action, with web-service support baked in:
       # 
-      #   def list
+      #   def index
       #     @people = Person.find(:all)
       # 
-      #     respond_to do |wants|
-      #       wants.html
-      #       wants.xml { render :xml => @people.to_xml }
+      #     respond_to do |format|
+      #       format.html
+      #       format.xml { render :xml => @people.to_xml }
       #     end
       #   end
       # 
@@ -30,7 +30,7 @@ module ActionController #:nodoc:
       # Supposing you have an action that adds a new person, optionally creating their company 
       # (by name) if it does not already exist, without web-services, it might look like this:
       # 
-      #   def add
+      #   def create
       #     @company = Company.find_or_create_by_name(params[:company][:name])
       #     @person  = @company.people.create(params[:person])
       # 
@@ -39,15 +39,15 @@ module ActionController #:nodoc:
       # 
       # Here's the same action, with web-service support baked in:
       # 
-      #   def add
+      #   def create
       #     company  = params[:person].delete(:company)
       #     @company = Company.find_or_create_by_name(company[:name])
       #     @person  = @company.people.create(params[:person])
       # 
-      #     respond_to do |wants|
-      #       wants.html { redirect_to(person_list_url) }
-      #       wants.js
-      #       wants.xml  { render :xml => @person.to_xml(:include => @company) }
+      #     respond_to do |format|
+      #       format.html { redirect_to(person_list_url) }
+      #       format.js
+      #       format.xml  { render :xml => @person.to_xml(:include => @company) }
       #     end
       #   end
       # 
@@ -97,9 +97,8 @@ module ActionController #:nodoc:
       # environment.rb as follows.
       # 
       #   Mime::Type.register "image/jpg", :jpg
-      # 
       def respond_to(*types, &block)
-        raise ArgumentError, "respond_to takes either types or a block, never bot" unless types.any? ^ block
+        raise ArgumentError, "respond_to takes either types or a block, never both" unless types.any? ^ block
         block ||= lambda { |responder| types.each { |type| responder.send(type) } }
         responder = Responder.new(block.binding)
         block.call(responder)
@@ -108,15 +107,19 @@ module ActionController #:nodoc:
     end
     
     class Responder #:nodoc:
-      DEFAULT_BLOCKS = {
-        :html    => 'Proc.new { render }',
-        :js      => 'Proc.new { render :action => "#{action_name}.rjs" }',
-        :xml     => 'Proc.new { render :action => "#{action_name}.rxml" }'
-      }
+      DEFAULT_BLOCKS = [:html, :js, :xml].inject({}) do |blocks, ext|
+        template_extension = (ext == :html ? '' : ".r#{ext}")
+        blocks.update ext => %(Proc.new { render :action => "\#{action_name}#{template_extension}", :content_type => Mime::#{ext.to_s.upcase} })
+      end
       
       def initialize(block_binding)
         @block_binding = block_binding
-        @mime_type_priority = eval("request.accepts", block_binding)
+        @mime_type_priority = eval(
+          "(params[:format] && Mime::EXTENSION_LOOKUP[params[:format]]) ? " +
+          "[ Mime::EXTENSION_LOOKUP[params[:format]] ] : request.accepts", 
+          block_binding
+        )
+
         @order     = []
         @responses = {}
       end
@@ -127,24 +130,33 @@ module ActionController #:nodoc:
         @order << mime_type
         
         if block_given?
-          @responses[mime_type] = block
-        else
-          @responses[mime_type] = eval(DEFAULT_BLOCKS[mime_type.to_sym], @block_binding)
-        end
-      end
-      
-      for mime_type in %w( all html js xml rss atom yaml )
-        eval <<-EOT
-          def #{mime_type}(&block)
-            custom(Mime::#{mime_type.upcase}, &block)
+          @responses[mime_type] = Proc.new do
+            eval "response.content_type = '#{mime_type.to_s}'", @block_binding
+            block.call
           end
-        EOT
+        else
+          if source = DEFAULT_BLOCKS[mime_type.to_sym]
+            @responses[mime_type] = eval(source, @block_binding)
+          else
+            raise ActionController::RenderError, "Expected a block but none was given for custom mime handler #{mime_type}"
+          end
+        end
       end
 
       def any(*args, &block)
         args.each { |type| send(type, &block) }
       end
       
+      def method_missing(symbol, &block)
+        mime_constant = symbol.to_s.upcase
+        
+        if Mime::SET.include?(Mime.const_get(mime_constant))
+          custom(Mime.const_get(mime_constant), &block)
+        else
+          super
+        end
+      end
+      
       def respond
         for priority in @mime_type_priority
           if priority == Mime::ALL