Permalink
Browse files

Convert Numeric bytes and time extension modules to class reopen

  • Loading branch information...
1 parent dc0c916 commit 5d5cde4b02a91d23fcac3c381d14e8d2716717ed @jeremy jeremy committed Mar 29, 2009
View
6 activesupport/lib/active_support/core_ext/numeric.rb
@@ -1,4 +1,2 @@
-require 'active_support/core_ext/numeric/conversions'
-
-require 'active_support/core_ext/util'
-ActiveSupport.core_ext Numeric, %w(time bytes)
+require 'active_support/core_ext/numeric/bytes'
+require 'active_support/core_ext/numeric/time'
View
69 activesupport/lib/active_support/core_ext/numeric/bytes.rb
@@ -1,44 +1,37 @@
-module ActiveSupport #:nodoc:
- module CoreExtensions #:nodoc:
- module Numeric #:nodoc:
- # Enables the use of byte calculations and declarations, like 45.bytes + 2.6.megabytes
- module Bytes
- def bytes
- self
- end
- alias :byte :bytes
+class Numeric
+ # Enables the use of byte calculations and declarations, like 45.bytes + 2.6.megabytes
+ def bytes
+ self
+ end
+ alias :byte :bytes
- def kilobytes
- self * 1024
- end
- alias :kilobyte :kilobytes
+ def kilobytes
+ self * 1024
+ end
+ alias :kilobyte :kilobytes
- def megabytes
- self * 1024.kilobytes
- end
- alias :megabyte :megabytes
+ def megabytes
+ self * 1024.kilobytes
+ end
+ alias :megabyte :megabytes
- def gigabytes
- self * 1024.megabytes
- end
- alias :gigabyte :gigabytes
+ def gigabytes
+ self * 1024.megabytes
+ end
+ alias :gigabyte :gigabytes
- def terabytes
- self * 1024.gigabytes
- end
- alias :terabyte :terabytes
-
- def petabytes
- self * 1024.terabytes
- end
- alias :petabyte :petabytes
-
- def exabytes
- self * 1024.petabytes
- end
- alias :exabyte :exabytes
-
- end
- end
+ def terabytes
+ self * 1024.gigabytes
+ end
+ alias :terabyte :terabytes
+
+ def petabytes
+ self * 1024.terabytes
+ end
+ alias :petabyte :petabytes
+
+ def exabytes
+ self * 1024.petabytes
end
+ alias :exabyte :exabytes
end
View
144 activesupport/lib/active_support/core_ext/numeric/time.rb
@@ -1,81 +1,75 @@
-module ActiveSupport #:nodoc:
- module CoreExtensions #:nodoc:
- module Numeric #: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 seconds
- ActiveSupport::Duration.new(self, [[:seconds, self]])
- end
- alias :second :seconds
-
- def minutes
- ActiveSupport::Duration.new(self * 60, [[:seconds, self * 60]])
- end
- alias :minute :minutes
-
- def hours
- ActiveSupport::Duration.new(self * 3600, [[:seconds, self * 3600]])
- end
- alias :hour :hours
-
- def days
- ActiveSupport::Duration.new(self * 24.hours, [[:days, self]])
- end
- alias :day :days
+class Numeric
+ # 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 seconds
+ ActiveSupport::Duration.new(self, [[:seconds, self]])
+ end
+ alias :second :seconds
- def weeks
- ActiveSupport::Duration.new(self * 7.days, [[:days, self * 7]])
- end
- alias :week :weeks
-
- def fortnights
- ActiveSupport::Duration.new(self * 2.weeks, [[:days, self * 14]])
- end
- alias :fortnight :fortnights
-
- # Reads best without arguments: 10.minutes.ago
- def ago(time = ::Time.now)
- time - self
- end
+ def minutes
+ ActiveSupport::Duration.new(self * 60, [[:seconds, self * 60]])
+ end
+ alias :minute :minutes
+
+ def hours
+ ActiveSupport::Duration.new(self * 3600, [[:seconds, self * 3600]])
+ end
+ alias :hour :hours
+
+ def days
+ ActiveSupport::Duration.new(self * 24.hours, [[:days, self]])
+ end
+ alias :day :days
- # Reads best with argument: 10.minutes.until(time)
- alias :until :ago
+ def weeks
+ ActiveSupport::Duration.new(self * 7.days, [[:days, self * 7]])
+ end
+ alias :week :weeks
+
+ def fortnights
+ ActiveSupport::Duration.new(self * 2.weeks, [[:days, self * 14]])
+ end
+ alias :fortnight :fortnights
+
+ # Reads best without arguments: 10.minutes.ago
+ def ago(time = ::Time.now)
+ time - self
+ end
- # Reads best with argument: 10.minutes.since(time)
- def since(time = ::Time.now)
- time + self
- end
+ # Reads best with argument: 10.minutes.until(time)
+ alias :until :ago
- # Reads best without arguments: 10.minutes.from_now
- alias :from_now :since
- end
- end
+ # Reads best with argument: 10.minutes.since(time)
+ def since(time = ::Time.now)
+ time + self
end
+
+ # Reads best without arguments: 10.minutes.from_now
+ alias :from_now :since
end

0 comments on commit 5d5cde4

Please sign in to comment.