activesupport 1.2.5 → 1.3.0

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

@@ -0,0 +1,11 @@
+class Module
+  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

@@ -0,0 +1,21 @@
+class Module
+  # Return the module which contains this one; if this is a root module, such as
+  # +::MyModule+, then Object is returned.
+  def parent
+    parent_name = name.split('::')[0..-2] * '::'
+    parent_name.empty? ? Object : parent_name.constantize
+  end
+  
+  # Return all the parents of this module, ordered from nested outwards. The
+  # receiver is not contained within the result.
+  def parents
+    parents = []
+    parts = name.split('::')[0..-2]
+    until parts.empty?
+      parents << (parts * '::').constantize
+      parts.pop
+    end
+    parents << Object unless parents.include? Object
+    parents
+  end
+end

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

@@ -0,0 +1,13 @@
+class Module
+  def as_load_path
+    if self == Object || self == Kernel
+      ''
+    elsif is_a? Class
+      parent == self ? '' : parent.as_load_path
+    else
+      name.split('::').collect do |word|
+        word.underscore
+      end * '/'
+    end
+  end
+end

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

@@ -1,8 +1,21 @@
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Numeric #:nodoc:
-      # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years
+      # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.
+      #
+      # If you need precise date calculations that doesn't just treat months as 30 days, then have
+      # a look at Time#advance.
+      # 
+      # Some of these methods are approximations, 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 seconds
+          self
+        end
+        alias :second :seconds
+
         def minutes
           self * 60
         end

data/lib/active_support/core_ext/object.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/object/extending'
+require File.dirname(__FILE__) + '/object/misc'

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

@@ -0,0 +1,47 @@
+class Object #:nodoc:
+  def remove_subclasses_of(*superclasses)
+    Class.remove_class(*subclasses_of(*superclasses))
+  end
+
+  def subclasses_of(*superclasses)
+    subclasses = []
+    ObjectSpace.each_object(Class) do |k|
+      next if # Exclude this class if
+        (k.ancestors & superclasses).empty? || # It's not a subclass of our supers
+        superclasses.include?(k) || # It *is* one of the supers
+        eval("! defined?(::#{k})") || # It's not defined.
+        eval("::#{k}").object_id != k.object_id
+      subclasses << k
+    end
+    subclasses
+  end
+  
+  def extended_by
+    ancestors = class << self; ancestors end
+    ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ]
+  end
+  
+  def copy_instance_variables_from(object, exclude = [])
+    exclude += object.protected_instance_variables if object.respond_to? :protected_instance_variables
+    
+    instance_variables = object.instance_variables - exclude.map { |name| name.to_s }
+    instance_variables.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
+  end
+  
+  def extend_with_included_modules_from(object)
+    object.extended_by.each { |mod| extend mod }
+  end
+
+  def instance_values
+    instance_variables.inject({}) do |values, name|
+      values[name[1..-1]] = instance_variable_get(name)
+      values
+    end
+  end
+  
+  unless defined? instance_exec # 1.9
+    def instance_exec(*arguments, &block)
+      block.bind(self)[*arguments]
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+class Object #:nodoc:
+  # A Ruby-ized realization of the K combinator, courtesy of Mikael Brockman.
+  #
+  #   def foo
+  #     returning values = [] do
+  #       values << 'bar'
+  #       values << 'baz'
+  #     end
+  #   end
+  #
+  #   foo # => ['bar', 'baz']
+  #
+  #   def foo
+  #     returning [] do |values|
+  #       values << 'bar'
+  #       values << 'baz'
+  #     end
+  #   end
+  #
+  #   foo # => ['bar', 'baz']
+  #
+  def returning(value)
+    yield(value)
+    value
+  end
+
+  def with_options(options)
+    yield ActiveSupport::OptionMerger.new(self, options)
+  end
+  
+  def to_json
+    ActiveSupport::JSON.encode(self)
+  end
+end

data/lib/active_support/core_ext/proc.rb

@@ -0,0 +1,12 @@
+class Proc #:nodoc:
+  def bind(object)
+    block, time = self, Time.now
+    (class << object; self end).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)
+      method
+    end.bind(object)
+  end
+end

data/lib/active_support/core_ext/string.rb

