actionpack 0.9.0 → 0.9.5

data/lib/action_view/helpers/text_helper.rb

@@ -1,35 +1,5 @@
 module ActionView
-  # The template helpers serves to relieve the templates from including the same inline code again and again. It's a
-  # set of standardized methods for working with forms (FormHelper), dates (DateHelper), texts (TextHelper), and 
-  # Active Records (ActiveRecordHelper) that's available to all templates by default.
-  #
-  # It's also really easy to make your own helpers and it's much encouraged to keep the template files free
-  # from complicated logic. It's even encouraged to bundle common compositions of methods from other helpers 
-  # (often the common helpers) as they're used by the specific application.
-  # 
-  # Defining a helper requires you to include a specialized +append_features+ method that makes them capable 
-  # of configuring their integration upon inclusion in a controller, like this:
-  # 
-  #   module MyHelper
-  #     def self.append_features(controller)
-  #       controller.ancestors.include?(ActionController::Base) ?
-  #         controller.add_template_helper(self) : super
-  #     end
-  #   
-  #     def hello_world() "hello world" end
-  #   end
-  # 
-  # MyHelper can now be included in a controller, like this:
-  # 
-  #   require 'my_helper'
-  #   class MyController < ActionController::Base
-  #     include MyHelper
-  #   end
-  # 
-  # ...and, same as above, used in any template rendered from MyController, like this:
-  # 
-  # Let's hear what the helper has to say: <tt><%= hello_world %></tt>
-  module Helpers
+  module Helpers #:nodoc:
     # Provides a set of methods for working with text strings that can help unburden the level of inline Ruby code in the
     # templates. In the example below we iterate over a collection of posts provided to the template and prints each title 
     # after making sure it doesn't run longer than 20 characters:
@@ -114,6 +84,18 @@ module ActionView
         # We can't really help what's not there
       end
 
+      begin
+        require "bluecloth"
+
+        # Returns the text with all the Markdown codes turned into HTML-tags. 
+        # <i>This method is only available if BlueCloth can be required</i>.
+        def markdown(text)
+          BlueCloth.new(text).to_html
+        end
+      rescue LoadError
+        # We can't really help what's not there
+      end
+
       # Turns all links into words, like "<a href="something">else</a>" to "else".
       def strip_links(text)
         text.gsub(/<a.*>(.*)<\/a>/m, '\1')

data/lib/action_view/helpers/url_helper.rb

@@ -17,11 +17,11 @@ module ActionView
       # 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.
       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)
-          content_tag "a", name, "href" => options
+          content_tag "a", name, (html_options || {}).merge({ "href" => options })
         else
-          convert_confirm_option_to_javascript!(html_options)
-          content_tag("a", name, html_options.merge({ "href" => url_for(options, *parameters_for_method_reference) }))
+          content_tag("a", name, (html_options || {}).merge({ "href" => url_for(options, *parameters_for_method_reference) }))
         end
       end
 
@@ -41,6 +41,12 @@ module ActionView
         end
       end
 
+      # 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.
+      def mail_to(email_address, name = nil, html_options = {})
+        content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{email_address}" })
+      end
+
       private
         def destination_equal_to_current(options)
           params_without_location = @params.reject { |key, value| %w( controller action id ).include?(key) }
@@ -50,7 +56,7 @@ module ActionView
             options[:controller] == @params['controller'] &&
             (options.has_key?(:params) ? params_without_location == options[:params] : true) 
         end
-        
+
         def assume_current_url_options!(options)
           if options[:controller].nil?
             options[:controller] = @params['controller']
@@ -63,7 +69,7 @@ module ActionView
         
         def convert_confirm_option_to_javascript!(html_options)
           if html_options.include?(:confirm)
-            html_options["onClick"] = "return confirm('#{html_options[:confirm]}');"
+            html_options["onclick"] = "return confirm('#{html_options[:confirm]}');"
             html_options.delete(:confirm)
           end
         end

data/lib/action_view/partials.rb

@@ -44,9 +44,12 @@ module ActionView
       end
 
       return nil if collection_of_partials.empty?
-      partial_spacer_template ? 
-        collection_of_partials.join(render("#{controller.send(:controller_name)}/_#{partial_spacer_template}")) : 
+      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
+      end
     end
     
     private

data/rakefile

@@ -6,7 +6,10 @@ require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "0.9.0"
+PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+PKG_NAME      = 'actionpack'
+PKG_VERSION   = '0.9.5' + PKG_BUILD
+PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"
 task :default => [ :test ]
@@ -38,10 +41,10 @@ dist_dirs = [ "lib", "test", "examples" ]
 
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
-  s.name = 'actionpack'
+  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.version = PKG_VERSION
 
   s.author = "David Heinemeier Hansson"
   s.email = "david@loudthinking.com"
