activesupport 2.3.5 → 3.0.0.beta3

data/lib/active_support/core_ext/load_error.rb

@@ -1,38 +1,22 @@
-class MissingSourceFile < LoadError #:nodoc:
-  attr_reader :path
-  def initialize(message, path)
-    super(message)
-    @path = path
-  end
-
-  def is_missing?(path)
-    path.gsub(/\.rb$/, '') == self.path.gsub(/\.rb$/, '')
-  end
-
-  def self.from_message(message)
-    REGEXPS.each do |regexp, capture|
-      match = regexp.match(message)
-      return MissingSourceFile.new(message, match[capture]) unless match.nil?
-    end
-    nil
-  end
-
+class LoadError
   REGEXPS = [
-    [/^no such file to load -- (.+)$/i, 1],
-    [/^Missing \w+ (file\s*)?([^\s]+.rb)$/i, 2],
-    [/^Missing API definition file in (.+)$/i, 1]
-  ] unless defined?(REGEXPS)
-end
+    /^no such file to load -- (.+)$/i,
+    /^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
+    /^Missing API definition file in (.+)$/i,
+  ]
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module LoadErrorExtensions #:nodoc:
-      module LoadErrorClassMethods #:nodoc:
-        def new(*args)
-          (self == LoadError && MissingSourceFile.from_message(args.first)) || super
-        end
+  def path
+    @path ||= begin
+      REGEXPS.find do |regex|
+        message =~ regex
       end
-      ::LoadError.extend(LoadErrorClassMethods)
+      $1
     end
   end
+
+  def is_missing?(location)
+    location.sub(/\.rb$/, '') == path.sub(/\.rb$/, '')
+  end
 end
+
+MissingSourceFile = LoadError

data/lib/active_support/core_ext/logger.rb

@@ -1,6 +1,7 @@
-# Adds the 'around_level' method to Logger.
+require 'active_support/core_ext/class/attribute_accessors'
 
-class Logger
+# Adds the 'around_level' method to Logger.
+class Logger #:nodoc:
   def self.define_around_helper(level)
     module_eval <<-end_eval
       def around_#{level}(before_message, after_message, &block)  # def around_debug(before_message, after_message, &block)

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

@@ -1,74 +1,70 @@
-module ActiveSupport
-  module CoreExtensions
-    module Module
-      # Encapsulates the common pattern of:
-      #
-      #   alias_method :foo_without_feature, :foo
-      #   alias_method :foo, :foo_with_feature
-      #
-      # With this, you simply do:
-      #
-      #   alias_method_chain :foo, :feature
-      #
-      # And both aliases are set up for you.
-      #
-      # Query and bang methods (foo?, foo!) keep the same punctuation:
-      #
-      #   alias_method_chain :foo?, :feature
-      #
-      # is equivalent to
-      #
-      #   alias_method :foo_without_feature?, :foo?
-      #   alias_method :foo?, :foo_with_feature?
-      #
-      # so you can safely chain foo, foo?, and foo! with the same feature.
-      def alias_method_chain(target, feature)
-        # Strip out punctuation on predicates or bang methods since
-        # e.g. target?_without_feature is not a valid method name.
-        aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
-        yield(aliased_target, punctuation) if block_given?
+class Module
+  # Encapsulates the common pattern of:
+  #
+  #   alias_method :foo_without_feature, :foo
+  #   alias_method :foo, :foo_with_feature
+  #
+  # With this, you simply do:
+  #
+  #   alias_method_chain :foo, :feature
+  #
+  # And both aliases are set up for you.
+  #
+  # Query and bang methods (foo?, foo!) keep the same punctuation:
+  #
+  #   alias_method_chain :foo?, :feature
+  #
+  # is equivalent to
+  #
+  #   alias_method :foo_without_feature?, :foo?
+  #   alias_method :foo?, :foo_with_feature?
+  #
+  # so you can safely chain foo, foo?, and foo! with the same feature.
+  def alias_method_chain(target, feature)
+    # Strip out punctuation on predicates or bang methods since
+    # e.g. target?_without_feature is not a valid method name.
+    aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+    yield(aliased_target, punctuation) if block_given?
 
-        with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
+    with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
 
-        alias_method without_method, target
-        alias_method target, with_method
+    alias_method without_method, target
+    alias_method target, with_method
 
