activesupport 2.3.18 → 3.0.0.beta

data/lib/active_support/core_ext/integer.rb

@@ -1,9 +1,3 @@
-require 'active_support/core_ext/integer/even_odd'
+require 'active_support/core_ext/integer/multiple'
 require 'active_support/core_ext/integer/inflections'
 require 'active_support/core_ext/integer/time'
-
-class Integer #:nodoc:
-  include ActiveSupport::CoreExtensions::Integer::EvenOdd
-  include ActiveSupport::CoreExtensions::Integer::Inflections
-  include ActiveSupport::CoreExtensions::Integer::Time
-end

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

@@ -1,20 +1,14 @@
 require 'active_support/inflector'
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Integer #:nodoc:
-      module Inflections
-        # Ordinalize turns a number into an ordinal string used to denote the
-        # position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
-        #
-        #   1.ordinalize    # => "1st"
-        #   2.ordinalize    # => "2nd"
-        #   1002.ordinalize # => "1002nd"
-        #   1003.ordinalize # => "1003rd"
-        def ordinalize
-          Inflector.ordinalize(self)
-        end
-      end
-    end
+class Integer
+  # Ordinalize turns a number into an ordinal string used to denote the
+  # position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
+  #
+  #   1.ordinalize    # => "1st"
+  #   2.ordinalize    # => "2nd"
+  #   1002.ordinalize # => "1002nd"
+  #   1003.ordinalize # => "1003rd"
+  def ordinalize
+    ActiveSupport::Inflector.ordinalize(self)
   end
 end

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

@@ -0,0 +1,6 @@
+class Integer
+  # Check whether the integer is evenly divisible by the argument.
+  def multiple_of?(number)
+    number != 0 ? self % number == 0 : zero?
+  end
+end

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

@@ -1,45 +1,39 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Integer #:nodoc:
-      # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.
-      #
-      # These methods use Time#advance for precise date calculations when using from_now, ago, etc. 
-      # as well as adding or subtracting their results from a Time object. For example:
-      #
-      #   # equivalent to Time.now.advance(:months => 1)
-      #   1.month.from_now
-      #
-      #   # equivalent to Time.now.advance(:years => 2)
-      #   2.years.from_now
-      #
-      #   # equivalent to Time.now.advance(:months => 4, :years => 5)
-      #   (4.months + 5.years).from_now
-      # 
-      # While these methods provide precise calculation when used as in the examples above, care
-      # should be taken to note that this is not true if the result of `months', `years', etc is
-      # converted before use:
-      #
-      #   # equivalent to 30.days.to_i.from_now
-      #   1.month.to_i.from_now
-      #
-      #   # equivalent to 365.25.days.to_f.from_now
-      #   1.year.to_f.from_now
-      #
-      # In such cases, Ruby's core
-      # Date[http://stdlib.rubyonrails.org/libdoc/date/rdoc/index.html] and
-      # Time[http://stdlib.rubyonrails.org/libdoc/time/rdoc/index.html] should be used for precision
-      # date and time arithmetic
-      module Time        
-        def months
-          ActiveSupport::Duration.new(self * 30.days, [[:months, self]])
-        end
-        alias :month :months
+class Integer
+  # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.
+  #
+  # These methods use Time#advance for precise date calculations when using from_now, ago, etc. 
+  # as well as adding or subtracting their results from a Time object. For example:
+  #
+  #   # equivalent to Time.now.advance(:months => 1)
+  #   1.month.from_now
+  #
+  #   # equivalent to Time.now.advance(:years => 2)
+  #   2.years.from_now
+  #
+  #   # equivalent to Time.now.advance(:months => 4, :years => 5)
+  #   (4.months + 5.years).from_now
+  # 
+  # While these methods provide precise calculation when used as in the examples above, care
+  # should be taken to note that this is not true if the result of `months', `years', etc is
+  # converted before use:
+  #
+  #   # equivalent to 30.days.to_i.from_now
+  #   1.month.to_i.from_now
+  #
+  #   # equivalent to 365.25.days.to_f.from_now
+  #   1.year.to_f.from_now
+  #
+  # In such cases, Ruby's core
+  # Date[http://stdlib.rubyonrails.org/libdoc/date/rdoc/index.html] and
+  # Time[http://stdlib.rubyonrails.org/libdoc/time/rdoc/index.html] should be used for precision
+  # date and time arithmetic
+  def months
+    ActiveSupport::Duration.new(self * 30.days, [[:months, self]])
+  end
+  alias :month :months
 
-        def years
-          ActiveSupport::Duration.new(self * 365.25.days, [[:years, self]])
-        end
-        alias :year :years
-      end
-    end
+  def years
+    ActiveSupport::Duration.new(self * 365.25.days, [[:years, self]])
   end
+  alias :year :years
 end

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

@@ -7,15 +7,17 @@ module Kernel
   #
   #   noisy_call # warning voiced
   def silence_warnings
-    old_verbose, $VERBOSE = $VERBOSE, nil
-    yield
-  ensure
-    $VERBOSE = old_verbose
+    with_warnings(nil) { yield }
   end
 
   # Sets $VERBOSE to true for the duration of the block and back to its original value afterwards.
   def enable_warnings
-    old_verbose, $VERBOSE = $VERBOSE, true
+    with_warnings(true) { yield }
+  end
+
+  # Sets $VERBOSE for the duration of the block and back to its original value afterwards.
+  def with_warnings(flag)
+    old_verbose, $VERBOSE = $VERBOSE, flag
     yield
   ensure
     $VERBOSE = old_verbose
@@ -35,7 +37,7 @@ module Kernel
   #   puts 'But this will'
   def silence_stream(stream)
     old_stream = stream.dup
-    stream.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
+    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
     stream.sync = true
     yield
   ensure
@@ -56,4 +58,4 @@ module Kernel
       raise unless exception_classes.any? { |cls| e.kind_of?(cls) }
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/kernel/reporting'
+
 module Kernel
   # Require a library with fallback to RubyGems.  Warnings during library
   # loading are silenced to increase signal/noise for application warnings.
@@ -21,4 +23,4 @@ module Kernel
       end
     end
   end
-end
+end

data/lib/active_support/core_ext/load_error.rb

@@ -1,39 +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 = [
-    [/^cannot load such file -- (.+)$/i, 1],
-    [/^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.rb

@@ -1,23 +1,10 @@
+require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/module/introspection'
+
 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/introspection'
 require 'active_support/core_ext/module/loading'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/module/model_naming'
 require 'active_support/core_ext/module/synchronization'
-
-module ActiveSupport
-  module CoreExtensions
-    # Various extensions for the Ruby core Module class.
-    module Module
-      # Nothing here. Only defined for API documentation purposes.
-    end
-  end
-end
-
-class Module
-  include ActiveSupport::CoreExtensions::Module
-end

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/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

@@ -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,65 +1,60 @@
-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.extract_options!
     syms.each do |sym|
-      next if sym.is_a?(Hash)
       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}
-          @@#{sym}
-        end
-      EOS
+        def self.#{sym}           # def self.pagination_options
+          @@#{sym}                #   @@pagination_options
+        end                       # end
 
-      unless options[:instance_reader] == false
-        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-          def #{sym}
-            @@#{sym}
-          end
-        EOS
-      end
+        def #{sym}                # def pagination_options
+          @@#{sym}                #   @@pagination_options
+        end                       # end
+      EOS
     end
   end
-  
+
   def mattr_writer(*syms)
     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
   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)