actionpack 1.12.3 → 1.12.4

data/test/controller/filter_params_test.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class FilterParamController < ActionController::Base
+end
+
+class FilterParamTest < Test::Unit::TestCase
+  def setup
+    @controller = FilterParamController.new
+  end
+  
+  def test_filter_parameters
+    assert FilterParamController.respond_to?(:filter_parameter_logging)
+    assert !@controller.respond_to?(:filter_parameters)
+    
+    FilterParamController.filter_parameter_logging
+    assert @controller.respond_to?(:filter_parameters)
+    
+    test_hashes = [[{},{},[]],
+    [{'foo'=>'bar'},{'foo'=>'bar'},[]],
+    [{'foo'=>'bar'},{'foo'=>'bar'},%w'food'],
+    [{'foo'=>'bar'},{'foo'=>'[FILTERED]'},%w'foo'],
+    [{'foo'=>'bar', 'bar'=>'foo'},{'foo'=>'[FILTERED]', 'bar'=>'foo'},%w'foo baz'],
+    [{'foo'=>'bar', 'baz'=>'foo'},{'foo'=>'[FILTERED]', 'baz'=>'[FILTERED]'},%w'foo baz'],
+    [{'bar'=>{'foo'=>'bar','bar'=>'foo'}},{'bar'=>{'foo'=>'[FILTERED]','bar'=>'foo'}},%w'fo'],
+    [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana']]
+    
+    test_hashes.each do |before_filter, after_filter, filter_words|
+      FilterParamController.filter_parameter_logging(*filter_words)
+      assert_equal after_filter, @controller.filter_parameters(before_filter)
+      
+      filter_words.push('blah')
+      FilterParamController.filter_parameter_logging(*filter_words) do |key, value|
+        value.reverse! if key =~ /bargain/
+      end
+
+      before_filter['barg'] = {'bargain'=>'gain', 'blah'=>'bar', 'bar'=>{'bargain'=>{'blah'=>'foo'}}}
+      after_filter['barg'] = {'bargain'=>'niag', 'blah'=>'[FILTERED]', 'bar'=>{'bargain'=>{'blah'=>'[FILTERED]'}}}
+
+      assert_equal after_filter, @controller.filter_parameters(before_filter)
+    end
+  end
+end

data/test/controller/send_file_test.rb

@@ -85,11 +85,25 @@ class SendFileTest < Test::Unit::TestCase
     assert_equal 'type', h['Content-Type']
     assert_equal 'disposition; filename="filename"', h['Content-Disposition']
     assert_equal 'binary', h['Content-Transfer-Encoding']
-    
+
     # test overriding Cache-Control: no-cache header to fix IE open/save dialog
     @controller.headers = { 'Cache-Control' => 'no-cache' }
     @controller.send(:send_file_headers!, options)
     h = @controller.headers
     assert_equal 'private', h['Cache-Control']
   end
+
+  %w(file data).each do |method|
+    define_method "test_send_#{method}_status" do
+      @controller.options = { :stream => false, :status => 500 }
+      assert_nothing_raised { assert_not_nil process(method) }
+      assert_equal '500', @controller.headers['Status']
+    end
+
+    define_method "test_default_send_#{method}_status" do
+      @controller.options = { :stream => false }
+      assert_nothing_raised { assert_not_nil process(method) }
+      assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @controller.headers['Status']
+    end
+  end
 end

data/test/template/compiled_templates_test.rb

@@ -0,0 +1,134 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper'
+require File.dirname(__FILE__) + "/../abstract_unit"
+
+class CompiledTemplateTests < Test::Unit::TestCase
+
+  def setup
+    @ct = ActionView::CompiledTemplates.new
+    @v = Class.new
+    @v.send :include, @ct
+    @a = './test_compile_template_a.rhtml'
+    @b = './test_compile_template_b.rhtml'
+    @s = './test_compile_template_link.rhtml'
+  end
+  def teardown
+    [@a, @b, @s].each do |f|
+      `rm #{f}` if File.exist?(f) || File.symlink?(f)
+    end
+  end
+  attr_reader :ct, :v
+
+  def test_name_allocation
+    hi_world = ct.method_names['hi world']
+    hi_sexy = ct.method_names['hi sexy']
+    wish_upon_a_star = ct.method_names['I love seeing decent error messages']
+    
+    assert_equal hi_world, ct.method_names['hi world']
+    assert_equal hi_sexy, ct.method_names['hi sexy']
+    assert_equal wish_upon_a_star, ct.method_names['I love seeing decent error messages']
+    assert_equal 3, [hi_world, hi_sexy, wish_upon_a_star].uniq.length
+  end
+
+  def test_wrap_source
+    assert_equal(
+      "def aliased_assignment(value)\nself.value = value\nend",
+      @ct.wrap_source(:aliased_assignment, [:value], 'self.value = value')
+    )
+
+    assert_equal(
+      "def simple()\nnil\nend",
+      @ct.wrap_source(:simple, [], 'nil')
+    )
+  end
+
+  def test_compile_source_single_method
+    selector = ct.compile_source('doubling method', [:a], 'a + a')
+    assert_equal 2, @v.new.send(selector, 1)
+    assert_equal 4, @v.new.send(selector, 2)
+    assert_equal -4, @v.new.send(selector, -2)
+    assert_equal 0, @v.new.send(selector, 0)
+    selector
+  end
+
+  def test_compile_source_two_method
+    sel1 = test_compile_source_single_method # compile the method in the other test
+    sel2 = ct.compile_source('doubling method', [:a, :b], 'a + b + a + b')
+    assert_not_equal sel1, sel2
+
+    assert_equal 2, @v.new.send(sel1, 1)
+    assert_equal 4, @v.new.send(sel1, 2)
+
+    assert_equal 6, @v.new.send(sel2, 1, 2)
+    assert_equal 32, @v.new.send(sel2, 15, 1)
+  end
+
+  def test_mtime
+    t1 = Time.now
+    test_compile_source_single_method
+    assert (t1..Time.now).include?(ct.mtime('doubling method', [:a]))
+  end
+
+  def test_compile_time
+    `echo '#{@a}' > #{@a}; echo '#{@b}' > #{@b}; ln -s #{@a} #{@s}`
+
+    v = ActionView::Base.new
+    v.base_path = '.'
+    v.cache_template_loading = false;
+
+    sleep 1
+    t = Time.now
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    a_n = v.method_names[@a]
+    b_n = v.method_names[@b]
+    s_n = v.method_names[@s]
+    # all of the files have changed since last compile
+    assert v.compile_time[a_n] > t
+    assert v.compile_time[b_n] > t
+    assert v.compile_time[s_n] > t
+
+    sleep 1
+    t = Time.now
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    # none of the files have changed since last compile
+    assert v.compile_time[a_n] < t
+    assert v.compile_time[b_n] < t
+    assert v.compile_time[s_n] < t
+
+    `rm #{@s}; ln -s #{@b} #{@s}`
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    # the symlink has changed since last compile
+    assert v.compile_time[a_n] < t
+    assert v.compile_time[b_n] < t
+    assert v.compile_time[s_n] > t
+
+    sleep 1
+    `touch #{@b}`
+    t = Time.now
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    # 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
+    assert v.compile_time[b_n] > t
+    assert v.compile_time[s_n] > t
+  end
+end
+
+module ActionView
+  class Base
+    def compile_time
+      @@compile_time
+    end
+    def method_names
+      @@method_names
+    end
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.12.3
-date: 2006-06-29 00:00:00 -05:00
+  version: 1.12.4
+date: 2006-08-09 00:00:00 -06:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
 - lib
@@ -25,9 +25,11 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - David Heinemeier Hansson
 files: 
+- filler
 - Rakefile
 - install.rb
 - README
@@ -160,6 +162,7 @@ files:
 - test/controller/cookie_test.rb
 - test/controller/custom_handler_test.rb
 - test/controller/fake_controllers.rb
+- test/controller/filter_params_test.rb
 - test/controller/filters_test.rb
 - test/controller/flash_test.rb
 - test/controller/fragment_store_setting_test.rb
@@ -281,7 +284,7 @@ files:
 - test/template/active_record_helper_test.rb
 - test/template/asset_tag_helper_test.rb
 - test/template/benchmark_helper_test.rb
-- test/template/compiled_templates_tests.rb
+- test/template/compiled_templates_test.rb
 - test/template/date_helper_test.rb
 - test/template/form_helper_test.rb
 - test/template/form_options_helper_test.rb

data/test/template/compiled_templates_tests.rb

@@ -1,63 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper'
-require File.dirname(__FILE__) + "/../abstract_unit"
-
-class CompiledTemplateTests < Test::Unit::TestCase
-
-  def setup
-    @ct = ActionView::CompiledTemplates.new
-    @v = Class.new
-    @v.send :include, @ct
-  end
-  attr_reader :ct, :v
-
-  def test_name_allocation
-    hi_world = ct.method_names['hi world']
-    hi_sexy = ct.method_names['hi sexy']
-    wish_upon_a_star = ct.method_names['I love seeing decent error messages']
-    
-    assert_equal hi_world, ct.method_names['hi world']
-    assert_equal hi_sexy, ct.method_names['hi sexy']
-    assert_equal wish_upon_a_star, ct.method_names['I love seeing decent error messages']
-    assert_equal 3, [hi_world, hi_sexy, wish_upon_a_star].uniq.length
-  end
-
-  def test_wrap_source
-    assert_equal(
-      "def aliased_assignment(value)\nself.value = value\nend",
-      @ct.wrap_source(:aliased_assignment, [:value], 'self.value = value')
-    )
-
-    assert_equal(
-      "def simple()\nnil\nend",
-      @ct.wrap_source(:simple, [], 'nil')
-    )
-  end
-
-  def test_compile_source_single_method
-    selector = ct.compile_source('doubling method', [:a], 'a + a')
-    assert_equal 2, @v.new.send(selector, 1)
-    assert_equal 4, @v.new.send(selector, 2)
-    assert_equal -4, @v.new.send(selector, -2)
-    assert_equal 0, @v.new.send(selector, 0)
-    selector
-  end
-
-  def test_compile_source_two_method
-    sel1 = test_compile_source_single_method # compile the method in the other test
-    sel2 = ct.compile_source('doubling method', [:a, :b], 'a + b + a + b')
-    assert_not_equal sel1, sel2
-
-    assert_equal 2, @v.new.send(sel1, 1)
-    assert_equal 4, @v.new.send(sel1, 2)
-
-    assert_equal 6, @v.new.send(sel2, 1, 2)
-    assert_equal 32, @v.new.send(sel2, 15, 1)
-  end
-
-  def test_mtime
-    t1 = Time.now
-    test_compile_source_single_method
-    assert (t1..Time.now).include?(ct.mtime('doubling method', [:a]))
-  end
-end