activesupport 2.3.18 → 3.0.0.beta

data/lib/active_support/core_ext/object.rb

@@ -1,7 +1,9 @@
+require 'active_support/core_ext/object/acts_like'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/object/try'
+
 require 'active_support/core_ext/object/conversions'
-require 'active_support/core_ext/object/extending'
 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'

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

@@ -0,0 +1,10 @@
+class Object
+  # A duck-type assistant method. For example, Active Support extends Date
+  # to define an acts_like_date? method, and extends Time to define
+  # acts_like_time?. As a result, we can do "x.acts_like?(:time)" and
+  # "x.acts_like?(:date)" to do duck-type-safe comparisons, since classes that
+  # we want to act like Time simply need to define an acts_like_time? method.
+  def acts_like?(duck)
+    respond_to? :"acts_like_#{duck}?"
+  end
+end

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

@@ -1,15 +1,4 @@
-class Object
-  # Alias of <tt>to_s</tt>.
-  def to_param
-    to_s
-  end
-
-  # Converts an object into a string suitable for use as a URL query string, using the given <tt>key</tt> as the
-  # param name.
-  #
-  # Note: This method is defined as a default implementation for all Objects for Hash#to_query to work.
-  def to_query(key)
-    require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
-    "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}"
-  end
-end
+require 'active_support/core_ext/object/to_param'
+require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/array/conversions'
+require 'active_support/core_ext/hash/conversions'

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

@@ -0,0 +1,65 @@
+# Most objects are cloneable, but not all. For example you can't dup +nil+:
+#
+#   nil.dup # => TypeError: can't dup NilClass
+#
+# Classes may signal their instances are not duplicable removing +dup+/+clone+
+# or raising exceptions from them. So, to dup an arbitrary object you normally
+# use an optimistic approach and are ready to catch an exception, say:
+#
+#   arbitrary_object.dup rescue object
+#
+# Rails dups objects in a few critical spots where they are not that arbitrary.
+# That rescue is very expensive (like 40 times slower than a predicate), and it
+# is often triggered.
+#
+# That's why we hardcode the following cases and check duplicable? instead of
+# using that rescue idiom.
+class Object
+  # Can you safely .dup this object?
+  # False for nil, false, true, symbols, numbers, class and module objects; true otherwise.
+  def duplicable?
+    true
+  end
+end
+
+class NilClass #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class FalseClass #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class TrueClass #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Symbol #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Numeric #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Class #:nodoc:
+  def duplicable?
+    false
+  end
+end
+
+class Module #:nodoc:
+  def duplicable?
+    false
+  end
+end

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

@@ -1,11 +1,4 @@
 class Object
-  # Available in 1.8.6 and later.
-  unless respond_to?(:instance_variable_defined?)
-    def instance_variable_defined?(variable)
-      instance_variables.include?(variable.to_s)
-    end
-  end
-
   # Returns a hash that maps instance variable names without "@" to their
   # corresponding values. Keys are strings both in Ruby 1.8 and 1.9.
   #

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

@@ -1,14 +1,13 @@
-require 'active_support/deprecation'
-
 class Object
-  # Get object's meta (ghost, eigenclass, singleton) class.
-  #
-  # Deprecated in favor of Object#singleton_class.
+  # Get object's meta (ghost, eigenclass, singleton) class
   def metaclass
     class << self
       self
     end
   end
 
-  deprecate :metaclass => :singleton_class
+  # 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
 end

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

