activesupport 2.3.5 → 3.0.0.beta3

data/lib/active_support/core_ext/string/output_safety.rb

@@ -1,48 +1,109 @@
+require 'erb'
+require 'active_support/core_ext/kernel/singleton_class'
+
+class ERB
+  module Util
+    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
+    JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
+
+    # A utility method for escaping HTML tag characters.
+    # This method is also aliased as <tt>h</tt>.
+    #
+    # In your ERb templates, use this method to escape any unsafe content. For example:
+    #   <%=h @person.name %>
+    #
+    # ==== Example:
+    #   puts html_escape("is a > 0 & a < 10?")
+    #   # => is a &gt; 0 &amp; a &lt; 10?
+    def html_escape(s)
+      s = s.to_s
+      if s.html_safe?
+        s
+      else
+        s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }.html_safe
+      end
+    end
+
+    remove_method(:h)
+    alias h html_escape
+
+    module_function :h
+
+    singleton_class.send(:remove_method, :html_escape)
+    module_function :html_escape
+
+    # A utility method for escaping HTML entities in JSON strings.
+    # This method is also aliased as <tt>j</tt>.
+    #
+    # In your ERb templates, use this method to escape any HTML entities:
+    #   <%=j @person.to_json %>
+    #
+    # ==== Example:
+    #   puts json_escape("is a > 0 & a < 10?")
+    #   # => is a \u003E 0 \u0026 a \u003C 10?
+    def json_escape(s)
+      s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
+    end
+
+    alias j json_escape
+    module_function :j
+    module_function :json_escape
+  end
+end
+
+class Object
+  def html_safe?
+    false
+  end
+end
+
+class Fixnum
+  def html_safe?
+    true
+  end
+end
+
 module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module String #:nodoc:
-      module OutputSafety
-        def self.included(base)
-          base.class_eval do
-            alias_method :add_without_safety, :+
-            alias_method :+, :add_with_safety
-            alias_method_chain :concat, :safety
-            undef_method :<<
-            alias_method :<<, :concat_with_safety
-          end
-        end
-
-        def html_safe?
-          defined?(@_rails_html_safe) && @_rails_html_safe
-        end
-
-        def html_safe!
-          @_rails_html_safe = true
-          self
-        end
-
-        def add_with_safety(other)
-          result = add_without_safety(other)
-          if html_safe? && also_html_safe?(other)
-            result.html_safe!
-          else
-            result
-          end
-        end
-
-        def concat_with_safety(other_or_fixnum)
-          result = concat_without_safety(other_or_fixnum)
-          unless html_safe? && also_html_safe?(other_or_fixnum)
-            @_rails_html_safe = false
-          end
-          result
-        end
-
-        private
-          def also_html_safe?(other)
-            other.respond_to?(:html_safe?) && other.html_safe?
-          end
+  class SafeBuffer < String
+    alias safe_concat concat
+
+    def concat(value)
+      if value.html_safe?
+        super(value)
+      else
+        super(ERB::Util.h(value))
       end
     end
+    alias << concat
+
+    def +(other)
+      dup.concat(other)
+    end
+
+    def html_safe?
+      true
+    end
+
+    def html_safe
+      self
+    end
+
+    def to_s
+      self
+    end
+
+    def to_yaml(*args)
+      to_str.to_yaml(*args)
+    end
+  end
+end
+
+class String
+  def html_safe!
+    raise "You can't call html_safe! on a String"
+  end
+
+  def html_safe
+    ActiveSupport::SafeBuffer.new(self)
   end
-end
+end

data/lib/active_support/core_ext/string/starts_ends_with.rb

@@ -1,35 +1,4 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module String #:nodoc:
-      # Additional string tests.
-      module StartsEndsWith
-        def self.append_features(base)
-          if '1.8.7 and up'.respond_to?(:start_with?)
-            base.class_eval do
-              alias_method :starts_with?, :start_with?
-              alias_method :ends_with?, :end_with?
-            end
-          else
-            super
-            base.class_eval do
-              alias_method :start_with?, :starts_with?
-              alias_method :end_with?, :ends_with?
-            end
-          end
-        end
-
-        # Does the string start with the specified +prefix+?
-        def starts_with?(prefix)
-          prefix = prefix.to_s
-          self[0, prefix.length] == prefix
-        end
-
-        # Does the string end with the specified +suffix+?
-        def ends_with?(suffix)
-          suffix = suffix.to_s
-          self[-suffix.length, suffix.length] == suffix      
-        end
-      end
-    end
-  end
+class String
+  alias_method :starts_with?, :start_with?
+  alias_method :ends_with?, :end_with?
 end

data/lib/active_support/core_ext/string/xchar.rb

@@ -1,11 +1,18 @@
 begin
-  # See http://bogomips.org/fast_xs/ by Eric Wong
+  # See http://fast-xs.rubyforge.org/ by Eric Wong.
+  # Also included with hpricot.
   require 'fast_xs'
+rescue LoadError
+  # fast_xs extension unavailable
+else
+  begin
+    require 'builder'
+  rescue LoadError
+    # builder demands the first shot at defining String#to_xs
+  end
 
   class String
     alias_method :original_xs, :to_xs if method_defined?(:to_xs)
     alias_method :to_xs, :fast_xs
   end
-rescue LoadError
-  # fast_xs extension unavailable.
 end

data/lib/active_support/core_ext/string.rb

@@ -1,25 +1,11 @@
-# encoding: utf-8
-
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/string/bytesize'
 require 'active_support/core_ext/string/conversions'
-require 'active_support/core_ext/string/access'
-require 'active_support/core_ext/string/starts_ends_with'
-require 'active_support/core_ext/string/iterators'
+require 'active_support/core_ext/string/filters'
 require 'active_support/core_ext/string/multibyte'
+require 'active_support/core_ext/string/starts_ends_with'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/xchar'
-require 'active_support/core_ext/string/filters'
 require 'active_support/core_ext/string/behavior'
+require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/output_safety'
-
-class String #:nodoc:
-  include ActiveSupport::CoreExtensions::String::Access
-  include ActiveSupport::CoreExtensions::String::Conversions
-  include ActiveSupport::CoreExtensions::String::Filters
-  include ActiveSupport::CoreExtensions::String::Inflections
-  include ActiveSupport::CoreExtensions::String::StartsEndsWith
-  include ActiveSupport::CoreExtensions::String::Iterators
-  include ActiveSupport::CoreExtensions::String::Behavior
-  include ActiveSupport::CoreExtensions::String::Multibyte
-  include ActiveSupport::CoreExtensions::String::OutputSafety
-end
+require 'active_support/core_ext/string/exclude'

data/lib/active_support/core_ext/time/acts_like.rb

@@ -0,0 +1,8 @@
+require 'active_support/core_ext/object/acts_like'
+
+class Time
+  # Duck-types as a Time-like class. See Object#acts_like?.
+  def acts_like_time?
+    true
+  end
+end