actionpack 1.8.1 → 1.9.0

data/lib/action_view/helpers/url_helper.rb

@@ -33,6 +33,67 @@ module ActionView
         end
       end
 
+      # Generates a form containing a sole button that submits to the
+      # URL given by _options_.  Use this method instead of +link_to+
+      # for actions that do not have the safe HTTP GET semantics
+      # implied by using a hypertext link.
+      #
+      # The parameters are the same as for +link_to+.  Any _html_options_
+      # that you pass will be applied to the inner +input+ element.
+      # In particular, pass
+      # 
+      #   :disabled => true/false
+      #
+      # as part of _html_options_ to control whether the button is
+      # disabled.  The generated form element is given the class
+      # 'button-to', to which you can attach CSS styles for display
+      # purposes.
+      #
+      # Example 1:
+      #
+      #   # inside of controller for "feeds"
+      #   button_to "Edit", :action => 'edit', :id => 3
+      #
+      # Generates the following HTML (sans formatting):
+      #
+      #   <form method="post" action="/feeds/edit/3" class="button-to">
+      #     <div><input value="Edit" type="submit" /></div>
+      #   </form>
+      #
+      # Example 2:
+      #
+      #   button_to "Destroy", { :action => 'destroy', :id => 3 },
+      #             :confirm => "Are you sure?"
+      #
+      # Generates the following HTML (sans formatting):
+      #
+      #   <form method="post" action="/feeds/destroy/3" class="button-to">
+      #     <div><input onclick="return confirm('Are you sure?');"
+      #                 value="Destroy" type="submit" />
+      #     </div>
+      #   </form>
+      #
+      # *NOTE*: This method generates HTML code that represents a form.
+      # Forms are "block" content, which means that you should not try to
+      # insert them into your HTML where only inline content is expected.
+      # For example, you can legally insert a form inside of a +div+ or
+      # +td+ element or in between +p+ elements, but not in the middle of
+      # a run of text, nor can you place a form within another form.
+      # (Bottom line: Always validate your HTML before going public.)
+
+      def button_to(name, options = {}, html_options = nil)
+        html_options = (html_options || {}).stringify_keys
+        convert_boolean_attributes!(html_options, %w( disabled ))
+        convert_confirm_option_to_javascript!(html_options)
+        url, name = options.is_a?(String) ? 
+          [ options,  name || options ] :
+          [ url_for(options), name || url_for(options) ]
+        html_options.merge!("type" => "submit", "value" => name)
+        "<form method=\"post\" action=\"#{h url}\" class=\"button-to\"><div>" +
+          tag("input", html_options) + "</div></form>"
+      end
+
+
       # This tag is deprecated. Combine the link_to and AssetTagHelper::image_tag yourself instead, like:
       #   link_to(image_tag("rss", :size => "30x45", :border => 0), "http://www.example.com")
       def link_image_to(src, options = {}, html_options = {}, *parameters_for_method_reference)
@@ -126,6 +187,10 @@ module ActionView
         extras << "subject=#{CGI.escape(subject).gsub("+", "%20")}&" unless subject.nil?
         extras = "?" << extras.gsub!(/&?$/,"") unless extras.empty?
 
+        email_address_obfuscated = email_address.dup
+        email_address_obfuscated.gsub!(/@/, html_options.delete("replace_at")) if html_options.has_key?("replace_at")
+        email_address_obfuscated.gsub!(/\./, html_options.delete("replace_dot")) if html_options.has_key?("replace_dot")
+
         if encode == 'javascript'
           tmp = "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address.to_s+extras }))}');"
           for i in 0...tmp.length
@@ -140,9 +205,9 @@ module ActionView
               string << email_address[i,1]
             end
           end
-          content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{string}#{extras}" })
+          content_tag "a", name || email_address_obfuscated, html_options.merge({ "href" => "mailto:#{string}#{extras}" })
         else
-          content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{email_address}#{extras}" })
+          content_tag "a", name || email_address_obfuscated, html_options.merge({ "href" => "mailto:#{email_address}#{extras}" })
         end
       end
 
@@ -157,6 +222,36 @@ module ActionView
             html_options["onclick"] = "return confirm('#{confirm.gsub(/'/, '\\\\\'')}');"
           end
         end