@@ -1,93 +1,2 @@
-require 'active_support/deprecation'
-
-class Object
-  # Returns +value+ after yielding +value+ to the block. This simplifies the
-  # process of constructing an object, performing work on the object, and then
-  # returning the object from a method. It is a Ruby-ized realization of the K
-  # combinator, courtesy of Mikael Brockman.
-  #
-  # ==== Examples
-  #
-  #  # Without returning
-  #  def foo
-  #    values = []
-  #    values << "bar"
-  #    values << "baz"
-  #    return values
-  #  end
-  #
-  #  foo # => ['bar', 'baz']
-  #
-  #  # returning with a local variable
-  #  def foo
-  #    returning values = [] do
-  #      values << 'bar'
-  #      values << 'baz'
-  #    end
-  #  end
-  #
-  #  foo # => ['bar', 'baz']
-  #  
-  #  # returning with a block argument
-  #  def foo
-  #    returning [] do |values|
-  #      values << 'bar'
-  #      values << 'baz'
-  #    end
-  #  end
-  #  
-  #  foo # => ['bar', 'baz']
-  def returning(value)
-    ActiveSupport::Deprecation.warn('Kernel#returning has been deprecated in favor of Object#tap.', caller)
-    yield(value)
-    value
-  end
-
-  # Yields <code>x</code> to the block, and then returns <code>x</code>.
-  # The primary purpose of this method is to "tap into" a method chain,
-  # in order to perform operations on intermediate results within the chain.
-  #
-  #   (1..10).tap { |x| puts "original: #{x.inspect}" }.to_a.
-  #     tap    { |x| puts "array: #{x.inspect}" }.
-  #     select { |x| x%2 == 0 }.
-  #     tap    { |x| puts "evens: #{x.inspect}" }.
-  #     map    { |x| x*x }.
-  #     tap    { |x| puts "squares: #{x.inspect}" }
-  def tap
-    yield self
-    self
-  end unless Object.respond_to?(:tap)
-
-  # An elegant way to factor duplication out of options passed to a series of
-  # method calls. Each method called in the block, with the block variable as
-  # the receiver, will have its options merged with the default +options+ hash
-  # provided. Each method called on the block variable must take an options
-  # hash as its final argument.
-  # 
-  #   with_options :order => 'created_at', :class_name => 'Comment' do |post|
-  #     post.has_many :comments, :conditions => ['approved = ?', true], :dependent => :delete_all
-  #     post.has_many :unapproved_comments, :conditions => ['approved = ?', false]
-  #     post.has_many :all_comments
-  #   end
-  #
-  # Can also be used with an explicit receiver:
-  #
-  #   map.with_options :controller => "people" do |people|
-  #     people.connect "/people",     :action => "index"
-  #     people.connect "/people/:id", :action => "show"
-  #   end
-  #
-  def with_options(options)
-    yield ActiveSupport::OptionMerger.new(self, options)
-  end
-  
-  # A duck-type assistant method. For example, Active Support extends Date
-  # to define an acts_like_date? method, and extends Time to define
-  # acts_like_time?. As a result, we can do "x.acts_like?(:time)" and
-  # "x.acts_like?(:date)" to do duck-type-safe comparisons, since classes that
-  # we want to act like Time simply need to define an acts_like_time? method.
-  def acts_like?(duck)
-    respond_to? "acts_like_#{duck}?"
-  end
-
-end
+require 'active_support/core_ext/object/returning'
+require 'active_support/core_ext/object/with_options'

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

@@ -0,0 +1,42 @@
+class Object
+  # Returns +value+ after yielding +value+ to the block. This simplifies the
+  # process of constructing an object, performing work on the object, and then
+  # returning the object from a method. It is a Ruby-ized realization of the K
+  # combinator, courtesy of Mikael Brockman.
+  #
+  # ==== Examples
+  #
+  #  # Without returning
+  #  def foo
+  #    values = []
+  #    values << "bar"
+  #    values << "baz"
+  #    return values
+  #  end
+  #
+  #  foo # => ['bar', 'baz']
+  #
+  #  # returning with a local variable
+  #  def foo
+  #    returning values = [] do
+  #      values << 'bar'
+  #      values << 'baz'
+  #    end
+  #  end
+  #
+  #  foo # => ['bar', 'baz']
+  #
+  #  # returning with a block argument
+  #  def foo
+  #    returning [] do |values|
+  #      values << 'bar'
+  #      values << 'baz'
+  #    end
+  #  end
+  #
+  #  foo # => ['bar', 'baz']
+  def returning(value)
+    yield(value)
+    value
+  end
+end

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

@@ -0,0 +1,49 @@
+
+
+class Object
+  # Alias of <tt>to_s</tt>.
+  def to_param
+    to_s
+  end
+end
+
+class NilClass
+  def to_param
+    self
+  end
+end
+
+class TrueClass
+  def to_param
+    self
+  end
+end
+
+class FalseClass
+  def to_param
+    self
+  end
+end
+
+class Array
+  # Calls <tt>to_param</tt> on all its elements and joins the result with
+  # slashes. This is used by <tt>url_for</tt> in Action Pack.
+  def to_param
+    collect { |e| e.to_param }.join '/'
+  end
+end
+
+class Hash
+  # Converts a hash into a string suitable for use as a URL query string. An optional <tt>namespace</tt> can be
+  # passed to enclose the param names (see example below).
+  #
+  # ==== Examples
+  #   { :name => 'David', :nationality => 'Danish' }.to_query # => "name=David&nationality=Danish"
+  #
+  #   { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user[name]=David&user[nationality]=Danish"
+  def to_param(namespace = nil)
+    collect do |key, value|
+      value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+    end.sort * '&'
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'active_support/core_ext/object/to_param'
+
+class Object
+  # Converts an object into a string suitable for use as a URL query string, using the given <tt>key</tt> as the
+  # param name.
+  #
+  # Note: This method is defined as a default implementation for all Objects for Hash#to_query to work.
+  def to_query(key)
+    require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
+    "#{CGI.escape(key.to_s).gsub(/%(5B|5D)/n) { [$1].pack('H*') }}=#{CGI.escape(to_param.to_s)}"
+  end
+end
+
+class Array
+  # Converts an array into a string suitable for use as a URL query string,
+  # using the given +key+ as the param name.
+  #
+  #   ['Rails', 'coding'].to_query('hobbies') # => "hobbies[]=Rails&hobbies[]=coding"
+  def to_query(key)
+    prefix = "#{key}[]"
+    collect { |value| value.to_query(prefix) }.join '&'
+  end
+end
+
+class Hash
+  alias_method :to_query, :to_param
+end

