diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-21 10:42:01 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-21 10:42:01 -0700 |
| commit | f007885a0371bd22d802a3d133d9bce645f5730c (patch) | |
| tree | df873638bffe7c31a6b5b93519d758a0e1474f5c | |
| parent | eb0257944ef7c9c0f7658b934a2f767497982909 (diff) | |
| parent | 03cd88a07221a1511c9d06fe4173052bb5554d0b (diff) | |
| download | rails-f007885a0371bd22d802a3d133d9bce645f5730c.tar.gz rails-f007885a0371bd22d802a3d133d9bce645f5730c.tar.bz2 rails-f007885a0371bd22d802a3d133d9bce645f5730c.zip | |
Merge pull request #1188 from thedarkone/duplicable-duration
Fix AS::Duration#duplicable? on 1.8
| -rw-r--r-- | activesupport/lib/active_support/duration.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/duplicable_test.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb index 00c67a470d..89b0923882 100644 --- a/activesupport/lib/active_support/duration.rb +++ b/activesupport/lib/active_support/duration.rb @@ -10,6 +10,7 @@ module ActiveSupport # 1.month.ago # equivalent to Time.now.advance(:months => -1) class Duration < BasicObject attr_accessor :value, :parts + delegate :duplicable?, :to => :value # required when using ActiveSupport's BasicObject on 1.8 def initialize(value, parts) #:nodoc: @value, @parts = value, parts diff --git a/activesupport/test/core_ext/duplicable_test.rb b/activesupport/test/core_ext/duplicable_test.rb index 77d0e86b78..24e0ccd9b3 100644 --- a/activesupport/test/core_ext/duplicable_test.rb +++ b/activesupport/test/core_ext/duplicable_test.rb @@ -1,9 +1,10 @@ require 'abstract_unit' require 'bigdecimal' require 'active_support/core_ext/object/duplicable' +require 'active_support/core_ext/numeric/time' class DuplicableTest < Test::Unit::TestCase - NO = [nil, false, true, :symbol, 1, 2.3, BigDecimal.new('4.56'), Class.new, Module.new] + NO = [nil, false, true, :symbol, 1, 2.3, BigDecimal.new('4.56'), Class.new, Module.new, 5.seconds] YES = ['1', Object.new, /foo/, [], {}, Time.now] def test_duplicable |