activesupport 1.4.4 → 2.0.0

data/lib/active_support/core_ext/range.rb

@@ -1,5 +1,11 @@
-require File.dirname(__FILE__) + '/range/conversions'
+require 'active_support/core_ext/range/conversions'
+require 'active_support/core_ext/range/overlaps'
+require 'active_support/core_ext/range/include_range'
+require 'active_support/core_ext/range/blockless_step'
 
 class Range #:nodoc:
   include ActiveSupport::CoreExtensions::Range::Conversions
+  include ActiveSupport::CoreExtensions::Range::Overlaps
+  include ActiveSupport::CoreExtensions::Range::IncludeRange
+  include ActiveSupport::CoreExtensions::Range::BlocklessStep
 end

data/lib/active_support/core_ext/range/blockless_step.rb

@@ -0,0 +1,22 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Range #:nodoc:
+      # Return an array when step is called without a block.
+      module BlocklessStep
+        def self.included(base) #:nodoc:
+          base.alias_method_chain :step, :blockless
+        end
+
+        def step_with_blockless(value, &block)
+          if block_given?
+            step_without_blockless(value, &block)
+          else
+            returning [] do |array|
+              step_without_blockless(value) { |step| array << step }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,16 +6,18 @@ module ActiveSupport #:nodoc:
         DATE_FORMATS = {
           :db => Proc.new { |start, stop| "BETWEEN '#{start.to_s(:db)}' AND '#{stop.to_s(:db)}'" }
         }
-        
-        def self.included(klass) #:nodoc:
-          klass.send(:alias_method, :to_default_s, :to_s)
-          klass.send(:alias_method, :to_s, :to_formatted_s)
+
+        def self.included(base) #:nodoc:
+          base.class_eval do
+            alias_method :to_default_s, :to_s
+            alias_method :to_s, :to_formatted_s
+          end
         end
-        
+
         def to_formatted_s(format = :default)
           DATE_FORMATS[format] ? DATE_FORMATS[format].call(first, last) : to_default_s   
         end
       end
     end
   end
-end
+end

data/lib/active_support/core_ext/range/include_range.rb

