activesupport 3.2.22.5 → 4.0.0.beta1

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

@@ -2,9 +2,9 @@ require 'active_support/string_inquirer'
 
 class String
   # Wraps the current string in the <tt>ActiveSupport::StringInquirer</tt> class,
-  # which gives you a prettier way to test for equality. Example:
+  # which gives you a prettier way to test for equality.
   #
-  #   env = "production".inquiry
+  #   env = 'production'.inquiry
   #   env.production?  # => true
   #   env.development? # => false
   def inquiry

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

@@ -2,71 +2,48 @@
 require 'active_support/multibyte'
 
 class String
-  if RUBY_VERSION >= "1.9"
-    # == Multibyte proxy
-    #
-    # +mb_chars+ is a multibyte safe proxy for string methods.
-    #
-    # In Ruby 1.8 and older it creates and returns an instance of the ActiveSupport::Multibyte::Chars class which
-    # encapsulates the original string. A Unicode safe version of all the String methods are defined on this proxy
-    # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsulated string.
-    #
-    #   name = 'Claus Müller'
-    #   name.reverse # => "rell??M sualC"
-    #   name.length  # => 13
-    #
-    #   name.mb_chars.reverse.to_s # => "rellüM sualC"
-    #   name.mb_chars.length       # => 12
-    #
-    # In Ruby 1.9 and newer +mb_chars+ returns +self+ because String is (mostly) encoding aware. This means that
-    # it becomes easy to run one version of your code on multiple Ruby versions.
-    #
-    # == Method chaining
-    #
-    # All the methods on the Chars proxy which normally return a string will return a Chars object. This allows
-    # method chaining on the result of any of these methods.
-    #
-    #   name.mb_chars.reverse.length # => 12
-    #
-    # == Interoperability and configuration
-    #
-    # The Chars object tries to be as interchangeable with String objects as possible: sorting and comparing between
-    # String and Char work like expected. The bang! methods change the internal string representation in the Chars
-    # object. Interoperability problems can be resolved easily with a +to_s+ call.
-    #
-    # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
-    # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
-    def mb_chars
-      if ActiveSupport::Multibyte.proxy_class.consumes?(self)
-        ActiveSupport::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
-    end
-
-    def is_utf8?
-      case encoding
-      when Encoding::UTF_8
-        valid_encoding?
-      when Encoding::ASCII_8BIT, Encoding::US_ASCII
-        dup.force_encoding(Encoding::UTF_8).valid_encoding?
-      else
-        false
-      end
-    end
-  else
-    def mb_chars
-      if ActiveSupport::Multibyte.proxy_class.wants?(self)
-        ActiveSupport::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
-    end
+  # == Multibyte proxy
+  #
+  # +mb_chars+ is a multibyte 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 the String methods are defined on this proxy
+  # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsulated string.
+  #
+  #   name = 'Claus Müller'
+  #   name.reverse # => "rell??M sualC"
+  #   name.length  # => 13
+  #
+  #   name.mb_chars.reverse.to_s # => "rellüM sualC"
+  #   name.mb_chars.length       # => 12
+  #
+  # == Method chaining
+  #
+  # All the methods on the Chars proxy which normally return a string will return a Chars object. This allows
+  # method chaining on the result of any of these methods.
+  #
+  #   name.mb_chars.reverse.length # => 12
+  #
+  # == Interoperability and configuration
+  #
+  # The Chars object tries to be as interchangeable with String objects as possible: sorting and comparing between
+  # String and Char work like expected. The bang! methods change the internal string representation in the Chars
+  # object. Interoperability problems can be resolved easily with a +to_s+ call.
+  #
+  # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
+  # information about how to change the default Multibyte behavior see ActiveSupport::Multibyte.
+  def mb_chars
+    ActiveSupport::Multibyte.proxy_class.new(self)
+  end
 
