actionpack 1.4.0 → 1.5.0

data/lib/action_view/helpers/url_helper.rb

@@ -16,6 +16,9 @@ module ActionView
       # get a link tag that just points without consideration. If nil is passed as a name, the link itself will become the name. 
       # The html_options have a special feature for creating javascript confirm alerts where if you pass :confirm => 'Are you sure?', 
       # the link will be guarded with a JS popup asking that question. If the user accepts, the link is processed, otherwise not.
+      #
+      # Example:
+      #   link_to "Delete this page", { :action => "destroy", :id => @page.id }, :confirm => "Are you sure?"
       def link_to(name, options = {}, html_options = {}, *parameters_for_method_reference)
         convert_confirm_option_to_javascript!(html_options) unless html_options.nil?
         if options.is_a?(String)
@@ -28,21 +31,25 @@ module ActionView
         end
       end
 
-      # Creates a link tag to the image residing at the +src+ using an URL created by the set of +options+. See the valid options in
+      # Creates a link tag on the image residing at the +src+ using an URL created by the set of +options+. See the valid options in
       # link:classes/ActionController/Base.html#M000021. It's also possible to pass a string instead of an options hash to
       # get a link tag that just points without consideration. The <tt>html_options</tt> works jointly for the image and ahref tag by
       # letting the following special values enter the options on the image and the rest goes to the ahref:
       #
-      # * <tt>alt</tt> - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
-      # * <tt>size</tt> - Supplied as "XxY", so "30x45" becomes width="30" and height="45"
-      # * <tt>border</tt> - Is set to 0 by default
-      # * <tt>align</tt> - Sets the alignment, no special features
+      # * <tt>:alt</tt> - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
+      # * <tt>:size</tt> - Supplied as "XxY", so "30x45" becomes width="30" and height="45"
+      # * <tt>:border</tt> - Is set to 0 by default
+      # * <tt>:align</tt> - Sets the alignment, no special features
       #
       # The +src+ can be supplied as a... 
       # * full path, like "/my_images/image.gif"
       # * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
       # * file name without extension, like "logo", that gets expanded to "/images/logo.png"
-      def link_to_image(src, options = {}, html_options = {}, *parameters_for_method_reference)
+      #
+      # Examples:
+      #   link_image_to "logo", { :controller => "home" }, :alt => "Homepage", :size => "45x80"
+      #   link_image_to "delete", { :action => "destroy" }, :size => "10x10", :confirm => "Are you sure?", "class" => "admin"
+      def link_image_to(src, options = {}, html_options = {}, *parameters_for_method_reference)
         image_options = { "src" => src.include?("/") ? src : "/images/#{src}" }
         image_options["src"] = image_options["src"] + ".png" unless image_options["src"].include?(".")
         
@@ -73,19 +80,19 @@ module ActionView
         link_to(tag("img", image_options), options, html_options, *parameters_for_method_reference)
       end
 
+      alias_method :link_to_image, :link_image_to # deprecated name
+
       # Creates a link tag of the given +name+ using an URL created by the set of +options+, unless the current 
-      # controller, action, and id are the same as the link's, in which case only the name is returned (or the
+      # request uri is the same as the link's, in which case only the name is returned (or the
       # given block is yielded, if one exists). This is useful for creating link bars where you don't want to link 
       # to the page currently being viewed.
       def link_to_unless_current(name, options = {}, html_options = {}, *parameters_for_method_reference)
-        assume_current_url_options!(options)
-
-        if destination_equal_to_current(options)
+        if current_page?(options)
           block_given? ?
             yield(name, options, html_options, *parameters_for_method_reference) :
             html_escape(name)
         else
-          link_to name, options, html_options, *parameters_for_method_reference
+          link_to(name, options, html_options, *parameters_for_method_reference)
         end
       end
 
@@ -93,11 +100,12 @@ module ActionView
       # 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>
+       # 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 = {})
         encode = html_options[:encode]
         html_options.delete(:encode)
@@ -122,26 +130,12 @@ module ActionView
         end
       end
 
-      private
-        def destination_equal_to_current(options)
-          params_without_location = @params.reject { |key, value| %w( controller action id ).include?(key) }
-
-          options[:action].to_s == @params['action'].to_s &&
-            options[:id].to_s == @params['id'].to_s &&
-            options[:controller].to_s == @params['controller'].to_s &&
-            (options.has_key?(:params) ? params_without_location == options[:params] : true) 
-        end
+      # Returns true if the current page uri is generated by the options passed (in url_for format).
+      def current_page?(options)
+        url_for(options) == @request.request_uri
+      end
 
-        def assume_current_url_options!(options)
-          if options[:controller].nil?
-            options[:controller] = @params['controller']
-            if options[:action].nil?
-              options[:action] = @params['action']
-              if options[:id].nil? then options[:id] ||= @params['id'] end
-            end
-          end
-        end
-        
+      private
         def convert_confirm_option_to_javascript!(html_options)
           if html_options.include?(:confirm)
             html_options["onclick"] = "return confirm('#{html_options[:confirm]}');"

data/lib/action_view/partials.rb

@@ -12,7 +12,7 @@ module ActionView
   #
   # == Rendering a collection of partials
   #
