actionpack 2.3.7 → 2.3.8.pre1

data/CHANGELOG

@@ -1,3 +1,8 @@
+*2.3.8 (May 24, 2010)*
+
+* HTML safety: fix compatibility *without* the optional rails_xss plugin.
+
+
 *2.3.7 (May 24, 2010)*
 
 * HTML safety: fix compatibility with the optional rails_xss plugin.  [Nathan Weizenbaum, Santiago Pastorino]

data/Rakefile

@@ -79,7 +79,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.3.7' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.8' + PKG_BUILD)
   s.add_dependency('rack', '~> 1.1.0')
 
   s.require_path = 'lib'

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/action_view/helpers/capture_helper.rb

@@ -124,7 +124,7 @@ module ActionView
 
       # Use an alternate output buffer for the duration of the block.
       # Defaults to a new empty string.
-      def with_output_buffer(buf = ActiveSupport::SafeBuffer.new) #:nodoc:
+      def with_output_buffer(buf = '') #:nodoc:
         self.output_buffer, old_buffer = buf, output_buffer
         yield
         output_buffer

data/lib/action_view/helpers/translation_helper.rb

@@ -3,17 +3,21 @@ require 'action_view/helpers/tag_helper'
 module ActionView
   module Helpers
     module TranslationHelper
-      # Delegates to I18n#translate but also performs two additional functions. First, it'll catch MissingTranslationData exceptions 
+      # Delegates to I18n#translate but also performs two additional functions. First, it'll catch MissingTranslationData exceptions
       # and turn them into inline spans that contains the missing key, such that you can see in a view what is missing where.
       #
       # Second, it'll scope the key by the current partial if the key starts with a period. So if you call translate(".foo") from the
       # people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo"). This makes it less repetitive
       # 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(key, options = {})
-        options[:raise] = true
-        translation = I18n.translate(scope_key_by_partial(key), options)
-        (translation.respond_to?(:join) ? translation.join : translation).html_safe
+      def translate(keys, options = {})
+        options[:raise]  = true
+        are_keys_a_string  = keys.is_a?(String)
+        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
       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')
@@ -28,12 +32,19 @@ module ActionView
 
 
       private
-        def scope_key_by_partial(key)
-          strkey = key.respond_to?(:join) ? key.join : key.to_s
-          if strkey.first == "."
-            template.path_without_format_and_extension.gsub(%r{/_?}, ".") + strkey
-          else
-            key
+        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
+            else
+              key
+            end
+          end
+        end
+
+        def html_safe_translation_keys(keys, translations)
+          keys.zip(translations).map do |key, translation|
+            key =~ /(\b|_|\.)html$/ ? translation.html_safe : translation
           end
         end
     end

data/lib/action_view/template_handlers/erb.rb

