actionpack 1.11.0 → 1.11.1

data/lib/action_view/helpers/text_helper.rb

@@ -135,11 +135,17 @@ module ActionView
       #   auto_link("Go to http://www.rubyonrails.com and say hello to david@loudthinking.com") =>
       #     Go to <a href="http://www.rubyonrails.com">http://www.rubyonrails.com</a> and
       #     say hello to <a href="mailto:david@loudthinking.com">david@loudthinking.com</a>
-      def auto_link(text, link = :all, href_options = {})
+      #
+      # If a block is given, each url and email address is yielded and the
+      # result is used as the link text.  Example:
+      #   auto_link(post.body, :all, :target => '_blank') do |text|
+      #     truncate(text, 15)
+      #   end
+      def auto_link(text, link = :all, href_options = {}, &block)
         case link
-          when :all             then auto_link_urls(auto_link_email_addresses(text), href_options)
-          when :email_addresses then auto_link_email_addresses(text)
-          when :urls            then auto_link_urls(text, href_options)
+          when :all             then auto_link_urls(auto_link_email_addresses(text, &block), href_options, &block)
+          when :email_addresses then auto_link_email_addresses(text, &block)
+          when :urls            then auto_link_urls(text, href_options, &block)
         end
       end
 
@@ -325,22 +331,37 @@ module ActionView
                         ([[:punct:]]|\s|<|$)    # trailing text
                        /x unless const_defined?(:AUTO_LINK_RE)
 
-        # Turns all urls into clickable links.
+        # Turns all urls into clickable links.  If a block is given, each url
+        # is yielded and the result is used as the link text.  Example:
+        #   auto_link_urls(post.body, :all, :target => '_blank') do |text|
+        #     truncate(text, 15)
+        #   end
         def auto_link_urls(text, href_options = {})
+          extra_options = tag_options(href_options.stringify_keys) || ""
           text.gsub(AUTO_LINK_RE) do
             all, a, b, c, d = $&, $1, $2, $3, $5
             if a =~ /<a\s/i # don't replace URL's that are already linked
               all
             else
-              extra_options = tag_options(href_options.stringify_keys) || ""
-              %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}"#{extra_options}>#{b}#{c}</a>#{d})
+              text = b + c
+              text = yield(text) if block_given?
+              %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}"#{extra_options}>#{text}</a>#{d})
             end
           end
         end
 
-        # Turns all email addresses into clickable links.
+        # Turns all email addresses into clickable links.  If a block is given,
+        # each email is yielded and the result is used as the link text.
+        # Example:
+        #   auto_link_email_addresses(post.body) do |text|
+        #     truncate(text, 15)
+        #   end
         def auto_link_email_addresses(text)
-          text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/, '<a href="mailto:\1">\1</a>')
+          text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
+            text = $1
+            text = yield(text) if block_given?
+            %{<a href="mailto:#{$1}">#{text}</a>}
+          end
         end
     end
   end

data/rakefile

@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = ActionPack::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActionPack::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
@@ -62,7 +62,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.2.3' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.2.4' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'

data/test/controller/active_record_assertions_test.rb

@@ -23,6 +23,7 @@ end
 
 # Set up company fixtures.
 $LOAD_PATH << "#{path_to_ar}/test"
+QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
 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?

data/test/controller/active_record_store_test.rb

@@ -15,12 +15,12 @@ require 'action_controller/session/active_record_store'
 
 #ActiveRecord::Base.logger = Logger.new($stdout)
 begin
-  CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+  CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
   CGI::Session::ActiveRecordStore::Session.connection
 rescue Object
   $stderr.puts 'SQLite 3 unavailable; falling back to SQLite 2.'
   begin
-    CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
+    CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :database => ':memory:')
     CGI::Session::ActiveRecordStore::Session.connection
   rescue Object
     $stderr.puts 'SQLite 2 unavailable; skipping ActiveRecordStore test suite.'
@@ -68,13 +68,19 @@ class ActiveRecordStoreTest < Test::Unit::TestCase
     ENV['REQUEST_METHOD'] = 'GET'
     CGI::Session::ActiveRecordStore.session_class = session_class
 