@@ -2,10 +2,12 @@ require File.dirname(__FILE__) + '/string/inflections'
 require File.dirname(__FILE__) + '/string/conversions'
 require File.dirname(__FILE__) + '/string/access'
 require File.dirname(__FILE__) + '/string/starts_ends_with'
+require File.dirname(__FILE__) + '/string/iterators'
 
 class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Access
   include ActiveSupport::CoreExtensions::String::Conversions
   include ActiveSupport::CoreExtensions::String::Inflections
   include ActiveSupport::CoreExtensions::String::StartsEndsWith
+  include ActiveSupport::CoreExtensions::String::Iterators
 end

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

@@ -50,9 +50,9 @@ module ActiveSupport #:nodoc:
         #   "hello".last(2)  # => "lo"
         #   "hello".last(10) # => "hello"
         def last(limit = 1)
-          self[(-limit)..-1]
+          self[(-limit)..-1] || self
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../inflector'
+require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:
@@ -12,8 +12,11 @@ module ActiveSupport #:nodoc:
           Inflector.singularize(self)
         end
 
-        def camelize
-          Inflector.camelize(self)
+        def camelize(first_letter = :upper)
+          case first_letter
+            when :upper then Inflector.camelize(self, true)
+            when :lower then Inflector.camelize(self, false)
+          end
         end
         alias_method :camelcase, :camelize
 
@@ -26,6 +29,10 @@ module ActiveSupport #:nodoc:
           Inflector.underscore(self)
         end
 
+        def dasherize
+          Inflector.dasherize(self)
+        end
+
         def demodulize
           Inflector.demodulize(self)
         end

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

@@ -0,0 +1,17 @@
+require 'strscan'
+
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Custom string iterators
+      module Iterators
+        # Yields a single-character string for each character in the string.
+        # When $KCODE = 'UTF8', multi-byte characters are yielded appropriately.
+        def each_char
+          scanner, char = StringScanner.new(self), /./mu
+          loop { yield(scanner.scan(char) || break) }
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/symbol.rb

@@ -0,0 +1,5 @@
+class Symbol #:nodoc:
+  def to_proc
+    Proc.new { |obj, *args| obj.send(self, *args) }
+  end
+end

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

@@ -44,6 +44,15 @@ module ActiveSupport #:nodoc:
             options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
           )
         end
+        
+        # Uses Date to provide precise Time calculations for years, months, and days.  The +options+ parameter takes a hash with 
+        # any of these keys: :months, :days, :years.
+        def advance(options)
+          d = ::Date.new(year + (options.delete(:years) || 0), month, day)
+          d = d >> options.delete(:months) if options[:months]
+          d = d +  options.delete(:days)   if options[:days]
+          change(options.merge(:year => d.year, :month => d.month, :mday => d.day))
+        end
 
         # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
         # Do not use this method in combination with x.months, use months_ago instead!
@@ -152,6 +161,12 @@ module ActiveSupport #:nodoc:
           change(:mday => last_day,:hour => 0, :min => 0, :sec => 0, :usec => 0)
         end
         alias :at_end_of_month :end_of_month
+		  
+        # Returns  a new Time representing the start of the quarter (1st of january, april, july, october, 0:00)
+        def beginning_of_quarter
+          beginning_of_month.change(:month => [10, 7, 4, 1].detect { |m| m <= self.month })
+        end
+        alias :at_beginning_of_quarter :beginning_of_quarter
         
         # Returns  a new Time representing the start of the year (1st of january, 0:00)
         def beginning_of_year

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

@@ -1,4 +1,5 @@
 require 'date'
+require 'time'
 
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:

data/lib/active_support/dependencies.rb

@@ -1,176 +1,72 @@
-require File.dirname(__FILE__) + '/module_attribute_accessors'
+require 'set'
+require File.dirname(__FILE__) + '/core_ext/module/attribute_accessors'
 require File.dirname(__FILE__) + '/core_ext/load_error'
+require File.dirname(__FILE__) + '/core_ext/kernel'
 
 module Dependencies #:nodoc:
   extend self
 
-  @@loaded = [ ]
+  # Should we turn on Ruby warnings on the first load of dependent files?
+  mattr_accessor :warnings_on_first_load
+  self.warnings_on_first_load = false
+
+  # All files ever loaded.
+  mattr_accessor :history
+  self.history = Set.new
+
+  # All files currently loaded.
   mattr_accessor :loaded
+  self.loaded = Set.new
 
