activesupport 2.1.2 → 2.2.2

data/lib/active_support/core_ext/base64/encoding.rb

@@ -4,6 +4,9 @@ module ActiveSupport #:nodoc:
       module Encoding
         # Encodes the value as base64 without the newline breaks. This makes the base64 encoding readily usable as URL parameters 
         # or memcache keys without further processing.
+        #
+        #  ActiveSupport::Base64.encode64s("Original unencoded string") 
+        #  # => "T3JpZ2luYWwgdW5lbmNvZGVkIHN0cmluZw=="
         def encode64s(value)
           encode64(value).gsub(/\n/, '')
         end

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

@@ -4,35 +4,31 @@ module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module BigDecimal #:nodoc:
       module Conversions
+        DEFAULT_STRING_FORMAT = 'F'.freeze
+        YAML_TAG = 'tag:yaml.org,2002:float'.freeze
+        YAML_MAPPING = { 'Infinity' => '.Inf', '-Infinity' => '-.Inf', 'NaN' => '.NaN' }
+
         def self.included(base) #:nodoc:
-          base.instance_eval do
+          base.class_eval do
             alias_method :_original_to_s, :to_s
             alias_method :to_s, :to_formatted_s
+
+            yaml_as YAML_TAG
           end
         end
-        
-        def to_formatted_s(format="F")
+
+        def to_formatted_s(format = DEFAULT_STRING_FORMAT)
           _original_to_s(format)
         end
-        
-        yaml_as "tag:yaml.org,2002:float"
-        def to_yaml( opts = {} )
-          YAML::quick_emit( nil, opts ) do |out|
-            # This emits the number without any scientific notation.
-            # I prefer it to using self.to_f.to_s, which would lose precision.
-            #
-            # Note that YAML allows that when reconsituting floats
-            # to native types, some precision may get lost.
-            # There is no full precision real YAML tag that I am aware of.
-            str = self.to_s
-            if str == "Infinity"
-              str = ".Inf"
-            elsif str == "-Infinity"
-              str = "-.Inf"
-            elsif str == "NaN"
-              str = ".NaN"
-            end
-            out.scalar( "tag:yaml.org,2002:float", str, :plain )
+
+        # This emits the number without any scientific notation.
+        # This is better than self.to_f.to_s since it doesn't lose precision.
+        #
+        # Note that reconstituting YAML floats to native floats may lose precision.
+        def to_yaml(opts = {})
+          YAML.quick_emit(nil, opts) do |out|
+            string = to_s
+            out.scalar(YAML_TAG, YAML_MAPPING[string] || string, :plain)
           end
         end
       end

data/lib/active_support/core_ext/blank.rb

@@ -12,6 +12,11 @@ class Object
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end
+    
+  # An object is present if it's not blank.
+  def present?
+    !blank?
+  end
 end
 
 class NilClass #:nodoc:

data/lib/active_support/core_ext/class/inheritable_attributes.rb

@@ -91,14 +91,14 @@ class Class # :nodoc:
   def inheritable_attributes
     @inheritable_attributes ||= EMPTY_INHERITABLE_ATTRIBUTES
   end
-  
+
   def write_inheritable_attribute(key, value)
     if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
       @inheritable_attributes = {}
     end
     inheritable_attributes[key] = value
   end
-  
+
   def write_inheritable_array(key, elements)
     write_inheritable_attribute(key, []) if read_inheritable_attribute(key).nil?
     write_inheritable_attribute(key, read_inheritable_attribute(key) + elements)
@@ -112,7 +112,7 @@ class Class # :nodoc:
   def read_inheritable_attribute(key)
     inheritable_attributes[key]
   end
-  
+
   def reset_inheritable_attributes
     @inheritable_attributes = EMPTY_INHERITABLE_ATTRIBUTES
   end