@@ -13,6 +13,11 @@ module ActionView
       def compile(template)
         magic = $1 if template.source =~ /\A(<%#.*coding[:=]\s*(\S+)\s*-?%>)/
         erb = "#{magic}<% __in_erb_template=true %>#{template.source}"
+
+        if erb.respond_to?(:force_encoding)
+          erb.force_encoding(template.source.encoding)
+        end
+
         ::ERB.new(erb, nil, erb_trim_mode, '@output_buffer').src
       end
     end

data/lib/action_view/test_case.rb

@@ -53,7 +53,7 @@ module ActionView
     setup :setup_with_controller
     def setup_with_controller
       @controller = TestController.new
-      @output_buffer = ''.html_safe
+      @output_buffer = ''
       @rendered = ''
 
       self.class.send(:include_helper_modules!)

data/test/abstract_unit.rb

@@ -1,7 +1,7 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
-$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
+$:.unshift File.expand_path('../../lib', __FILE__)
+$:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift File.expand_path('../fixtures/helpers', __FILE__)
+$:.unshift File.expand_path('../fixtures/alternate_helpers', __FILE__)
 
 require 'rubygems'
 require 'yaml'
@@ -58,4 +58,4 @@ class DummyMutex
   end
 end
 
-ActionController::Reloader.default_lock = DummyMutex.new
+ActionController::Reloader.default_lock = DummyMutex.new

data/test/controller/capture_test.rb

@@ -36,7 +36,7 @@ class CaptureTest < ActionController::TestCase
 
   def test_simple_capture
     get :capturing
-    assert_equal "Dreamy days", @response.body.strip
+    assert_equal "<p>Dreamy days</p>", @response.body.strip
   end
 
   def test_content_for

data/test/fixtures/test/array_translation.erb

@@ -1 +1 @@
-<%= t(['foo', 'bar']) %>
+<% translation = t(['foo', 'bar', 'baz_html']) %><%= translation.first %>, <%= translation.second %>, <%= translation.third %>

data/test/fixtures/test/capturing.erb

@@ -1,4 +1,4 @@
 <% days = capture do %>
-  Dreamy days
+  <p>Dreamy days</p>
 <% end %>
-<%= days %>
+<%= days %>

data/test/fixtures/test/scoped_array_translation.erb

@@ -1 +1 @@
-<%= t(['.foo', '.bar']) %>
+<%= t(['.foo', '.bar']).join(", ") %>

data/test/fixtures/test/translation.erb

@@ -0,0 +1 @@
+<%= t('.helper') %>

data/test/template/translation_helper_test.rb

@@ -1,32 +1,33 @@
 require 'abstract_unit'
 
-class TranslationHelperTest < Test::Unit::TestCase
+class TranslationHelperTest < ActiveSupport::TestCase
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TranslationHelper
-  
+
   attr_reader :request
   def setup
   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
-  
+
   def test_returns_missing_translation_message_wrapped_into_span
     expected = '<span class="translation_missing">en, foo</span>'
     assert_equal expected, translate(:foo)
   end
-  
+
   def test_translation_of_an_array
     I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
-    assert_equal "foobar", translate(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(["foo", "bar"])
   end
 
   def test_translation_of_an_array_with_html
-    expected = '<a href="#">foo</a><a href="#">bar</a>'
-    I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(['<a href="#">foo</a>', '<a href="#">bar</a>'])
+    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
 
@@ -35,16 +36,31 @@ class TranslationHelperTest < Test::Unit::TestCase
     I18n.expects(:localize).with(@time)
     localize @time
   end
-  
+
   def test_scoping_by_partial
-    expects(:template).returns(stub(:path_without_format_and_extension => "people/index"))
-    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true).returns("")
-    translate ".foo", :locale => 'en'
+    I18n.expects(:translate).with(["test.translation.helper"], :raise => true).returns(["helper"])
+    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+    assert_equal "helper", @view.render(:file => "test/translation")
   end
 
   def test_scoping_by_partial_of_an_array
-    I18n.expects(:translate).with("test.scoped_array_translation.foo.bar", :raise => true).returns(["foo", "bar"])
+    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 "foobar", @view.render(:file => "test/scoped_array_translation")
+    assert_equal "foo, bar", @view.render(:file => "test/scoped_array_translation")
+  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?
+  end
+
+  def test_translate_marks_translations_named_html_as_safe_html
+    I18n.expects(:translate).with(["html"], :raise => true).returns(["<a>Hello World</a>"])
+    assert translate("html").html_safe?
+  end
+
+  def test_translate_marks_translations_with_a_html_suffix_as_safe_html
+    I18n.expects(:translate).with(["hello_html"], :raise => true).returns(["<a>Hello World</a>"])
+    assert translate("hello_html").html_safe?
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 2
   - 3
-  - 7
-  version: 2.3.7
+  - 8
+  - pre1
+  version: 2.3.8.pre1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -27,8 +28,9 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 7
-        version: 2.3.7
+        - 8
+        - pre1
+        version: 2.3.8.pre1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -451,6 +453,7 @@ files:
 - test/fixtures/test/scoped_array_translation.erb
 - test/fixtures/test/sub_template_raise.html.erb
 - test/fixtures/test/template.erb
+- test/fixtures/test/translation.erb
 - test/fixtures/test/update_element_with_capture.erb
 - test/fixtures/test/using_layout_around_block.html.erb
 - test/fixtures/test/using_layout_around_block_with_args.html.erb
@@ -508,11 +511,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: actionpack