activesupport 3.0.0.beta4 → 3.0.pre

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

@@ -3,14 +3,6 @@ class Hash
   # limiting a set of parameters to everything but a few known toggles:
   #
   #   @person.update_attributes(params[:person].except(:admin))
-  #
-  # If the receiver responds to +convert_key+, the method is called on each of the
-  # arguments. This allows +except+ to play nice with hashes with indifferent access
-  # for instance:
-  #
-  #   {:a => 1}.with_indifferent_access.except(:a)  # => {}
-  #   {:a => 1}.with_indifferent_access.except("a") # => {}
-  #
   def except(*keys)
     dup.except!(*keys)
   end

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

@@ -1,11 +1,6 @@
 require 'active_support/hash_with_indifferent_access'
 
 class Hash
-
-  # Returns an +ActiveSupport::HashWithIndifferentAccess+ out of its receiver:
-  #
-  #   {:a => 1}.with_indifferent_access["a"] # => 1
-  #
   def with_indifferent_access
     hash = ActiveSupport::HashWithIndifferentAccess.new(self)
     hash.default = self.default

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

@@ -1,7 +1,10 @@
 class Hash
   # Return a new hash with all keys converted to strings.
   def stringify_keys
-    dup.stringify_keys!
+    inject({}) do |options, (key, value)|
+      options[key.to_s] = value
+      options
+    end
   end
 
   # Destructively convert all keys to strings.
@@ -12,19 +15,17 @@ class Hash
     self
   end
 
-  # Return a new hash with all keys converted to symbols, as long as
-  # they respond to +to_sym+.
+  # Return a new hash with all keys converted to symbols.
   def symbolize_keys
-    dup.symbolize_keys!
+    inject({}) do |options, (key, value)|
+      options[(key.to_sym rescue key) || key] = value
+      options
+    end
   end
 
-  # Destructively convert all keys to symbols, as long as they respond
-  # to +to_sym+.
+  # Destructively convert all keys to symbols.
   def symbolize_keys!
-    keys.each do |key|
-      self[(key.to_sym rescue key) || key] = delete(key)
-    end
-    self
+    self.replace(self.symbolize_keys)
   end
 
   alias_method :to_options,  :symbolize_keys

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

@@ -29,10 +29,4 @@ class Hash
     replace(hash)
     omit
   end
-
-  def extract!(*keys)
-    result = {}
-    keys.each {|key| result[key] = delete(key) }
-    result
-  end
 end

data/lib/active_support/core_ext/integer.rb

@@ -1,3 +1,3 @@
-require 'active_support/core_ext/integer/multiple'
+require 'active_support/core_ext/integer/even_odd'
 require 'active_support/core_ext/integer/inflections'
 require 'active_support/core_ext/integer/time'

data/lib/active_support/core_ext/integer/even_odd.rb

@@ -0,0 +1,16 @@
+class Integer
+  # Check whether the integer is evenly divisible by the argument.
+  def multiple_of?(number)
+    self % number == 0
+  end
+
+  # Is the integer a multiple of 2?
+  def even?
+    multiple_of? 2
+  end unless method_defined?(:even?)
+
+  # Is the integer not a multiple of 2?
+  def odd?
+    !even?
+  end unless method_defined?(:odd?)
+end

data/lib/active_support/core_ext/kernel.rb

@@ -1,5 +1,5 @@
+require 'active_support/core_ext/kernel/daemonizing'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/kernel/agnostics'
 require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/kernel/debugger'
-require 'active_support/core_ext/kernel/singleton_class'

data/lib/active_support/core_ext/kernel/daemonizing.rb

@@ -0,0 +1,7 @@
+module Kernel
+  # Turns the current script into a daemon process that detaches from the console.
+  # It can be shut down with a TERM signal.
+  def daemonize
+    Process.daemon
+  end
+end

data/lib/active_support/core_ext/kernel/debugger.rb

@@ -1,13 +1,12 @@
 module Kernel
   unless respond_to?(:debugger)
-    # Starts a debugging session if ruby-debug has been loaded (call rails server --debugger to do load it).
+    # Starts a debugging session if ruby-debug has been loaded (call script/server --debugger to do load it).
     def debugger
-      message = "\n***** Debugger requested, but was not available (ensure ruby-debug is listed in Gemfile/installed as gem): Start server with --debugger to enable *****\n"
+      message = "\n***** Debugger requested, but was not available: Start server with --debugger to enable *****\n"
       defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)
     end
   end
 
-  undef :breakpoint if respond_to?(:breakpoint)
   def breakpoint
     message = "\n***** The 'breakpoint' command has been renamed 'debugger' -- please change *****\n"
     defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)

data/lib/active_support/core_ext/kernel/reporting.rb

@@ -1,4 +1,3 @@
-require 'rbconfig'
 module Kernel
   # Sets $VERBOSE to nil for the duration of the block and back to its original value afterwards.
   #
@@ -38,7 +37,7 @@ module Kernel
   #   puts 'But this will'
   def silence_stream(stream)
     old_stream = stream.dup
-    stream.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
     stream.sync = true
     yield
   ensure

data/lib/active_support/core_ext/load_error.rb