@@ -123,7 +123,7 @@ class Class # :nodoc:
 
     def inherited_with_inheritable_attributes(child)
       inherited_without_inheritable_attributes(child) if respond_to?(:inherited_without_inheritable_attributes)
-      
+
       if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
         new_inheritable_attributes = EMPTY_INHERITABLE_ATTRIBUTES
       else
@@ -131,7 +131,7 @@ class Class # :nodoc:
           memo.update(key => value.duplicable? ? value.dup : value)
         end
       end
-      
+
       child.instance_variable_set('@inheritable_attributes', new_inheritable_attributes)
     end
 

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

@@ -1,3 +1,5 @@
+require 'date'
+
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Date #:nodoc:
@@ -10,6 +12,7 @@ module ActiveSupport #:nodoc:
 
         # Date memoizes some instance methods using metaprogramming to wrap
         # the methods with one that caches the result in an instance variable.
+        #
         # If a Date is frozen but the memoized method hasn't been called, the
         # first call will result in a frozen object error since the memo
         # instance variable is uninitialized.

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

@@ -20,18 +20,33 @@ module ActiveSupport #:nodoc:
           def yesterday
             ::Date.today.yesterday
           end
-          
+
           # Returns a new Date representing the date 1 day after today (i.e. tomorrow's date).
           def tomorrow
             ::Date.today.tomorrow
           end
-          
+
           # Returns Time.zone.today when config.time_zone is set, otherwise just returns Date.today.
           def current
             ::Time.zone_default ? ::Time.zone.today : ::Date.today
           end
         end
-        
+
+        # Tells whether the Date object's date lies in the past
+        def past?
+          self < ::Date.current
+        end
+
+        # Tells whether the Date object's date is today
+        def today?
+          self.to_date == ::Date.current # we need the to_date because of DateTime
+        end
+
+        # Tells whether the Date object's date lies in the future
+        def future?
+          self > ::Date.current
+        end
+
         # Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00)
         # and then subtracts the specified number of seconds
         def ago(seconds)
@@ -57,7 +72,7 @@ module ActiveSupport #:nodoc:
         def end_of_day
           to_time.end_of_day
         end
-        
+
         def plus_with_duration(other) #:nodoc:
           if ActiveSupport::Duration === other
             other.since(self)
@@ -65,7 +80,7 @@ module ActiveSupport #:nodoc:
             plus_without_duration(other)
           end
         end
-        
+
         def minus_with_duration(other) #:nodoc:
           if ActiveSupport::Duration === other
             plus_with_duration(-other)
@@ -73,8 +88,8 @@ module ActiveSupport #:nodoc:
             minus_without_duration(other)
           end
         end
-        
-        # Provides precise Date calculations for years, months, and days.  The +options+ parameter takes a hash with 
+
+        # Provides precise Date calculations for years, months, and days.  The +options+ parameter takes a hash with
         # any of these keys: <tt>:years</tt>, <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>.
         def advance(options)
           d = self
@@ -98,7 +113,7 @@ module ActiveSupport #:nodoc:
             options[:day]   || self.day
           )
         end
-        
+
         # Returns a new Date/DateTime representing the time a number of specified months ago
         def months_ago(months)
           advance(:months => -months)
@@ -161,7 +176,7 @@ module ActiveSupport #:nodoc:
           days_into_week = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6}
           result = (self + 7).beginning_of_week + days_into_week[day]
           self.acts_like?(:time) ? result.change(:hour => 0) : result
-        end          
+        end
 
         # Returns a new ; DateTime objects will have time set to 0:00DateTime representing the start of the month (1st of the month; DateTime objects will have time set to 0:00)
         def beginning_of_month

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

@@ -7,7 +7,7 @@ module ActiveSupport #:nodoc:
       module Calculations
         def self.included(base) #:nodoc:
           base.extend ClassMethods
-          
+
           base.class_eval do
             alias_method :compare_without_coercion, :<=>
             alias_method :<=>, :compare_with_coercion