-        case
-          when public_method_defined?(without_method)
-            public target
-          when protected_method_defined?(without_method)
-            protected target
-          when private_method_defined?(without_method)
-            private target
-        end
-      end
-
-      # Allows you to make aliases for attributes, which includes
-      # getter, setter, and query methods.
-      #
-      # Example:
-      #
-      #   class Content < ActiveRecord::Base
-      #     # has a title attribute
-      #   end
-      #
-      #   class Email < Content
-      #     alias_attribute :subject, :title
-      #   end
-      #
-      #   e = Email.find(1)
-      #   e.title    # => "Superstars"
-      #   e.subject  # => "Superstars"
-      #   e.subject? # => true
-      #   e.subject = "Megastars"
-      #   e.title    # => "Megastars"
-      def alias_attribute(new_name, old_name)
-        module_eval <<-STR, __FILE__, __LINE__+1
-          def #{new_name}; self.#{old_name}; end          # def subject; self.title; end
-          def #{new_name}?; self.#{old_name}?; end        # def subject?; self.title?; end
-          def #{new_name}=(v); self.#{old_name} = v; end  # def subject=(v); self.title = v; end
-        STR
-      end
+    case
+      when public_method_defined?(without_method)
+        public target
+      when protected_method_defined?(without_method)
+        protected target
+      when private_method_defined?(without_method)
+        private target
     end
   end
+
+  # Allows you to make aliases for attributes, which includes
+  # getter, setter, and query methods.
+  #
+  # Example:
+  #
+  #   class Content < ActiveRecord::Base
+  #     # has a title attribute
+  #   end
+  #
+  #   class Email < Content
+  #     alias_attribute :subject, :title
+  #   end
+  #
+  #   e = Email.find(1)
+  #   e.title    # => "Superstars"
+  #   e.subject  # => "Superstars"
+  #   e.subject? # => true
+  #   e.subject = "Megastars"
+  #   e.title    # => "Megastars"
+  def alias_attribute(new_name, old_name)
+    module_eval <<-STR, __FILE__, __LINE__ + 1
+      def #{new_name}; self.#{old_name}; end          # def subject; self.title; end
+      def #{new_name}?; self.#{old_name}?; end        # def subject?; self.title?; end
+      def #{new_name}=(v); self.#{old_name} = v; end  # def subject=(v); self.title = v; end
+    STR
+  end
 end

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

@@ -0,0 +1,24 @@
+require 'active_support/core_ext/object/blank'
+
+class Module
+  # A module may or may not have a name.
+  #
+  #   module M; end
+  #   M.name # => "M"
+  #
+  #   m = Module.new
+  #   m.name # => ""
+  #
+  # A module gets a name when it is first assigned to a constant. Either
+  # via the +module+ or +class+ keyword or by an explicit assignment:
+  #
+  #   m = Module.new # creates an anonymous module
+  #   M = m          # => m gets a name here as a side-effect
+  #   m.name         # => "M"
+  #
+  def anonymous?
+    # Uses blank? because the name of an anonymous class is an empty
+    # string in 1.8, and nil in 1.9.
+    name.blank? 
+  end
+end

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

@@ -21,7 +21,7 @@ class Module
   def attr_accessor_with_default(sym, default = nil, &block)
     raise 'Default value or block required' unless !default.nil? || block
     define_method(sym, block_given? ? block : Proc.new { default })
-    module_eval(<<-EVAL, __FILE__, __LINE__)
+    module_eval(<<-EVAL, __FILE__, __LINE__ + 1)
       def #{sym}=(value)                        # def age=(value)
         class << self; attr_reader :#{sym} end  #   class << self; attr_reader :age end
         @#{sym} = value                         #   @age = value

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

@@ -22,11 +22,11 @@ class Module
 
   alias_method :attr_internal, :attr_internal_accessor
 
-  private
-    mattr_accessor :attr_internal_naming_format
-    self.attr_internal_naming_format = '@_%s'
+  class << self; attr_accessor :attr_internal_naming_format end
+  self.attr_internal_naming_format = '@_%s'
 
+  private
     def attr_internal_ivar_name(attr)
-      attr_internal_naming_format % attr
+      Module.attr_internal_naming_format % attr
     end
 end

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