-  @@mechanism = :load
+  # Should we load files or require them?
   mattr_accessor :mechanism
-  
+  self.mechanism = :load
+
   def load?
     mechanism == :load
   end
-  
-  def depend_on(file_name, swallow_load_errors = false)
-    unless loaded.include?(file_name)
-      loaded << file_name
 
-      begin
-        require_or_load(file_name)
-      rescue LoadError
-        raise unless swallow_load_errors
-      end
-    end
+  def depend_on(file_name, swallow_load_errors = false)
+    require_or_load(file_name)
+  rescue LoadError
+    raise unless swallow_load_errors
   end
 
   def associate_with(file_name)
     depend_on(file_name, true)
   end
-  
+
   def clear
-    self.loaded = [ ]
+    loaded.clear
   end
-  
-  def require_or_load(file_name)
-    file_name = "#{file_name}.rb" unless ! load? || file_name[-3..-1] == '.rb'
-    load? ? load(file_name) : require(file_name)
-  end
-  
-  def remove_subclasses_for(*classes)
-    Object.remove_subclasses_of(*classes)
-  end
-  
-  # LoadingModules implement namespace-safe dynamic loading.
-  # They support automatic loading via const_missing, allowing contained items to be automatically
-  # loaded when required. No extra syntax is required, as expressions such as Controller::Admin::UserController
-  # load the relavent files automatically.
-  #
-  # Ruby-style modules are supported, as a folder named 'submodule' will load 'submodule.rb' when available.
-  class LoadingModule < Module #:nodoc:
-    attr_reader :path
-    attr_reader :root
-    
-    class << self
-      def root(*load_paths)
-        RootLoadingModule.new(*load_paths)
-      end
-    end
-    
-    def initialize(root, path=[])
-      @path = path.clone.freeze
-      @root = root
-    end
-    
-    def root?()      self.root == self    end
-    def load_paths() self.root.load_paths end
-    
-    # Load missing constants if possible.
-    def const_missing(name)
-      const_load!(name) ? const_get(name) : super(name)
-    end
-  
-    # Load the controller class or a parent module.
-    def const_load!(name, file_name = nil)
-      file_name ||= 'application' if root? && name.to_s == 'ApplicationController'
-      path = self.path + [file_name || name]
-
-      load_paths.each do |load_path|
-        fs_path = load_path.filesystem_path(path)
-        next unless fs_path
-
-        case 
-        when File.directory?(fs_path)
-          new_module = LoadingModule.new(self.root, self.path + [name])
-          self.const_set name, new_module
-          if self.root?
-            if Object.const_defined?(name)
-              msg = "Cannot load module #{name}: Object::#{name} is set to #{Object.const_get(name).inspect}"
-              raise NameError, msg
-            end
-            Object.const_set(name, new_module)
-          end
-          break
-        when File.file?(fs_path)
-          loaded_file = self.root.load_file!(fs_path)
-          
-          # Import the loaded constant from Object provided we are the root node.
-          self.const_set(name, Object.const_get(name)) if self.root? && Object.const_defined?(name)
-          
-          # Throw an error if we load the file but we don't find the Object we expect
-          if loaded_file and not self.const_defined?(name)
-            msg = "Already loaded file '#{fs_path}' but '#{name.to_s}' was not set, perhaps you need to rename '#{fs_path}'?"
-            raise LoadError, msg
-          end
-          break
-        end
-      end
-      
-      self.const_defined?(name)
-    end
-    
-    # Is this name present or loadable?
-    # This method is used by Routes to find valid controllers.
-    def const_available?(name)
-      self.const_defined?(name) || load_paths.any? {|lp| lp.filesystem_path(path + [name])}
-    end
-  end
-  
-  class RootLoadingModule < LoadingModule #:nodoc:
-    attr_reader :load_paths
 
-    def initialize(*paths)
-      @load_paths = paths.flatten.collect {|p| p.kind_of?(ConstantLoadPath) ? p : ConstantLoadPath.new(p)}
-    end
-
-    def root() self end
+  def require_or_load(file_name)
+    file_name = $1 if file_name =~ /^(.*)\.rb$/
+    return if loaded.include?(file_name)
 
-    def path() [] end
-    
-    # Load the source file at the given file path
-    def load_file!(file_path)
-      require_dependency(file_path)
-    end
+    # Record that we've seen this file *before* loading it to avoid an
+    # infinite loop with mutual dependencies.
+    loaded << file_name
 
-    # Erase all items in this module
-    def clear!
-      constants.each do |name|
-        Object.send(:remove_const, name) if Object.const_defined?(name) && Object.const_get(name).object_id == self.const_get(name).object_id
-        self.send(:remove_const, name)
-      end
-    end
-  end
-  
-  # This object defines a path from which Constants can be loaded.
-  class ConstantLoadPath #:nodoc:
-    # Create a new load path with the filesystem path
-    def initialize(root) @root = root end
-    
-    # Return nil if the path does not exist, or the path to a directory
-    # if the path leads to a module, or the path to a file if it leads to an object.
-    def filesystem_path(path, allow_module=true)
-      fs_path = [@root]
-      fs_path += path[0..-2].map {|name| const_name_to_module_name name}
-
-      if allow_module
-        result = File.join(fs_path, const_name_to_module_name(path.last))
-        return result if File.directory? result # Return the module path if one exists
+    if load?
+      begin
+        # Enable warnings iff this file has not been loaded before and
+        # warnings_on_first_load is set.
+        if !warnings_on_first_load or history.include?(file_name)
+          load "#{file_name}.rb"
+        else
+          enable_warnings { load "#{file_name}.rb" }
+        end
+      rescue
+        loaded.delete file_name
+        raise
       end
-
-      result = File.join(fs_path, const_name_to_file_name(path.last))
-
-      File.file?(result) ? result : nil
-    end
-    
-    def const_name_to_file_name(name)
-      name.to_s.underscore + '.rb'
+    else
+      require file_name
     end
 
-    def const_name_to_module_name(name)
-      name.to_s.underscore
-    end
+    # Record history *after* loading so first load gets warnings.
+    history << file_name
   end
 end
 
@@ -181,27 +77,53 @@ Object.send(:define_method, :require_association) { |file_name| Dependencies.ass
 class Module #:nodoc:
   # Rename the original handler so we can chain it to the new one
   alias :rails_original_const_missing :const_missing
-
+  
   # Use const_missing to autoload associations so we don't have to
   # require_association when using single-table inheritance.
   def const_missing(class_id)
-    if Object.const_defined?(:Controllers) and Object::Controllers.const_available?(class_id)
-      return Object::Controllers.const_get(class_id)
-    end
-    
     file_name = class_id.to_s.demodulize.underscore
+    file_path = as_load_path.empty? ? file_name : "#{as_load_path}/#{file_name}"
     begin
-      require_dependency(file_name)
-      raise NameError.new("uninitialized constant #{class_id}") unless Object.const_defined?(class_id)
-      return Object.const_get(class_id)
+      require_dependency(file_path)
+      brief_name = self == Object ? '' : "#{name}::"
+      raise NameError.new("uninitialized constant #{brief_name}#{class_id}") unless const_defined?(class_id)
+      return const_get(class_id)
     rescue MissingSourceFile => e
-      # Convert the exception to a NameError only if the file we are looking for is the missing one.
-      raise unless e.is_missing? file_name
+      # Re-raise the error if it does not concern the file we were trying to load.
+      raise unless e.is_missing? file_path
+      
+      # Look for a directory in the load path that we ought to load.
+      if $LOAD_PATH.any? { |base| File.directory? "#{base}/#{file_path}" }
+        mod = Module.new
+        const_set class_id, mod # Create the new module
+        return mod
+      end
+      
+      # Attempt to access the name from the parent, unless we don't have a valid
+      # parent, or the constant is already defined in the parent. If the latter
+      # is the case, then we are being queried via self::class_id, and we should
+      # avoid returning the constant from the parent if possible.
+      if parent && parent != self && ! parents.any? { |p| p.const_defined?(class_id) }
+        suppress(NameError) do
+          return parent.send(:const_missing, class_id)
+        end
+      end
+      
       raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
     end
   end
 end
 
+class Class
+  def const_missing(class_id)
+    if [Object, Kernel].include?(self) || parent == self
+      super
+    else
+      parent.send :const_missing, class_id
+    end
+  end
+end
+
 class Object #:nodoc:
   def load(file, *extras)
     super(file, *extras)
@@ -237,4 +159,4 @@ class Exception #:nodoc:
     @blamed_files = exc.blamed_files.clone
     self
   end
-end
+end