radiant 0.9.0.rc2 → 0.9.1

data/vendor/rails/activesupport/lib/active_support/core_ext/object/blank.rb

@@ -2,11 +2,11 @@ class Object
   # An object is blank if it's false, empty, or a whitespace string.
   # For example, "", "   ", +nil+, [], and {} are blank.
   #
-  # This simplifies
+  # This simplifies:
   #
   #   if !address.nil? && !address.empty?
   #
-  # to
+  # ...to:
   #
   #   if !address.blank?
   def blank?
@@ -17,6 +17,24 @@ class Object
   def present?
     !blank?
   end
+  
+  # Returns object if it's #present? otherwise returns nil.
+  # object.presence is equivalent to object.present? ? object : nil.
+  #
+  # This is handy for any representation of objects where blank is the same
+  # as not present at all.  For example, this simplifies a common check for
+  # HTTP POST/query parameters:
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # ...becomes:
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  def presence
+    self if present?
+  end
 end
 
 class NilClass #:nodoc:

data/vendor/rails/activesupport/lib/active_support/core_ext/object/metaclass.rb

@@ -1,13 +1,14 @@
+require 'active_support/deprecation'
+
 class Object
-  # Get object's meta (ghost, eigenclass, singleton) class
+  # Get object's meta (ghost, eigenclass, singleton) class.
+  #
+  # Deprecated in favor of Object#singleton_class.
   def metaclass
     class << self
       self
     end
   end
 
-  # If class_eval is called on an object, add those methods to its metaclass
-  def class_eval(*args, &block)
-    metaclass.class_eval(*args, &block)
-  end
+  deprecate :metaclass => :singleton_class
 end

data/vendor/rails/activesupport/lib/active_support/core_ext/object/singleton_class.rb

@@ -0,0 +1,13 @@
+class Object
+  # Returns the object's singleton class.
+  def singleton_class
+    class << self
+      self
+    end
+  end unless respond_to?(:singleton_class)
+
+  # class_eval on an object acts like singleton_class_eval.
+  def class_eval(*args, &block)
+    singleton_class.class_eval(*args, &block)
+  end
+end

data/vendor/rails/activesupport/lib/active_support/core_ext/string.rb

@@ -21,5 +21,4 @@ class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Iterators
   include ActiveSupport::CoreExtensions::String::Behavior
   include ActiveSupport::CoreExtensions::String::Multibyte
-  include ActiveSupport::CoreExtensions::String::OutputSafety
 end

data/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb

@@ -1,48 +1,112 @@
+require 'erb'
+
+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
+
+    undef :h
+    alias h html_escape
+
+    module_function :html_escape
+    module_function :h
+
+    # 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
+  alias safe_concat concat
+
+  def as_str
+    self
+  end
+
+  def html_safe
+    ActiveSupport::SafeBuffer.new(self)
+  end
+
+  def html_safe?
+    false
   end
-end
+end

data/vendor/rails/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb

@@ -20,14 +20,12 @@ module ActiveSupport #:nodoc:
 
         # Does the string start with the specified +prefix+?
         def starts_with?(prefix)
-          prefix = prefix.to_s
-          self[0, prefix.length] == prefix
+          prefix.respond_to?(:to_str) && 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      
+          suffix.respond_to?(:to_str) && self[-suffix.length, suffix.length] == suffix
         end
       end
     end

data/vendor/rails/activesupport/lib/active_support/core_ext/time.rb

@@ -15,14 +15,18 @@ class Time
       alias_method :_original_load, :_load
       def _load(marshaled_time)
         time = _original_load(marshaled_time)
-        utc = time.instance_variable_get('@marshal_with_utc_coercion')
-        utc ? time.utc : time
+        time.instance_eval do
+          if defined?(@marshal_with_utc_coercion)
+            val = remove_instance_variable("@marshal_with_utc_coercion")
+          end
+          val ? utc : self
+        end
       end
     end
-    
+
     alias_method :_original_dump, :_dump
     def _dump(*args)
-      obj = self.frozen? ? self.dup : self
+      obj = dup
       obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
       obj._original_dump(*args)
     end

data/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb

@@ -157,8 +157,13 @@ module ActiveSupport #:nodoc:
           advance(:years => years)
         end
 
+        def last_year # :nodoc:
+          ActiveSupport::Deprecation.warn("Time#last_year is deprecated and has been removed in Rails 3, please use Time#prev_year instead", caller)
+          prev_year
+        end
+
         # Short-hand for years_ago(1)
-        def last_year
+        def prev_year
           years_ago(1)
         end
 
@@ -167,9 +172,13 @@ module ActiveSupport #:nodoc:
           years_since(1)
         end
 
+        def last_month # :nodoc:
+          ActiveSupport::Deprecation.warn("Time#last_month is deprecated and has been removed in Rails 3, please use Time#prev_month instead", caller)
+          prev_month
+        end
 
         # Short-hand for months_ago(1)
-        def last_month
+        def prev_month
           months_ago(1)
         end
 
@@ -283,7 +292,7 @@ module ActiveSupport #:nodoc:
         # are coerced into values that Time#- will recognize
         def minus_with_coercion(other)
           other = other.comparable_time if other.respond_to?(:comparable_time)
-          minus_without_coercion(other)
+          other.is_a?(::DateTime) ? to_f - other.to_f : minus_without_coercion(other)
         end
 
         # Layers additional behavior on Time#<=> so that DateTime and ActiveSupport::TimeWithZone instances

