actionpack 0.9.5 → 1.0.0

data/lib/action_view/helpers/form_options_helper.rb

@@ -8,15 +8,25 @@ module ActionView
     # the actual select tag, so you'll need to construct that in HTML manually.
     module FormOptionsHelper
       include ERB::Util
-      
+
+      # Create a select tag and a series of contained option tags for the provided object and method.
+      # The option currenlty held by the object will be selected, provided that the object is available.
+      # 
+      # This can be used to provide a default set of options in the standard way: before rendering the create form, a
+      # new model instance is assigned the default options and bound to @model_name. Usually this model is not saved
+      # to the database. Instead, a second model object is created when the create request is received.
+      # This allows the user to submit a form page more than once with the expected results of creating multiple records.
+      # In addition, this allows a single partial to be used to generate form inputs for both edit and create forms.
       def select(object, method, choices, options = {}, html_options = {})
         InstanceTag.new(object, method, self).to_select_tag(choices, options, html_options)
       end
-
+        
+      # Return select and option tags for the given object and method using options_from_collection_for_select to generate the list of option tags.
       def collection_select(object, method, collection, value_method, text_method, options = {}, html_options = {})
         InstanceTag.new(object, method, self).to_collection_select_tag(collection, value_method, text_method, options, html_options)
       end
-
+      
+      # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
       def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
         InstanceTag.new(object, method, self).to_country_select_tag(priority_countries, options, html_options)
       end

data/lib/action_view/helpers/tag_helper.rb

@@ -7,24 +7,24 @@ module ActionView
       include ERB::Util
 
       # Examples: 
-      # * tag("br") => <br />
-      # * tag("input", { "type" => "text"}) => <input type="text" />
+      # * <tt>tag("br") => <br /></tt>
+      # * <tt>tag("input", { "type" => "text"}) => <input type="text" /></tt>
       def tag(name, options = {}, open = false)
-        "<#{name + tag_options(options)}" + (open ? ">" : " />")
+        "<#{name}#{tag_options(options)}" + (open ? ">" : " />")
       end
       
       # Examples: 
-      # * content_tag("p", "Hello world!") => <p>Hello world!</p>
-      # * content_tag("div", content_tag("p", "Hello world!"), "class" => "strong") => 
-      #   <div class="strong"><p>Hello world!</p></div>
+      # * <tt>content_tag("p", "Hello world!") => <p>Hello world!</p></tt>
+      # * <tt>content_tag("div", content_tag("p", "Hello world!"), "class" => "strong") => </tt>
+      #   <tt><div class="strong"><p>Hello world!</p></div></tt>
       def content_tag(name, content, options = {})
-        "<#{name + tag_options(options)}>#{content}</#{name}>"
+        "<#{name}#{tag_options(options)}>#{content}</#{name}>"
       end
 
       # Starts a form tag that points the action to an url configured with <tt>url_for_options</tt> just like 
       # ActionController::Base#url_for.
-      def form_tag(url_for_options, options = {}, *parameters_for_url)
-        html_options = { "method" => "POST" }.merge(options)
+      def form_tag(url_for_options = {}, options = {}, *parameters_for_url)
+        html_options = { "method" => "post" }.merge(options)
         
         if html_options[:multipart]
           html_options["enctype"] = "multipart/form-data"
@@ -46,14 +46,12 @@ module ActionView
 
       private
         def tag_options(options)