data/lib/active_support/core_ext/{try.rb → object/try.rb}

@@ -1,8 +1,8 @@
 class Object
-  # Invokes the method identified by the symbol +method+, passing it any arguments 
+  # Invokes the method identified by the symbol +method+, passing it any arguments
   # and/or the block specified, just like the regular Ruby <tt>Object#send</tt> does.
   #
-  # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised 
+  # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised
   # and +nil+ will be returned instead, if the receiving object is a +nil+ object or NilClass.
   #
   # ==== Examples
@@ -19,7 +19,7 @@ class Object
   #   Person.try(:find, 1)
   #   @people.try(:collect) {|p| p.name}
   #--
-  # This method definition below is for rdoc purposes only. The alias_method call 
+  # This method definition below is for rdoc purposes only. The alias_method call
   # below overrides it as an optimization since +try+ behaves like +Object#send+,
   # unless called on +NilClass+.
   def try(method, *args, &block)
@@ -29,7 +29,7 @@ class Object
   alias_method :try, :__send__
 end
 
-class NilClass
+class NilClass #:nodoc:
   def try(*args)
     nil
   end

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

@@ -0,0 +1,24 @@
+class Object
+  # An elegant way to factor duplication out of options passed to a series of
+  # method calls. Each method called in the block, with the block variable as
+  # the receiver, will have its options merged with the default +options+ hash
+  # provided. Each method called on the block variable must take an options
+  # hash as its final argument.
+  #
+  #   with_options :order => 'created_at', :class_name => 'Comment' do |post|
+  #     post.has_many :comments, :conditions => ['approved = ?', true], :dependent => :delete_all
+  #     post.has_many :unapproved_comments, :conditions => ['approved = ?', false]
+  #     post.has_many :all_comments
+  #   end
+  #
+  # Can also be used with an explicit receiver:
+  #
+  #   map.with_options :controller => "people" do |people|
+  #     people.connect "/people",     :action => "index"
+  #     people.connect "/people/:id", :action => "show"
+  #   end
+  #
+  def with_options(options)
+    yield ActiveSupport::OptionMerger.new(self, options)
+  end
+end

data/lib/active_support/core_ext/proc.rb

@@ -1,11 +1,13 @@
+require "active_support/core_ext/object"
+
 class Proc #:nodoc:
   def bind(object)
     block, time = self, Time.now
-    (class << object; self end).class_eval do
+    object.class_eval do
       method_name = "__bind_#{time.to_i}_#{time.usec}"
-      define_method(method_name, &block)
-      method = instance_method(method_name)
-      remove_method(method_name)
+      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")
       method
     end.bind(object)
   end

data/lib/active_support/core_ext/process/daemon.rb

@@ -1,25 +1,23 @@
-if RUBY_VERSION < "1.9"
-  module Process
-    def self.daemon(nochdir = nil, noclose = nil)
-      exit if fork                     # Parent exits, child continues.
-      Process.setsid                   # Become session leader.
-      exit if fork                     # Zap session leader. See [1].
+module Process
+  def self.daemon(nochdir = nil, noclose = nil)
+    exit if fork                     # Parent exits, child continues.
+    Process.setsid                   # Become session leader.
+    exit if fork                     # Zap session leader. See [1].
 
-      unless nochdir
-        Dir.chdir "/"                  # Release old working directory.
-      end
+    unless nochdir
+      Dir.chdir "/"                  # Release old working directory.
+    end
 
-      File.umask 0000                  # Ensure sensible umask. Adjust as needed.
+    File.umask 0000                  # Ensure sensible umask. Adjust as needed.
 
-      unless noclose
-        STDIN.reopen "/dev/null"       # Free file descriptors and
-        STDOUT.reopen "/dev/null", "a" # point them somewhere sensible.
-        STDERR.reopen '/dev/null', 'a'
-      end
+    unless noclose
+      STDIN.reopen "/dev/null"       # Free file descriptors and
+      STDOUT.reopen "/dev/null", "a" # point them somewhere sensible.
+      STDERR.reopen '/dev/null', 'a'
+    end
 
-      trap("TERM") { exit }
+    trap("TERM") { exit }
 
-      return 0
-    end
-  end
+    return 0
+  end unless respond_to?(:daemon)
 end