activesupport 3.0.0.beta → 3.0.0.beta2

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

@@ -2,21 +2,25 @@ require 'active_support/core_ext/array/extract_options'
 
 class Module
   def mattr_reader(*syms)
-    syms.extract_options!
+    options = syms.extract_options!
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}  # unless defined? @@pagination_options
-          @@#{sym} = nil          #   @@pagination_options = nil
-        end                       # end
-
-        def self.#{sym}           # def self.pagination_options
-          @@#{sym}                #   @@pagination_options
-        end                       # end
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
 
-        def #{sym}                # def pagination_options
-          @@#{sym}                #   @@pagination_options
-        end                       # end
+        def self.#{sym}
+          @@#{sym}
+        end
       EOS
+      
+      unless options[:instance_reader] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}
+            @@#{sym}
+          end
+        EOS
+      end
     end
   end
 
@@ -24,20 +28,20 @@ class Module
     options = syms.extract_options!
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}                       # unless defined? @@pagination_options
-          @@#{sym} = nil                               #   @@pagination_options = nil
-        end                                            # end
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
 
-        def self.#{sym}=(obj)                          # def self.pagination_options=(obj)
-          @@#{sym} = obj                               #   @@pagination_options = obj
-        end                                            # end
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
       EOS
 
       unless options[:instance_writer] == false
-        class_eval(<<-EOS, __FILE__, __LINE__)
-          def #{sym}=(obj)                             # def pagination_options=(obj)
-            @@#{sym} = obj                             #   @@pagination_options = obj
-          end                                          # end
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
         EOS
       end
     end

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

@@ -1,14 +1,21 @@
+require "active_support/core_ext/module/remove_method"
+
 class Module
   # Provides a delegate class method to easily expose contained objects' methods
   # as your own. Pass one or more methods (specified as symbols or strings)
-  # and the name of the target object as the final <tt>:to</tt> option (also a symbol
-  # or string).  At least one method and the <tt>:to</tt> option are required.
+  # and the name of the target object via the <tt>:to</tt> option (also a symbol
+  # or string). At least one method and the <tt>:to</tt> option are required.
   #
   # Delegation is particularly useful with Active Record associations:
   #
   #   class Greeter < ActiveRecord::Base
-  #     def hello()   "hello"   end
-  #     def goodbye() "goodbye" end
+  #     def hello
+  #       "hello"
+  #     end
+  #
+  #     def goodbye
+  #       "goodbye"
+  #     end
   #   end
   #
   #   class Foo < ActiveRecord::Base
@@ -34,7 +41,7 @@ class Module
   #   class Foo
   #     CONSTANT_ARRAY = [0,1,2,3]
   #     @@class_array  = [4,5,6,7]
-  #     
+  #
   #     def initialize
   #       @instance_array = [8,9,10,11]
   #     end
@@ -72,9 +79,9 @@ class Module
   #   invoice.customer_name    # => "John Doe"
   #   invoice.customer_address # => "Vimmersvej 13"
   #
-  # If the object to which you delegate can be nil, you may want to use the
-  # :allow_nil option. In that case, it returns nil instead of raising a
-  # NoMethodError exception:
+  # If the delegate object is +nil+ an exception is raised, and that happens
+  # no matter whether +nil+ responds to the delegated method. You can get a
+  # +nil+ instead with the +:allow_nil+ option.
   #
   #  class Foo
   #    attr_accessor :bar
@@ -120,11 +127,15 @@ class Module
         end
 
       module_eval(<<-EOS, file, line)
+        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
           if #{to}.nil?                                     #   if client.nil?
-            #{on_nil}
+            #{on_nil}                                       #     return # depends on :allow_nil
           else                                              #   else
             raise                                           #     raise
           end                                               #   end

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

@@ -3,7 +3,7 @@ require 'active_support/inflector'
 class Module
   # Returns the name of the module containing this one.
   #