-  # The example of partial use describes a familar pattern where a template needs to iterate over an array and render a sub
+  # The example of partial use describes a familiar pattern where a template needs to iterate over an array and render a sub
   # template for each of the elements. This pattern has been implemented as a single method that accepts an array and renders
   # 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:
@@ -60,7 +60,7 @@ module ActionView
         if partial_path.include?('/')
           return File.dirname(partial_path), File.basename(partial_path)
         else
-          return controller.send(:controller_name), partial_path
+          return controller.class.controller_path, partial_path
         end
       end
 

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

@@ -76,7 +76,7 @@ module Builder #:nodoc:
     end
 
     # Append text to the output target.  Escape any markup.  May be
-    # used within the markup brakets as:
+    # used within the markup brackets as:
     #
     #   builder.p { br; text! "HI" }   #=>  <p><br/>HI</p>
     def text!(text)
@@ -84,7 +84,7 @@ module Builder #:nodoc:
     end
     
     # Append text to the output target without escaping any markup.
-    # May be used within the markup brakets as:
+    # May be used within the markup brackets as:
     #
     #   builder.p { |x| x << "<br/>HI" }   #=>  <p><br/>HI</p>
     #
@@ -94,7 +94,7 @@ module Builder #:nodoc:
     #
     # It is also useful for stacking builder objects.  Builders only
     # use <tt><<</tt> to append to the target, so by supporting this
-    # method/operation builders can use oother builders as their
+    # method/operation builders can use other builders as their
     # targets.
     def <<(text)
       _text(text)

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.4.0' + PKG_BUILD
+PKG_VERSION   = '1.5.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"
@@ -47,7 +47,7 @@ spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
   s.version = PKG_VERSION
   s.summary = "Web-flow and rendering framework putting the VC in MVC."
-  s.description = %q{Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.}
+  s.description = %q{Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.} #'
 
   s.author = "David Heinemeier Hansson"
   s.email = "david@loudthinking.com"
@@ -56,6 +56,9 @@ spec = Gem::Specification.new do |s|
 
   s.has_rdoc = true
   s.requirements << 'none'
+
+  s.add_dependency('activesupport', '= 1.0.0' + PKG_BUILD)
+
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
 

data/test/abstract_unit.rb

@@ -1,4 +1,5 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
 
 require 'test/unit'
 require 'action_controller'
@@ -6,4 +7,5 @@ require 'action_controller'
 require 'action_controller/test_process'
 
 ActionController::Base.logger = nil
-ActionController::Base.ignore_missing_templates = true
+ActionController::Base.ignore_missing_templates = true
+ActionController::Routing::Routes.reload

data/test/controller/action_pack_assertions_test.rb

@@ -15,6 +15,10 @@ class ActionPackAssertionsController < ActionController::Base
   # a redirect to an internal location
   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
+
   # a redirect to an external location
   def redirect_external() redirect_to_url "http://www.rubyonrails.org"; end
   
@@ -195,7 +199,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_success
   end
   
-  # -- standard request/reponse object testing --------------------------------
+  # -- standard request/response object testing --------------------------------
  
   # ensure our session is working properly
   def test_session_objects
@@ -333,6 +337,13 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_equal "Mr. David", @response.body
   end
 
+  def test_assert_template_xpath_match_no_matches
+    process :hello_xml_world
+    assert_raises Test::Unit::AssertionFailedError do
+      assert_template_xpath_match('/no/such/node/in/document')
+    end
+  end
+
   def test_simple_one_element_xpath_match
     process :hello_xml_world
     assert_template_xpath_match('//title', "Hello World")
@@ -342,6 +353,23 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :hello_xml_world
     assert_template_xpath_match('//p', %w( abes monks wiseguys ))
   end
+
+  def test_follow_redirect
+    process :redirect_to_action
+    assert_redirected_to :action => "flash_me"
+    
+    follow_redirect
+    assert_equal 1, @request.parameters["id"]
+
+    assert "Inconceivable!", @response.body
+  end
+  
+  def test_follow_redirect_outside_current_action
+    process :redirect_to_controller
+    assert_redirected_to :controller => "elsewhere", :action => "flash_me"
+
+    assert_raises(RuntimeError, "Can't follow redirects outside of current controller (elsewhere)") { follow_redirect }
+  end
 end
 
 class ActionPackHeaderTest < Test::Unit::TestCase  

data/test/controller/active_record_assertions_test.rb

@@ -1,120 +1,128 @@
 path_to_ar = File.dirname(__FILE__) + '/../../../activerecord'
 
 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
-
-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
+  
+  # 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
 
-# -----------------------------------------------------------------------------
+  begin
 
-require File.dirname(__FILE__) + '/../abstract_unit'
+    driver_to_use = 'native_sqlite'
 
-# 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
+    $: << 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
+      # 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 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
+      # 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
+      # the safety dance......
+      def rescue_action(e) raise; end
+    end
 
-# -----------------------------------------------------------------------------
+    # -----------------------------------------------------------------------------
 
-ActiveRecordAssertionsController.template_root = File.dirname(__FILE__) + "/../fixtures/"
+    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
+    # 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 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
+      # 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 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'
+      # ensure we have problems with an ActiveRecord
+      def test_invalid_record
+        process :bad_company
+        assert_success
+        assert_invalid_record 'company'
+      end
+    end 
+
+  rescue SqliteError => e
+    puts "Skipping active record based tests"    
+    puts e.message    
   end
-end 
 
-end
+end