-    # Returns true if the string has UTF-8 semantics (a String used for purely byte resources is unlikely to have
-    # them), returns false otherwise.
-    def is_utf8?
-      ActiveSupport::Multibyte::Chars.consumes?(self)
+  def is_utf8?
+    case encoding
+    when Encoding::UTF_8
+      valid_encoding?
+    when Encoding::ASCII_8BIT, Encoding::US_ASCII
+      dup.force_encoding(Encoding::UTF_8).valid_encoding?
+    else
+      false
     end
   end
 end

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

@@ -3,35 +3,25 @@ require 'active_support/core_ext/kernel/singleton_class'
 
 class ERB
   module Util
-    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#x27;' }
+    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
+    HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+));)/
+    JSON_ESCAPE_REGEXP = /[&"><]/
 
-    if RUBY_VERSION >= '1.9'
-      # A utility method for escaping HTML tag characters.
-      # This method is also aliased as <tt>h</tt>.
-      #
-      # In your ERB templates, use this method to escape any unsafe content. For example:
-      #   <%=h @person.name %>
-      #
-      # ==== Example:
-      #   puts html_escape("is a > 0 & a < 10?")
-      #   # => is a &gt; 0 &amp; a &lt; 10?
-      def html_escape(s)
-        s = s.to_s
-        if s.html_safe?
-          s
-        else
-          s.gsub(/[&"'><]/, HTML_ESCAPE).html_safe
-        end
-      end
-    else
-      def html_escape(s) #:nodoc:
-        s = s.to_s
-        if s.html_safe?
-          s
-        else
-          s.gsub(/[&"'><]/n) { |special| HTML_ESCAPE[special] }.html_safe
-        end
+    # A utility method for escaping HTML tag characters.
+    # This method is also aliased as <tt>h</tt>.
+    #
+    # In your ERB templates, use this method to escape any unsafe content. For example:
+    #   <%=h @person.name %>
+    #
+    #   puts html_escape('is a > 0 & a < 10?')
+    #   # => is a &gt; 0 &amp; a &lt; 10?
+    def html_escape(s)
+      s = s.to_s
+      if s.html_safe?
+        s
+      else
+        s.gsub(/[&"'><]/, HTML_ESCAPE).html_safe
       end
     end
 
@@ -44,10 +34,24 @@ class ERB
     singleton_class.send(:remove_method, :html_escape)
     module_function :html_escape
 
+    # A utility method for escaping HTML without affecting existing escaped entities.
+    #
+    #   html_escape_once('1 < 2 &amp; 3')
+    #   # => "1 &lt; 2 &amp; 3"
+    #
+    #   html_escape_once('&lt;&lt; Accept & Checkout')
+    #   # => "&lt;&lt; Accept &amp; Checkout"
+    def html_escape_once(s)
+      result = s.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP) { |special| HTML_ESCAPE[special] }
+      s.html_safe? ? result.html_safe : result
+    end
+
+    module_function :html_escape_once
+
     # A utility method for escaping HTML entities in JSON strings
     # using \uXXXX JavaScript escape sequences for string literals:
     #
-    #   json_escape("is a > 0 & a < 10?")
+    #   json_escape('is a > 0 & a < 10?')
     #   # => is a \u003E 0 \u0026 a \u003C 10?
     #
     # Note that after this operation is performed the output is not
@@ -55,19 +59,11 @@ class ERB
     #
     #   json_escape('{"name":"john","created_at":"2010-04-28T01:39:31Z","id":1}')
     #   # => {name:john,created_at:2010-04-28T01:39:31Z,id:1}
-    #
-    # This method is also aliased as +j+, and available as a helper
-    # in Rails templates:
-    #
-    #   <%=j @person.to_json %>
-    #
     def json_escape(s)
-      result = s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
+      result = s.to_s.gsub(JSON_ESCAPE_REGEXP) { |special| JSON_ESCAPE[special] }
       s.html_safe? ? result.html_safe : result
     end
 
-    alias j json_escape
-    module_function :j
     module_function :json_escape
   end
 end
@@ -86,26 +82,31 @@ end
 
 module ActiveSupport #:nodoc:
   class SafeBuffer < String
-    UNSAFE_STRING_METHODS = ["capitalize", "chomp", "chop", "delete", "downcase", "gsub", "lstrip", "next", "reverse", "rstrip", "slice", "squeeze", "strip", "sub", "succ", "swapcase", "tr", "tr_s", "upcase", "prepend"].freeze
+    UNSAFE_STRING_METHODS = %w(
+      capitalize chomp chop delete downcase gsub lstrip next reverse rstrip
+      slice squeeze strip sub succ swapcase tr tr_s upcase prepend
+    )
 
     alias_method :original_concat, :concat
     private :original_concat
 
     class SafeConcatError < StandardError
       def initialize
-        super "Could not concatenate to the buffer because it is not html safe."
+        super 'Could not concatenate to the buffer because it is not html safe.'
       end
     end
 
     def [](*args)
-      return super if args.size < 2
-
-      if html_safe?
-        new_safe_buffer = super
-        new_safe_buffer.instance_eval { @html_safe = true }
-        new_safe_buffer
+      if args.size < 2
+        super
       else
-        to_str[*args]
+        if html_safe?
+          new_safe_buffer = super
+          new_safe_buffer.instance_eval { @html_safe = true }
+          new_safe_buffer
+        else
+          to_str[*args]
+        end
       end
     end
 
@@ -141,6 +142,18 @@ module ActiveSupport #:nodoc:
       dup.concat(other)
     end
 
+    def %(args)
+      args = Array(args).map do |arg|
+        if !html_safe? || arg.html_safe?
+          arg
+        else
+          ERB::Util.h(arg)
+        end
+      end
+
+      self.class.new(super(args))
+    end
+
     def html_safe?
       defined?(@html_safe) && @html_safe
     end
@@ -157,11 +170,6 @@ module ActiveSupport #:nodoc:
       coder.represent_scalar nil, to_str
     end
 
-    def to_yaml(*args)
-      return super() if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-      to_str.to_yaml(*args)
-    end
-
     UNSAFE_STRING_METHODS.each do |unsafe_method|
       if 'String'.respond_to?(unsafe_method)
         class_eval <<-EOT, __FILE__, __LINE__ + 1

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

@@ -0,0 +1,13 @@
+require 'active_support/core_ext/time/zones'
+
+class String
+  # Converts String to a TimeWithZone in the current zone if Time.zone or Time.zone_default
+  # is set, otherwise converts String to a Time via String#to_time
+  def in_time_zone(zone = ::Time.zone)
+    if zone
+      ::Time.find_zone!(zone).parse(self)
+    else
+      to_time
+    end
+  end
+end

data/lib/active_support/core_ext/struct.rb

@@ -0,0 +1,6 @@
+#  Backport of Struct#to_h from Ruby 2.0
+class Struct # :nodoc:
+  def to_h
+    Hash[members.zip(values)]
+  end
+end unless Struct.instance_methods.include?(:to_h)

data/lib/active_support/core_ext/thread.rb

@@ -0,0 +1,74 @@
+class Thread
+  LOCK = Mutex.new # :nodoc:
+
+  # Returns the value of a thread local variable that has been set. Note that
+  # these are different than fiber local values.
+  #
+  # Thread local values are carried along with threads, and do not respect
+  # fibers. For example:
+  #
+  #   Thread.new {
+  #     Thread.current.thread_variable_set("foo", "bar") # set a thread local
+  #     Thread.current["foo"] = "bar"                    # set a fiber local
+  #
+  #     Fiber.new {
+  #       Fiber.yield [
+  #         Thread.current.thread_variable_get("foo"), # get the thread local
+  #         Thread.current["foo"],                     # get the fiber local
+  #       ]
+  #     }.resume
+  #   }.join.value # => ['bar', nil]
+  #
+  # The value <tt>"bar"</tt> is returned for the thread local, where +nil+ is returned
+  # for the fiber local. The fiber is executed in the same thread, so the
+  # thread local values are available.
+  def thread_variable_get(key)
+    locals[key.to_sym]
+  end
+
+  # Sets a thread local with +key+ to +value+. Note that these are local to
+  # threads, and not to fibers. Please see Thread#thread_variable_get for
+  # more information.
+  def thread_variable_set(key, value)
+    locals[key.to_sym] = value
+  end
+
+  # Returns an an array of the names of the thread-local variables (as Symbols).
+  #
+  #    thr = Thread.new do
+  #      Thread.current.thread_variable_set(:cat, 'meow')
+  #      Thread.current.thread_variable_set("dog", 'woof')
+  #    end
+  #    thr.join               #=> #<Thread:0x401b3f10 dead>
+  #    thr.thread_variables   #=> [:dog, :cat]
+  #
+  # Note that these are not fiber local variables. Please see Thread#thread_variable_get
+  # for more details.
+  def thread_variables
+    locals.keys
+  end
+
+  # Returns <tt>true</tt> if the given string (or symbol) exists as a
+  # thread-local variable.
+  #
+  #    me = Thread.current
+  #    me.thread_variable_set(:oliver, "a")
+  #    me.thread_variable?(:oliver)    #=> true
+  #    me.thread_variable?(:stanley)   #=> false
+  #
+  # Note that these are not fiber local variables. Please see Thread#thread_variable_get
+  # for more details.
+  def thread_variable?(key)
+    locals.has_key?(key.to_sym)
+  end
+
+  private
+
+  def locals
+    if defined?(@locals)
+      @locals
+    else
+      LOCK.synchronize { @locals ||= {} }
+    end
+  end
+end unless Thread.instance_methods.include?(:thread_variable_set)

data/lib/active_support/core_ext/time.rb

@@ -0,0 +1,6 @@
+require 'active_support/core_ext/time/acts_like'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/time/marshal'
+require 'active_support/core_ext/time/zones'
+require 'active_support/core_ext/time/infinite_comparable'

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

@@ -2,10 +2,13 @@ require 'active_support/duration'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/time_with_zone'
 require 'active_support/core_ext/time/zones'
+require 'active_support/core_ext/date_and_time/calculations'
+require 'active_support/deprecation'
 
 class Time
+  include DateAndTime::Calculations
+
   COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-  DAYS_INTO_WEEK = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6 }
 
   class << self
     # Overriding case equality method so that it returns true for ActiveSupport::TimeWithZone instances
@@ -16,28 +19,45 @@ class Time
     # Return the number of days in the given month.
     # If no year is specified, it will use the current year.
     def days_in_month(month, year = now.year)
-      return 29 if month == 2 && ::Date.gregorian_leap?(year)
-      COMMON_YEAR_DAYS_IN_MONTH[month]
+      if month == 2 && ::Date.gregorian_leap?(year)
+        29
+      else
+        COMMON_YEAR_DAYS_IN_MONTH[month]
+      end
     end
 
+    # *DEPRECATED*: Use +Time#utc+ or +Time#local+ instead.
+    #
     # 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)
+      ActiveSupport::Deprecation.warn 'time_with_datetime_fallback is deprecated. Use Time#utc or Time#local instead', caller
       time = ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
+
       # This check is needed because Time.utc(y) returns a time object in the 2000s for 0 <= y <= 138.
-      time.year == year ? time : ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
+      if time.year == year
+        time
+      else
+        ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
+      end
     rescue
       ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
     end
 
+    # *DEPRECATED*: Use +Time#utc+ instead.
+    #
     # Wraps class method +time_with_datetime_fallback+ with +utc_or_local+ set to <tt>:utc</tt>.
     def utc_time(*args)
+      ActiveSupport::Deprecation.warn 'utc_time is deprecated. Use Time#utc instead', caller
       time_with_datetime_fallback(:utc, *args)
     end
 
+    # *DEPRECATED*: Use +Time#local+ instead.
+    #
     # Wraps class method +time_with_datetime_fallback+ with +utc_or_local+ set to <tt>:local</tt>.
     def local_time(*args)
+      ActiveSupport::Deprecation.warn 'local_time is deprecated. Use Time#local instead', caller
       time_with_datetime_fallback(:local, *args)
     end
 
@@ -45,38 +65,6 @@ class Time
     def current
       ::Time.zone ? ::Time.zone.now : ::Time.now
     end
-
-    # Layers additional behavior on Time.at so that ActiveSupport::TimeWithZone and DateTime
-    # instances can be used when called with a single argument
-    def at_with_coercion(*args)
-      return at_without_coercion(*args) if args.size != 1
-
-      # Time.at can be called with a time or numerical value
-      time_or_number = args.first
-
-      if time_or_number.is_a?(ActiveSupport::TimeWithZone) || time_or_number.is_a?(DateTime)
-        at_without_coercion(time_or_number.to_f).getlocal
-      else
-        at_without_coercion(time_or_number)
-      end
-    end
-    alias_method :at_without_coercion, :at
-    alias_method :at, :at_with_coercion
-  end
-
-  # Tells whether the Time object's time lies in the past
-  def past?
-    self < ::Time.current
-  end
-
-  # Tells whether the Time object's time is today
-  def today?
-    to_date == ::Date.current
-  end
-
-  # Tells whether the Time object's time lies in the future
-  def future?
-    self > ::Time.current
   end
 
   # Seconds since midnight: Time.now.seconds_since_midnight
@@ -84,20 +72,42 @@ class Time
     to_i - change(:hour => 0).to_i + (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, min, 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.
+  # Returns the number of seconds until 23:59:59.
+  #
+  #   Time.new(2012, 8, 29,  0,  0,  0).seconds_until_end_of_day # => 86399
+  #   Time.new(2012, 8, 29, 12, 34, 56).seconds_until_end_of_day # => 41103
+  #   Time.new(2012, 8, 29, 23, 59, 59).seconds_until_end_of_day # => 0
+  def seconds_until_end_of_day
+    end_of_day.to_i - to_i
+  end
+
+  # Returns a new Time where one or more of the elements have been changed according
+  # to the +options+ parameter. The time options (<tt>:hour</tt>, <tt>:min</tt>,
+  # <tt>:sec</tt>, <tt>:usec</tt>) 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.  The +options+ parameter takes a hash with any of these
+  # keys: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:min</tt>,
+  # <tt>:sec</tt>, <tt>:usec</tt>.
+  #
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(day: 1)              # => Time.new(2012, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, day: 1)  # => Time.new(1981, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, hour: 0) # => Time.new(1981, 8, 29, 0, 0, 0)
   def change(options)
-    ::Time.send(
-      utc? ? :utc_time : :local_time,
-      options[:year]  || year,
-      options[:month] || month,
-      options[:day]   || day,
-      options[:hour]  || hour,
-      options[:min]   || (options[:hour] ? 0 : min),
-      options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec),
-      options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : usec)
-    )
+    new_year  = options.fetch(:year, year)
+    new_month = options.fetch(:month, month)
+    new_day   = options.fetch(:day, day)
+    new_hour  = options.fetch(:hour, hour)
+    new_min   = options.fetch(:min, options[:hour] ? 0 : min)
+    new_sec   = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
+    new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+
+    if utc?
+      ::Time.utc(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    elsif zone
+      ::Time.local(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    else
+      ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec + (new_usec.to_r / 1000000), utc_offset)
+    end
   end
 
   # Uses Date to provide precise Time calculations for years, months, and days.
@@ -107,18 +117,26 @@ class Time
   def advance(options)
     unless options[:weeks].nil?
       options[:weeks], partial_weeks = options[:weeks].divmod(1)
-      options[:days] = (options[:days] || 0) + 7 * partial_weeks
+      options[:days] = options.fetch(:days, 0) + 7 * partial_weeks
     end
 
     unless options[:days].nil?
       options[:days], partial_days = options[:days].divmod(1)
-      options[:hours] = (options[:hours] || 0) + 24 * partial_days
+      options[:hours] = options.fetch(:hours, 0) + 24 * partial_days
     end
 
     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)
+    seconds_to_advance = \
+      options.fetch(:seconds, 0) +
+      options.fetch(:minutes, 0) * 60 +
+      options.fetch(:hours, 0) * 3600
+
+    if seconds_to_advance.zero?
+      time_advanced_by_date
+    else
+      time_advanced_by_date.since(seconds_to_advance)
+    end
   end
 
   # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
@@ -134,98 +152,9 @@ class Time
   end
   alias :in :since
 
-  # Returns a new Time representing the time a number of specified weeks ago.
-  def weeks_ago(weeks)
-    advance(:weeks => -weeks)
-  end
-
-  # Returns a new Time representing the time a number of specified months ago
-  def months_ago(months)
-    advance(:months => -months)
-  end
-
-  # Returns a new Time representing the time a number of specified months in the future
-  def months_since(months)
-    advance(:months => months)
-  end
-
-  # Returns a new Time representing the time a number of specified years ago
-  def years_ago(years)
-    advance(:years => -years)
-  end
-
-  # Returns a new Time representing the time a number of specified years in the future
-  def years_since(years)
-    advance(:years => years)
-  end
-
-  # Short-hand for years_ago(1)
-  def prev_year
-    years_ago(1)
-  end
-
-  # Short-hand for years_since(1)
-  def next_year
-    years_since(1)
-  end
-
-  # Short-hand for months_ago(1)
-  def prev_month
-    months_ago(1)
-  end
-
-  # Short-hand for months_since(1)
-  def next_month
-    months_since(1)
-  end
-
-  # Returns number of days to start of this week, week starts on start_day (default is :monday).
-  def days_to_week_start(start_day = :monday)
-    start_day_number = DAYS_INTO_WEEK[start_day]
-    current_day_number = wday != 0 ? wday - 1 : 6
-    days_span = current_day_number - start_day_number
-    days_span >= 0 ? days_span : 7 + days_span
-  end
-
-  # Returns a new Time representing the "start" of this week, week starts on start_day (default is :monday, i.e. Monday, 0:00).
-  def beginning_of_week(start_day = :monday)
-    days_to_start = days_to_week_start(start_day)
-    (self - days_to_start.days).midnight
-  end
-  alias :at_beginning_of_week :beginning_of_week
-
-  # Returns a new +Date+/+DateTime+ representing the start of this week. Week is
-  # assumed to start on a Monday. +DateTime+ objects have their time set to 0:00.
-  def monday
-    beginning_of_week
-  end
-
-  # Returns a new Time representing the end of this week, week starts on start_day (default is :monday, i.e. end of Sunday).
-  def end_of_week(start_day = :monday)
-    days_to_end =  6 - days_to_week_start(start_day)
-    (self + days_to_end.days).end_of_day
-  end
-  alias :at_end_of_week :end_of_week
-
-  # Returns a new +Date+/+DateTime+ representing the end of this week. Week is
-  # assumed to start on a Monday. +DateTime+ objects have their time set to 23:59:59.
-  def sunday
-    end_of_week
-  end
-
-  # Returns a new Time representing the start of the given day in the previous week (default is :monday).
-  def prev_week(day = :monday)
-    ago(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
-  end
-
-  # Returns a new Time representing the start of the given day in next week (default is :monday).
-  def next_week(day = :monday)
-    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 - seconds_since_midnight).change(:usec => 0)
+    #(self - seconds_since_midnight).change(usec: 0)
     change(:hour => 0)
   end
   alias :midnight :beginning_of_day
@@ -234,8 +163,14 @@ class Time
 
   # Returns a new Time representing the end of the day, 23:59:59.999999 (.999999999 in ruby1.9)
   def end_of_day
-    change(:hour => 23, :min => 59, :sec => 59, :usec => Rational(999999999, 1000))
+    change(
+      :hour => 23,
+      :min => 59,
+      :sec => 59,
+      :usec => Rational(999999999, 1000)
+    )
   end
+  alias :at_end_of_day :end_of_day
 
   # Returns a new Time representing the start of the hour (x:00)
   def beginning_of_hour
@@ -245,65 +180,37 @@ class Time
 
   # Returns a new Time representing the end of the hour, x:59:59.999999 (.999999999 in ruby1.9)
   def end_of_hour
-    change(:min => 59, :sec => 59, :usec => Rational(999999999, 1000))
-  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(:day => 1, :hour => 0)
-  end
-  alias :at_beginning_of_month :beginning_of_month
-
-  # Returns a new Time representing the end of the month (end of the last day of the month)
-  def end_of_month
-    #self - ((self.mday-1).days + self.seconds_since_midnight)
-    last_day = ::Time.days_in_month(month, year)
-    change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => Rational(999999999, 1000))
-  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 <= month })
-  end
-  alias :at_beginning_of_quarter :beginning_of_quarter
-
-  # Returns a new Time representing the end of the quarter (end of the last day of march, june, september, december)
-  def end_of_quarter
-    beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= month }).end_of_month
-  end
-  alias :at_end_of_quarter :end_of_quarter
-
-  # Returns a new Time representing the start of the year (1st of january, 0:00)
-  def beginning_of_year
-    change(:month => 1, :day => 1, :hour => 0)
-  end
-  alias :at_beginning_of_year :beginning_of_year
-
-  # Returns a new Time representing the end of the year (end of the 31st of december)
-  def end_of_year
-    change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59, :usec => Rational(999999999, 1000))
+    change(
+      :min => 59,
+      :sec => 59,
+      :usec => Rational(999999999, 1000)
+    )
   end
