From a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 28 Feb 2009 16:48:14 -0800
Subject: * Introduce ActiveSupport.core_ext Integer, %w(conversions time etc)
 * Convert some extension modules to simply reopening the class * Remove
 deprecated Float time extensions * Fold Base64 extension into
 ActiveSupport::Base64 since stdlib Base64 is gone

---
 .../lib/active_support/core_ext/float/rounding.rb  | 34 +++++++++-------------
 .../lib/active_support/core_ext/float/time.rb      | 27 -----------------
 2 files changed, 14 insertions(+), 47 deletions(-)
 delete mode 100644 activesupport/lib/active_support/core_ext/float/time.rb

(limited to 'activesupport/lib/active_support/core_ext/float')

diff --git a/activesupport/lib/active_support/core_ext/float/rounding.rb b/activesupport/lib/active_support/core_ext/float/rounding.rb
index 062d466838..0b1ae4be7e 100644
--- a/activesupport/lib/active_support/core_ext/float/rounding.rb
+++ b/activesupport/lib/active_support/core_ext/float/rounding.rb
@@ -1,24 +1,18 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Float #:nodoc:
-      module Rounding
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            alias_method :round_without_precision, :round
-            alias_method :round, :round_with_precision
-          end
-        end
+class Float
+  remove_method :round
 
-        # Rounds the float with the specified precision.
-        #
-        #   x = 1.337
-        #   x.round    # => 1
-        #   x.round(1) # => 1.3
-        #   x.round(2) # => 1.34
-        def round_with_precision(precision = nil)
-          precision.nil? ? round_without_precision : (self * (10 ** precision)).round / (10 ** precision).to_f
-        end
-      end
+  # Rounds the float with the specified precision.
+  #
+  #   x = 1.337
+  #   x.round    # => 1
+  #   x.round(1) # => 1.3
+  #   x.round(2) # => 1.34
+  def round(precision = nil)
+    if precision
+      magnitude = 10.0 ** precision
+      (self * magnitude).round / magnitude
+    else
+      super()
     end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/float/time.rb b/activesupport/lib/active_support/core_ext/float/time.rb
deleted file mode 100644
index 13f2e0ddca..0000000000
--- a/activesupport/lib/active_support/core_ext/float/time.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-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
\ No newline at end of file
-- 
cgit v1.2.3