@@ -1,23 +1,36 @@
-class LoadError
-  REGEXPS = [
-    /^no such file to load -- (.+)$/i,
-    /^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
-    /^Missing API definition file in (.+)$/i,
-    /^cannot load such file -- (.+)$/i,
-  ]
+class MissingSourceFile < LoadError #:nodoc:
+  attr_reader :path
+  def initialize(message, path)
+    super(message)
+    @path = path
+  end
 
-  def path
-    @path ||= begin
-      REGEXPS.find do |regex|
-        message =~ regex
-      end
-      $1
-    end
+  def is_missing?(path)
+    path.gsub(/\.rb$/, '') == self.path.gsub(/\.rb$/, '')
   end
 
-  def is_missing?(location)
-    location.sub(/\.rb$/, '') == path.sub(/\.rb$/, '')
+  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
+
+  REGEXPS = [
+    [/^no such file to load -- (.+)$/i, 1],
+    [/^Missing \w+ (file\s*)?([^\s]+.rb)$/i, 2],
+    [/^Missing API definition file in (.+)$/i, 1],
+    [/win32/, 0]
+  ] unless defined?(REGEXPS)
 end
 
-MissingSourceFile = LoadError
+class LoadError
+  def self.new(*args)
+    if self == LoadError
+      MissingSourceFile.from_message(args.first)
+    else
+      super
+    end
+  end
+end

data/lib/active_support/core_ext/logger.rb

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

data/lib/active_support/core_ext/module.rb

@@ -1,12 +1,10 @@
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/introspection'
-require 'active_support/core_ext/module/anonymous'
-require 'active_support/core_ext/module/reachable'
+
+require 'active_support/core_ext/module/inclusion'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/attr_accessor_with_default'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/loading'
 require 'active_support/core_ext/module/synchronization'
-require 'active_support/core_ext/module/deprecation'
-require 'active_support/core_ext/module/remove_method'
-require 'active_support/core_ext/module/method_names'

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

@@ -61,7 +61,7 @@ class Module
   #   e.subject = "Megastars"
   #   e.title    # => "Megastars"
   def alias_attribute(new_name, old_name)
-    module_eval <<-STR, __FILE__, __LINE__ + 1
+    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

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__ + 1)
+    module_eval(<<-EVAL, __FILE__, __LINE__)
       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

@@ -2,14 +2,14 @@ class Module
   # Declares an attribute reader backed by an internally-named instance variable.
   def attr_internal_reader(*attrs)
     attrs.each do |attr|
-      module_eval "def #{attr}() #{attr_internal_ivar_name(attr)} end", __FILE__, __LINE__
+      module_eval "def #{attr}() #{attr_internal_ivar_name(attr)} end"
     end
   end
 
   # Declares an attribute writer backed by an internally-named instance variable.
   def attr_internal_writer(*attrs)
     attrs.each do |attr|
-      module_eval "def #{attr}=(v) #{attr_internal_ivar_name(attr)} = v end", __FILE__, __LINE__
+      module_eval "def #{attr}=(v) #{attr_internal_ivar_name(attr)} = v end"
     end
   end
 

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

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

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

@@ -1,21 +1,14 @@
-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 via the <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 as the final <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
@@ -41,7 +34,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
@@ -79,9 +72,9 @@ class Module
   #   invoice.customer_name    # => "John Doe"
   #   invoice.customer_address # => "Vimmersvej 13"
   #
-  # 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.
+  # 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:
   #
   #  class Foo
   #    attr_accessor :bar
@@ -126,16 +119,12 @@ class Module
           %(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}                                       #     return # depends on :allow_nil
+            #{on_nil}
           else                                              #   else
             raise                                           #     raise
           end                                               #   end

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

@@ -0,0 +1,30 @@
+class Module
+  # Returns the classes in the current ObjectSpace where this module has been
+  # mixed in according to Module#included_modules.
+  #
+  #   module M
+  #   end
+  #   
+  #   module N
+  #     include M
+  #   end
+  #   
+  #   class C
+  #     include M
+  #   end
+  #   
+  #   class D < C
+  #   end
+  #
+  #   p M.included_in_classes # => [C, D]
+  #
+  def included_in_classes
+    classes = []
+    ObjectSpace.each_object(Class) { |k| classes << k if k.included_modules.include?(self) }
+
+    classes.reverse.inject([]) do |unique_classes, klass| 
+      unique_classes << klass unless unique_classes.collect { |k| k.to_s }.include?(klass.to_s)
+      unique_classes
+    end
+  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.
   #
-  #   M::N.parent_name # => "M"
+  #   p 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
   #
-  #   M::N.parent # => M
-  #   X.parent    # => M
+  #   p M::N.parent # => M
+  #   p X.parent    # => M
   #
   # The parent of top-level and anonymous modules is Object.
   #
-  #   M.parent          # => Object
-  #   Module.new.parent # => Object
+  #   p M.parent          # => Object
+  #   p Module.new.parent # => Object
   #
   def parent
     parent_name ? ActiveSupport::Inflector.constantize(parent_name) : Object
@@ -40,9 +40,9 @@ class Module
   #   end
   #   X = M::N
   #
-  #   M.parents    # => [Object]
-  #   M::N.parents # => [M, Object]
-  #   X.parents    # => [M, Object]
+  #   p M.parents    # => [Object]
+  #   p M::N.parents # => [M, Object]
+  #   p X.parents    # => [M, Object]
   #
   def parents
     parents = []