-  alias :at_end_of_year :end_of_year
+  alias :at_end_of_hour :end_of_hour
 
-  # Convenience method which returns a new Time representing the time 1 day ago
-  def yesterday
-    advance(:days => -1)
+  # Returns a new Time representing the start of the minute (x:xx:00)
+  def beginning_of_minute
+    change(:sec => 0)
   end
+  alias :at_beginning_of_minute :beginning_of_minute
 
-  # Convenience method which returns a new Time representing the time 1 day since the instance time
-  def tomorrow
-    advance(:days => 1)
+  # Returns a new Time representing the end of the minute, x:xx:59.999999 (.999999999 in ruby1.9)
+  def end_of_minute
+    change(
+      :sec => 59,
+      :usec => Rational(999999999, 1000)
+    )
   end
+  alias :at_end_of_minute :end_of_minute
 
   # Returns a Range representing the whole day of the current time.
   def all_day
     beginning_of_day..end_of_day
   end
 
-  # Returns a Range representing the whole week of the current time. Week starts on start_day (default is :monday, i.e. end of Sunday).
-  def all_week(start_day = :monday)
+  # Returns a Range representing the whole week of the current time.
+  # Week starts on start_day, default is <tt>Date.week_start</tt> or <tt>config.week_start</tt> when set.
+  def all_week(start_day = Date.beginning_of_week)
     beginning_of_week(start_day)..end_of_week(start_day)
   end
 
@@ -356,7 +263,11 @@ class Time
   # can be chronologically compared with a Time
   def compare_with_coercion(other)
     # we're avoiding Time#to_datetime cause it's expensive
-    other.is_a?(Time) ? compare_without_coercion(other.to_time) : to_datetime <=> other
+    if other.is_a?(Time)
+      compare_without_coercion(other.to_time)
+    else
+      to_datetime <=> other
+    end
   end
   alias_method :compare_without_coercion, :<=>
   alias_method :<=>, :compare_with_coercion
@@ -370,4 +281,5 @@ class Time
   end
   alias_method :eql_without_coercion, :eql?
   alias_method :eql?, :eql_with_coercion
+
 end