@@ -0,0 +1,22 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Range #:nodoc:
+      # Check if a Range includes another Range.
+      module IncludeRange
+        def self.included(base) #:nodoc:
+          base.alias_method_chain :include?, :range
+        end
+
+        def include_with_range?(value)
+          if value.is_a?(::Range)
+            operator = exclude_end? ? :< : :<=
+            end_value = value.exclude_end? ? last.succ : last
+            include?(value.first) && (value.last <=> end_value).send(operator, 0)
+          else
+            include_without_range?(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/range/overlaps.rb

@@ -0,0 +1,12 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Range #:nodoc:
+      # Check if Ranges overlap.
+      module Overlaps
+        def overlaps?(other)
+          include?(other.first) || other.include?(first)
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/string.rb

@@ -1,15 +1,18 @@
-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'
-require File.dirname(__FILE__) + '/string/unicode'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string/conversions'
+require 'active_support/core_ext/string/access'
+require 'active_support/core_ext/string/starts_ends_with'
+require 'active_support/core_ext/string/iterators' unless 'test'.respond_to?(:each_char)
+require 'active_support/core_ext/string/unicode'
+require 'active_support/core_ext/string/xchar'
 
 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
+  if defined? ActiveSupport::CoreExtensions::String::Iterators
+    include ActiveSupport::CoreExtensions::String::Iterators
+  end
   include ActiveSupport::CoreExtensions::String::Unicode
 end

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

@@ -7,12 +7,16 @@ module ActiveSupport #:nodoc:
       module Conversions
         # Form can be either :utc (default) or :local.
         def to_time(form = :utc)
-          ::Time.send(form, *ParseDate.parsedate(self))
+          ::Time.send("#{form}_time", *ParseDate.parsedate(self)[0..5].map {|arg| arg || 0})
         end
 
         def to_date
           ::Date.new(*ParseDate.parsedate(self)[0..2])
         end
+        
+        def to_datetime
+          ::DateTime.civil(*ParseDate.parsedate(self)[0..5].map {|arg| arg || 0} << 0)
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:
-      # Define methods for handeling unicode data.
+      # Define methods for handling unicode data.
       module Unicode
         # +chars+ is a Unicode safe proxy for string methods. It creates and returns an instance of the
         # ActiveSupport::Multibyte::Chars class which encapsulates the original string. A Unicode safe version of all
@@ -39,4 +39,4 @@ module ActiveSupport #:nodoc:
       end
     end
   end
-end
+end

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

@@ -0,0 +1,11 @@
+begin
+  # See http://bogomips.org/fast_xs/ by Eric Wong
+  require 'fast_xs'
+
+  class String
+    alias_method :original_xs, :to_xs if method_defined?(:to_xs)
+    alias_method :to_xs, :fast_xs
+  end
+rescue LoadError
+  # fast_xs extension unavailable.
+end

data/lib/active_support/core_ext/symbol.rb

@@ -1,12 +1,14 @@
-class Symbol
-  # Turns the symbol into a simple proc, which is especially useful for enumerations. Examples:
-  #
-  #   # The same as people.collect { |p| p.name }
-  #   people.collect(&:name)
-  #
-  #   # The same as people.select { |p| p.manager? }.collect { |p| p.salary }
-  #   people.select(&:manager?).collect(&:salary)
-  def to_proc
-    Proc.new { |*args| args.shift.__send__(self, *args) }
+unless :test.respond_to?(:to_proc)
+  class Symbol
+    # Turns the symbol into a simple proc, which is especially useful for enumerations. Examples:
+    #
+    #   # The same as people.collect { |p| p.name }
+    #   people.collect(&:name)
+    #
+    #   # The same as people.select { |p| p.manager? }.collect { |p| p.salary }
+    #   people.select(&:manager?).collect(&:salary)
+    def to_proc
+      Proc.new { |*args| args.shift.__send__(self, *args) }
+    end
   end
 end

data/lib/active_support/core_ext/test.rb

@@ -0,0 +1 @@
+require 'active_support/core_ext/test/unit/assertions'

data/lib/active_support/core_ext/test/unit/assertions.rb

@@ -0,0 +1,62 @@
+module Test #:nodoc:
+  module Unit #:nodoc:
+    # FIXME: no Proc#binding in Ruby 2, must change this API
+    module Assertions #:nodoc:
+      # Test numeric difference between the return value of an expression as a result of what is evaluated
+      # in the yielded block.
+      #
+      #   assert_difference 'Article.count' do
+      #     post :create, :article => {...}
+      #   end
+      #
+      # An arbitrary expression is passed in and evaluated.
+      #
+      #   assert_difference 'assigns(:article).comments(:reload).size' do
+      #     post :create, :comment => {...}
+      #   end
+      #
+      # An arbitrary positive or negative difference can be specified. The default is +1.
+      #
+      #   assert_difference 'Article.count', -1 do
+      #     post :delete, :id => ...
+      #   end
+      #
+      # An array of expressions can also be passed in and evaluated.
+      #
+      #   assert_difference [ 'Article.count', 'Post.count' ], +2 do
+      #     post :create, :article => {...}
+      #   end
+      #
+      # A error message can be specified.
+      #
+      #   assert_difference 'Article.count', -1, "An Article should be destroyed" do
+      #     post :delete, :id => ...
+      #   end
+      def assert_difference(expressions, difference = 1, message = nil, &block)
+        expression_evaluations = Array(expressions).collect{ |expression| lambda { eval(expression, block.send!(:binding)) } }
+
+        original_values = expression_evaluations.inject([]) { |memo, expression| memo << expression.call }
+        yield
+        expression_evaluations.each_with_index do |expression, i|
+          assert_equal original_values[i] + difference, expression.call, message
+        end
+      end
+
+      # Assertion that the numeric result of evaluating an expression is not changed before and after
+      # invoking the passed in block.
+      #
+      #   assert_no_difference 'Article.count' do
+      #     post :create, :article => invalid_attributes
+      #   end
+      #
+      # A error message can be specified.
+      #
+      #   assert_no_difference 'Article.count', "An Article should not be destroyed" do
+      #     post :create, :article => invalid_attributes
+      #   end
+      def assert_no_difference(expressions, message = nil, &block)
+        assert_difference expressions, 0, message, &block
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/time.rb

@@ -8,10 +8,12 @@ class Time
   end
 end
 
-require File.dirname(__FILE__) + '/time/calculations'
-require File.dirname(__FILE__) + '/time/conversions'
+require 'active_support/core_ext/time/behavior'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/conversions'
 
 class Time#:nodoc:
+  include ActiveSupport::CoreExtensions::Time::Behavior
   include ActiveSupport::CoreExtensions::Time::Calculations
   include ActiveSupport::CoreExtensions::Time::Conversions
 end

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

@@ -0,0 +1,13 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Time #:nodoc:
+      module Behavior
+        # Enable more predictable duck-typing on Time-like classes. See
+        # Object#acts_like?.
+        def acts_like_time?
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,14 @@ module ActiveSupport #:nodoc:
       # Enables the use of time calculations within Time itself
       module Calculations
         def self.included(base) #:nodoc:
-          base.extend(ClassMethods)
+          base.extend ClassMethods
+
+          base.class_eval do
+            alias_method :plus_without_duration, :+
+            alias_method :+, :plus_with_duration
+            alias_method :minus_without_duration, :-
+            alias_method :-, :minus_with_duration
+          end
         end
 
         module ClassMethods
@@ -21,36 +28,56 @@ module ActiveSupport #:nodoc:
               month % 2 == 0 ? 31 : 30
             end
           end
+
+          # Returns a new Time if requested year can be accommodated by Ruby's Time class
+          # (i.e., if year is within either 1970..2038 or 1902..2038, depending on system architecture);
+          # otherwise returns a DateTime
+          def time_with_datetime_fallback(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0, usec=0)
+            ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
+          rescue
+            offset = utc_or_local.to_sym == :local ? ::DateTime.local_offset : 0
+            ::DateTime.civil(year, month, day, hour, min, sec, offset)
+          end
+
+          # wraps class method time_with_datetime_fallback with utc_or_local == :utc
+          def utc_time(*args)
+            time_with_datetime_fallback(:utc, *args)
+          end
+
+          # wraps class method time_with_datetime_fallback with utc_or_local == :local
+          def local_time(*args)
+            time_with_datetime_fallback(:local, *args)
+          end
         end
 
         # Seconds since midnight: Time.now.seconds_since_midnight
         def seconds_since_midnight
           self.to_i - self.change(:hour => 0).to_i + (self.usec/1.0e+6)
         end
-            
+
         # Returns a new Time where one or more of the elements have been changed according to the +options+ parameter. The time options
-        # (hour, minute, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and 
+        # (hour, minute, sec, usec) reset cascadingly, so if only the hour is passed, then minute, sec, and usec is set to 0. If the hour and
         # minute is passed, then sec and usec is set to 0.
         def change(options)
           ::Time.send(
-            self.utc? ? :utc : :local, 
-            options[:year]  || self.year, 
-            options[:month] || self.month, 
-            options[:mday]  || self.mday, 
-            options[:hour]  || self.hour, 
+            self.utc? ? :utc_time : :local_time,
+            options[:year]  || self.year,
+            options[:month] || self.month,
+            options[:day]   || self.day,
+            options[:hour]  || self.hour,
             options[:min]   || (options[:hour] ? 0 : self.min),
             options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
             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.
+
+        # Uses Date to provide precise Time calculations for years, months, and days.  The +options+ parameter takes a hash with
+        # any of these keys: :years, :months, :weeks, :days, :hours, :minutes, :seconds.
         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))