data/vendor/rails/activesupport/lib/active_support/deprecation.rb

@@ -52,7 +52,8 @@ module ActiveSupport
       private
         def deprecation_message(callstack, message = nil)
           message ||= "You are using deprecated behavior which will be removed from the next major or minor release."
-          "DEPRECATION WARNING: #{message}. #{deprecation_caller_message(callstack)}"
+          message += '.' unless message =~ /\.$/
+          "DEPRECATION WARNING: #{message} #{deprecation_caller_message(callstack)}"
         end
 
         def deprecation_caller_message(callstack)
@@ -89,7 +90,7 @@ module ActiveSupport
         method_names = method_names + options.keys
         method_names.each do |method_name|
           alias_method_chain(method_name, :deprecation) do |target, punctuation|
-            class_eval(<<-EOS, __FILE__, __LINE__)
+            class_eval(<<-EOS, __FILE__, __LINE__ + 1)
               def #{target}_with_deprecation#{punctuation}(*args, &block)          # def generate_secret_with_deprecation(*args, &block)
                 ::ActiveSupport::Deprecation.warn(                                 #   ::ActiveSupport::Deprecation.warn(
                   self.class.deprecated_method_warning(                            #     self.class.deprecated_method_warning(

data/vendor/rails/activesupport/lib/active_support/inflections.rb

@@ -51,6 +51,6 @@ module ActiveSupport
     inflect.irregular('move', 'moves')
     inflect.irregular('cow', 'kine')
 
-    inflect.uncountable(%w(equipment information rice money species series fish sheep))
+    inflect.uncountable(%w(equipment information rice money species series fish sheep jeans))
   end
 end

data/vendor/rails/activesupport/lib/active_support/inflector.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'singleton'
 require 'iconv'
+require 'kconv'
 
 module ActiveSupport
   # The Inflector transforms words from singular to plural, class names to table names, modularized class names to ones without,
@@ -157,7 +158,7 @@ module ActiveSupport
     def singularize(word)
       result = word.to_s.dup
 
-      if inflections.uncountables.include?(result.downcase)
+      if inflections.uncountables.any? { |inflection| result =~ /#{inflection}\Z/i }
         result
       else
         inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
@@ -257,10 +258,12 @@ module ActiveSupport
     #   <%= link_to(@person.name, person_path(@person)) %>
     #   # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a>
     def parameterize(string, sep = '-')
+      # remove malformed utf8 characters
+      string = string.toutf8 unless string.is_utf8?
       # replace accented chars with ther ascii equivalents
       parameterized_string = transliterate(string)
       # Turn unwanted chars into the seperator
-      parameterized_string.gsub!(/[^a-z0-9\-_\+]+/i, sep)
+      parameterized_string.gsub!(/[^a-z0-9\-_]+/i, sep)
       unless sep.blank?
         re_sep = Regexp.escape(sep)
         # No more than one of the separator in a row.

data/vendor/rails/activesupport/lib/active_support/json/backends/yajl.rb

@@ -0,0 +1,40 @@
+require 'yajl-ruby' unless defined?(Yajl)
+
+module ActiveSupport
+  module JSON
+    module Backends
+      module Yajl
+        ParseError = ::Yajl::ParseError
+        extend self
+
+        # Parses a JSON string or IO and convert it into an object
+        def decode(json)
+          data = ::Yajl::Parser.new.parse(json)
+          if ActiveSupport.parse_json_times
+            convert_dates_from(data)
+          else
+            data
+          end
+        end
+
+      private
+        def convert_dates_from(data)
+          case data
+          when nil
+            nil
+          when DATE_REGEX
+            DateTime.parse(data)
+          when Array
+            data.map! { |d| convert_dates_from(d) }
+          when Hash
+            data.each do |key, value|
+              data[key] = convert_dates_from(value)
+            end
+          else
+            data
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/rails/activesupport/lib/active_support/json/backends/yaml.rb

@@ -27,11 +27,9 @@ module ActiveSupport
                   pos = scanner.pos
                 elsif quoting == char
                   if json[pos..scanner.pos-2] =~ DATE_REGEX
-                    # found a date, track the exact positions of the quotes so we can remove them later.
-                    # oh, and increment them for each current mark, each one is an extra padded space that bumps
-                    # the position in the final YAML output
-                    total_marks = marks.size
-                    times << pos+total_marks << scanner.pos+total_marks
+                    # found a date, track the exact positions of the quotes so we can
+                    # overwrite them with spaces later.
+                    times << pos << scanner.pos
                   end
                   quoting = false
                 end
@@ -59,7 +57,12 @@ module ActiveSupport
               output    = []
               left_pos.each_with_index do |left, i|
                 scanner.pos = left.succ
-                output << scanner.peek(right_pos[i] - scanner.pos + 1).gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
+                chunk = scanner.peek(right_pos[i] - scanner.pos + 1)
+                # overwrite the quotes found around the dates with spaces
+                while times.size > 0 && times[0] <= right_pos[i]
+                  chunk[times.shift - scanner.pos - 1] = ' '
+                end
+                chunk.gsub!(/\\([\\\/]|u[[:xdigit:]]{4})/) do
                   ustr = $1
                   if ustr.start_with?('u')
                     [ustr[1..-1].to_i(16)].pack("U")
@@ -69,10 +72,10 @@ module ActiveSupport
                     ustr
                   end
                 end
+                output << chunk
               end
               output = output * " "
 
-              times.each { |i| output[i-1] = ' ' }
               output.gsub!(/\\\//, '/')
               output
             end