activesupport 3.1.0.rc4 → 3.1.0.rc5

data/lib/active_support/backtrace_cleaner.rb

@@ -1,12 +1,12 @@
 module ActiveSupport
-  # Many backtraces include too much information that's not relevant for the context. This makes it hard to find the signal
-  # in the backtrace and adds debugging time. With a BacktraceCleaner, you can setup filters and silencers for your particular
-  # context, so only the relevant lines are included.
+  # Backtraces often include many lines that are not relevant for the context under review. This makes it hard to find the 
+  # signal amongst the backtrace noise, and adds debugging time. With a BacktraceCleaner, filters and silencers are used to
+  # remove the noisy lines, so that only the most relevant lines remain.
   #
-  # If you need to reconfigure an existing BacktraceCleaner, like the one in Rails, to show as much as possible, you can always
-  # call BacktraceCleaner#remove_silencers! Also, if you need to reconfigure an existing BacktraceCleaner so that it does not
-  # filter or modify the paths of any lines of the backtrace, you can call BacktraceCleaner#remove_filters! These two methods
-  # will give you a completely untouched backtrace.
+  # Filters are used to modify lines of data, while silencers are used to remove lines entirely.  The typical filter use case
+  # is to remove lengthy path information from the start of each line, and view file paths relevant to the app directory 
+  # instead of the file system root.  The typical silencer use case is to exclude the output of a noisy library from the 
+  # backtrace, so that you can focus on the rest.
   #
   # ==== Example:
   #
@@ -15,13 +15,18 @@ module ActiveSupport
   #   bc.add_silencer { |line| line =~ /mongrel|rubygems/ }
   #   bc.clean(exception.backtrace) # will strip the Rails.root prefix and skip any lines from mongrel or rubygems
   #
+  # To reconfigure an existing BacktraceCleaner (like the default one in Rails) and show as much data as possible, you can 
+  # always call <tt>BacktraceCleaner#remove_silencers!</tt>, which will restore the backtrace to a pristine state.  If you 
+  # need to reconfigure an existing BacktraceCleaner so that it does not filter or modify the paths of any lines of the 
+  # backtrace, you can call BacktraceCleaner#remove_filters! These two methods will give you a completely untouched backtrace.
+  #
   # Inspired by the Quiet Backtrace gem by Thoughtbot.
   class BacktraceCleaner
     def initialize
       @filters, @silencers = [], []
     end
 
-    # Returns the backtrace after all filters and silencers has been run against it. Filters run first, then silencers.
+    # Returns the backtrace after all filters and silencers have been run against it. Filters run first, then silencers.
     def clean(backtrace, kind = :silent)
       filtered = filter(backtrace)
 
@@ -45,8 +50,8 @@ module ActiveSupport
       @filters << block
     end
 
-    # Adds a silencer from the block provided. If the silencer returns true for a given line, it'll be excluded from the
-    # clean backtrace.
+    # Adds a silencer from the block provided. If the silencer returns true for a given line, it will be excluded from 
+    # the clean backtrace.
     #
     # Example:
     #
@@ -57,7 +62,7 @@ module ActiveSupport
     end
 
     # Will remove all silencers, but leave in the filters. This is useful if your context of debugging suddenly expands as
-    # you suspect a bug in the libraries you use.
+    # you suspect a bug in one of the libraries you use.
     def remove_silencers!
       @silencers = []
     end

data/lib/active_support/cache/file_store.rb

@@ -16,7 +16,7 @@ module ActiveSupport
 
       def initialize(cache_path, options = nil)
         super(options)
-        @cache_path = cache_path
+        @cache_path = cache_path.to_s
         extend Strategy::LocalCache
       end
 

data/lib/active_support/configurable.rb

@@ -12,12 +12,12 @@ module ActiveSupport
 
     class Configuration < ActiveSupport::InheritableOptions
       def compile_methods!
-        self.class.compile_methods!(keys.reject {|key| respond_to?(key)})
+        self.class.compile_methods!(keys)
       end
 
       # compiles reader methods so we don't have to go through method_missing
       def self.compile_methods!(keys)