-  #   p M::N.parent_name # => "M"
+  #   M::N.parent_name # => "M"
   def parent_name
     unless defined? @parent_name
       @parent_name = name =~ /::[^:]+\Z/ ? $`.freeze : nil
@@ -19,13 +19,13 @@ class Module
   #   end
   #   X = M::N
   #
-  #   p M::N.parent # => M
-  #   p X.parent    # => M
+  #   M::N.parent # => M
+  #   X.parent    # => M
   #
   # The parent of top-level and anonymous modules is Object.
   #
-  #   p M.parent          # => Object
-  #   p Module.new.parent # => Object
+  #   M.parent          # => Object
+  #   Module.new.parent # => Object
   #
   def parent
     parent_name ? ActiveSupport::Inflector.constantize(parent_name) : Object
@@ -40,9 +40,9 @@ class Module
   #   end
   #   X = M::N
   #
-  #   p M.parents    # => [Object]
-  #   p M::N.parents # => [M, Object]
-  #   p X.parents    # => [M, Object]
+  #   M.parents    # => [Object]
+  #   M::N.parents # => [M, Object]
+  #   X.parents    # => [M, Object]
   #
   def parents
     parents = []

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

@@ -0,0 +1,14 @@
+class Module
+  if instance_methods[0].is_a?(Symbol)
+    def instance_method_names(*args)
+      instance_methods(*args).map(&:to_s)
+    end
+
+    def method_names(*args)
+      methods(*args).map(&:to_s)
+    end
+  else
+    alias_method :instance_method_names, :instance_methods
+    alias_method :method_names, :methods
+  end
+end

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

@@ -0,0 +1,10 @@
+require 'active_support/core_ext/module/anonymous'
+require 'active_support/core_ext/string/inflections'
+
+class Module
+  def reachable? #:nodoc:
+    !anonymous? && name.constantize.equal?(self)
+  rescue NameError
+    false
+  end
+end

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

@@ -0,0 +1,6 @@
+class Module
+  def remove_possible_method(method)
+    remove_method(method)
+  rescue NameError
+  end
+end

data/lib/active_support/core_ext/object.rb

@@ -5,5 +5,11 @@ require 'active_support/core_ext/object/try'
 
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/instance_variables'
-require 'active_support/core_ext/object/metaclass'
+require 'active_support/core_ext/object/singleton_class'
 require 'active_support/core_ext/object/misc'
+require 'active_support/core_ext/object/extending'
+
+require 'active_support/core_ext/object/returning'
+require 'active_support/core_ext/object/to_param'
+require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/object/with_options'

data/lib/active_support/core_ext/object/extending.rb

@@ -0,0 +1,11 @@
+require 'active_support/core_ext/class/subclasses'
+
+class Object
+  # Exclude this class unless it's a subclass of our supers and is defined.
+  # We check defined? in case we find a removed class that has yet to be
+  # garbage collected. This also fails for anonymous classes -- please
+  # submit a patch if you have a workaround.
+  def subclasses_of(*superclasses) #:nodoc:
+    Class.subclasses_of(*superclasses)
+  end
+end

data/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/lib/active_support/core_ext/proc.rb

@@ -5,9 +5,9 @@ class Proc #:nodoc:
     block, time = self, Time.now
     object.class_eval do
       method_name = "__bind_#{time.to_i}_#{time.usec}"
-      define_method(method_name, &block)     # define_method("__bind_1230458026_720454", &block)
-      method = instance_method(method_name)  # method = instance_method("__bind_1230458026_720454")
-      remove_method(method_name)             # remove_method("__bind_1230458026_720454")
+      define_method(method_name, &block)
+      method = instance_method(method_name)
+      remove_method(method_name)
       method
     end.bind(object)
   end

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

@@ -1,4 +1,5 @@
 require 'date'
+require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/calculations'
 
 class String

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

@@ -2,7 +2,7 @@
 # For instance, you can figure out the name of a database from the name of a class.
 #
 #   "ScaleScore".tableize # => "scale_scores"
-
+#
 class String
   # Returns the plural form of the word in the string.
   #

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

@@ -1,91 +1 @@
-=begin
-  heavily based on Masao Mutoh's gettext String interpolation extension
-  http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb
-  Copyright (C) 2005-2010 Masao Mutoh
-  You may redistribute it and/or modify it under the same license terms as Ruby.
-=end
-
-if RUBY_VERSION < '1.9' && !"".respond_to?(:interpolate_without_ruby_19_syntax)
-
-  # KeyError is raised by String#% when the string contains a named placeholder
-  # that is not contained in the given arguments hash. Ruby 1.9 includes and
-  # raises this exception natively. We define it to mimic Ruby 1.9's behaviour
-  # in Ruby 1.8.x
-
-  class KeyError < IndexError
-    def initialize(message = nil)
-      super(message || "key not found")
-    end
-  end unless defined?(KeyError)
-
-  # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
-  #
-  # String#% method which accept "named argument". The translator can know
-  # the meaning of the msgids using "named argument" instead of %s/%d style.
-
-  class String
-    alias :interpolate_without_ruby_19_syntax :% # :nodoc:
-
-    INTERPOLATION_PATTERN = Regexp.union(
-      /%%/,
-      /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
-      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
-    )
-
-    # % uses self (i.e. the String) as a format specification and returns the
-    # result of applying it to the given arguments. In other words it interpolates
-    # the given arguments to the string according to the formats the string
-    # defines.
-    #
-    # There are three ways to use it:
-    #
-    # * Using a single argument or Array of arguments.
-    #
-    #   This is the default behaviour of the String class. See Kernel#sprintf for
-    #   more details about the format string.
-    #
-    #   Example:
-    #
-    #     "%d %s" % [1, "message"]
-    #     # => "1 message"
-    #
-    # * Using a Hash as an argument and unformatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %{foo}
-    #   it will interpret the hash values as named arguments.
-    #
-    #   Example:
-    #
-    #     "%{firstname}, %{lastname}" % {:firstname => "Masao", :lastname => "Mutoh"}
-    #     # => "Masao Mutoh"
-    #
-    # * Using a Hash as an argument and formatted, named placeholders.
-    #
-    #   When you pass a Hash as an argument and specify placeholders with %<foo>d
-    #   it will interpret the hash values as named arguments and format the value
-    #   according to the formatting instruction appended to the closing >.
-    #
-    #   Example:
-    #
-    #     "%<integer>d, %<float>.1f" % { :integer => 10, :float => 43.4 }
-    #     # => "10, 43.3"
-    def %(args)
-      if args.kind_of?(Hash)
-        dup.gsub(INTERPOLATION_PATTERN) do |match|
-          if match == '%%'
-            '%'
-          else
-            key = ($1 || $2).to_sym
-            raise KeyError unless args.has_key?(key)
-            $3 ? sprintf("%#{$3}", args[key]) : args[key]
-          end
-        end
-      elsif self =~ INTERPOLATION_PATTERN
-        raise ArgumentError.new('one hash required')
-      else
-        result = gsub(/%([{<])/, '%%\1')
-        result.send :'interpolate_without_ruby_19_syntax', args
-      end
-    end
-  end
-end
+require 'i18n/core_ext/string/interpolate'

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

@@ -1,4 +1,5 @@
-require "erb"
+require 'erb'
+require 'active_support/core_ext/object/singleton_class'
 
 class ERB
   module Util
@@ -23,12 +24,14 @@ class ERB
       end
     end
 
-    undef :h
+    remove_method(:h)
     alias h html_escape
 
-    module_function :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>.
     #
@@ -71,15 +74,12 @@ module ActiveSupport #:nodoc:
         super(ERB::Util.h(value))
       end
     end
+    alias << concat
 
     def +(other)
       dup.concat(other)
     end
 
-    def <<(value)
-      self.concat(value)
-    end
-
     def html_safe?
       true
     end
@@ -91,6 +91,10 @@ module ActiveSupport #:nodoc:
     def to_s
       self
     end
+
+    def to_yaml(*args)
+      to_str.to_yaml(*args)
+    end
   end
 end
 
@@ -102,4 +106,4 @@ class String
   def html_safe
     ActiveSupport::SafeBuffer.new(self)
   end
-end
+end

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

@@ -1,5 +1,5 @@
 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

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

@@ -1,4 +1,5 @@
 require 'active_support/inflector'
+require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/values/time_zone'
 
 class Time