@@ -19,6 +19,20 @@ module ActiveSupport #:nodoc:
           def local_offset
             ::Time.local(2007).utc_offset.to_r / 86400
           end
+
+          def current
+            ::Time.zone_default ? ::Time.zone.now.to_datetime : ::Time.now.to_datetime
+          end
+        end
+
+        # Tells whether the DateTime object's datetime lies in the past
+        def past?
+          self < ::DateTime.current
+        end
+
+        # Tells whether the DateTime object's datetime lies in the future
+        def future?
+          self > ::DateTime.current
         end
 
         # Seconds since midnight: DateTime.now.seconds_since_midnight
@@ -78,7 +92,7 @@ module ActiveSupport #:nodoc:
         def end_of_day
           change(:hour => 23, :min => 59, :sec => 59)
         end
-        
+
         # Adjusts DateTime to UTC by adding its offset value; offset is set to 0
         #
         # Example:
@@ -89,17 +103,17 @@ module ActiveSupport #:nodoc:
           new_offset(0)
         end
         alias_method :getutc, :utc
-        
+
         # Returns true if offset == 0
         def utc?
           offset == 0
         end
-        
+
         # Returns the offset value in seconds
         def utc_offset
           (offset * 86400).to_i
         end
-        
+
         # Layers additional behavior on DateTime#<=> so that Time and ActiveSupport::TimeWithZone instances can be compared with a DateTime
         def compare_with_coercion(other)
           other = other.comparable_time if other.respond_to?(:comparable_time)

data/lib/active_support/core_ext/duplicable.rb

@@ -35,3 +35,9 @@ class Numeric #:nodoc:
     false
   end
 end
+
+class Class #:nodoc:
+  def duplicable?
+    false
+  end
+end

data/lib/active_support/core_ext/enumerable.rb

@@ -1,3 +1,5 @@
+require 'active_support/ordered_hash'
+
 module Enumerable
   # Ruby 1.8.7 introduces group_by, but the result isn't ordered. Override it.
   remove_method(:group_by) if [].respond_to?(:group_by) && RUBY_VERSION < '1.9'
@@ -18,10 +20,19 @@ module Enumerable
   #   "2006-02-24 -> Transcript, Transcript"
   #   "2006-02-23 -> Transcript"
   def group_by
-    inject ActiveSupport::OrderedHash.new do |grouped, element|
-      (grouped[yield(element)] ||= []) << element
-      grouped
+    assoc = ActiveSupport::OrderedHash.new
+
+    each do |element|
+      key = yield(element)
+
+      if assoc.has_key?(key)
+        assoc[key] << element
+      else
+        assoc[key] = [element]
+      end
     end
+
+    assoc
   end unless [].respond_to?(:group_by)
 
   # Calculates a sum from the elements. Examples:
@@ -53,8 +64,28 @@ module Enumerable
     end
   end
 
+  # Iterates over a collection, passing the current element *and* the
+  # +memo+ to the block. Handy for building up hashes or
+  # reducing collections down to one object. Examples:
+  #
+  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
+  #
+  # *Note* that you can't use immutable objects like numbers, true or false as
+  # the memo. You would think the following returns 120, but since the memo is
+  # never changed, it does not.
+  #
+  #   (1..5).each_with_object(1) { |value, memo| memo *= value } # => 1
+  #
+  def each_with_object(memo, &block)
+    returning memo do |m|
+      each do |element|
+        block.call(element, m)
+      end
+    end
+  end unless [].respond_to?(:each_with_object)
+
   # Convert an enumerable to a hash. Examples:
-  # 
+  #
   #   people.index_by(&:login)
   #     => { "nextangle" => <Person ...>, "chade-" => <Person ...>, ...}
   #   people.index_by { |person| "#{person.first_name} #{person.last_name}" }
@@ -66,4 +97,11 @@ module Enumerable
       accum
     end
   end
