actionpack 2.3.8.pre1 → 2.3.8

data/lib/action_view/helpers/form_tag_helper.rb

@@ -265,7 +265,7 @@ module ActionView
         escape = options.key?("escape") ? options.delete("escape") : true
         content = html_escape(content) if escape
 
-        content_tag :textarea, content.html_safe, { "name" => name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
+        content_tag :textarea, content.to_s.html_safe, { "name" => name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
       end
 
       # Creates a check box form input tag.

data/lib/action_view/helpers/translation_helper.rb

@@ -11,13 +11,22 @@ module ActionView
       # to translate many keys within the same partials and gives you a simple framework for scoping them consistently. If you don't
       # prepend the key with a period, nothing is converted.
       def translate(keys, options = {})
-        options[:raise]  = true
-        are_keys_a_string  = keys.is_a?(String)
+        if multiple_keys = keys.is_a?(Array)
+          ActiveSupport::Deprecation.warn "Giving an array to translate is deprecated, please give a symbol or a string instead", caller
+        end
+
+        options[:raise] = true
         keys = scope_keys_by_partial(keys)
 
         translations = I18n.translate(keys, options)
-        translations = html_safe_translation_keys(keys, Array.wrap(translations))
-        are_keys_a_string ? translations.first : translations
+        translations = [translations] if !multiple_keys && translations.size > 1
+        translations = html_safe_translation_keys(keys, translations)
+
+        if multiple_keys || translations.size > 1
+          translations
+        else
+          translations.first
+        end
       rescue I18n::MissingTranslationData => e
         keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
         content_tag('span', keys.join(', '), :class => 'translation_missing')
@@ -34,8 +43,10 @@ module ActionView
       private
         def scope_keys_by_partial(keys)
           Array.wrap(keys).map do |key|
-            if key.to_s.first == "."
-              template.path_without_format_and_extension.gsub(%r{/_?}, ".") + key.to_s
+            key = key.to_s
+
+            if key.first == "."
+              template.path_without_format_and_extension.gsub(%r{/_?}, ".") + key
             else
               key
             end
@@ -44,7 +55,11 @@ module ActionView
 
         def html_safe_translation_keys(keys, translations)
           keys.zip(translations).map do |key, translation|
-            key =~ /(\b|_|\.)html$/ ? translation.html_safe : translation
+            if key =~ /(\b|_|\.)html$/ && translation.respond_to?(:html_safe)
+              translation.html_safe
+            else
+              translation
+            end
           end
         end
     end

data/test/active_record_unit.rb

@@ -16,7 +16,7 @@ if defined?(ActiveRecord) && defined?(Fixtures)
 else
   $stderr.print 'Attempting to load Active Record... '
   begin
-    PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
+    PATH_TO_AR = File.expand_path('../../../activerecord/lib', __FILE__)
     raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
     $LOAD_PATH.unshift PATH_TO_AR
     require 'active_record'

data/test/controller/assert_select_test.rb

@@ -210,13 +210,13 @@ class AssertSelectTest < ActionController::TestCase
       assert_nothing_raised    { assert_select "div", "foo" }
       assert_nothing_raised    { assert_select "div", "bar" }
       assert_nothing_raised    { assert_select "div", /\w*/ }
-      assert_nothing_raised    { assert_select "div", /\w*/, :count=>2 }
-      assert_raise(Assertion) { assert_select "div", :text=>"foo", :count=>2 }
+      assert_nothing_raised    { assert_select "div", :text => /\w*/, :count=>2 }
+      assert_raise(Assertion)  { assert_select "div", :text=>"foo", :count=>2 }
       assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
       assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
       assert_nothing_raised    { assert_select "div", :html=>/\w*/ }
       assert_nothing_raised    { assert_select "div", :html=>/\w*/, :count=>2 }
-      assert_raise(Assertion) { assert_select "div", :html=>"<span>foo</span>", :count=>2 }
+      assert_raise(Assertion)  { assert_select "div", :html=>"<span>foo</span>", :count=>2 }
     end
   end
 
@@ -268,8 +268,8 @@ class AssertSelectTest < ActionController::TestCase
 
   def test_css_select
     render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert 2, css_select("div").size
-    assert 0, css_select("p").size
+    assert_equal 2, css_select("div").size
+    assert_equal 0, css_select("p").size
   end
 
   def test_nested_css_select

data/test/controller/helper_test.rb

@@ -87,7 +87,7 @@ class HelperTest < Test::Unit::TestCase
     assert_nothing_raised {
       @controller_class.helper { include HelperTest::TestHelper }
     }
-    assert [], missing_methods
+    assert_equal [], missing_methods
   end
 
   def test_helper_method

data/test/template/form_tag_helper_test.rb

@@ -176,6 +176,12 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_text_area_tag_unescaped_nil_content
+    actual = text_area_tag "body", nil, :escape => false
+    expected = %(<textarea id="body" name="body"></textarea>)
+    assert_dom_equal expected, actual
+  end
+
   def test_text_field_tag
     actual = text_field_tag "title", "Hello!"
     expected = %(<input id="title" name="title" type="text" value="Hello!" />)

data/test/template/translation_helper_test.rb

@@ -9,7 +9,7 @@ class TranslationHelperTest < ActiveSupport::TestCase
   end
 
   def test_delegates_to_i18n_setting_the_raise_option
-    I18n.expects(:translate).with([:foo], :locale => 'en', :raise => true).returns([""])
+    I18n.expects(:translate).with(['foo'], :locale => 'en', :raise => true).returns([""])
     translate :foo, :locale => 'en'
   end
 
@@ -18,17 +18,33 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert_equal expected, translate(:foo)
   end
 
+  def test_translation_returning_an_array
+    I18n.expects(:translate).with(["foo"], :raise => true).returns(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(:foo)
+  end
+
   def test_translation_of_an_array
-    I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
-    assert_equal ["foo", "bar"], translate(["foo", "bar"])
+    assert_deprecated do
+      I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
+      assert_equal ["foo", "bar"], translate(["foo", "bar"])
+    end
+  end
+
+  def test_translation_of_an_array_returning_an_array
+    assert_deprecated do
+      I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", ["bar", "baz"]])
+      assert_equal ["foo", ["bar", "baz"]], translate(["foo", "bar"])
+    end
   end
 
   def test_translation_of_an_array_with_html
-    translate_expected = ['<a href="#">foo</a>', '<a href="#">bar</a>', '<a href="#">baz</a>']
-    I18n.expects(:translate).with(["foo", "bar", "baz_html"], :raise => true).returns(translate_expected)
-    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
-    expected = '<a href="#">foo</a>, <a href="#">bar</a>, <a href="#">baz</a>'
-    assert_equal expected, @view.render(:file => "test/array_translation")
+    assert_deprecated do
+      translate_expected = ['<a href="#">foo</a>', '<a href="#">bar</a>', '<a href="#">baz</a>']
+      I18n.expects(:translate).with(["foo", "bar", "baz_html"], :raise => true).returns(translate_expected)
+      @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+      expected = '<a href="#">foo</a>, <a href="#">bar</a>, <a href="#">baz</a>'
+      assert_equal expected, @view.render(:file => "test/array_translation")
+    end
   end
 
   def test_delegates_localize_to_i18n
@@ -44,11 +60,19 @@ class TranslationHelperTest < ActiveSupport::TestCase
   end
 
   def test_scoping_by_partial_of_an_array
-    I18n.expects(:translate).with(["test.scoped_array_translation.foo", "test.scoped_array_translation.bar"], :raise => true).returns(["foo", "bar"])
-    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
-    assert_equal "foo, bar", @view.render(:file => "test/scoped_array_translation")
+    assert_deprecated do
+      I18n.expects(:translate).with(["test.scoped_array_translation.foo", "test.scoped_array_translation.bar"], :raise => true).returns(["foo", "bar"])
+      @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+      assert_equal "foo, bar", @view.render(:file => "test/scoped_array_translation")
+    end
   end
 
+  def test_translate_works_with_symbols
+    I18n.expects(:translate).with(["hello"], :raise => true).returns(["Hello World"])
+    assert_equal "Hello World", translate(:hello)
+  end
+
+
   def test_translate_does_not_mark_plain_text_as_safe_html
     I18n.expects(:translate).with(["hello"], :raise => true).returns(["Hello World"])
     assert_equal false, translate("hello").html_safe?
@@ -63,4 +87,9 @@ class TranslationHelperTest < ActiveSupport::TestCase
     I18n.expects(:translate).with(["hello_html"], :raise => true).returns(["<a>Hello World</a>"])
     assert translate("hello_html").html_safe?
   end
+
+  def test_translation_returning_an_array_ignores_html_suffix
+    I18n.expects(:translate).with(["foo_html"], :raise => true).returns(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(:foo_html)
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 2
   - 3
   - 8
-  - pre1
-  version: 2.3.8.pre1
+  version: 2.3.8
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -29,8 +28,7 @@ dependencies:
         - 2
         - 3
         - 8
-        - pre1
-        version: 2.3.8.pre1
+        version: 2.3.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -511,13 +509,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - none
 rubyforge_project: actionpack