From f0dbd22c4647bf8e37fd9b58ce6652aaca27376e Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Sun, 2 Sep 2007 23:54:08 +0000 Subject: Allow Float#round to take a precision argument. Closes #8626 [norbert] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7401 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/core_ext/float.rb | 5 +++++ .../lib/active_support/core_ext/float/rounding.rb | 22 +++++++++++++++++++ activesupport/test/core_ext/float_ext_test.rb | 25 ++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 activesupport/lib/active_support/core_ext/float.rb create mode 100644 activesupport/lib/active_support/core_ext/float/rounding.rb create mode 100644 activesupport/test/core_ext/float_ext_test.rb (limited to 'activesupport') diff --git a/activesupport/lib/active_support/core_ext/float.rb b/activesupport/lib/active_support/core_ext/float.rb new file mode 100644 index 0000000000..ac5d5a47e6 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/float.rb @@ -0,0 +1,5 @@ +require File.dirname(__FILE__) + '/float/rounding' + +class Float #:nodoc: + include ActiveSupport::CoreExtensions::Float::Rounding +end diff --git a/activesupport/lib/active_support/core_ext/float/rounding.rb b/activesupport/lib/active_support/core_ext/float/rounding.rb new file mode 100644 index 0000000000..989b1f8f80 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/float/rounding.rb @@ -0,0 +1,22 @@ +module ActiveSupport #:nodoc: + module CoreExtensions #:nodoc: + module Float #:nodoc: + module Rounding + def self.included(base) #:nodoc: + base.send(:alias_method, :round_without_precision, :round) + base.send(:alias_method, :round, :round_with_precision) + 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_with_precision(precision = nil) + precision.nil? ? round_without_precision : (self * (10 ** precision)).round / (10 ** precision).to_f + end + end + end + end +end diff --git a/activesupport/test/core_ext/float_ext_test.rb b/activesupport/test/core_ext/float_ext_test.rb new file mode 100644 index 0000000000..b74add519f --- /dev/null +++ b/activesupport/test/core_ext/float_ext_test.rb @@ -0,0 +1,25 @@ +require File.dirname(__FILE__) + '/../abstract_unit' + +class FloatExtRoundingTests < Test::Unit::TestCase + def test_round_for_positive_number + assert_equal 1, 1.4.round + assert_equal 2, 1.6.round + assert_equal 2, 1.6.round(0) + assert_equal 1.4, 1.4.round(1) + assert_equal 1.4, 1.4.round(3) + assert_equal 1.5, 1.45.round(1) + assert_equal 1.45, 1.445.round(2) + end + + def test_round_for_negative_number + assert_equal( -1, -1.4.round ) + assert_equal( -2, -1.6.round ) + assert_equal( -1.4, -1.4.round(1) ) + assert_equal( -1.5, -1.45.round(1) ) + end + + def test_round_with_negative_precision + assert_equal 123460.0, 123456.0.round(-1) + assert_equal 123500.0, 123456.0.round(-2) + end +end -- cgit v1.2.3