-          if options.empty?
-            ""
-          else
-            " " + options.collect { |pair| 
-              "#{pair.first}=\"#{html_escape(pair.last)}\"" 
-            }.sort.join(" ") 
+          unless options.empty?
+            " " + options.map { |key, value|
+              %(#{key}="#{html_escape(value)}")
+            }.sort.join(" ")
           end
         end
     end
   end
-end
+end

data/lib/action_view/helpers/url_helper.rb

@@ -8,7 +8,7 @@ module ActionView
       # Returns the URL for the set of +options+ provided. See the valid options in link:classes/ActionController/Base.html#M000021
       def url_for(options = {}, *parameters_for_method_reference)
         if Hash === options then options = { :only_path => true }.merge(options) end
-        @controller.send(:url_for, options, *parameters_for_method_reference).gsub("&", "&")
+        @controller.send(:url_for, options, *parameters_for_method_reference)
       end
 
       # Creates a link tag of the given +name+ using an URL created by the set of +options+. See the valid options in
@@ -25,6 +25,51 @@ 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
+      # 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
+      #
+      # 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)
+        image_options = { "src" => src.include?("/") ? src : "/images/#{src}" }
+        image_options["src"] = image_options["src"] + ".png" unless image_options["src"].include?(".")
+        
+        if html_options["alt"]
+          image_options["alt"] = html_options["alt"]
+          html_options.delete "alt"
+        else
+          image_options["alt"] = src.split("/").last.split(".").first.capitalize
+        end
+
+        if html_options["size"]
+          image_options["width"], image_options["height"] = html_options["size"].split("x")
+          html_options.delete "size"
+        end
+
+        if html_options["border"]
+          image_options["border"] = html_options["border"]
+          html_options.delete "border"
+        else
+          image_options["border"] = "0"
+        end
+        
+        if html_options["align"]
+          image_options["align"] = html_options["align"]
+          html_options.delete "align"
+        end
+
+        link_to(tag("img", image_options), options, html_options, *parameters_for_method_reference)
+      end
+
       # 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
       # given block is yielded, if one exists). This is useful for creating link bars where you don't want to link 

data/lib/action_view/partials.rb

@@ -34,13 +34,16 @@ module ActionView
     def render_partial(partial_path, object = nil, local_assigns = {})
       path, partial_name = partial_pieces(partial_path)
       object ||= controller.instance_variable_get("@#{partial_name}")
+      counter_name  = partial_counter_name(partial_name)
+      local_assigns = local_assigns.merge(counter_name => 1) unless local_assigns.has_key?(counter_name)
       render("#{path}/_#{partial_name}", { partial_name => object }.merge(local_assigns))
     end
 
     def render_collection_of_partials(partial_name, collection, partial_spacer_template = nil)
       collection_of_partials = Array.new
+      counter_name = partial_counter_name(partial_name)
       collection.each_with_index do |element, counter|
-        collection_of_partials.push(render_partial(partial_name, element, "#{partial_name.split("/").last}_counter" => counter))
+        collection_of_partials.push(render_partial(partial_name, element, counter_name => counter))
       end
 
       return nil if collection_of_partials.empty?
@@ -60,5 +63,9 @@ module ActionView
           return controller.send(:controller_name), partial_path
         end
       end
+
+      def partial_counter_name(partial_name)
+        "#{partial_name.split('/').last}_counter"
+      end
   end
 end

data/lib/action_view/template_error.rb

@@ -28,7 +28,7 @@ module ActionView
       end
     end
   
-    def source_extract
+    def source_extract(indention = 0)
       source_code = IO.readlines(@file_name)
       
       start_on_line = [ line_number - SOURCE_CODE_RADIUS - 1, 0 ].max
@@ -37,9 +37,9 @@ module ActionView
       line_counter = start_on_line
       extract = source_code[start_on_line..end_on_line].collect do |line| 
         line_counter += 1
-        "#{line_counter}: " + line
+        "#{' ' * indention}#{line_counter}: " + line
       end
-    
+
       extract.join
     end
   
@@ -71,6 +71,13 @@ module ActionView
       "\n\n"
     end
 
+    def backtrace
+      [ 
+        "On line ##{line_number} of #{file_name}\n\n#{source_extract(4)}\n    " + 
+        clean_backtrace(original_exception).join("\n    ")
+      ]
+    end
+
     private
       def strip_base_path(file_name)
         file_name.gsub(@base_path, "")

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

@@ -15,7 +15,39 @@ module Builder #:nodoc:
   # BlankSlate is useful as a base class when writing classes that
   # depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
   class BlankSlate #:nodoc:
-    instance_methods.each { |m| undef_method m unless m =~ /^(__|instance_eval)/ }
+    class << self
+      def hide(name)
+	      undef_method name if
+	        instance_methods.include?(name.to_s) and
+	        name !~ /^(__|instance_eval)/
+      end
+    end
+
+    instance_methods.each { |m| hide(m) }
+  end
+end
+
+# Since Ruby is very dynamic, methods added to the ancestors of
+# BlankSlate <em>after BlankSlate is defined</em> will show up in the
+# list of available BlankSlate methods.  We handle this by defining a hook in the Object and Kernel classes that will hide any defined 
+module Kernel #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return if self != Kernel
+      Builder::BlankSlate.hide(name)
+    end
   end
+end
 
+class Object #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return  if self != Object
+      Builder::BlankSlate.hide(name)
+    end
+  end
 end

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

@@ -11,7 +11,7 @@
 
 require 'builder/xmlmarkup'
 
-module Builder #:nodoc:
+module Builder
 
   # Create a series of SAX-like XML events (e.g. start_tag, end_tag)
   # from the markup code.  XmlEvent objects are used in a way similar

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

@@ -13,7 +13,7 @@
 
 require 'builder/xmlbase'
 
-module Builder #:nodoc:
+module Builder
 
   # Create XML markup easily.  All (well, almost all) methods sent to
   # an XmlMarkup object will be translated to the equivalent XML

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '0.9.5' + PKG_BUILD
+PKG_VERSION   = '1.0.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"
@@ -58,7 +58,7 @@ spec = Gem::Specification.new do |s|
 
   s.files = [ "rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
   dist_dirs.each do |dir|
-    s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "CVS" ) }
+    s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   s.files.delete "examples/benchmark.rb"
   s.files.delete "examples/benchmark_with_ar.fcgi"
