actionpack 1.3.1 → 1.4.0

data/CHANGELOG

@@ -1,3 +1,67 @@
+*1.4.0* (January 25th, 2005)
+
+* Fixed problems with ActiveRecordStore under the development environment in Rails
+
+* Fixed the ordering of attributes in the xml-decleration of Builder #540 [woeye]
+
+* Added @request.raw_post as a convenience access to @request.env['RAW_POST_DATA'] #534 [Tobias Luetke]
+
+* Added support for automatic id-based indexing for lists of items #532 [dblack]. Example:
+
+    <% @students.each do |@student| %>
+      <%= text_field "student[]", "first_name", :size => "20" %>
+      <%= text_field "student[]", "last_name" %>
+      <%= text_field "student[]", "grade", :size => "5" %>
+    <% end %>
+  
+  ...would produce, for say David Black with id 123 and a grace of C+:
+  
+    <input id="student_123_first_name" name="student[123][first_name]" size="20"     size="30" type="text" value="David" />
+    <input id="student_123_last_name" name="student[123][last_name]" size="30"  type="text" value="Black" />
+    <input id="student_123_grade" name="student[123][grade]" size="5" type="text"  value="C+" />
+
+* Added :application_prefix to url_for and friends that makes it easier to setup Rails in non-vhost environments #516 [Jamis Buck]
+
+* Added :encode option to mail_to that'll allow you to masquarede the email address behind javascript or hex encoding #494 [Lucas Carlson]
+
+* Fixed that the content-header was being set to application/octet_stream instead of application/octet-stream on send_date/file [Alexey]
+
+* Removed the need for passing the binding when using CacheHelper#cache
+
+* Added TestResponse#binary_content that'll return as a string the data sent through send_data/send_file for testing #500 [Alexey]
+
+* Added @request.env['RAW_POST_DATA'] for people who need access to the data before Ruby's CGI has parsed it #505 [bitsweat]
+
+* Fixed that a default fragment store wan't being set to MemoryStore as intended.
+
+* Fixed that all redirect and render calls now return true, so you can use the pattern of "do and return". Example:
+
+    def show
+      redirect_to(:action => "login") and return unless @person.authenticated?
+      render_text "I won't happen unless the person is authenticated"
+    end
+
+* Added that renders and redirects called in before_filters will have the same effect as returning false: stopping the chain. Example:
+
+    class WeblogController
+      before_filter { |c| c.send(:redirect_to_url("http://www.farfaraway.com")}) }
+      
+      def hello
+        render_text "I will never be called"
+      end
+    end
+
+
+* Added that only one render or redirect can happen per action. The first call wins and subsequent calls are ignored. Example:
+
+    def do_something
+      redirect_to :action => "elsewhere"
+      render_action "overthere"
+    end
+  
+  Only the redirect happens. The rendering call is simply ignored.
+
+
 *1.3.1* (January 18th, 2005)
 
 * Fixed a bug where cookies wouldn't be set if a symbol was used instead of a string as the key

data/install.rb

