From 98c0c5db50a7679b3d58769ac22cb0a27a62c930 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Thu, 10 Feb 2011 23:01:02 +0800
Subject: Removed Array#safe_join in AS core_ext and moved it to a view helper
 with the same same.

---
 actionpack/lib/action_view/helpers.rb              |  4 +--
 .../action_view/helpers/output_safety_helper.rb    | 40 ++++++++++++++++++++++
 .../lib/action_view/helpers/raw_output_helper.rb   | 18 ----------
 3 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 actionpack/lib/action_view/helpers/output_safety_helper.rb
 delete mode 100644 actionpack/lib/action_view/helpers/raw_output_helper.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index 41013c800c..d338ce616a 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -18,7 +18,7 @@ module ActionView #:nodoc:
     autoload :JavaScriptHelper, "action_view/helpers/javascript_helper"
     autoload :NumberHelper
     autoload :PrototypeHelper
-    autoload :RawOutputHelper
+    autoload :OutputSafetyHelper
     autoload :RecordTagHelper
     autoload :SanitizeHelper
     autoload :ScriptaculousHelper
@@ -48,7 +48,7 @@ module ActionView #:nodoc:
     include JavaScriptHelper
     include NumberHelper
     include PrototypeHelper
-    include RawOutputHelper
+    include OutputSafetyHelper
     include RecordTagHelper
     include SanitizeHelper
     include ScriptaculousHelper
diff --git a/actionpack/lib/action_view/helpers/output_safety_helper.rb b/actionpack/lib/action_view/helpers/output_safety_helper.rb
new file mode 100644
index 0000000000..39f3f38e33
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/output_safety_helper.rb
@@ -0,0 +1,40 @@
+require 'active_support/core_ext/string/output_safety'
+
+module ActionView #:nodoc:
+  # = Action View Raw Output Helper
+  module Helpers #:nodoc:
+    module OutputSafetyHelper
+      # This method outputs without escaping a string. Since escaping tags is
+      # now default, this can be used when you don't want Rails to automatically
+      # escape tags. This is not recommended if the data is coming from the user's
+      # input.
+      #
+      # For example:
+      #
+      # <%=raw @user.name %>
+      def raw(stringish)
+        stringish.to_s.html_safe
+      end
+
+      # This method returns a html safe string using <tt>Array#join</tt> if all
+      # the items in the array, including the supplied separator, are html safe.
+      # Otherwise the result of <tt>Array#join</tt> is returned without marking
+      # it as html safe.
+      #
+      #   safe_join(["Mr", "Bojangles"]).html_safe?
+      #   # => false
+      #
+      #   safe_join(["Mr".html_safe, "Bojangles".html_safe]).html_safe?
+      #   # => true
+      #
+      def safe_join(array, sep=$,)
+        sep ||= "".html_safe
+        str = array.join(sep)
+
+        is_html_safe = array.all? { |item| item.html_safe? }
+
+        (sep.html_safe? && is_html_safe) ? str.html_safe : str
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/raw_output_helper.rb b/actionpack/lib/action_view/helpers/raw_output_helper.rb
deleted file mode 100644
index 216683a2e0..0000000000
--- a/actionpack/lib/action_view/helpers/raw_output_helper.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module ActionView #:nodoc:
-  # = Action View Raw Output Helper
-  module Helpers #:nodoc:
-    module RawOutputHelper
-      # This method outputs without escaping a string. Since escaping tags is
-      # now default, this can be used when you don't want Rails to automatically
-      # escape tags. This is not recommended if the data is coming from the user's
-      # input.
-      #
-      # For example:
-      #
-      # <%=raw @user.name %>
-      def raw(stringish)
-        stringish.to_s.html_safe
-      end
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3