+
+        # Processes the _html_options_ hash, converting the boolean
+        # attributes from true/false form into the form required by
+        # HTML/XHTML.  (An attribute is considered to be boolean if
+        # its name is listed in the given _bool_attrs_ array.)
+        #
+        # More specifically, for each boolean attribute in _html_options_
+        # given as:
+        #
+        #     "attr" => bool_value
+        #
+        # if the the associated _bool_value_ evaluates to true, it is
+        # replaced with the attribute's name; otherwise the attribute is
+        # removed from the _html_options_ hash.  (See the XHTML 1.0 spec,
+        # section 4.5 "Attribute Minimization" for more:
+        # http://www.w3.org/TR/xhtml1/#h-4.5)
+        #
+        # Returns the updated _html_options_ hash, which is also modified
+        # in place.
+        #
+        # Example:
+        #
+        #   convert_boolean_attributes!( html_options,
+        #                                %w( checked disabled readonly ) )
+
+        def convert_boolean_attributes!(html_options, bool_attrs)
+          bool_attrs.each { |x| html_options[x] = x if html_options.delete(x) }
+          html_options
+        end
+
     end
   end
-end
+end

data/lib/action_view/partials.rb

@@ -5,17 +5,17 @@ module ActionView
   #
   # In a template for Advertiser#account:
   #
-  #  <%= render_partial "account" %>
+  #  <%= render :partial => "account" %>
   #
   # This would render "advertiser/_account.rhtml" and pass the instance variable @account in as a local variable +account+ to 
   # the template for display.
   #
   # In another template for Advertiser#buy, we could have:
   #
-  #   <%= render_partial "account", :account => @buyer %>
+  #   <%= render :partial => "account", :locals => { :account => @buyer } %>
   #
   #   <% for ad in @advertisements %>
-  #     <%= render_partial "ad", :ad => ad %>
+  #     <%= render :partial => "ad", :locals => { :ad => ad } %>
   #   <% end %>
   #
   # This would first render "advertiser/_account.rhtml" with @buyer passed in as the local variable +account+, then render 
@@ -28,21 +28,25 @@ module ActionView
   # a partial by the same name as the elements contained within. So the three-lined example in "Using partials" can be rewritten
   # with a single line:
   #
-  #   <%= render_partial_collection "ad", @advertisements %>
+  #   <%= render :partial => "ad", :collection => @advertisements %>
   #
   # This will render "advertiser/_ad.rhtml" and pass the local variable +ad+ to the template for display. An iteration counter
   # will automatically be made available to the template with a name of the form +partial_name_counter+. In the case of the 
   # example above, the template would be fed +ad_counter+.
+  #
+  # NOTE: Due to backwards compatibility concerns, the collection can't be one of hashes. Normally you'd also just keep domain objects,
+  # like Active Records, in there.
   # 
   # == Rendering shared partials
   #
   # Two controllers can share a set of partials and render them like this:
   #
-  #   <%= render_partial "advertisement/ad", :ad => @advertisement %>
+  #   <%= render :partial => "advertisement/ad", :locals => { :ad => @advertisement } %>
   #
   # This will render the partial "advertisement/_ad.rhtml" regardless of which controller this is being called from.
   module Partials
-    def render_partial(partial_path, local_assigns = {}, deprecated_local_assigns = {})
+    # Deprecated, use render :partial
+    def render_partial(partial_path, local_assigns = {}, deprecated_local_assigns = {}) #:nodoc:
       path, partial_name = partial_pieces(partial_path)
       object = extracting_object(partial_name, local_assigns, deprecated_local_assigns)
       local_assigns = extract_local_assigns(local_assigns, deprecated_local_assigns)
@@ -51,7 +55,8 @@ module ActionView
       render("#{path}/_#{partial_name}", { partial_name => object }.merge(local_assigns))
     end
 
-    def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = {})
+    # Deprecated, use render :partial, :collection
+    def render_partial_collection(partial_name, collection, partial_spacer_template = nil, local_assigns = {}) #:nodoc:
       collection_of_partials = Array.new
       counter_name = partial_counter_name(partial_name)
       collection.each_with_index do |element, counter|
@@ -59,11 +64,12 @@ module ActionView
       end
 
       return nil if collection_of_partials.empty?
+
       if partial_spacer_template
         spacer_path, spacer_name = partial_pieces(partial_spacer_template)
         collection_of_partials.join(render("#{spacer_path}/_#{spacer_name}"))
       else
-        collection_of_partials
+        collection_of_partials.join
       end
     end
     

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

@@ -239,6 +239,17 @@ module Builder
 	[:version, :encoding, :standalone])
     end
 
