actionpack 2.0.2 → 2.0.4

data/test/template/compiled_templates_test.rb

@@ -64,8 +64,12 @@ class CompiledTemplateTests < Test::Unit::TestCase
 
   def test_mtime
     t1 = Time.now
+
     test_compile_source_single_method
-    assert (t1..Time.now).include?(ct.mtime('doubling method', [:a]))
+    mtime = ct.mtime('doubling method', [:a])
+
+    assert mtime < Time.now
+    assert mtime > t1
   end
 
   uses_mocha 'test_compile_time' do

data/test/template/date_helper_test.rb

@@ -1395,7 +1395,7 @@ class DateHelperTest < Test::Unit::TestCase
 
     expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
     expected << %(<option value=""></option>\n)
-    2002.upto(2012) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
+    (Time.now.year - 5).upto(Time.now.year + 5) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
     expected << "</select>\n"
     expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
     expected << %(<option value=""></option>\n)

data/test/template/deprecate_ivars_test.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class DeprecateIvars < ActionController::Base
+  def use_logger
+    render :inline => "<%= logger.class -%>"
+  end
+  
+  def use_old_logger
+    render :inline => "<%= @logger.class -%>"
+  end
+  
+  def use_action_name
+    render :inline => "<%= action_name -%>"
+  end
+  
+  def use_old_action_name
+    render :inline => "<%= @action_name -%>"
+  end
+end
+
+class DeprecateIvarsTest < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    
+    @controller = DeprecateIvars.new
+    @controller.logger = Logger.new(nil)
+    
+    @request.host = "rubyonrails.com"
+  end
+  
+  def test_logger
+    assert_not_deprecated { get :use_logger }
+    assert_equal "Logger", @response.body
+  end
+  
+  def test_deprecated_logger
+    assert_deprecated { get :use_old_logger }
+    assert_equal "Logger", @response.body
+  end
+  
+  def test_action_name
+    assert_not_deprecated { get :use_action_name }
+    assert_equal "use_action_name", @response.body
+  end
+  
+  def test_deprecated_action_name
+    assert_deprecated { get :use_old_action_name }
+    assert_equal "use_old_action_name", @response.body
+  end
+end

data/test/template/form_options_helper_test.rb

@@ -109,6 +109,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
       )
   end
 
+  # FIXME: fails on Ruby 1.9, probably in html-scanner
   def test_hash_options_for_select
     assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
@@ -1293,4 +1294,32 @@ COUNTRIES
                  "</select>",
                  html
   end
+
+  def test_time_zone_select_with_default_time_zone_and_nil_value
+     @firm = Firm.new()
+     @firm.time_zone = nil
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                   "<option value=\"A\">A</option>\n" +
+                   "<option value=\"B\" selected=\"selected\">B</option>\n" +
+                   "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\">D</option>\n" +
+                   "<option value=\"E\">E</option>" +
+                   "</select>",
+                   html
+  end
+
+  def test_time_zone_select_with_default_time_zone_and_value
+     @firm = Firm.new('D')
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                   "<option value=\"A\">A</option>\n" +
+                   "<option value=\"B\">B</option>\n" +
+                   "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                   "<option value=\"E\">E</option>" +
+                   "</select>",
+                   html
+  end
+
 end

data/test/template/form_tag_helper_test.rb

@@ -188,6 +188,24 @@ class FormTagHelperTest < Test::Unit::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_label_tag_without_text
+    actual = label_tag "title"
+    expected = %(<label for="title">Title</label>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_label_tag_with_text
+    actual = label_tag "title", "My Title"
+    expected = %(<label for="title">My Title</label>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_label_tag_class_string
+    actual = label_tag "title", "My Title", "class" => "small_label"
+    expected = %(<label for="title" class="small_label">My Title</label>)
+    assert_dom_equal expected, actual
+  end
+
   def test_boolean_optios
     assert_dom_equal %(<input checked="checked" disabled="disabled" id="admin" name="admin" readonly="readonly" type="checkbox" value="1" />), check_box_tag("admin", 1, true, 'disabled' => true, :readonly => "yes")
     assert_dom_equal %(<input checked="checked" id="admin" name="admin" type="checkbox" value="1" />), check_box_tag("admin", 1, true, :disabled => false, :readonly => nil)

data/test/template/number_helper_test.rb

@@ -87,6 +87,7 @@ class NumberHelperTest < Test::Unit::TestCase
     assert_equal '1.01 KB',   number_to_human_size(1.0100.kilobytes, 4)
     assert_equal '10 KB',   number_to_human_size(10.000.kilobytes, 4)
     assert_equal '1 Byte',   number_to_human_size(1.1)
+    assert_equal '10 Bytes', number_to_human_size(10)
     assert_nil number_to_human_size('x')
     assert_nil number_to_human_size(nil)
   end

data/test/template/text_helper_test.rb

@@ -1,5 +1,5 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
-require "#{File.dirname(__FILE__)}/../testing_sandbox"
+require 'abstract_unit'
+require 'testing_sandbox'
 
 class TextHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TextHelper
@@ -36,16 +36,26 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal str[0...27] + "...", truncate(str)
   end
 
-  def test_truncate_multibyte
-    with_kcode 'none' do
-      assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10) 
+  if RUBY_VERSION < '1.9.0'
+    def test_truncate_multibyte
+      with_kcode 'none' do
+        assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10) 
+      end
+      with_kcode 'u' do
+        assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
+          truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244", 10)
+      end
     end