@@ -68,6 +71,12 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 
+# Publish beta gem
+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
+end
+
 # Publish documentation
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 

data/test/controller/action_pack_assertions_test.rb

@@ -146,7 +146,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # test the assert_rendered_file 
   def test_assert_rendered_file
     process :hello_world
-    assert_rendered_file 'test_request_response/hello_world'
+    assert_rendered_file 'test/hello_world'
     assert_rendered_file 'hello_world'
     assert_rendered_file
   end
@@ -163,6 +163,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   def test_session_objects
     process :session_stuffing
     assert @response.has_session_object?('xmas')
+    assert_session_equal 'turkey', 'xmas'
     assert !@response.has_session_object?('easter')
   end
   
@@ -178,6 +179,11 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :nothing
     assert_nil @response.template_objects['howdy']
   end
+  
+  def test_assigned_equal
+    process :assign_this
+    assert_assigned_equal "ho", :howdy
+  end
 
   # check the empty flashing
   def test_flash_me_naked
@@ -202,6 +208,12 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_nil @response.flash['hello']
   end
   
+  # examine that the flash objects are what we expect
+  def test_flash_equals
+    process :flash_me
+    assert_flash_equal 'my name is inigo montoya...', 'hello'
+  end
+  
   
   # check if we were rendered by a file-based template? 
   def test_rendered_action
@@ -292,4 +304,20 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :hello_xml_world
     assert_template_xpath_match('//p', %w( abes monks wiseguys ))
   end
-end
+end
+
+class ActionPackHeaderTest < Test::Unit::TestCase  
+  def setup
+    @controller = ActionPackAssertionsController.new
+    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
+  end
+  def test_rendering_xml_sets_content_type
+    process :hello_xml_world
+    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'])
+  end
+end

data/test/controller/active_record_assertions_test.rb

@@ -4,7 +4,8 @@ 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.  active_record exists as a sibling directory to actionpack
+# 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
 

data/test/controller/helper_test.rb

@@ -0,0 +1,110 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class HelperTest < Test::Unit::TestCase
+  HELPER_PATHS = %w(/../fixtures/helpers)
+
+  class TestController < ActionController::Base
+    attr_accessor :delegate_attr
+    def delegate_method() end
+    def rescue_action(e) raise end
+  end
+
+  module LocalAbcHelper
+    def a() end
+    def b() end
+    def c() end
+  end
+
+
+  def setup
+    # Increment symbol counter.
+    @symbol = (@@counter ||= 'A0').succ!.dup
+
+    # Generate new controller class.
+    controller_class_name = "Helper#{@symbol}Controller"
+    eval("class #{controller_class_name} < TestController; end")
+    @controller_class = self.class.const_get(controller_class_name)
+
+    # Generate new template class and assign to controller.
+    template_class_name = "Test#{@symbol}View"
+    eval("class #{template_class_name} < ActionView::Base; end")
+    @template_class = self.class.const_get(template_class_name)
+    @controller_class.template_class = @template_class
+
+    # Add helper paths to LOAD_PATH.
+    HELPER_PATHS.each { |path|
+      $LOAD_PATH.unshift(File.dirname(__FILE__) + path)
+    }
+
+    # Set default test helper.
+    self.test_helper = LocalAbcHelper
+  end
+
+  def teardown
+    # Reset template class.
+    #ActionController::Base.template_class = ActionView::Base
+
+    # Remove helper paths from LOAD_PATH.
+    HELPER_PATHS.each { |path|
+      $LOAD_PATH.delete(File.dirname(__FILE__) + path)
+    }
+  end
+
+
+  def test_deprecated_helper
+    assert_equal helper_methods, missing_methods
+    assert_nothing_raised { @controller_class.helper TestHelper }
+    assert_equal [], missing_methods
+  end
+
+  def test_declare_helper
+    require 'abc_helper'
+    self.test_helper = AbcHelper
+    assert_equal helper_methods, missing_methods
+    assert_nothing_raised { @controller_class.helper :abc }
+    assert_equal [], missing_methods
+  end
+
+  def test_declare_missing_helper
+    assert_equal helper_methods, missing_methods
+    assert_raise(ArgumentError) { @controller_class.helper :missing }
+  end
+
+  def test_helper_block
+    assert_nothing_raised {
+      @controller_class.helper { def block_helper_method; end }
+    }
+    assert template_methods.include?('block_helper_method')
+  end
+
+  def test_helper_block_include
+    assert_equal helper_methods, missing_methods
+    assert_nothing_raised {
+      @controller_class.helper { include TestHelper }
+    }
+    assert [], missing_methods
+  end
+
+  def test_helper_method
+    assert_nothing_raised { @controller_class.helper_method :delegate_method }
+    assert template_methods.include?('delegate_method')
+  end
+
+  def test_helper_attr
+    assert_nothing_raised { @controller_class.helper_attr :delegate_attr }
+    assert template_methods.include?('delegate_attr')
+    assert template_methods.include?('delegate_attr=')
+  end
+
+
+  private
+    def helper_methods;   TestHelper.instance_methods      end
+    def template_methods; @template_class.instance_methods  end
+    def missing_methods;  helper_methods - template_methods end
+
+    def test_helper=(helper_module)
+      old_verbose, $VERBOSE = $VERBOSE, nil
+      self.class.const_set('TestHelper', helper_module)
+      $VERBOSE = old_verbose
+    end
+end