-        keys.each do |key|
+        keys.reject { |m| method_defined?(m) }.each do |key|
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{key}; _get(#{key.inspect}); end
           RUBY

data/lib/active_support/core_ext/array/wrap.rb

@@ -14,7 +14,7 @@ class Array
   # This method is similar in purpose to <tt>Kernel#Array</tt>, but there are some differences:
   #
   # * If the argument responds to +to_ary+ the method is invoked. <tt>Kernel#Array</tt>
-  # moves on to try +to_a+ if the returned value is +nil+, but <tt>Arraw.wrap</tt> returns
+  # moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns
   # such a +nil+ right away.
   # * If the returned value from +to_ary+ is neither +nil+ nor an +Array+ object, <tt>Kernel#Array</tt>
   # raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.

data/lib/active_support/core_ext/class/attribute.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/remove_method'
+require 'active_support/core_ext/array/extract_options'
 
 class Class
   # Declare a class-level attribute whose value is inheritable by subclasses.
@@ -56,11 +57,18 @@ class Class
   #   object.setting          # => false
   #   Base.setting            # => true
   #
+  # To opt out of the instance reader method, pass :instance_reader => false.
+  #
+  #   object.setting          # => NoMethodError
+  #   object.setting?         # => NoMethodError
+  #
   # To opt out of the instance writer method, pass :instance_writer => false.
   #
   #   object.setting = false  # => NoMethodError
   def class_attribute(*attrs)
-    instance_writer = !attrs.last.is_a?(Hash) || attrs.pop[:instance_writer]
+    options = attrs.extract_options!
+    instance_reader = options.fetch(:instance_reader, true)
+    instance_writer = options.fetch(:instance_writer, true)
 
     attrs.each do |name|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -84,13 +92,15 @@ class Class
           val
         end
 
-        remove_possible_method :#{name}
-        def #{name}
-          defined?(@#{name}) ? @#{name} : self.class.#{name}
-        end
+        if instance_reader
+          remove_possible_method :#{name}
+          def #{name}
+            defined?(@#{name}) ? @#{name} : self.class.#{name}
+          end
 
-        def #{name}?
-          !!#{name}
+          def #{name}?
+            !!#{name}
+          end
         end
       RUBY
 
@@ -100,12 +110,6 @@ class Class
 
   private
   def singleton_class?
-    # in case somebody is crazy enough to overwrite allocate
-    allocate = Class.instance_method(:allocate)
-    # object.class always points to a real (non-singleton) class
-    allocate.bind(self).call.class != self
-  rescue TypeError
-    # MRI/YARV/JRuby all disallow creating new instances of a singleton class
-    true
+    !name || '' == name
   end
 end

data/lib/active_support/core_ext/enumerable.rb

@@ -96,7 +96,7 @@ module Enumerable
   # Returns true if the collection has more than 1 element. Functionally equivalent to collection.size > 1.
   # Can be called with a block too, much like any?, so people.many? { |p| p.age > 26 } returns true if more than 1 person is over 26.
   def many?(&block)
-    size = block_given? ? select(&block).size : self.size
+    size = block_given? ? count(&block) : self.size
     size > 1
   end
 

data/lib/active_support/core_ext/hash/indifferent_access.rb

@@ -11,7 +11,7 @@ class Hash
   end
 
   # Called when object is nested under an object that receives
-  # #with_indifferent_access. This method with be called on the current object
+  # #with_indifferent_access. This method will be called on the current object
   # by the enclosing object and is aliased to #with_indifferent_access by
   # default. Subclasses of Hash may overwrite this method to return +self+ if
   # converting to an +ActiveSupport::HashWithIndifferentAccess+ would not be

data/lib/active_support/core_ext/module/delegation.rb

@@ -127,10 +127,6 @@ class Module
         end
 
       module_eval(<<-EOS, file, line - 5)
-        if instance_methods(false).map(&:to_s).include?("#{prefix}#{method}")
-          remove_possible_method("#{prefix}#{method}")
-        end
-
         def #{prefix}#{method}(*args, &block)               # def customer_name(*args, &block)
           #{to}.__send__(#{method.inspect}, *args, &block)  #   client.__send__(:name, *args, &block)
         rescue NoMethodError                                # rescue NoMethodError

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'date'
 require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/calculations'

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

@@ -35,7 +35,7 @@ class String
     # object. Interoperability problems can be resolved easily with a +to_s+ call.
     #
     # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
-    # information about how to change the default Multibyte behaviour see ActiveSupport::Multibyte.
+    # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
     def mb_chars
       if ActiveSupport::Multibyte.proxy_class.consumes?(self)
         ActiveSupport::Multibyte.proxy_class.new(self)

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

@@ -67,7 +67,7 @@ class Object
   end
 end
 
-class Fixnum
+class Numeric
   def html_safe?
     true
   end
@@ -76,10 +76,33 @@ end
 module ActiveSupport #:nodoc:
   class SafeBuffer < String
     UNSAFE_STRING_METHODS = ["capitalize", "chomp", "chop", "delete", "downcase", "gsub", "lstrip", "next", "reverse", "rstrip", "slice", "squeeze", "strip", "sub", "succ", "swapcase", "tr", "tr_s", "upcase"].freeze
-    alias safe_concat concat
+
+    alias_method :original_concat, :concat
+    private :original_concat
+
+    class SafeConcatError < StandardError
+      def initialize
+        super "Could not concatenate to the buffer because it is not html safe."
+      end
+    end
+
+    def safe_concat(value)
+      raise SafeConcatError if dirty?
+      original_concat(value)
+    end
+
+    def initialize(*)
+      @dirty = false
+      super
+    end
+
+    def initialize_copy(other)
+      super
+      @dirty = other.dirty?
+    end
 
     def concat(value)
-      if value.html_safe?
+      if dirty? || value.html_safe?
         super(value)
       else
         super(ERB::Util.h(value))
@@ -92,15 +115,15 @@ module ActiveSupport #:nodoc:
     end
 
     def html_safe?
-      true
+      !dirty?
     end
 
-    def html_safe
+    def to_s
       self
     end
 
-    def to_s
-      self
+    def to_param
+      to_str
     end
 
     def encode_with(coder)
@@ -109,7 +132,6 @@ module ActiveSupport #:nodoc:
 
     def to_yaml(*args)
       return super() if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-
       to_str.to_yaml(*args)
     end
 
@@ -120,18 +142,21 @@ module ActiveSupport #:nodoc:
         end
 
         def #{unsafe_method}!(*args)
-          raise TypeError, "Cannot modify SafeBuffer in place"
+          @dirty = true
+          super
         end
       EOT
     end
+
+    protected
+
+    def dirty?
+      @dirty
+    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

data/lib/active_support/dependencies.rb

@@ -651,17 +651,6 @@ module ActiveSupport #:nodoc:
       return []
     end
 
-    class LoadingModule #:nodoc:
-      # Old style environment.rb referenced this method directly.  Please note, it doesn't
-      # actually *do* anything any more.
-      def self.root(*args)
-        if defined?(Rails) && Rails.logger
-          Rails.logger.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
-          Rails.logger.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
-        end
-      end
-    end
-
     # Convert the provided const desc to a qualified constant name (as a string).
     # A module, class, symbol, or string may be provided.
     def to_constant_name(desc) #:nodoc:

data/lib/active_support/deprecation/behaviors.rb

@@ -7,12 +7,12 @@ module ActiveSupport
       # Whether to print a backtrace along with the warning.
       attr_accessor :debug
 
-      # Returns the set behaviour or if one isn't set, defaults to +:stderr+
+      # Returns the set behavior or if one isn't set, defaults to +:stderr+
       def behavior
         @behavior ||= [DEFAULT_BEHAVIORS[:stderr]]
       end
 
-      # Sets the behaviour to the specified value. Can be a single value or an array.
+      # Sets the behavior to the specified value. Can be a single value or an array.
       #
       # Examples
       #

data/lib/active_support/hash_with_indifferent_access.rb

@@ -6,6 +6,8 @@ require 'active_support/core_ext/hash/keys'
 
 module ActiveSupport
   class HashWithIndifferentAccess < Hash
+    
+    # Always returns true, so that <tt>Array#extract_options!</tt> finds members of this class.
     def extractable_options?
       true
     end

data/lib/active_support/log_subscriber.rb

@@ -3,8 +3,8 @@ require 'active_support/core_ext/class/attribute'
 
 module ActiveSupport
   # ActiveSupport::LogSubscriber is an object set to consume ActiveSupport::Notifications
-  # with solely purpose of logging. The log subscriber dispatches notifications to a
-  # registered object based on its given namespace.
+  # with the sole purpose of logging them. The log subscriber dispatches notifications to 
+  # a registered object based on its given namespace.
   #
   # An example would be Active Record log subscriber responsible for logging queries:
   #
@@ -109,8 +109,8 @@ module ActiveSupport
 
     # Set color by using a string or one of the defined constants. If a third
     # option is set to true, it also adds bold to the string. This is based
-    # on Highline implementation and it automatically appends CLEAR to the end
-    # of the returned String.
+    # on the Highline implementation and will automatically append CLEAR to the
+    # end of the returned String.
     #
     def color(text, color, bold=false)
       return text unless colorize_logging

data/lib/active_support/multibyte/chars.rb

@@ -331,8 +331,7 @@ module ActiveSupport #:nodoc:
       # when the storage for a string is limited for some reason.
       #
       # Example:
-      #   s = 'こんにちは'
-      #   s.mb_chars.limit(7) # => "こに"
+      #   'こんにちは'.mb_chars.limit(7).to_s # => "こん"
       def limit(limit)
         slice(0...translate_offset(limit))
       end

data/lib/active_support/multibyte/unicode.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module ActiveSupport
   module Multibyte
     module Unicode

data/lib/active_support/ordered_options.rb

@@ -36,6 +36,10 @@ module ActiveSupport #:nodoc:
         self[name]
       end
     end
+
+    def respond_to?(name)
+      true
+    end
   end
 
   class InheritableOptions < OrderedOptions

data/lib/active_support/version.rb

@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc4"
+    PRE   = "rc5"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  hash: 15424109
-  prerelease: 6
+  prerelease: true
   segments: 
   - 3
   - 1
   - 0
-  - rc
-  - 4
-  version: 3.1.0.rc4
+  - rc5
+  version: 3.1.0.rc5
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,17 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-07-25 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -256,6 +253,7 @@ files:
 - lib/active_support/xml_mini/rexml.rb
 - lib/active_support/xml_mini.rb
 - lib/active_support.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -265,22 +263,18 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -289,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.