@@ -75,6 +75,7 @@ end
 desc "Publish the API documentation"
 task :pgem => [:package] do 
   Rake::SshFilePublisher.new("davidhh@one.textdrive.com", "domains/rubyonrails.org/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh davidhh@one.textdrive.com './gemupdate.sh'`
 end
 
 # Publish documentation
@@ -83,11 +84,6 @@ task :pdoc => [:rdoc] do
   Rake::SshDirPublisher.new("davidhh@one.textdrive.com", "domains/rubyonrails.org/ap", "doc").upload
 end
 
-desc "Publish to RubyForge"
-task :rubyforge do
-    Rake::RubyForgePublisher.new('actionpack', 'webster132').upload
-end
-
 
 desc "Count lines in the main rake file"
 task :lines do
@@ -106,9 +102,4 @@ task :lines do
     end
   }
   puts "Lines #{lines}, LOC #{codelines}"
-end
-
-desc "Publish to RubyForge"
-task :rubyforge do
-    Rake::RubyForgePublisher.new('activecontrol', 'webster132').upload
-end
+end

data/test/controller/action_pack_assertions_test.rb

@@ -54,6 +54,18 @@ class ActionPackAssertionsController < ActionController::Base
     session['xmas'] = 'turkey'
     render_text "ho ho ho"
   end
+  
+  # raises exception on get requests
+  def raise_on_get
+    raise "get" if @request.get?
+    render_text "request method: #{@request.env['REQUEST_METHOD']}"
+  end
+
+  # raises exception on post requests
+  def raise_on_post
+    raise "post" if @request.post?
+    render_text "request method: #{@request.env['REQUEST_METHOD']}"
+  end
 
   # 911
   def rescue_action(e) raise; end
@@ -70,7 +82,7 @@ ActionPackAssertionsController.template_root = File.dirname(__FILE__) + "/../fix
 
 
 # a test case to exercise the new capabilities TestRequest & TestResponse
-class ActionPackAssertionsControllerTest < Test::Unit::TestCase  
+class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # let's get this party started  
   def setup
     @controller = ActionPackAssertionsController.new
@@ -85,6 +97,32 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_session_has 'xmas'
     assert_session_has_no 'halloween'
   end
+  
+  # test the get method, make sure the request really was a get
+  def test_get
+    assert_raise(RuntimeError) { get :raise_on_get }
+    get :raise_on_post
+    assert_equal @response.body, 'request method: GET'
+  end
+
+  # test the get method, make sure the request really was a get
+  def test_post
+    assert_raise(RuntimeError) { post :raise_on_post }
+    post :raise_on_get
+    assert_equal @response.body, 'request method: POST'
+  end
+  
+  # test the get/post switch within one test action
+  def test_get_post_switch
+    post :raise_on_get
+    assert_equal @response.body, 'request method: POST'
+    get :raise_on_post
+    assert_equal @response.body, 'request method: GET'
+    post :raise_on_get
+    assert_equal @response.body, 'request method: POST'
+    get :raise_on_post
+    assert_equal @response.body, 'request method: GET'
+  end
 
   # test the assertion of goodies in the template
   def test_assert_template_has

data/test/controller/active_record_assertions_test.rb