+          d = to_date.advance(options)
+          time_advanced_by_date = change(:year => d.year, :month => d.month, :day => d.day)
+          seconds_to_advance = (options[:seconds] || 0) + (options[:minutes] || 0) * 60 + (options[:hours] || 0) * 3600
+          seconds_to_advance == 0 ? time_advanced_by_date : time_advanced_by_date.since(seconds_to_advance)
         end
 
         # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
@@ -59,58 +86,43 @@ module ActiveSupport #:nodoc:
           self.since(-seconds)
         end
 
-        # Returns a new Time representing the time a number of seconds since the instance time, this is basically a wrapper around 
-        #the Numeric extension. Do not use this method in combination with x.months, use months_since instead!
+        # Returns a new Time representing the time a number of seconds since the instance time, this is basically a wrapper around
+        # the Numeric extension. Do not use this method in combination with x.months, use months_since instead!
         def since(seconds)
           initial_dst = self.dst? ? 1 : 0
           f = seconds.since(self)
           final_dst   = f.dst? ? 1 : 0
           (seconds.abs >= 86400 && initial_dst != final_dst) ? f + (initial_dst - final_dst).hours : f
+        rescue
+          self.to_datetime.since(seconds)          
         end
         alias :in :since
 
         # Returns a new Time representing the time a number of specified months ago
         def months_ago(months)