@@ -1,58 +1,64 @@
-require "active_support/core_ext/array"
+require 'active_support/core_ext/array/extract_options'
 
-# Extends the module object with module and instance accessors for class attributes, 
-# just like the native attr* accessors for instance attributes.
-#
-#  module AppConfiguration
-#    mattr_accessor :google_api_key
-#    self.google_api_key = "123456789"
-#
-#    mattr_accessor :paypal_url
-#    self.paypal_url = "www.sandbox.paypal.com"
-#  end
-#
-#  AppConfiguration.google_api_key = "overriding the api key!"
 class Module
   def mattr_reader(*syms)
+    options = syms.extract_options!
     syms.each do |sym|
-      next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        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
-                                  #
-        def #{sym}                # def pagination_options
-          @@#{sym}                #   @@pagination_options
-        end                       # end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        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
-  
+
   def mattr_writer(*syms)
     options = syms.extract_options!
     syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}                       # unless defined? @@pagination_options
-          @@#{sym} = nil                               #   @@pagination_options = nil
-        end                                            # end
-                                                       #
-        def self.#{sym}=(obj)                          # def self.pagination_options=(obj)
-          @@#{sym} = obj                               #   @@pagination_options = obj
-        end                                            # end
-                                                       #
-        #{"                                            #
-        def #{sym}=(obj)                               # def pagination_options=(obj)
-          @@#{sym} = obj                               #   @@pagination_options = obj
-        end                                            # end
-        " unless options[:instance_writer] == false }  # # instance writer above is generated unless options[:instance_writer] == false
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
       EOS
+
+      unless options[:instance_writer] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+        EOS
+      end
     end
   end
-  
+
+  # Extends the module object with module and instance accessors for class attributes,
+  # just like the native attr* accessors for instance attributes.
+  #
+  #  module AppConfiguration
+  #    mattr_accessor :google_api_key
+  #    self.google_api_key = "123456789"
+  #
+  #    mattr_accessor :paypal_url
+  #    self.paypal_url = "www.sandbox.paypal.com"
+  #  end
+  #
+  #  AppConfiguration.google_api_key = "overriding the api key!"
   def mattr_accessor(*syms)
     mattr_reader(*syms)
     mattr_writer(*syms)

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
@@ -116,15 +123,19 @@ class Module
         if options[:allow_nil]
           'return'
         else
-          %(raise "#{prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
+          %(raise "#{self}##{prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
+        end
+
+      module_eval(<<-EOS, file, line - 5)
+        if instance_methods(false).map(&:to_s).include?("#{prefix}#{method}")
+          remove_possible_method("#{prefix}#{method}")
         end
 
-      module_eval(<<-EOS, file, line)
         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/deprecation.rb

@@ -0,0 +1,9 @@
+class Module
+  # Declare that a method has been deprecated.
+  #   deprecate :foo
+  #   deprecate :bar => 'message'
+  #   deprecate :foo, :bar, :baz => 'warning!', :qux => 'gone!'
+  def deprecate(*method_names)
+    ActiveSupport::Deprecation.deprecate_methods(self, *method_names)
+  end
+end

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

@@ -1,90 +1,88 @@
-module ActiveSupport
-  module CoreExtensions
-    module Module
-      # Returns the name of the module containing this one.
-      #
-      #   p M::N.parent_name # => "M"
-      def parent_name
-        unless defined? @parent_name
-          @parent_name = name =~ /::[^:]+\Z/ ? $`.freeze : nil
-        end
-        @parent_name
-      end
+require 'active_support/inflector'
 
-      # Returns the module which contains this one according to its name.
-      #
-      #   module M
-      #     module N
-      #     end
-      #   end
-      #   X = M::N
-      #
-      #   p M::N.parent # => M
-      #   p X.parent    # => M
-      #
-      # The parent of top-level and anonymous modules is Object.
-      #
-      #   p M.parent          # => Object
-      #   p Module.new.parent # => Object
-      #
-      def parent
-        parent_name ? parent_name.constantize : Object
-      end
+class Module
+  # Returns the name of the module containing this one.
+  #
+  #   M::N.parent_name # => "M"
+  def parent_name
+    unless defined? @parent_name
+      @parent_name = name =~ /::[^:]+\Z/ ? $`.freeze : nil
+    end
+    @parent_name
+  end
 
-      # Returns all the parents of this module according to its name, ordered from
-      # nested outwards. The receiver is not contained within the result.
-      #
-      #   module M
-      #     module N
-      #     end
-      #   end
-      #   X = M::N
-      #
-      #   p M.parents    # => [Object]
-      #   p M::N.parents # => [M, Object]
-      #   p X.parents    # => [M, Object]
-      #
-      def parents
-        parents = []
-        if parent_name
-          parts = parent_name.split('::')
-          until parts.empty?
-            parents << (parts * '::').constantize
-            parts.pop
-          end
-        end
-        parents << Object unless parents.include? Object
-        parents
-      end
+  # Returns the module which contains this one according to its name.
+  #
+  #   module M
+  #     module N
+  #     end
+  #   end
+  #   X = M::N
+  #
+  #   M::N.parent # => M
+  #   X.parent    # => M
+  #
+  # The parent of top-level and anonymous modules is Object.
+  #
+  #   M.parent          # => Object
+  #   Module.new.parent # => Object
+  #
+  def parent
+    parent_name ? ActiveSupport::Inflector.constantize(parent_name) : Object
+  end
 
-      if RUBY_VERSION < '1.9'
-        # Returns the constants that have been defined locally by this object and
-        # not in an ancestor. This method is exact if running under Ruby 1.9. In
-        # previous versions it may miss some constants if their definition in some
-        # ancestor is identical to their definition in the receiver.
-        def local_constants
-          inherited = {}
+  # Returns all the parents of this module according to its name, ordered from
+  # nested outwards. The receiver is not contained within the result.
+  #
+  #   module M
+  #     module N
+  #     end
+  #   end
+  #   X = M::N
+  #
+  #   M.parents    # => [Object]
+  #   M::N.parents # => [M, Object]
+  #   X.parents    # => [M, Object]
+  #
+  def parents
+    parents = []
+    if parent_name
+      parts = parent_name.split('::')
+      until parts.empty?
+        parents << ActiveSupport::Inflector.constantize(parts * '::')
+        parts.pop
+      end
+    end
+    parents << Object unless parents.include? Object
+    parents
+  end
 
-          ancestors.each do |anc|
-            next if anc == self
-            anc.constants.each { |const| inherited[const] = anc.const_get(const) }
-          end
+  if RUBY_VERSION < '1.9'
+    # Returns the constants that have been defined locally by this object and
+    # not in an ancestor. This method is exact if running under Ruby 1.9. In
+    # previous versions it may miss some constants if their definition in some
+    # ancestor is identical to their definition in the receiver.
+    def local_constants
+      inherited = {}
 
-          constants.select do |const|
-            !inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
-          end
-        end
-      else
-        def local_constants #:nodoc:
-          constants(false)
-        end
+      ancestors.each do |anc|
+        next if anc == self
+        anc.constants.each { |const| inherited[const] = anc.const_get(const) }
       end
 
-      # Returns the names of the constants defined locally rather than the
-      # constants themselves. See <tt>local_constants</tt>.
-      def local_constant_names
-        local_constants.map { |c| c.to_s }
+      constants.select do |const|
+        !inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
       end
     end
+  else
+    def local_constants #:nodoc:
+      constants(false)
+    end
+  end
+
+  # Returns the names of the constants defined locally rather than the
+  # constants themselves. See <tt>local_constants</tt>.
+  def local_constant_names
+    local_constants.map { |c| c.to_s }
   end
 end

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/module/synchronization.rb

@@ -1,3 +1,6 @@
+require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/array/extract_options'
+
 class Module
   # Synchronize access around a method, delegating synchronization to a
   # particular mutex. A mutex (either a Mutex, or any object that responds to 
@@ -25,7 +28,7 @@ class Module
         raise ArgumentError, "#{method} is already synchronized. Double synchronization is not currently supported."
       end
 
-      module_eval(<<-EOS, __FILE__, __LINE__)
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def #{aliased_method}_with_synchronization#{punctuation}(*args, &block)     # def expire_with_synchronization(*args, &block)
           #{with}.synchronize do                                                    #   @@lock.synchronize do
             #{aliased_method}_without_synchronization#{punctuation}(*args, &block)  #     expire_without_synchronization(*args, &block)