@@ -21,11 +21,12 @@ require 'fixtures/company'
 
 # add some validation rules to trip up the assertions
 class Company
-  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  
+  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
 
 # -----------------------------------------------------------------------------

data/test/controller/cgi_test.rb

@@ -133,10 +133,40 @@ class CGITest < Test::Unit::TestCase
   end
 
   def test_parse_params_with_array
-      input = { "selected[]" =>  [ "1", "2", "3" ] }
+    input = { "selected[]" =>  [ "1", "2", "3" ] }
 
-      expected_output = { "selected" => [ "1", "2", "3" ] }
+    expected_output = { "selected" => [ "1", "2", "3" ] }
 
-      assert_equal expected_output, CGIMethods.parse_request_parameters(input)
+    assert_equal expected_output, CGIMethods.parse_request_parameters(input)
+  end
+
+  def test_parse_params_with_non_alphanumeric_name
+    input     = { "a/b[c]" =>  %w(d) }
+    expected  = { "a/b" => { "c" => "d" }}
+    assert_equal expected, CGIMethods.parse_request_parameters(input)
+  end
+
+  def test_parse_params_with_single_brackets_in_middle
+    input     = { "a/b[c]d" =>  %w(e) }
+    expected  = { "a/b[c]d" => "e" }
+    assert_equal expected, CGIMethods.parse_request_parameters(input)
+  end
+
+  def test_parse_params_with_separated_brackets
+    input     = { "a/b@[c]d[e]" =>  %w(f) }
+    expected  = { "a/b@" => { "c]d[e" => "f" }}
+    assert_equal expected, CGIMethods.parse_request_parameters(input)
+  end
+
+  def test_parse_params_with_separated_brackets_and_array
+    input     = { "a/b@[c]d[e][]" =>  %w(f) }
+    expected  = { "a/b@" => { "c]d[e" => ["f"] }}
+    assert_equal expected , CGIMethods.parse_request_parameters(input)
+  end
+
+  def test_parse_params_with_unmatched_brackets_and_array
+    input     = { "a/b@[c][d[e][]" =>  %w(f) }
+    expected  = { "a/b@" => { "c" => { "d[e" => ["f"] }}}
+    assert_equal expected, CGIMethods.parse_request_parameters(input)
   end
 end

data/test/controller/cookie_test.rb

@@ -2,11 +2,32 @@ require File.dirname(__FILE__) + '/../abstract_unit'
 
 class CookieTest < Test::Unit::TestCase
   class TestController < ActionController::Base
-    def authenticate
+    def authenticate_with_deprecated_writer
       cookie "name" => "user_name", "value" => "david"
       render_text "hello world"
     end
 
+    def authenticate
+      cookies["user_name"] = "david"
+      render_text "hello world"
+    end
+
+    def authenticate_for_fourten_days
+      cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
+      render_text "hello world"
+    end
+
+    def authenticate_for_fourten_days_with_symbols
+      cookies[:user_name] = { :value => "david", :expires => Time.local(2005, 10, 10) }
+      render_text "hello world"
+    end
+
+    def set_multiple_cookies
+      cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
+      cookies["login"]     = "XJ-122"
+      render_text "hello world"
+    end
+
     def access_frozen_cookies
       @cookies["wont"] = "work"
     end
@@ -21,12 +42,32 @@ class CookieTest < Test::Unit::TestCase
     @request.host = "www.nextangle.com"
   end
 
+  def test_setting_cookie_with_deprecated_writer
+    @request.action = "authenticate_with_deprecated_writer"
+    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], process_request.headers["cookie"]
+  end
+
   def test_setting_cookie
     @request.action = "authenticate"
     assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], process_request.headers["cookie"]
   end
 
-  def test_setting_cookie
+  def test_setting_cookie_for_fourteen_days
+    @request.action = "authenticate_for_fourten_days"
+    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], process_request.headers["cookie"]
+  end
+
+  def test_setting_cookie_for_fourteen_days_with_symbols
+    @request.action = "authenticate_for_fourten_days"
+    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], process_request.headers["cookie"]
+  end
+
+  def test_multiple_cookies
+    @request.action = "set_multiple_cookies"
+    assert_equal 2, process_request.headers["cookie"].size
+  end
+
+  def test_setting_cookie_on_frozen_instance_variable
     @request.action = "access_frozen_cookies"
     assert_raises(TypeError) { process_request }
   end