data/test/controller/send_file_test.rb

@@ -0,0 +1,68 @@
+require File.join(File.dirname(__FILE__), '..', 'abstract_unit')
+
+
+module TestFileUtils
+  def file_name() File.basename(__FILE__) end
+  def file_path() File.expand_path(__FILE__) end
+  def file_data() File.open(file_path, 'rb') { |f| f.read } end
+end
+
+
+class SendFileController < ActionController::Base
+  include TestFileUtils
+
+  attr_writer :options
+  def options() @options ||= {} end
+
+  def file() send_file(file_path, options) end
+  def data() send_data(file_data, options) end
+
+  def rescue_action(e) raise end
+end
+
+
+class SendFileTest < Test::Unit::TestCase
+  include TestFileUtils
+
+  def setup
+    @controller = SendFileController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+  end
+
+  def test_file_nostream
+    @controller.options = { :stream => false }
+    response = nil
+    assert_nothing_raised { response = process('file') }
+    assert_not_nil response
+    assert_kind_of String, response.body
+    assert_equal file_data, response.body
+  end
+
+  def test_file_stream
+    response = nil
+    assert_nothing_raised { response = process('file') }
+    assert_not_nil response
+    assert_kind_of Proc, response.body
+
+    old_stdout = $stdout
+    begin
+      require 'stringio'
+      $stdout = StringIO.new
+      $stdout.binmode
+      assert_nothing_raised { response.body.call }
+      assert_equal file_data, $stdout.string
+    ensure
+      $stdout = old_stdout
+    end
+  end
+
+  def test_data
+    response = nil
+    assert_nothing_raised { response = process('data') }
+    assert_not_nil response
+
+    assert_kind_of String, response.body
+    assert_equal file_data, response.body
+  end
+end

data/test/controller/url_test.rb

@@ -30,9 +30,14 @@ class UrlTest < Test::Unit::TestCase
       { "type" => "ISBN", "code" => "0743536703" }
     ), "books", "index")
     