+    # Surrounds the given text with a CDATA tag
+    #
+    # For example:
+    #
+    #   xml.cdata! "blah blah blah"
+    #       # => <![CDATA[blah blah blah]]>
+    def cdata!(text)
+      _ensure_no_block block_given?
+      _special("<![CDATA[", "]]>", text, nil)
+    end
+    
     private
 
     # NOTE: All private methods of a builder object are prefixed when

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.8.1' + PKG_BUILD
+PKG_VERSION   = '1.9.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
@@ -61,7 +61,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.0.4' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.1.0' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
@@ -104,18 +104,26 @@ task :lines do
   puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
 end
 
+# Publishing ------------------------------------------------------
+
+task :update_scriptaculous do
+  system("svn export --force http://dev.rubyonrails.org/svn/rails/spinoffs/scriptaculous/src/ #{File.dirname(__FILE__)}/lib/action_view/helpers/javascripts/")
+end
+
+desc "Updates actionpack to the latest version of the javascript spinoffs"
+task :update_js => [:update_scriptaculous]
 
 # Publishing ------------------------------------------------------
 
 desc "Publish the API documentation"
 task :pgem => [:package] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.com './gemupdate.sh'`
+  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.com", "public_html/ap", "doc").upload
+  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/ap", "doc").upload
 end
 
 desc "Publish the release files to RubyForge."

data/test/abstract_unit.rb

@@ -9,4 +9,4 @@ require 'action_controller/test_process'
 
 ActionController::Base.logger = nil
 ActionController::Base.ignore_missing_templates = true
-ActionController::Routing::Routes.reload
+ActionController::Routing::Routes.reload rescue nil

data/test/controller/action_pack_assertions_test.rb

@@ -13,12 +13,14 @@ class ActionPackAssertionsController < ActionController::Base
   def hello_xml_world() render "test/hello_xml_world"; end
  
   # a redirect to an internal location
-  def redirect_internal() redirect_to "nothing"; end
+  def redirect_internal() redirect_to "/nothing"; end
 
   def redirect_to_action() redirect_to :action => "flash_me", :id => 1, :params => { "panda" => "fun" }; end
 
   def redirect_to_controller() redirect_to :controller => "elsewhere", :action => "flash_me"; end
 
+  def redirect_to_path() redirect_to '/some/path' end
+  
   # a redirect to an external location
   def redirect_external() redirect_to_url "http://www.rubyonrails.org"; end
   
@@ -53,6 +55,10 @@ class ActionPackAssertionsController < ActionController::Base
     render_text "Mr. #{@params["name"]}"
   end
 
+  def render_url
+    render_text "<div>#{url_for(:action => 'flash_me', :only_path => true)}</div>"
+  end
+
   # puts something in the session
   def session_stuffing
     session['xmas'] = 'turkey'
@@ -73,7 +79,17 @@ class ActionPackAssertionsController < ActionController::Base
 
   # 911
   def rescue_action(e) raise; end
-    
+end
+
+module Admin
+  class InnerModuleController < ActionController::Base
+    def redirect_to_absolute_controller
+      redirect_to :controller => '/content'
+    end
+    def redirect_to_fellow_controller
+      redirect_to :controller => 'user'
+    end
+  end
 end
 
 # ---------------------------------------------------------------------------
@@ -95,6 +111,11 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
  
   # -- assertion-based testing ------------------------------------------------
 
+  def test_assert_tag_and_url_for
+    get :render_url
+    assert_tag :content => "/action_pack_assertions/flash_me"
+  end
+
   # test the session assertion to make sure something is there.
   def test_assert_session_has
     process :session_stuffing
@@ -188,13 +209,13 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :hello_world
     assert_rendered_file 'test/hello_world'
     assert_rendered_file 'hello_world'
-    assert_rendered_file
   end
   
   # test the assert_success assertion
   def test_assert_success
     process :nothing
     assert_success
+    assert_rendered_file
   end
   
   # -- standard request/response object testing --------------------------------
@@ -268,7 +289,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # check the redirection location
   def test_redirection_location
     process :redirect_internal
-    assert_equal 'nothing', @response.redirect_url
+    assert_equal 'http://test.host/nothing', @response.redirect_url
 
     process :redirect_external
     assert_equal 'http://www.rubyonrails.org', @response.redirect_url
@@ -357,7 +378,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_redirected_to :action => "flash_me"
     
     follow_redirect
-    assert_equal 1, @request.parameters["id"]
+    assert_equal 1, @request.parameters["id"].to_i
 
     assert "Inconceivable!", @response.body
   end
@@ -368,6 +389,28 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
 
     assert_raises(RuntimeError, "Can't follow redirects outside of current controller (elsewhere)") { follow_redirect }
   end
+
+  def test_redirected_to_url_leadling_slash
+    process :redirect_to_path
+    assert_redirected_to '/some/path'
+  end
+  def test_redirected_to_url_no_leadling_slash
+    process :redirect_to_path
+    assert_redirected_to 'some/path'
+  end
+  def test_redirected_to_url_full_url
+    process :redirect_to_path
+    assert_redirected_to 'http://test.host/some/path'
+  end
+
+  def test_redirected_to_with_nested_controller
+    @controller = Admin::InnerModuleController.new
+    get :redirect_to_absolute_controller
+    assert_redirected_to :controller => 'content'
+    
+    get :redirect_to_fellow_controller
+    assert_redirected_to :controller => 'admin/user'
+  end
 end
 
 class ActionPackHeaderTest < Test::Unit::TestCase  
@@ -380,8 +423,8 @@ class ActionPackHeaderTest < Test::Unit::TestCase
     assert_equal('text/xml', @controller.headers['Content-Type'])
   end
   def test_rendering_xml_respects_content_type
-	  @response.headers['Content-Type'] = 'application/pdf'
-	  process :hello_xml_world
-	  assert_equal('application/pdf', @controller.headers['Content-Type'])
+    @response.headers['Content-Type'] = 'application/pdf'
+    process :hello_xml_world
+    assert_equal('application/pdf', @controller.headers['Content-Type'])
   end
-end
+end

data/test/controller/active_record_assertions_test.rb

@@ -1,128 +1,127 @@
+require "#{File.dirname(__FILE__)}/../abstract_unit"
+
+# Unfurl the safety net.
 path_to_ar = File.dirname(__FILE__) + '/../../../activerecord'
+if Object.const_defined?(:ActiveRecord) || File.exist?(path_to_ar)
+  begin
 
-if Object.const_defined?("ActiveRecord") || File.exist?(path_to_ar)
-  
-  # This test is very different than the others.  It requires ActiveRecord to 
-  # run.  There's a bunch of stuff we are assuming here:
-  #
-  # 1.  activerecord exists as a sibling directory to actionpack
-  #     (i.e., actionpack/../activerecord)
-  # 2.  you've created the appropriate database to run the active_record unit tests
-  # 3.  you set the appropriate database connection below
+# These tests require Active Record, so you're going to need AR in a
+# sibling directory to AP and have SQLite installed.
 
-  begin
+unless Object.const_defined?(:ActiveRecord)
+  require "#{path_to_ar}/lib/active_record"
+end
 
-    driver_to_use = 'native_sqlite'
-
-    $: << path_to_ar + '/lib/'
-    $: << path_to_ar + '/test/'
-    require 'active_record' unless Object.const_defined?("ActiveRecord")
-    require "connections/#{driver_to_use}/connection"
-    require 'fixtures/company'
-
-    # -----------------------------------------------------------------------------
-
-    # add some validation rules to trip up the assertions
-    class Company
-      protected
-        def validate
-          errors.add_on_empty('name')
-          errors.add('rating', 'rating should not be 2') if rating == 2
-          errors.add_to_base('oh oh') if rating == 3
-        end  
-    end
-
-    # -----------------------------------------------------------------------------
-
-    require File.dirname(__FILE__) + '/../abstract_unit'
-
-    # a controller class to handle the AR assertions
-    class ActiveRecordAssertionsController < ActionController::Base
-      # fail with 1 bad column
-      def nasty_columns_1
-        @company = Company.new
-        @company.name = "B"
-        @company.rating = 2
-        render_text "snicker...."
-      end
-  
-      # fail with 2 bad column
-      def nasty_columns_2
-        @company = Company.new
-        @company.name = ""
-        @company.rating = 2
-        render_text "double snicker...."
-      end
-  
-      # this will pass validation
-      def good_company
-        @company = Company.new
-        @company.name = "A"
-        @company.rating = 69
-        render_text "Goodness Gracious!"
-      end
-  
-      # this will fail validation
-      def bad_company
-        @company = Company.new 
-        render_text "Who's Bad?"
-      end
-  
-      # the safety dance......
-      def rescue_action(e) raise; end
-    end
-
-    # -----------------------------------------------------------------------------
-
-    ActiveRecordAssertionsController.template_root = File.dirname(__FILE__) + "/../fixtures/"
-
-    # The test case to try the AR assertions
-    class ActiveRecordAssertionsControllerTest < Test::Unit::TestCase
-      # set it up
-      def setup
-        @request = ActionController::TestRequest.new
-        @response = ActionController::TestResponse.new
-        @controller = ActiveRecordAssertionsController.new
-      end
-
-      # test for 1 bad apple column
-      def test_some_invalid_columns
-        process :nasty_columns_1
-        assert_success
-        assert_invalid_record 'company'
-        assert_invalid_column_on_record 'company', 'rating'
-        assert_valid_column_on_record 'company', 'name'
-        assert_valid_column_on_record 'company', ['name','id']
-      end
-
-      # test for 2 bad apples columns
-      def test_all_invalid_columns
-        process :nasty_columns_2
-        assert_success
-        assert_invalid_record 'company'
-        assert_invalid_column_on_record 'company', 'rating'
-        assert_invalid_column_on_record 'company', 'name'
-        assert_invalid_column_on_record 'company', ['name','rating']
-      end
-
-      # ensure we have no problems with an ActiveRecord
-      def test_valid_record
-        process :good_company
-        assert_success
-        assert_valid_record 'company'
-      end
- 
-      # ensure we have problems with an ActiveRecord
-      def test_invalid_record
-        process :bad_company
-        assert_success
-        assert_invalid_record 'company'
-      end
-    end 
+begin
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+  ActiveRecord::Base.connection
+rescue Object
+  $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
+  ActiveRecord::Base.connection
+end
 
-  rescue Object => e
-    puts "Skipping active record based tests"    
-    puts e.message    
+# Set up company fixtures.
+$LOAD_PATH << "#{path_to_ar}/test"
+require 'fixtures/company'
+File.read("#{path_to_ar}/test/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
+  ActiveRecord::Base.connection.execute(sql) unless sql.blank?
+end
+
+# Add some validation rules to trip up the assertions.
+class Company
+  protected
+    def validate
+      errors.add_on_empty('name')
+      errors.add('rating', 'rating should not be 2') if rating == 2
+      errors.add_to_base('oh oh') if rating == 3
+    end  
+end
+
+# A controller to host the assertions.
+class ActiveRecordAssertionsController < ActionController::Base
+  self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
+
+  # fail with 1 bad column
+  def nasty_columns_1
+    @company = Company.new
+    @company.name = "B"
+    @company.rating = 2
+    render_text "snicker...."
+  end
+
+  # fail with 2 bad columns
+  def nasty_columns_2
+    @company = Company.new
+    @company.name = ""
+    @company.rating = 2
+    render_text "double snicker...."
+  end
+
+  # this will pass validation
+  def good_company
+    @company = Company.new
+    @company.name = "A"
+    @company.rating = 69
+    render_text "Goodness Gracious!"
+  end
+
+  # this will fail validation
+  def bad_company
+    @company = Company.new 
+    render_text "Who's Bad?"
+  end
+
+  # the safety dance......
+  def rescue_action(e) raise; end
+end
+
+
+class ActiveRecordAssertionsControllerTest < Test::Unit::TestCase
+  def setup
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+    @controller = ActiveRecordAssertionsController.new
+  end
+
+  # test for 1 bad apple column
+  def test_some_invalid_columns
+    process :nasty_columns_1
+    assert_success
+    assert_invalid_record 'company'
+    assert_invalid_column_on_record 'company', 'rating'
+    assert_valid_column_on_record 'company', 'name'
+    assert_valid_column_on_record 'company', %w(name id)
   end
 
+  # test for 2 bad apples columns
+  def test_all_invalid_columns
+    process :nasty_columns_2
+    assert_success
+    assert_invalid_record 'company'
+    assert_invalid_column_on_record 'company', 'rating'
+    assert_invalid_column_on_record 'company', 'name'
+    assert_invalid_column_on_record 'company', %w(name rating)
+  end
+
+  # ensure we have no problems with an ActiveRecord
+  def test_valid_record
+    process :good_company
+    assert_success
+    assert_valid_record 'company'
+  end
+
+  # ensure we have problems with an ActiveRecord
+  def test_invalid_record
+    process :bad_company
+    assert_success
+    assert_invalid_record 'company'
+  end
+end 
+
+# End of safety net.
+  rescue Object => e
+    $stderr.puts "Skipping Active Record assertion tests: #{e}"
+    #$stderr.puts "  #{e.backtrace.join("\n  ")}"
+  end
 end