-    with_kcode 'u' do
-      assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
-        truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244", 10)
+  else
+    def test_truncate_multibyte
+      assert_equal "\354\225\210\353\205\225\355...",
+        truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10)
+
+      assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
+        truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8'), 10)
     end
   end
-  
+
   def test_highlighter
     assert_equal(
       "This is a <strong class=\"highlight\">beautiful</strong> morning",
@@ -103,15 +113,22 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal('...is a beautiful? morn...', excerpt('This is a beautiful? morning', 'beautiful', 5))
   end
 
-  def test_excerpt_with_utf8
-    with_kcode('u') do
-      assert_equal("...fficiency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
+  if RUBY_VERSION < '1.9'
+    def test_excerpt_with_utf8
+      with_kcode('u') do
+        assert_equal("...fficiency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
+      end
+      with_kcode('none') do
+        assert_equal("...\203ciency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
+      end
     end
-    with_kcode('none') do
+  else
+    def test_excerpt_with_utf8
+      assert_equal("...fficiency could not be h...".force_encoding('UTF-8'), excerpt("That's why efficiency could not be helped".force_encoding('UTF-8'), 'could', 8))
       assert_equal("...\203ciency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
     end
   end
-    
+
   def test_word_wrap
     assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", 15))
   end
@@ -158,6 +175,7 @@ class TextHelperTest < Test::Unit::TestCase
               http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
               http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
               http://www.mail-archive.com/rails@lists.rubyonrails.org/
+              http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
             )
 
     urls.each do |url|

data/test/template/url_helper_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 
 RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)
 

data/test/testing_sandbox.rb

@@ -1,11 +1,15 @@
 module TestingSandbox
   # Temporarily replaces KCODE for the block
   def with_kcode(kcode)
-    old_kcode, $KCODE = $KCODE, kcode
-    begin
+    if RUBY_VERSION < '1.9'
+      old_kcode, $KCODE = $KCODE, kcode
+      begin
+        yield
+      ensure
+        $KCODE = old_kcode
+      end
+    else
       yield
-    ensure
-      $KCODE = old_kcode
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,17 +9,18 @@ autorequire: action_controller
 bindir: bin
 cert_chain: []
 
-date: 2007-12-16 00:00:00 -06:00
+date: 2008-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     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
@@ -157,6 +158,7 @@ files:
 - test/active_record_unit.rb
 - test/activerecord
 - test/activerecord/active_record_store_test.rb
+- test/activerecord/fixtures_test.rb
 - test/activerecord/render_partial_with_record_identification_test.rb
 - test/controller
 - test/controller/action_pack_assertions_test.rb
@@ -262,7 +264,9 @@ files:
 - test/fixtures/layout_tests/views
 - test/fixtures/layout_tests/views/hello.rhtml
 - test/fixtures/layouts
+- test/fixtures/layouts/block_with_layout.erb
 - test/fixtures/layouts/builder.builder
+- test/fixtures/layouts/partial_with_layout.erb
 - test/fixtures/layouts/standard.erb
 - test/fixtures/layouts/talk_from_action.erb
 - test/fixtures/layouts/yield.erb
@@ -380,6 +384,7 @@ files:
 - test/template/benchmark_helper_test.rb
 - test/template/compiled_templates_test.rb
 - test/template/date_helper_test.rb
+- test/template/deprecate_ivars_test.rb
 - test/template/erb_util_test.rb
 - test/template/form_helper_test.rb
 - test/template/form_options_helper_test.rb
@@ -415,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 0.9.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Web-flow and rendering framework putting the VC in MVC.