-    @new_session = CGI::Session.new(CGI.new, 'database_manager' => CGI::Session::ActiveRecordStore, 'new_session' => true)
+    @cgi = CGI.new
+    @new_session = CGI::Session.new(@cgi, 'database_manager' => CGI::Session::ActiveRecordStore, 'new_session' => true)
     @new_session['foo'] = 'bar'
   end
 
+  def test_another_instance
+    @another = CGI::Session.new(@cgi, 'session_id' => @new_session.session_id, 'database_manager' => CGI::Session::ActiveRecordStore)
+    assert_equal @new_session.session_id, @another.session_id
+  end
+
   def test_model_attribute
     assert_kind_of CGI::Session::ActiveRecordStore::Session, @new_session.model
-    assert_equal @new_session.model.data, @new_session.data
+    assert_equal({ 'foo' => 'bar' }, @new_session.model.data)
   end
 
   def teardown
@@ -98,7 +104,7 @@ class ColumnLimitTest < Test::Unit::TestCase
     too_big = ':(' * limit
     s = @session_class.new(:session_id => '666', :data => {'foo' => too_big})
     s.data
-    assert_raises(ActionController::SessionOverflowError) { s.save }
+    assert_raise(ActionController::SessionOverflowError) { s.save }
   end
 end
 
@@ -132,7 +138,7 @@ class SqlBypassActiveRecordStoreTest < ActiveRecordStoreTest
 
   def test_model_attribute
     assert_kind_of CGI::Session::ActiveRecordStore::SqlBypass, @new_session.model
-    assert_equal @new_session.model.data, @new_session.data
+    assert_equal({ 'foo' => 'bar' }, @new_session.model.data)
   end
 end
 

data/test/controller/flash_test.rb

@@ -31,7 +31,7 @@ class FlashTest < Test::Unit::TestCase
     def use_flash_and_keep_it
       @flash_copy = {}.update flash
       @flashy = flash["that"]
-      keep_flash
+      silence_warnings { keep_flash }
       render :inline => "hello"
     end
 

data/test/controller/helper_test.rb

@@ -14,6 +14,14 @@ module Fun
 
     def rescue_action(e) raise end
   end
+
+  class PDFController < ActionController::Base
+    def test
+      render :inline => "test: <%= foobar %>"
+    end
+
+    def rescue_action(e) raise end
+  end
 end
 
 module LocalAbcHelper
@@ -100,11 +108,19 @@ class HelperTest < Test::Unit::TestCase
   end
 
   def test_helper_for_nested_controller
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @request.action = "render_hello_world"
-    
-    assert_equal "hello: Iz guuut!", Fun::GamesController.process(@request, @response).body
+    request  = ActionController::TestRequest.new
+    response = ActionController::TestResponse.new
+    request.action = 'render_hello_world'
+
+    assert_equal 'hello: Iz guuut!', Fun::GamesController.process(request, response).body
+  end
+
+  def test_helper_for_acronym_controller
+    request  = ActionController::TestRequest.new
+    response = ActionController::TestResponse.new
+    request.action = 'test'
+
+    assert_equal 'test: baz', Fun::PDFController.process(request, response).body
   end
 
   private

data/test/controller/new_render_test.rb

@@ -43,6 +43,22 @@ class NewRenderTestController < ActionController::Base
   def render_custom_code
     render :text => "hello world", :status => "404 Moved"
   end
+
+  def render_file_with_instance_variables
+    @secret = 'in the sauce'
+    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.rhtml')
+    render :file => path
+  end
+
+  def render_file_with_locals
+    path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.rhtml')
+    render :file => path, :locals => {:secret => 'in the sauce'} 
+  end
+
+  def render_file_not_using_full_path
+    @secret = 'in the sauce'
+    render :file => 'test/render_file_with_ivar', :use_full_path => true
+  end
   
   def render_xml_hello
     @name = "David"
@@ -242,6 +258,21 @@ class NewRenderTest < Test::Unit::TestCase
     assert_response :missing
   end
 
+  def test_render_file_with_instance_variables
+    get :render_file_with_instance_variables
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
+  def test_render_file_not_using_full_path
+    get :render_file_not_using_full_path 
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
+  def test_render_file_with_locals
+    get :render_file_with_locals
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
   def test_attempt_to_access_object_method
     assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
   end