-          months_since(-months)
+          advance(:months => -months)
         end
 
+        # Returns a new Time representing the time a number of specified months in the future
         def months_since(months)
-          year, month, mday = self.year, self.month, self.mday
-
-          month += months
-
-          # in case months is negative
-          while month < 1
-            month += 12
-            year -= 1
-          end
-
-          # in case months is positive
-          while month > 12
-            month -= 12
-            year += 1
-          end
-
-          max = ::Time.days_in_month(month, year)
-          mday = max if mday > max
-
-          change(:year => year, :month => month, :mday => mday)
+          advance(:months => months)
         end
 
         # Returns a new Time representing the time a number of specified years ago
         def years_ago(years)
-          change(:year => self.year - years)
+          advance(:years => -years)
         end
-        
+
+        # Returns a new Time representing the time a number of specified years in the future
         def years_since(years)
-          change(:year => self.year + years)
+          advance(:years => years)
         end
 
         # Short-hand for years_ago(1)
         def last_year
           years_ago(1)
         end
-        
+
         # Short-hand for years_since(1)
         def next_year
           years_since(1)
@@ -126,7 +138,7 @@ module ActiveSupport #:nodoc:
         def next_month
           months_since(1)
         end
-        
+
         # Returns a new Time representing the "start" of this week (Monday, 0:00)
         def beginning_of_week
           days_to_monday = self.wday!=0 ? self.wday-1 : 6
@@ -134,13 +146,13 @@ module ActiveSupport #:nodoc:
         end
         alias :monday :beginning_of_week
         alias :at_beginning_of_week :beginning_of_week
-        
+
         # Returns a new Time representing the start of the given day in next week (default is Monday).
         def next_week(day = :monday)
           days_into_week = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6}
           since(1.week).beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
         end
-        
+
         # Returns a new Time representing the start of the day (0:00)
         def beginning_of_day
           (self - self.seconds_since_midnight).change(:usec => 0)
@@ -148,43 +160,64 @@ module ActiveSupport #:nodoc:
         alias :midnight :beginning_of_day
         alias :at_midnight :beginning_of_day
         alias :at_beginning_of_day :beginning_of_day
-        
+
+        # Returns a new Time representing the end of the day (23:59:59)
+        def end_of_day
+          change(:hour => 23, :min => 59, :sec => 59)
+        end
+
         # Returns a new Time representing the start of the month (1st of the month, 0:00)
         def beginning_of_month
           #self - ((self.mday-1).days + self.seconds_since_midnight)
-          change(:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
+          change(:day => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
         end
         alias :at_beginning_of_month :beginning_of_month
-        
+
         # Returns a new Time representing the end of the month (last day of the month, 0:00)
         def end_of_month
           #self - ((self.mday-1).days + self.seconds_since_midnight)
           last_day = ::Time.days_in_month( self.month, self.year )
-          change(:mday => last_day,:hour => 0, :min => 0, :sec => 0, :usec => 0)
+          change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :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
-          change(:month => 1,:mday => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
+          change(:month => 1,:day => 1,:hour => 0, :min => 0, :sec => 0, :usec => 0)
         end
         alias :at_beginning_of_year :beginning_of_year
-        
+
         # Convenience method which returns a new Time representing the time 1 day ago
         def yesterday
           self.ago(1.day)
         end
-        
+
         # Convenience method which returns a new Time representing the time 1 day since the instance time
         def tomorrow
           self.since(1.day)
         end
+
+        def plus_with_duration(other) #:nodoc:
+          if ActiveSupport::Duration === other
+            other.since(self)
+          else
+            plus_without_duration(other)
+          end
+        end
+
+        def minus_with_duration(other) #:nodoc:
+          if ActiveSupport::Duration === other
+            other.until(self)
+          else
+            minus_without_duration(other)
+          end
+        end
       end
     end
   end