@@ -19,7 +19,8 @@ unless $sitedir
 end
 
 makedirs = %w{ action_controller/assertions action_controller/cgi_ext
-               action_controller/session action_controller/support action_controller/support/core_ext
+               action_controller/session action_controller/support action_controller/support/core_ext 
+               action_controller/support/core_ext/hash action_controller/support/core_ext/numeric action_controller/support/core_ext/string
                action_controller/templates action_controller/templates/rescues
                action_controller/templates/scaffolds
                action_view/helpers action_view/vendor action_view/vendor/builder
@@ -41,6 +42,7 @@ files = %w-
  action_controller/cgi_ext/cgi_ext.rb
  action_controller/cgi_ext/cgi_methods.rb
  action_controller/cgi_ext/cookie_performance_fix.rb
+ action_controller/cgi_ext/raw_post_data_fix.rb
  action_controller/caching.rb
  action_controller/cgi_process.rb
  action_controller/cookies.rb
@@ -61,8 +63,15 @@ files = %w-
  action_controller/support/class_inheritable_attributes.rb
  action_controller/support/class_attribute_accessors.rb
  action_controller/support/clean_logger.rb
- action_controller/support/core_ext/hash_ext.rb
- action_controller/support/core_ext.rb
+ action_controller/support/core_ext/hash/keys.rb
+ action_controller/support/core_ext/hash.rb
+ action_controller/support/core_ext/object_and_class.rb
+ action_controller/support/core_ext/numeric/bytes.rb
+ action_controller/support/core_ext/numeric/time.rb
+ action_controller/support/core_ext/numeric.rb
+ action_controller/support/core_ext/string/inflections.rb
+ action_controller/support/core_ext/string.rb
+ active_record/support/core_ext.rb
  action_controller/support/inflector.rb
  action_controller/support/binding_of_caller.rb
  action_controller/support/breakpoint.rb

data/lib/action_controller/base.rb

@@ -163,6 +163,17 @@ module ActionController #:nodoc:
   # For more examples of redirecting options, have a look at the unit test in test/controller/url_test.rb. It's very readable and will give
   # you an excellent understanding of the different options and what they do.
   #
+  # == Calling multiple redirects or renders
+  #
+  # The rule for handling calls of multiple redirects and renders is that the first call wins. So in the following example:
+  #
+  #   def do_something
+  #     redirect_to :action => "elsewhere"
+  #     render_action "overthere"
+  #   end
+  #
+  # Only the redirect happens. The rendering call is simply ignored.
+  #
   # == Environments
   #
   # Action Controller works out of the box with CGI, FastCGI, and mod_ruby. CGI and mod_ruby controllers are triggered just the same using:
@@ -178,7 +189,7 @@ module ActionController #:nodoc:
     DEFAULT_RENDER_STATUS_CODE = "200 OK"
   
     DEFAULT_SEND_FILE_OPTIONS = {
-      :type         => 'application/octet_stream'.freeze,
+      :type         => 'application/octet-stream'.freeze,
       :disposition  => 'attachment'.freeze,
       :stream       => true, 
       :buffer_size  => 4096
@@ -385,11 +396,11 @@ module ActionController #:nodoc:
       # considerably faster than rendering through the template engine.
       # Use block for response body if provided (useful for deferred rendering or streaming output).
       def render_text(text = nil, status = nil, &block) #:doc:
+        return if performed?
         add_variables_to_assigns
         @response.headers["Status"] = status || DEFAULT_RENDER_STATUS_CODE
         @response.body = block_given? ? block : text
         @performed_render = true
-        return false
       end
       
       # Renders an empty response that can be used when the request is only interested in triggering an effect. Do note that good
@@ -541,10 +552,10 @@ module ActionController #:nodoc:
       # <tt>redirect_to_url "http://www.rubyonrails.org"</tt>. If the resource has moved permanently, it's possible to pass true as the
       # second parameter and the browser will get "301 Moved Permanently" instead of "302 Found".
       def redirect_to_url(url, permanently = false) #:doc:
+        return if performed?
         logger.info("Redirected to #{url}") unless logger.nil?
         @response.redirect(url, permanently)
         @performed_redirect = true
-        return false
       end
 
       # Resets the session by clearsing out all the objects stored within and initializing a new session object.
@@ -594,13 +605,17 @@ module ActionController #:nodoc:
       def perform_action
         if action_methods.include?(action_name) || action_methods.include?('method_missing')
           send(action_name)
-          render unless @performed_render || @performed_redirect
+          render unless performed?
         elsif template_exists? && template_public?
           render
         else
           raise UnknownAction, "No action responded to #{action_name}", caller
         end
       end
+      
+      def performed?
+        @performed_render || @performed_redirect
+      end
 
       def action_methods
         action_controller_classes = self.class.ancestors.reject{ |a| [Object, Kernel].include?(a) }

data/lib/action_controller/caching.rb

@@ -193,7 +193,7 @@ module ActionController #:nodoc:
     # parties. The caching is doing using the cache helper available in the Action View. A template with caching might look something like:
     #
     #   <b>Hello <%= @name %></b>
-    #   <% cache(binding) do %>
+    #   <% cache do %>
     #     All the topics in the system:
     #     <%= render_collection_of_partials "topic", Topic.find_all %>
     #   <% end %>
@@ -203,7 +203,7 @@ module ActionController #:nodoc:
     # if you need to cache multiple fragments per action or if the action itself is cached using <tt>caches_action</tt>. So instead we should
     # qualify the name of the action used with something like:
     #
-    #   <% cache(binding, :action => "list", :action_suffix => "all_topics") do %>
+    #   <% cache(:action => "list", :action_suffix => "all_topics") do %>
     #
     # That would result in a name such as "/topics/list/all_topics", which wouldn't conflict with any action cache and neither with another
     # fragment using a different suffix. Note that the URL doesn't have to really exist or be callable. We're just using the url_for system
@@ -241,22 +241,22 @@ module ActionController #:nodoc:
       def self.append_features(base) #:nodoc:
         super
         base.class_eval do
-          @@cache_store = MemoryStore.new
+          @@fragment_cache_store = MemoryStore.new
           cattr_accessor :fragment_cache_store
         end
       end
 
       # Called by CacheHelper#cache
-      def cache_erb_fragment(binding, name = {}, options = {})
-        unless perform_caching then yield; return end
+      def cache_erb_fragment(block, name = {}, options = {})
+        unless perform_caching then block.call; return end
         
-        buffer = eval("_erbout", binding)
+        buffer = eval("_erbout", block.binding)
 
         if cache = read_fragment(name, options)
           buffer.concat(cache)
         else
           pos = buffer.length
-          yield
+          block.call
           write_fragment(name, buffer[pos..-1], options)
         end
       end

data/lib/action_controller/cgi_ext/raw_post_data_fix.rb

@@ -0,0 +1,46 @@
+class CGI #:nodoc:
+  # Add @request.env['RAW_POST_DATA'] for the vegans.
+  module QueryExtension
+    # Initialize the data from the query.
+    #
+    # Handles multipart forms (in particular, forms that involve file uploads).
+    # Reads query parameters in the @params field, and cookies into @cookies.
+    def initialize_query()
+      if boundary = multipart_form_boundary
+        @multipart = true
+        @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
+      else
+        @multipart = false
+        @params = CGI::parse(read_query_params)
+      end
+      
+      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
+    end
+
+    private
+      MULTIPART_FORM_BOUNDARY_RE = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n #"
+
+      def multipart_form_boundary        
+        if env_table['REQUEST_METHOD'] == 'POST'
+          MULTIPART_FORM_BOUNDARY_RE.match(env_table['CONTENT_TYPE']).to_a.pop
+        end
+      end
+
+      def read_query_params
+        case env_table['REQUEST_METHOD']
+          when 'GET', 'HEAD'
+            if defined? MOD_RUBY              
+              Apache::request.args or ''
+            else
+              env_table['QUERY_STRING'] or ''
+            end
+          when 'POST'
+            stdinput.binmode if stdinput.respond_to?(:binmode)
+            content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
+            env_table['RAW_POST_DATA'] = content.freeze
+          else
+            read_from_cmdline
+          end
+      end
+  end # module QueryExtension
+end

data/lib/action_controller/cgi_process.rb

@@ -1,5 +1,6 @@
 require 'action_controller/cgi_ext/cgi_ext'
 require 'action_controller/cgi_ext/cookie_performance_fix'
+require 'action_controller/cgi_ext/raw_post_data_fix'
 require 'action_controller/session/drb_store'
 require 'action_controller/session/active_record_store'
 require 'action_controller/session/mem_cache_store'

data/lib/action_controller/dependencies.rb

@@ -78,8 +78,9 @@ module ActionController #:nodoc:
           inherited_without_model(child)
           return if child.controller_name == "application" # otherwise the ApplicationController in Rails will include itself
           begin
-            child.model(Inflector.singularize(child.controller_name))
-          rescue LoadError
+            Object.const_get(child.controller_name.singularize.classify)
+            child.model(child.controller_name.singularize)
+          rescue NameError, LoadError
             # No neither singular or plural model available for this controller
           end
         end        

data/lib/action_controller/filters.rb

@@ -12,9 +12,9 @@ module ActionController #:nodoc:
     #
     # Filters have access to the request, response, and all the instance variables set by other filters in the chain
     # or by the action (in the case of after filters). Additionally, it's possible for a pre-processing <tt>before_filter</tt>
-    # to halt the processing before the intended action is processed by returning false. This is especially useful for
-    # filters like authentication where you're not interested in allowing the action to be performed if the proper 
-    # credentials are not in order.
+    # to halt the processing before the intended action is processed by returning false or performing a redirect or render. 
+    # This is especially useful for filters like authentication where you're not interested in allowing the action to be 
+    # performed if the proper credentials are not in order.
     #
     # == Filter inheritance
     #
@@ -290,7 +290,7 @@ module ActionController #:nodoc:
       end
 
       def perform_action_with_filters
-        return if before_action == false
+        return if before_action == false || performed?
         perform_action_without_filters
         after_action
       end

data/lib/action_controller/helpers.rb

@@ -96,7 +96,7 @@ module ActionController #:nodoc:
           inherited_without_helper(child)
           begin
             child.helper(child.controller_name)
-          rescue LoadError, StandardError
+          rescue ArgumentError, LoadError
             # No default helper available for this controller
           end
         end        

data/lib/action_controller/request.rb

@@ -29,7 +29,8 @@ module ActionController
     def head?
       method == :head
     end
-
+    
+    
     # Determine originating IP address.  REMOTE_ADDR is the standard
     # but will fail if the user is behind a proxy.  HTTP_CLIENT_IP and/or
     # HTTP_X_FORWARDED_FOR are set by proxies so check for these before
@@ -53,40 +54,47 @@ module ActionController
     # Returns the domain part of a host, such as rubyonrails.org in "www.rubyonrails.org". You can specify
     # a different <tt>tld_length</tt>, such as 2 to catch rubyonrails.co.uk in "www.rubyonrails.co.uk".
     def domain(tld_length = 1)
-      host.split(".").last(1 + tld_length).join(".")
+      host.split('.').last(1 + tld_length).join('.')
     end
 
     # Returns all the subdomains as an array, so ["dev", "www"] would be returned for "dev.www.rubyonrails.org".
     # You can specify a different <tt>tld_length</tt>, such as 2 to catch ["www"] instead of ["www", "rubyonrails"]
     # in "www.rubyonrails.co.uk".
     def subdomains(tld_length = 1)
-      parts = host.split(".")
+      parts = host.split('.')
       parts - parts.last(1 + tld_length)
     end
 
+    # Recieve the raw post data. 
+    # This is useful for services such as REST, XMLRPC and SOAP 
+    # which communicate over HTTP POST but don't use the traditional parameter format. 
+    def raw_post
+      env['RAW_POST_DATA']
+    end
+    
     def request_uri
-      env["REQUEST_URI"]
+      env['REQUEST_URI']
     end
 
     def protocol
-      port == 443 ? "https://" : "http://"
+      port == 443 ? 'https://' : 'http://'
     end
 
     def ssl?
-      protocol == "https://"
+      protocol == 'https://'
     end
 
     def path
-      request_uri ? request_uri.split("?").first : ""
+      request_uri ? request_uri.split('?').first : ''
     end
 
     def port
-      env["SERVER_PORT"].to_i
+      env['SERVER_PORT'].to_i
     end
 
     # Returns a string like ":8080" if the port is not 80 or 443 while on https.
     def port_string
-      (protocol == "http://" && port == 80) || (protocol == "https://" && port == 443) ? "" : ":#{port}"
+      (protocol == 'http://' && port == 80) || (protocol == 'https://' && port == 443) ? '' : ":#{port}"
     end
 
     def host_with_port

data/lib/action_controller/support/binding_of_caller.rb

@@ -1,85 +1,83 @@
-begin
-  require 'simplecc'
-rescue LoadError
-  class Continuation #:nodoc:
-    def self.create(*args, &block)
-      cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
-      result ||= args
-      return *[cc, *result]
-    end
-  end
-end
-
-class Binding #:nodoc:
-  # This method returns the binding of the method that called your
-  # method. It will raise an Exception when you're not inside a method.
-  #
-  # It's used like this:
-  #   def inc_counter(amount = 1)
-  #     Binding.of_caller do |binding|
-  #       # Create a lambda that will increase the variable 'counter'
-  #       # in the caller of this method when called.
-  #       inc = eval("lambda { |arg| counter += arg }", binding)
-  #       # We can refer to amount from inside this block safely.
-  #       inc.call(amount)
-  #     end
-  #     # No other statements can go here. Put them inside the block.
-  #   end
-  #   counter = 0
-  #   2.times { inc_counter }
-  #   counter # => 2
-  #
-  # Binding.of_caller must be the last statement in the method.
-  # This means that you will have to put everything you want to
-  # do after the call to Binding.of_caller into the block of it.
-  # This should be no problem however, because Ruby has closures.
-  # If you don't do this an Exception will be raised. Because of
-  # the way that Binding.of_caller is implemented it has to be
-  # done this way.
-  def self.of_caller(&block)
-    old_critical = Thread.critical
-    Thread.critical = true
-    count = 0
-    cc, result, error, extra_data = Continuation.create(nil, nil)
-    error.call if error
-
-    tracer = lambda do |*args|
-      type, context, extra_data = args[0], args[4], args
-      if type == "return"
-        count += 1
-        # First this method and then calling one will return --
-        # the trace event of the second event gets the context
-        # of the method which called the method that called this
-        # method.
-        if count == 2
-          # It would be nice if we could restore the trace_func
-          # that was set before we swapped in our own one, but
-          # this is impossible without overloading set_trace_func
-          # in current Ruby.
-          set_trace_func(nil)
-          cc.call(eval("binding", context), nil, extra_data)
-        end
-      elsif type == "line" then
-        nil
-      elsif type == "c-return" and extra_data[3] == :set_trace_func then
-        nil
-      else
-        set_trace_func(nil)
-        error_msg = "Binding.of_caller used in non-method context or " +
-          "trailing statements of method using it aren't in the block."
-        cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
-      end
-    end
-
-    unless result
-      set_trace_func(tracer)
-      return nil
-    else
-      Thread.critical = old_critical
-      case block.arity
-        when 1 then yield(result)
-        else yield(result, extra_data)        
-      end
-    end
-  end
-end
+begin
+  require 'simplecc'
+rescue LoadError
+  class Continuation; end # :nodoc: # for RDoc
+  def Continuation.create(*args, &block) # :nodoc:
+    cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
+    result ||= args
+    return *[cc, *result]
+  end
+end
+
+class Binding; end # for RDoc
+# This method returns the binding of the method that called your
+# method. It will raise an Exception when you're not inside a method.
+#
+# It's used like this:
+#   def inc_counter(amount = 1)
+#     Binding.of_caller do |binding|
+#       # Create a lambda that will increase the variable 'counter'
+#       # in the caller of this method when called.
+#       inc = eval("lambda { |arg| counter += arg }", binding)
+#       # We can refer to amount from inside this block safely.
+#       inc.call(amount)
+#     end
+#     # No other statements can go here. Put them inside the block.
+#   end
+#   counter = 0
+#   2.times { inc_counter }
+#   counter # => 2
+#
+# Binding.of_caller must be the last statement in the method.
+# This means that you will have to put everything you want to
+# do after the call to Binding.of_caller into the block of it.
+# This should be no problem however, because Ruby has closures.
+# If you don't do this an Exception will be raised. Because of
+# the way that Binding.of_caller is implemented it has to be
+# done this way.
+def Binding.of_caller(&block)
+  old_critical = Thread.critical
+  Thread.critical = true
+  count = 0
+  cc, result, error, extra_data = Continuation.create(nil, nil)
+  error.call if error
+
+  tracer = lambda do |*args|
+    type, context, extra_data = args[0], args[4], args
+    if type == "return"
+      count += 1
+      # First this method and then calling one will return --
+      # the trace event of the second event gets the context
+      # of the method which called the method that called this
+      # method.
+      if count == 2
+        # It would be nice if we could restore the trace_func
+        # that was set before we swapped in our own one, but
+        # this is impossible without overloading set_trace_func
+        # in current Ruby.
+        set_trace_func(nil)
+        cc.call(eval("binding", context), nil, extra_data)
+      end
+    elsif type == "line" then
+      nil
+    elsif type == "c-return" and extra_data[3] == :set_trace_func then
+      nil
+    else
+      set_trace_func(nil)
+      error_msg = "Binding.of_caller used in non-method context or " +
+        "trailing statements of method using it aren't in the block."
+      cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
+    end
+  end
+
+  unless result
+    set_trace_func(tracer)
+    return nil
+  else
+    Thread.critical = old_critical
+    case block.arity
+      when 1 then yield(result)
+      else yield(result, extra_data)        
+    end
+  end
+end

data/lib/action_controller/support/breakpoint.rb

@@ -16,11 +16,14 @@
 # license please contact me.
 
 require 'irb'
-# require 'binding_of_caller' <- Needs this
+require File.dirname(__FILE__) + '/binding_of_caller'
 require 'drb'
 require 'drb/acl'
 
 module Breakpoint
+  id = %q$Id: breakpoint.rb 41 2005-01-22 20:22:10Z flgr $
+  Version = id.split(" ")[2].to_i
+
   extend self
 
   # This will pop up an interactive ruby session at a
@@ -114,10 +117,10 @@ module Breakpoint
     end
   end
 
-  module CommandBundle #:nodoc:
+  module CommandBundle
     # Proxy to a Breakpoint client. Lets you directly execute code
     # in the context of the client.
-    class Client#:nodoc:
+    class Client
       def initialize(eval_handler) # :nodoc:
         @eval_handler = eval_handler
       end
@@ -133,15 +136,23 @@ module Breakpoint
       end
 
       # Will execute the specified statement at the client.
-      def method_missing(method, *args)
-        if args.empty?
-          result = eval("#{method}")
+      def method_missing(method, *args, &block)
+        if args.empty? and not block
+          result = eval "#{method}"
         else
-          result = eval("#{method}(*Marshal.load(#{Marshal.dump(args).inspect}))")
-        end
-
-        unless [true, false, nil].include?(result)
-          result.extend(DRbUndumped) if result
+          # This is a bit ugly. The alternative would be using an
+          # eval context instead of an eval handler for executing
+          # the code at the client. The problem with that approach
+          # is that we would have to handle special expressions
+          # like "self", "nil" or constants ourself which is hard.
+          remote = eval %{
+            result = lambda { |block, *args| #{method}(*args, &block) }
+            def result.call_with_block(*args, &block)
+              call(block, *args)
+            end
+            result
+          }
+          remote.call_with_block(*args, &block)
         end
 
         return result
@@ -175,6 +186,7 @@ module Breakpoint
     #   client.File.open("temp.txt", "w") { |f| f.puts "Hello" } 
     def client()
       if Breakpoint.use_drb? then
+        sleep(0.5) until Breakpoint.drb_service.eval_handler
         Client.new(Breakpoint.drb_service.eval_handler)
       else
         Client.new(lambda { |code| eval(code, TOPLEVEL_BINDING) })
@@ -205,7 +217,7 @@ module Breakpoint
   # These exceptions will be raised on failed asserts
   # if Breakpoint.asserts_cause_exceptions is set to
   # true.
-  class FailedAssertError < RuntimeError#:nodoc:
+  class FailedAssertError < RuntimeError
   end
 
   # This asserts that the block evaluates to true.
@@ -279,7 +291,7 @@ module Breakpoint
       @collision_handler.call
     end
 
-    def ping; end
+    def ping() end
 
     def add_breakpoint(context, message)
       workspace = IRB::WorkSpace.new(context)
@@ -290,31 +302,7 @@ module Breakpoint
       @handler.call(workspace, message)
     end
 
-    def register_handler(&block)
-      @handler = block
-    end
-
-    def unregister_handler
-      @handler = nil
-    end
-
-    attr_reader :eval_handler
-
-    def register_eval_handler(&block)
-      @eval_handler = block
-    end
-
-    def unregister_eval_handler
-      @eval_handler = lambda { }
-    end
-
-    def register_collision_handler(&block)
-      @collision_handler = block
-    end
-
-    def unregister_collision_handler
-      @collision_handler = lambda { }
-    end
+    attr_accessor :handler, :eval_handler, :collision_handler
   end
 
   # Will run Breakpoint in DRb mode. This will spawn a server
@@ -359,7 +347,8 @@ module Breakpoint
   #
   # Detailed information about running DRb through firewalls is
   # available at http://www.rubygarden.org/ruby?DrbTutorial
-  def activate_drb(uri = nil, allowed_hosts = ['localhost', '127.0.0.1', '::1'], ignore_collisions = false) #:nodoc:
+  def activate_drb(uri = nil, allowed_hosts = ['localhost', '127.0.0.1', '::1'],
+    ignore_collisions = false)
 
     return false if @use_drb
 
@@ -402,7 +391,7 @@ module Breakpoint
   end
 
   # Deactivates a running Breakpoint service.
-  def deactivate_drb #:nodoc:
+  def deactivate_drb
     @service.stop_service unless @service.nil?
     @service = nil
     @use_drb = false
@@ -411,14 +400,12 @@ module Breakpoint
 
   # Returns true when Breakpoints are used over DRb.
   # Breakpoint.activate_drb causes this to be true.
-  def use_drb? #:nodoc:
+  def use_drb?
     @use_drb == true
   end
 end
 
 module IRB # :nodoc:
-  def IRB.parse_opts() end
-
   class << self; remove_method :start; end
   def self.start(ap_path = nil, main_context = nil, workspace = nil)
     $0 = File::basename(ap_path, ".rb") if ap_path
@@ -442,7 +429,11 @@ module IRB # :nodoc:
     @CONF[:MAIN_CONTEXT] = irb.context
 
     old_sigint = trap("SIGINT") do
-      irb.signal_handle
+      begin
+        irb.signal_handle
+      rescue RubyLex::TerminateLineInput
+        # ignored
+      end
     end
     
     catch(:IRB_EXIT) do
@@ -466,7 +457,7 @@ module IRB # :nodoc:
     end
   end
 
-  class Context#:nodoc:
+  class Context
     alias :old_evaluate :evaluate
     def evaluate(line, line_no)
       if line.chomp == "exit" then
@@ -477,7 +468,7 @@ module IRB # :nodoc:
     end
   end
 
-  class WorkSpace#:nodoc:
+  class WorkSpace
     alias :old_evaluate :evaluate
 
     def evaluate(*args)
@@ -495,7 +486,7 @@ module IRB # :nodoc:
     end
   end
 
-  module InputCompletor#:nodoc:
+  module InputCompletor
     def self.eval(code, context, *more)
       # Big hack, this assumes that InputCompletor
       # will only call eval() when it wants code
@@ -506,9 +497,9 @@ module IRB # :nodoc:
 end
 
 module DRb # :nodoc:
-  class DRbObject#:nodoc:
-    undef :inspect
-    undef :clone
+  class DRbObject
+    undef :inspect if method_defined?(:inspect)
+    undef :clone if method_defined?(:clone)
   end
 end
 
@@ -524,4 +515,4 @@ def assert(&block)
   Binding.of_caller do |context|
     Breakpoint.assert(context, &block)
   end
-end
+end

data/lib/action_controller/support/core_ext/object_and_class.rb

@@ -0,0 +1,24 @@
+class Object #:nodoc:
+  def remove_subclasses_of(superclass)
+    subclasses_of(superclass).each { |subclass| Object.send(:remove_const, subclass) rescue nil }
+  end
+
+  def subclasses_of(superclass)
+    subclasses = []
+    ObjectSpace.each_object(Class) do |k|
+      next if !k.ancestors.include?(superclass) || superclass == k || k.to_s.include?("::") || subclasses.include?(k.to_s)
+      subclasses << k.to_s
+    end
+    subclasses
+  end
+end
+
+class Class #:nodoc:
+  def remove_subclasses
+    Object.remove_subclasses_of(self)
+  end
+
+  def subclasses
+    Object.subclasses_of(self)
+  end
+end

data/lib/action_controller/support/dependencies.rb

@@ -9,14 +9,19 @@ module Dependencies
   @@mechanism = :load
   mattr_accessor :mechanism
   
+  def load?
+    mechanism == :load
+  end
+  
   def depend_on(file_name, swallow_load_errors = false)
     if !loaded.include?(file_name)
       loaded << file_name
-
       begin
         require_or_load(file_name)
       rescue LoadError
         raise unless swallow_load_errors
+      rescue Object => e
+        raise ScriptError, "#{e.message}"
       end
     end
   end
@@ -29,12 +34,16 @@ module Dependencies
     self.loaded = [ ]
   end
   
-  private
-    def require_or_load(file_name)
-      mechanism == :load ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
-    end
+  def require_or_load(file_name)
+    load? ? load("#{file_name}.rb") : require(file_name)
+  end
+  
+  def remove_subclasses_for(*classes)
+    classes.each { |klass| klass.remove_subclasses }
+  end
 end
 
+Object.send(:define_method, :require_or_load)     { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
 Object.send(:define_method, :require_dependency)  { |file_name| Dependencies.depend_on(file_name) } unless Object.respond_to?(:require_dependency)
 Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) } unless Object.respond_to?(:require_association)
 
@@ -42,16 +51,12 @@ class Object #:nodoc:
   class << self
     # Use const_missing to autoload associations so we don't have to
     # require_association when using single-table inheritance.
-    unless respond_to?(:pre_dependency_const_missing)
-      alias_method :pre_dependency_const_missing, :const_missing
-
-      def const_missing(class_id)
-        begin
-          require_dependency(Inflector.underscore(Inflector.demodulize(class_id.to_s)))
-          return Object.const_get(class_id) if Object.const_defined?(class_id)
-        rescue LoadError
-          pre_dependency_const_missing(class_id)
-        end
+    def const_missing(class_id)
+      begin
+        require_or_load(class_id.to_s.demodulize.underscore)
+        if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
+      rescue LoadError
+        raise NameError, "uninitialized constant #{class_id}"
       end
     end
   end

data/lib/action_controller/test_process.rb

@@ -191,6 +191,23 @@ module ActionController #:nodoc:
       headers['cookie'].inject({}) { |hash, cookie| hash[cookie.name] = cookie; hash }
     end
 
+    # Returns binary content (downloadable file), converted to a String
+    def binary_content
+      raise "Response body is not a Proc: #{body.inspect}" unless body.kind_of?(Proc)
+      require 'stringio'
+
+      sio = StringIO.new
+
+      begin 
+        $stdout = sio
+        body.call
+      ensure
+        $stdout = STDOUT
+      end
+
+      sio.rewind
+      sio.read
+    end
 end
 
   class TestSession #:nodoc:

data/lib/action_controller/url_rewriter.rb

@@ -1,7 +1,7 @@
 module ActionController
   # Rewrites urls for Base.redirect_to and Base.url_for in the controller.
   class UrlRewriter #:nodoc:
-    VALID_OPTIONS = [:action, :action_prefix, :action_suffix, :module, :controller, :controller_prefix, :anchor, :params, :path_params, :id, :only_path, :overwrite_params, :host, :protocol ]
+    VALID_OPTIONS = [:action, :action_prefix, :action_suffix, :application_prefix, :module, :controller, :controller_prefix, :anchor, :params, :path_params, :id, :only_path, :overwrite_params, :host, :protocol ]
   
     def initialize(request, controller, action)
       @request, @controller, @action = request, controller, action
@@ -41,6 +41,7 @@ module ActionController
         rewritten_url << (options[:protocol] || @request.protocol) unless options[:only_path]
         rewritten_url << (options[:host] || @request.host_with_port) unless options[:only_path]
 
+	rewritten_url << options[:application_prefix] if options[:application_prefix]
         rewritten_url << path
         rewritten_url << build_query_string(new_parameters(options)) if options[:params] || options[:overwrite_params]
         rewritten_url << "##{options[:anchor]}" if options[:anchor]

data/lib/action_view/helpers/cache_helper.rb

@@ -2,8 +2,8 @@ module ActionView
   module Helpers
     # See ActionController::Caching::Fragments for usage instructions.
     module CacheHelper
-      def cache(binding, name = {})
-        @controller.cache_erb_fragment(binding, name) { yield }
+      def cache(name = {}, &block)
+        @controller.cache_erb_fragment(block, name)
       end
     end
   end

data/lib/action_view/helpers/form_helper.rb

@@ -137,6 +137,9 @@ module ActionView
       def initialize(object_name, method_name, template_object, local_binding = nil)
         @object_name, @method_name = object_name, method_name
         @template_object, @local_binding = template_object, local_binding
+        if @object_name.sub!(/\[\]$/,"")
+          @auto_index = @template_object.instance_variable_get("@#{Regexp.last_match.pre_match}").id
+        end
       end
       
       def to_input_field_tag(field_type, options = {})
@@ -214,6 +217,9 @@ module ActionView
             options['name'] = tag_name_with_index(options["index"]) unless options.has_key? "name"
             options['id'] = tag_id_with_index(options["index"]) unless options.has_key? "id"
             options.delete("index")
+          elsif @auto_index
+            options['name'] = tag_name_with_index(@auto_index) unless options.has_key? "name"
+            options['id'] = tag_id_with_index(@auto_index) unless options.has_key? "id"
           else
             options['name'] = tag_name unless options.has_key? "name"
             options['id'] = tag_id unless options.has_key? "id"

data/lib/action_view/helpers/url_helper.rb

@@ -91,8 +91,35 @@ module ActionView
 
       # Creates a link tag for starting an email to the specified <tt>email_address</tt>, which is also used as the name of the
       # link unless +name+ is specified. Additional HTML options, such as class or id, can be passed in the <tt>html_options</tt> hash.
+      #
+      # You can also make it difficult for spiders to harvest email address by obfuscating them.
+      # Examples:
+      # * mail_to "me@domain.com", "My email", :encode => "javascript"
+      # => <script type="text/javascript" language="javascript">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>
+      # * mail_to "me@domain.com", "My email", :encode => "hex"
+      # => <a href="mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">My email</a>
       def mail_to(email_address, name = nil, html_options = {})
-        content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{email_address}" })
+        encode = html_options[:encode]
+        html_options.delete(:encode)
+        string = ''
+        if encode == 'javascript'
+          tmp = "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address.to_s }))}');"
+          for i in 0...tmp.length
+            string << sprintf("%%%x",tmp[i])
+          end
+          "<script type=\"text/javascript\" language=\"javascript\">eval(unescape('#{string}'))</script>"
+        elsif encode == 'hex'
+          for i in 0...email_address.length
+            if email_address[i,1] =~ /\w/
+              string << sprintf("%%%x",email_address[i])
+            else
+              string << email_address[i,1]
+            end
+          end
+          content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{string}" })
+        else
+          content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{email_address}" })
+        end
       end
 
       private

data/lib/action_view/vendor/builder/xmlmarkup.rb

@@ -221,7 +221,7 @@ module Builder
     # For example:
     #
     #    xml.instruct!
-    #        #=> <?xml encoding="UTF-8" version="1.0"?>
+    #        #=> <?xml version="1.0" encoding="UTF-8"?>
     #    xml.instruct! :aaa, :bbb=>"ccc"
     #        #=> <?aaa bbb="ccc"?>
     #
@@ -231,7 +231,12 @@ module Builder
 	a = { :version=>"1.0", :encoding=>"UTF-8" }
 	attrs = a.merge attrs
       end
-      _special("<?#{directive_tag}", "?>", nil, attrs)
+      _special(
+	"<?#{directive_tag}",
+	"?>",
+	nil,
+	attrs,
+	[:version, :encoding, :standalone])
     end
 
     private
@@ -245,11 +250,11 @@ module Builder
     end
     
     # Insert special instruction. 
-    def _special(open, close, data=nil, attrs=nil)
+    def _special(open, close, data=nil, attrs=nil, order=[])
       _indent
       @target << open
       @target << data if data
-      _insert_attributes(attrs) if attrs
+      _insert_attributes(attrs, order) if attrs
       @target << close
       _newline
     end
@@ -269,10 +274,14 @@ module Builder
     end
 
     # Insert the attributes (given in the hash).
-    def _insert_attributes(attrs)
+    def _insert_attributes(attrs, order=[])
       return if attrs.nil?
+      order.each do |k|
+	v = attrs[k]
+	@target << %{ #{k}="#{v}"} if v
+      end
       attrs.each do |k, v|
-	@target << %{ #{k}="#{v}"}
+	@target << %{ #{k}="#{v}"} unless order.member?(k)
       end
     end
 

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.3.1' + PKG_BUILD
+PKG_VERSION   = '1.4.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"

data/test/controller/filters_test.rb

@@ -14,6 +14,20 @@ class FilterTest < Test::Unit::TestCase
         @ran_filter << "ensure_login"
       end
   end
+
+  class RenderingController < ActionController::Base
+    before_filter :render_something_else
+
+    def show
+      @ran_action = true
+      render_text "ran action"
+    end
+
+    private
+      def render_something_else
+        render_text "something else"
+      end
+  end
   
   class ConditionalFilterController < ActionController::Base
     def show
@@ -264,6 +278,12 @@ class FilterTest < Test::Unit::TestCase
                  " after appended aroundfilter  after aroundfilter  after procfilter ", 
                  MixedFilterController.execution_log
   end
+  
+  def test_rendering_breaks_filtering_chain
+    response = test_process(RenderingController)
+    assert_equal "something else", response.body
+    assert !response.template.assigns["ran_action"]
+  end
 
   private
     def test_process(controller, action = "show")

data/test/controller/raw_post_test.rb

@@ -0,0 +1,31 @@
+require 'test/unit'
+require 'cgi'
+require 'stringio'
+require File.dirname(__FILE__) + '/../../lib/action_controller/cgi_ext/raw_post_data_fix'
+
+class RawPostDataTest < Test::Unit::TestCase
+  def setup
+    ENV['REQUEST_METHOD'] = 'POST'
+    ENV['CONTENT_TYPE'] = ''
+    ENV['CONTENT_LENGTH'] = '0'
+  end
+
+  def test_raw_post_data
+    process_raw "action=create_customer&full_name=David%20Heinemeier%20Hansson&customerId=1"
+  end
+
+  private
+    def process_raw(query_string)
+      old_stdin = $stdin
+      begin
+        $stdin = StringIO.new(query_string.dup)
+        ENV['CONTENT_LENGTH'] = $stdin.size.to_s
+        CGI.new
+        assert_not_nil ENV['RAW_POST_DATA']
+        assert ENV['RAW_POST_DATA'].frozen?
+        assert_equal query_string, ENV['RAW_POST_DATA']
+      ensure
+        $stdin = old_stdin
+      end
+    end
+end

data/test/controller/url_test.rb

@@ -453,4 +453,25 @@ class UrlTest < Test::Unit::TestCase
       url.rewrite({ :controller => "msg", :action_prefix => "allous", :action => "new" })
     )
   end
+
+  def test_clean_application_prefix
+    assert_equal "http://www.singlefile.com/namespace/library/books/ISBN/0743536703/show",
+      @library_url.rewrite(:application_prefix => "/namespace")
+  end
+
+  def test_clean_application_prefix_with_controller_prefix
+    assert_equal "http://www.singlefile.com/namespace/shop/",
+      @library_url.rewrite(:application_prefix => "/namespace",
+                           :controller_prefix => "shop" )
+  end
+
+  def test_blank_application_prefix
+    assert_equal "http://www.singlefile.com/library/books/ISBN/0743536703/show",
+      @library_url.rewrite(:application_prefix => "")
+  end
+
+  def test_nil_application_prefix
+    assert_equal "http://www.singlefile.com/library/books/ISBN/0743536703/show",
+      @library_url.rewrite(:application_prefix => nil)
+  end
 end

data/test/template/form_helper_test.rb

@@ -18,6 +18,8 @@ class FormHelperTest < Test::Unit::TestCase
     @post = Post.new    
     def @post.errors() Class.new{ def on(field) field == "author_name" end }.new end
 
+    def @post.id; 123; end
+
     @post.title       = "Hello World"
     @post.author_name = ""
     @post.body        = "Back to the hill and over it again!"
@@ -136,4 +138,28 @@ class FormHelperTest < Test::Unit::TestCase
       check_box("post", "secret", "id" => "i mean it")
     )
   end
+
+  def test_auto_index
+    pid = @post.id
+    assert_equal(
+      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
+    )
+    assert_equal(
+      "<textarea cols=\"40\" id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\" rows=\"20\" wrap=\"virtual\">Back to the hill and over it again!</textarea>",
+      text_area("post[]", "body")
+    )
+    assert_equal(
+      "<input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" />",
+      check_box("post[]", "secret")
+    )
+   assert_equal(
+"<input checked=\"checked\" id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"radio\" value=\"Hello World\" />",
+      radio_button("post[]", "title", "Hello World")
+    )
+    assert_equal("<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"radio\" value=\"Goodbye World\" />",
+      radio_button("post[]", "title", "Goodbye World")
+    )
+
+  end
+
 end

data/test/template/tag_helper_test.rb

@@ -14,5 +14,17 @@ class TagHelperTest < Test::Unit::TestCase
     assert_equal "<a href=\"create\">Create</a>", content_tag("a", "Create", "href" => "create")
   end
 
+  def test_mail_to_with_javascript
+  	assert_equal "<script type=\"text/javascript\" language=\"javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript")
+  end
+
+  def test_mail_to_with_hex
+  	assert_equal "<a href=\"mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex")
+  end
+
+  def test_mail_to
+  	assert_equal "<a href=\"mailto:me@domain.com\">My email</a>", mail_to("me@domain.com", "My email")
+  end
+
   # FIXME: Test form tag
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
-date: 2005-01-18
+  version: 1.4.0
+date: 2005-01-25
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib
@@ -67,6 +67,7 @@ files:
   - lib/action_controller/cgi_ext/cgi_ext.rb
   - lib/action_controller/cgi_ext/cgi_methods.rb
   - lib/action_controller/cgi_ext/cookie_performance_fix.rb
+  - lib/action_controller/cgi_ext/raw_post_data_fix.rb
   - lib/action_controller/session/active_record_store.rb
   - lib/action_controller/session/drb_server.rb
   - lib/action_controller/session/drb_store.rb
@@ -86,6 +87,7 @@ files:
   - lib/action_controller/support/core_ext/hash.rb
   - lib/action_controller/support/core_ext/numeric
   - lib/action_controller/support/core_ext/numeric.rb
+  - lib/action_controller/support/core_ext/object_and_class.rb
   - lib/action_controller/support/core_ext/string
   - lib/action_controller/support/core_ext/string.rb
   - lib/action_controller/support/core_ext/hash/keys.rb
@@ -137,6 +139,7 @@ files:
   - test/controller/flash_test.rb
   - test/controller/helper_test.rb
   - test/controller/layout_test.rb
+  - test/controller/raw_post_test.rb
   - test/controller/redirect_test.rb
   - test/controller/render_test.rb
   - test/controller/request_test.rb