-    @clean_url = ActionController::UrlRewriter.new(MockRequest.new(
-      "http://", "www.singlefile.com", 80, "/identity/", {}
-    ), "identity", "index")
+    @clean_urls = [
+      ActionController::UrlRewriter.new(MockRequest.new(
+        "http://", "www.singlefile.com", 80, "/identity/", {}
+      ), "identity", "index"),
+      ActionController::UrlRewriter.new(MockRequest.new(
+        "http://", "www.singlefile.com", 80, "/identity", {}
+      ), "identity", "index")
+    ]
 
     @clean_url_with_id = ActionController::UrlRewriter.new(MockRequest.new(
       "http://", "www.singlefile.com", 80, "/identity/show/5", { "id" => "5" }
@@ -54,9 +59,11 @@ class UrlTest < Test::Unit::TestCase
   def test_action_from_index
     assert_equal "http://www.singlefile.com/library/books/ISBN/0743536703/edit", @library_url_on_index.rewrite(:action => "edit")
   end
-  
+
   def test_action_from_index_on_clean
-    assert_equal "http://www.singlefile.com/identity/edit", @clean_url.rewrite(:action => "edit")
+    @clean_urls.each do |url|
+      assert_equal "http://www.singlefile.com/identity/edit", url.rewrite(:action => "edit")
+    end
   end
 
   def test_action_without_prefix
@@ -127,7 +134,7 @@ class UrlTest < Test::Unit::TestCase
   def test_controller_and_action_params_and_overwrite_params_and_anchor
     assert_equal(
       "http://www.singlefile.com/library/settings/show?code=0000001&version=5.0#5", 
-      @library_url.rewrite(:controller => "settings", :action => "show", :params=>{"version" => "5.0" },  :overwrite_params => {"code"=>"0000001"},  :anchor => "5")
+      @library_url.rewrite(:controller => "settings", :action => "show", :params=>{"version" => "5.0"},  :overwrite_params => {"code"=>"0000001"},  :anchor => "5")
     )
   end
 
@@ -143,7 +150,9 @@ class UrlTest < Test::Unit::TestCase
   end
 
   def test_controller_and_action_with_same_name_as_controller
-    assert_equal "http://www.singlefile.com/anything/identity", @clean_url.rewrite(:controller => "anything", :action => "identity")
+    @clean_urls.each do |url|
+      assert_equal "http://www.singlefile.com/anything/identity", url.rewrite(:controller => "anything", :action => "identity")
+    end
   end
 
   def test_controller_and_index_action_without_controller_prefix
@@ -172,13 +181,15 @@ class UrlTest < Test::Unit::TestCase
   end
 
   def test_parameters_with_id
-    assert_equal(
-      "http://www.singlefile.com/identity/show?name=David&id=5", 
-      @clean_url.rewrite(
-        :action => "show", 
-        :params => {"id" => "5", "name" => "David"}
+    @clean_urls.each do |url|
+      assert_equal(
+        "http://www.singlefile.com/identity/show?name=David&id=5", 
+        url.rewrite(
+          :action => "show",
+          :params => { "id" => "5", "name" => "David" }
+        )
       )
-    )
+    end
   end
   
   def test_action_with_id
@@ -189,18 +200,36 @@ class UrlTest < Test::Unit::TestCase
         :id => 7
       )
     )
+    @clean_urls.each do |url|
+      assert_equal(
+        "http://www.singlefile.com/identity/index/7", 
+        url.rewrite(:id => 7)
+      )
+    end
   end
 
   def test_parameters_with_id_and_away
     assert_equal(
       "http://www.singlefile.com/identity/show/25?name=David", 
       @clean_url_with_id.rewrite(
-        :path_params => {"id" => "25" },
-        :params => { "name" => "David"}
+        :path_params => { "id" => "25" },
+        :params => { "name" => "David" }
       )
     )
   end
 
+  def test_parameters_with_index_and_id
+    @clean_urls.each do |url|
+      assert_equal(
+        "http://www.singlefile.com/identity/index/25?name=David", 
+        url.rewrite(
+          :path_params => { "id" => "25" },
+          :params => { "name" => "David" }
+        )
+      )
+    end
+  end
+
   def test_action_going_away_from_id
     assert_equal(
       "http://www.singlefile.com/identity/list", 
@@ -215,7 +244,7 @@ class UrlTest < Test::Unit::TestCase
       "http://www.singlefile.com/identity/show/25?name=David", 
       @clean_url_with_id.rewrite(
         :id => "25",
-        :params => { "name" => "David"}
+        :params => { "name" => "David" }
       )
     )
   end
@@ -227,20 +256,24 @@ class UrlTest < Test::Unit::TestCase
         :controller => "store",
         :action => "open",
         :id => "25",
-        :params => { "name" => "David"}
+        :params => { "name" => "David" }
       )
     )
   end
 
   def test_parameters_to_id
-    assert_equal(
-      "http://www.singlefile.com/identity/show/25?name=David", 
-      @clean_url.rewrite(
-        :action => "show",
-        :path_params => {"id" => "25" },
-        :params => { "name" => "David"}
-      )
-    )
+    @clean_urls.each do |url|
+      %w(show index).each do |action|
+        assert_equal(
+          "http://www.singlefile.com/identity/#{action}/25?name=David", 
+          url.rewrite(
+            :action => action,
+            :path_params => { "id" => "25" },
+            :params => { "name" => "David" }
+          )
+        )
+      end
+    end
   end
 
   def test_parameters_from_id
@@ -262,17 +295,19 @@ class UrlTest < Test::Unit::TestCase
     )
   end
 
-  def test_from_clean_to_libray
-    assert_equal(
-      "http://www.singlefile.com/library/books/ISBN/0743536703/show?delete=1&name=David", 
-      @clean_url.rewrite(
-        :controller_prefix => "library",
-        :controller => "books", 
-        :action_prefix => "ISBN/0743536703",
-        :action => "show", 
-        :params => {"delete" => "1", "name" => "David"}
+  def test_from_clean_to_library
+    @clean_urls.each do |url|
+      assert_equal(
+        "http://www.singlefile.com/library/books/ISBN/0743536703/show?delete=1&name=David", 
+        url.rewrite(
+          :controller_prefix => "library",
+          :controller => "books", 
+          :action_prefix => "ISBN/0743536703",
+          :action => "show", 
+          :params => { "delete" => "1", "name" => "David" }
+        )
       )
-    )
+    end
   end
   
   def test_from_library_to_clean
@@ -315,4 +350,15 @@ class UrlTest < Test::Unit::TestCase
       basecamp_url.rewrite(:action_prefix => "transcripts/1", :action => "comments")
     )
   end
+
+  def test_on_explicit_index_page # My index page is very modest, thank you...
+    url = ActionController::UrlRewriter.new(
+      MockRequest.new(
+        "http://", "example.com", 80, "/controller/index",
+        {"controller"=>"controller", "action"=>"index"}
+      ), "controller", "index"
+    )
+    assert_equal("http://example.com/controller/foo", url.rewrite(:action => 'foo'))
+  end
+
 end