+  
+  # Returns true if the collection has more than 1 element. Functionally equivalent to collection.size > 1.
+  # Works with a block too ala any?, so people.many? { |p| p.age > 26 } # => returns true if more than 1 person is over 26.
+  def many?(&block)
+    size = block_given? ? select(&block).size : self.size
+    size > 1
+  end
 end

data/lib/active_support/core_ext/file.rb

@@ -1,21 +1,5 @@
-require 'tempfile'
+require 'active_support/core_ext/file/atomic'
 
-# Write to a file atomically.  Useful for situations where you don't
-# want other processes or threads to see half-written files.
-#
-#   File.atomic_write("important.file") do |file|
-#     file.write("hello")
-#   end
-#
-# If your temp directory is not on the same filesystem as the file you're 
-# trying to write, you can provide a different temporary directory.
-# 
-#   File.atomic_write("/data/something.important", "/data/tmp") do |f|
-#     file.write("hello")
-#   end
-def File.atomic_write(file_name, temp_dir = Dir.tmpdir)
-  temp_file = Tempfile.new(File.basename(file_name), temp_dir)
-  yield temp_file
-  temp_file.close
-  File.rename(temp_file.path, file_name)
-end
+class File #:nodoc:
+  extend ActiveSupport::CoreExtensions::File::Atomic
+end

data/lib/active_support/core_ext/file/atomic.rb

@@ -0,0 +1,46 @@
+require 'tempfile'
+
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module File #:nodoc:
+      module Atomic
+        # Write to a file atomically.  Useful for situations where you don't
+        # want other processes or threads to see half-written files.
+        #
+        #   File.atomic_write("important.file") do |file|
+        #     file.write("hello")
+        #   end
+        #
+        # If your temp directory is not on the same filesystem as the file you're 
+        # trying to write, you can provide a different temporary directory.
+        # 
+        #   File.atomic_write("/data/something.important", "/data/tmp") do |f|
+        #     file.write("hello")
+        #   end
+        def atomic_write(file_name, temp_dir = Dir.tmpdir)
+          temp_file = Tempfile.new(basename(file_name), temp_dir)
+          yield temp_file
+          temp_file.close
+
+          begin
+            # Get original file permissions
+            old_stat = stat(file_name)
+          rescue Errno::ENOENT
+            # No old permissions, write a temp file to determine the defaults
+            check_name = ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}"
+            open(check_name, "w") { }
+            old_stat = stat(check_name)
+            unlink(check_name)
+          end
+
+          # Overwrite original file with temp file
+          rename(temp_file.path, file_name)
+
+          # Set correct permissions on new file
+          chown(old_stat.uid, old_stat.gid, file_name)
+          chmod(old_stat.mode, file_name)
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/float.rb

@@ -1,5 +1,7 @@
 require 'active_support/core_ext/float/rounding'
+require 'active_support/core_ext/float/time'
 
 class Float #:nodoc:
   include ActiveSupport::CoreExtensions::Float::Rounding
+  include ActiveSupport::CoreExtensions::Float::Time
 end

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

@@ -0,0 +1,27 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Float #:nodoc:
+      module Time
+        # Deprication helper methods not available as core_ext is loaded first.
+        def years
+          ::ActiveSupport::Deprecation.warn(self.class.deprecated_method_warning(:years, "Fractional years are not respected. Convert value to integer before calling #years."), caller)
+          years_without_deprecation
+        end
+        def months
+          ::ActiveSupport::Deprecation.warn(self.class.deprecated_method_warning(:months, "Fractional months are not respected. Convert value to integer before calling #months."), caller)
+          months_without_deprecation
+        end
+
+        def months_without_deprecation
+          ActiveSupport::Duration.new(self * 30.days, [[:months, self]])
+        end
+        alias :month :months
+      
+        def years_without_deprecation
+          ActiveSupport::Duration.new(self * 365.25.days, [[:years, self]])
+        end
+        alias :year :years
+      end
+    end
+  end
+end