data/test/controller/request_test.rb

@@ -100,6 +100,11 @@ class RequestTest < Test::Unit::TestCase
     @request.relative_url_root = nil
     @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
     assert_equal "/collaboration/hieraki", @request.relative_url_root    
+    
+    # apache/scgi case
+    @request.relative_url_root = nil
+    @request.env['SCRIPT_NAME'] = "/collaboration/hieraki"
+    assert_equal "/collaboration/hieraki", @request.relative_url_root    
   end
   
   def test_request_uri

data/test/fixtures/helpers/fun/pdf_helper.rb

@@ -0,0 +1,3 @@
+module Fun::PDFHelper
+  def foobar() 'baz' end
+end

data/test/fixtures/test/render_file_with_ivar.rhtml

@@ -0,0 +1 @@
+The secret is <%= @secret %>

data/test/fixtures/test/render_file_with_locals.rhtml

@@ -0,0 +1 @@
+The secret is <%= secret %>

data/test/template/form_options_helper_test.rb

@@ -103,25 +103,35 @@ class FormOptionsHelperTest < Test::Unit::TestCase
         options_for_select([ "ruby", "rubyonrails" ], "ruby")
       )
   end
-  
+
   def test_hash_options_for_select
     assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" })
     )
-  end
-
-  def test_hash_options_for_select_with_selection
     assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar")
     )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ])
+    )
   end
 
-  def test_hash_options_for_select_with_selection
+  def test_ducktyped_options_for_select
+    quack = Struct.new(:first, :last)
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")])
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], "Dollar")
+    )
     assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ])
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], ["Dollar", "<Kroner>"])
     )
   end
 

data/test/template/text_helper_test.rb

@@ -161,6 +161,13 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal %(<p><a href="#{url1}">#{url1}</a><br /><a href="#{url2}">#{url2}</a><br /></p>), auto_link("<p>#{url1}<br />#{url2}<br /></p>")
   end
 
+  def test_auto_link_with_block
+    url = "http://api.rubyonrails.com/Foo.html"
+    email = "fantabulous@shiznadel.ic"
+
+    assert_equal %(<p><a href="#{url}">#{url[0..7]}...</a><br /><a href="mailto:#{email}">#{email[0..7]}...</a><br /></p>), auto_link("<p>#{url}<br />#{email}<br /></p>") { |url| truncate(url, 10) }
+  end
+
   def test_sanitize_form
     raw = "<form action=\"/foo/bar\" method=\"post\"><input></form>"
     result = sanitize(raw)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.11.0
-date: 2005-11-07 00:00:00 +01:00
+  version: 1.11.1
+date: 2005-12-07 00:00:00 -06:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib
@@ -107,6 +107,7 @@ files:
   - lib/action_controller/vendor/html-scanner/html
   - lib/action_controller/vendor/html-scanner/html/document.rb
   - lib/action_controller/vendor/html-scanner/html/node.rb
+  - lib/action_controller/vendor/html-scanner/html/node.rb.rej
   - lib/action_controller/vendor/html-scanner/html/tokenizer.rb
   - lib/action_controller/vendor/html-scanner/html/version.rb
   - lib/action_pack/version.rb
@@ -194,6 +195,7 @@ files:
   - test/fixtures/helpers/abc_helper.rb
   - test/fixtures/helpers/fun
   - test/fixtures/helpers/fun/games_helper.rb
+  - test/fixtures/helpers/fun/pdf_helper.rb
   - test/fixtures/layouts/builder.rxml
   - test/fixtures/layouts/standard.rhtml
   - test/fixtures/layouts/talk_from_action.rhtml
@@ -219,6 +221,8 @@ files:
   - test/fixtures/test/hello_xml_world.rxml
   - test/fixtures/test/list.rhtml
   - test/fixtures/test/potential_conflicts.rhtml
+  - test/fixtures/test/render_file_with_ivar.rhtml
+  - test/fixtures/test/render_file_with_locals.rhtml
   - test/fixtures/test/render_to_string_test.rhtml
   - test/fixtures/test/update_element_with_capture.rhtml
   - test/template/active_record_helper_test.rb
@@ -267,5 +271,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.2.3
+            version: 1.2.4
       version: