RubyGems - actionpack - Versions diffs - 2.0.1 → 2.0.2 - Mend

actionpack 2.0.1 → 2.0.2

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (40) hide show

data/CHANGELOG +59 -26
data/Rakefile +1 -1
data/lib/action_controller/base.rb +6 -16
data/lib/action_controller/benchmarking.rb +5 -4
data/lib/action_controller/caching.rb +2 -2
data/lib/action_controller/cgi_ext/cookie.rb +1 -5
data/lib/action_controller/cookies.rb +3 -3
data/lib/action_controller/dispatcher.rb +1 -1
data/lib/action_controller/helpers.rb +2 -3
data/lib/action_controller/integration.rb +29 -14
data/lib/action_controller/layout.rb +2 -1
data/lib/action_controller/request.rb +1 -1
data/lib/action_controller/request_forgery_protection.rb +7 -1
data/lib/action_controller/rescue.rb +1 -1
data/lib/action_controller/routing.rb +12 -9
data/lib/action_controller/session/cookie_store.rb +3 -0
data/lib/action_pack/version.rb +1 -1
data/lib/action_view.rb +6 -0
data/lib/action_view/base.rb +83 -140
data/lib/action_view/helpers/asset_tag_helper.rb +68 -46
data/lib/action_view/helpers/text_helper.rb +2 -2
data/lib/action_view/template_handler.rb +17 -0
data/lib/action_view/template_handlers/builder.rb +19 -0
data/lib/action_view/template_handlers/erb.rb +21 -0
data/lib/action_view/template_handlers/rjs.rb +14 -0
data/test/action_view_test.rb +18 -0
data/test/controller/cgi_test.rb +4 -4
data/test/controller/cookie_test.rb +1 -1
data/test/controller/filters_test.rb +1 -0
data/test/controller/helper_test.rb +8 -6
data/test/controller/integration_test.rb +41 -11
data/test/controller/new_render_test.rb +2 -2
data/test/controller/render_test.rb +31 -10
data/test/controller/request_test.rb +2 -1
data/test/controller/routing_test.rb +9 -3
data/test/fixtures/test/{hello_world.builder → hello_world_from_rxml.builder} +0 -0
data/test/template/asset_tag_helper_test.rb +45 -12
data/test/template/compiled_templates_test.rb +14 -12
data/test/template/erb_util_test.rb +56 -0
metadata +56 -43

data/test/controller/render_test.rb CHANGED Viewed

@@ -9,6 +9,7 @@ module Fun
 end
+# FIXME: crashes Ruby 1.9
 class TestController < ActionController::Base
   layout :determine_layout
@@ -44,6 +45,10 @@ class TestController < ActionController::Base
     render :json => {:hello => 'world'}.to_json, :callback => 'alert'
   end
+  def render_json_with_custom_content_type
+    render :json => {:hello => 'world'}.to_json, :content_type => 'text/javascript'
+  end
   def render_symbol_json
     render :json => {:hello => 'world'}.to_json
   end
@@ -65,6 +70,10 @@ class TestController < ActionController::Base
     render :template => "test/hello"
   end
+  def render_xml_with_custom_content_type
+    render :xml => "<blah/>", :content_type => "application/atomsvc+xml"
+  end
   def heading
     head :ok
   end
@@ -199,56 +208,62 @@ class RenderTest < Test::Unit::TestCase
     assert_template "test/hello_world"
   end
-  def test_do_with_render
+  def test_render
     get :render_hello_world
     assert_template "test/hello_world"
   end
-  def test_do_with_render_from_variable
+  def test_render_from_variable
     get :render_hello_world_from_variable
     assert_equal "hello david", @response.body
   end
-  def test_do_with_render_action
+  def test_render_action
     get :render_action_hello_world
     assert_template "test/hello_world"
   end
-  def test_do_with_render_action_with_symbol
+  def test_render_action_with_symbol
     get :render_action_hello_world_with_symbol
     assert_template "test/hello_world"
   end
-  def test_do_with_render_text
+  def test_render_text
     get :render_text_hello_world
     assert_equal "hello world", @response.body
   end
-  def test_do_with_render_json
+  def test_render_json
     get :render_json_hello_world
     assert_equal '{"hello": "world"}', @response.body
     assert_equal 'application/json', @response.content_type
   end
-  def test_do_with_render_json_with_callback
+  def test_render_json_with_callback
     get :render_json_hello_world_with_callback
     assert_equal 'alert({"hello": "world"})', @response.body
     assert_equal 'application/json', @response.content_type
   end
-  def test_do_with_render_symbol_json
+  def test_render_json_with_custom_content_type
+    get :render_json_with_custom_content_type
+    assert_equal '{"hello": "world"}', @response.body
+    assert_equal 'text/javascript', @response.content_type
+  end
+  def test_render_symbol_json
     get :render_symbol_json
     assert_equal '{"hello": "world"}', @response.body
     assert_equal 'application/json', @response.content_type
   end
-  def test_do_with_render_custom_code
+  def test_render_custom_code
     get :render_custom_code
     assert_response 404
     assert_equal 'hello world', @response.body
   end
-  def test_do_with_render_nothing_with_appendix
+  def test_render_nothing_with_appendix
     get :render_nothing_with_appendix
     assert_response 200
     assert_equal 'appended', @response.body
@@ -269,6 +284,7 @@ class RenderTest < Test::Unit::TestCase
   def test_render_xml
     get :render_xml_hello
     assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", @response.body
+    assert_equal "application/xml", @response.content_type
   end
   def test_render_xml_with_default
@@ -435,6 +451,11 @@ class RenderTest < Test::Unit::TestCase
     assert_equal %(Element.replace("foo", "partial html");), @response.body
   end
+  def test_should_render_xml_but_keep_custom_content_type
+    get :render_xml_with_custom_content_type
+    assert_equal "application/atomsvc+xml", @response.content_type
+  end
   protected
     def etag_for(text)

data/test/controller/request_test.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
+require 'action_controller/integration'
 class RequestTest < Test::Unit::TestCase
   def setup
@@ -315,7 +316,7 @@ class RequestTest < Test::Unit::TestCase
   def test_allow_method_hacking_on_post
     set_request_method_to :post
-    [:get, :head, :put, :post, :delete].each do |method|
+    [:get, :head, :options, :put, :post, :delete].each do |method|
       @request.instance_eval { @parameters = { :_method => method } ; @request_method = nil }
       assert_equal(method == :head ? :get : method, @request.method)
     end

data/test/controller/routing_test.rb CHANGED Viewed

@@ -2,6 +2,12 @@ require "#{File.dirname(__FILE__)}/../abstract_unit"
 require "#{File.dirname(__FILE__)}/fake_controllers"
 require 'action_controller/routing'
+class MilestonesController < ActionController::Base
+  def index() head :ok end
+  alias_method :show, :index
+  def rescue_action(e) raise e end
+end
 RunTimeTests = ARGV.include? 'time'
 ROUTING = ActionController::Routing
@@ -2023,14 +2029,14 @@ class RouteSetTest < Test::Unit::TestCase
   def test_named_route_in_nested_resource
     set.draw do |map|
       map.resources :projects do |project|
-        project.comments 'comments', :controller => 'comments', :action => 'index'
+        project.milestones 'milestones', :controller => 'milestones', :action => 'index'
       end
     end
-    request.path = "/projects/1/comments"
+    request.path = "/projects/1/milestones"
     request.method = :get
     assert_nothing_raised { set.recognize(request) }
-    assert_equal("comments", request.path_parameters[:controller])
+    assert_equal("milestones", request.path_parameters[:controller])
     assert_equal("index", request.path_parameters[:action])
   end

data/test/fixtures/test/{hello_world.builder → hello_world_from_rxml.builder} RENAMED Viewed

File without changes

data/test/template/asset_tag_helper_test.rb CHANGED Viewed

@@ -223,7 +223,6 @@ class AssetTagHelperTest < Test::Unit::TestCase
     assert_equal copy, source
   end
   def test_caching_javascript_include_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a%d.example.com'
@@ -234,20 +233,37 @@ class AssetTagHelperTest < Test::Unit::TestCase
       javascript_include_tag(:all, :cache => true)
     )
-    assert File.exists?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
     assert_dom_equal(
       %(<script src="http://a2.example.com/javascripts/money.js" type="text/javascript"></script>),
       javascript_include_tag(:all, :cache => "money")
     )
-    assert File.exists?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   ensure
     File.delete(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
     File.delete(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   end
+  def test_caching_javascript_include_tag_when_caching_on_with_proc_asset_host
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
+    ActionController::Base.perform_caching = true
+    assert_equal '/javascripts/scripts.js'.length, 23
+    assert_dom_equal(
+      %(<script src="http://a23.example.com/javascripts/scripts.js" type="text/javascript"></script>),
+      javascript_include_tag(:all, :cache => 'scripts')
+    )
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'scripts.js'))
+  ensure
+    File.delete(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'scripts.js'))
+  end
   def test_caching_javascript_include_tag_when_caching_on_and_using_subdirectory
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a%d.example.com'
@@ -258,7 +274,7 @@ class AssetTagHelperTest < Test::Unit::TestCase
       javascript_include_tag(:all, :cache => "cache/money")
     )
-    assert File.exists?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'cache', 'money.js'))
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'cache', 'money.js'))
   ensure
     File.delete(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'cache', 'money.js'))
   end
@@ -272,14 +288,14 @@ class AssetTagHelperTest < Test::Unit::TestCase
       javascript_include_tag(:all, :cache => true)
     )
-    assert !File.exists?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
     assert_dom_equal(
       %(<script src="/javascripts/application.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>),
       javascript_include_tag(:all, :cache => "money")
     )
-    assert !File.exists?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   end
   def test_caching_stylesheet_link_tag_when_caching_on
@@ -292,19 +308,36 @@ class AssetTagHelperTest < Test::Unit::TestCase
       stylesheet_link_tag(:all, :cache => true)
     )
-    assert File.exists?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
     assert_dom_equal(
       %(<link href="http://a3.example.com/stylesheets/money.css" media="screen" rel="stylesheet" type="text/css" />),
       stylesheet_link_tag(:all, :cache => "money")
     )
-    assert File.exists?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   ensure
     File.delete(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
     File.delete(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   end
+  def test_caching_stylesheet_link_tag_when_caching_on_with_proc_asset_host
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
+    ActionController::Base.perform_caching = true
+    assert_equal '/stylesheets/styles.css'.length, 23
+    assert_dom_equal(
+      %(<link href="http://a23.example.com/stylesheets/styles.css" media="screen" rel="stylesheet" type="text/css" />),
+      stylesheet_link_tag(:all, :cache => 'styles')
+    )
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'styles.css'))
+  ensure
+    File.delete(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'styles.css'))
+  end
   def test_caching_stylesheet_include_tag_when_caching_off
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.perform_caching = false
@@ -314,14 +347,14 @@ class AssetTagHelperTest < Test::Unit::TestCase
       stylesheet_link_tag(:all, :cache => true)
     )
-    assert !File.exists?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
     assert_dom_equal(
       %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />),
       stylesheet_link_tag(:all, :cache => "money")
     )
-    assert !File.exists?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   end
 end

data/test/template/compiled_templates_test.rb CHANGED Viewed

@@ -95,11 +95,13 @@ class CompiledTemplateTests < Test::Unit::TestCase
     assert v.send(:compile_template?, nil, @b, {})
     assert v.send(:compile_template?, nil, @s, {}) unless windows
+    @handler = ActionView::Base.handler_for_extension(:rhtml)
     # All templates are rendered at t+2
     Time.expects(:now).times(windows ? 2 : 3).returns(t + 2.seconds)
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s) unless windows
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s) unless windows
     a_n = v.method_names[@a]
     b_n = v.method_names[@b]
     s_n = v.method_names[@s] unless windows
@@ -117,9 +119,9 @@ class CompiledTemplateTests < Test::Unit::TestCase
     assert !v.send(:compile_template?, nil, @a, {})
     assert !v.send(:compile_template?, nil, @b, {})
     assert !v.send(:compile_template?, nil, @s, {}) unless windows
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s)  unless windows
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s)  unless windows
     # none of the files have changed since last compile
     assert v.compile_time[a_n] < t + 3.seconds
     assert v.compile_time[b_n] < t + 3.seconds
@@ -142,9 +144,9 @@ class CompiledTemplateTests < Test::Unit::TestCase
     # Only the symlink template gets rendered at t+3
     Time.stubs(:now).returns(t + 3.seconds) unless windows
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s) unless windows
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s) unless windows
     # the symlink has changed since last compile
     assert v.compile_time[a_n] < t + 3.seconds
     assert v.compile_time[b_n] < t + 3.seconds
@@ -167,9 +169,9 @@ class CompiledTemplateTests < Test::Unit::TestCase
     assert v.send(:compile_template?, nil, @s, {}) unless windows
     Time.expects(:now).times(windows ? 1 : 2).returns(t + 5.seconds)
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s) unless windows
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s) unless windows
     # the file at the end of the symlink has changed since last compile
     # both the symlink and the file at the end of it should be recompiled
     assert v.compile_time[a_n] < t + 5.seconds

data/test/template/erb_util_test.rb ADDED Viewed

@@ -0,0 +1,56 @@
+require "#{File.dirname(__FILE__)}/../abstract_unit"
+class ErbUtilTest < Test::Unit::TestCase
+  include ERB::Util
+  def test_amp
+    assert_equal '&amp;', html_escape('&')
+  end
+  def test_quot
+    assert_equal '&quot;', html_escape('"')
+  end
+  def test_lt
+    assert_equal '&lt;', html_escape('<')
+  end
+  def test_gt
+    assert_equal '&gt;', html_escape('>')
+  end
+  def test_rest_in_ascii
+    (0..127).to_a.map(&:chr).each do |chr|
+      next if %w(& " < >).include?(chr)
+      assert_equal chr, html_escape(chr)
+    end
+  end
+end
+require "#{File.dirname(__FILE__)}/../abstract_unit"
+class ErbUtilTest < Test::Unit::TestCase
+  include ERB::Util
+  def test_amp
+    assert_equal '&amp;', html_escape('&')
+  end
+  def test_quot
+    assert_equal '&quot;', html_escape('"')
+  end
+  def test_lt
+    assert_equal '&lt;', html_escape('<')
+  end
+  def test_gt
+    assert_equal '&gt;', html_escape('>')
+  end
+  def test_rest_in_ascii
+    (0..127).to_a.map(&:chr).each do |chr|
+      next if %w(& " < >).include?(chr)
+      assert_equal chr, html_escape(chr)
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,33 +1,34 @@
 --- !ruby/object:Gem::Specification
-rubygems_version: 0.9.4
-specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-date: 2007-12-07 00:00:00 -06:00
-summary: Web-flow and rendering framework putting the VC in MVC.
-require_paths:
-- lib
-email: david@loudthinking.com
-homepage: http://www.rubyonrails.org
-rubyforge_project: actionpack
-description: 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.
-autorequire: action_controller
-default_executable:
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement
-  requirements:
-  - - ">"
-    - !ruby/object:Gem::Version
-      version: 0.0.0
-  version:
+  version: 2.0.2
 platform: ruby
-signing_key:
-cert_chain:
-post_install_message:
 authors:
 - David Heinemeier Hansson
+autorequire: action_controller
+bindir: bin
+cert_chain: []
+date: 2007-12-16 00:00:00 -06:00
+default_executable:
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    version:
+description: 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.
+email: david@loudthinking.com
+executables: []
+extensions: []
+extra_rdoc_files: []
 files:
 - Rakefile
 - install.rb
@@ -144,6 +145,11 @@ files:
 - lib/action_view/helpers/url_helper.rb
 - lib/action_view/partials.rb
 - lib/action_view/template_error.rb
+- lib/action_view/template_handler.rb
+- lib/action_view/template_handlers
+- lib/action_view/template_handlers/builder.rb
+- lib/action_view/template_handlers/erb.rb
+- lib/action_view/template_handlers/rjs.rb
 - lib/action_view.rb
 - lib/actionpack.rb
 - test/abstract_unit.rb
@@ -352,9 +358,9 @@ files:
 - test/fixtures/test/formatted_xml_erb.xml.erb
 - test/fixtures/test/greeting.erb
 - test/fixtures/test/hello.builder
-- test/fixtures/test/hello_world.builder
 - test/fixtures/test/hello_world.erb
 - test/fixtures/test/hello_world_container.builder
+- test/fixtures/test/hello_world_from_rxml.builder
 - test/fixtures/test/hello_world_with_layout_false.erb
 - test/fixtures/test/hello_xml_world.builder
 - test/fixtures/test/list.erb
@@ -374,6 +380,7 @@ files:
 - test/template/benchmark_helper_test.rb
 - test/template/compiled_templates_test.rb
 - test/template/date_helper_test.rb
+- test/template/erb_util_test.rb
 - test/template/form_helper_test.rb
 - test/template/form_options_helper_test.rb
 - test/template/form_tag_helper_test.rb
@@ -386,25 +393,31 @@ files:
 - test/template/text_helper_test.rb
 - test/template/url_helper_test.rb
 - test/testing_sandbox.rb
-test_files: []
+has_rdoc: true
+homepage: http://www.rubyonrails.org
+post_install_message:
 rdoc_options: []
-extra_rdoc_files: []
-executables: []
-extensions: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
 requirements:
 - none
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - "="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-    version:
+rubyforge_project: actionpack
+rubygems_version: 0.9.5
+signing_key:
+specification_version: 2
+summary: Web-flow and rendering framework putting the VC in MVC.
+test_files: []