Introduce BasicObject as Builder::BlankSlate for Ruby 1.9 forward compatibility.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7762 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 8 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb
new file mode 100644
index 0000000000..7a3d1a9ed0
--- /dev/null
+++ b/activesupport/lib/active_support/basic_object.rb
@@ -0,0 +1,6 @@
+# Ruby 1.9 introduces BasicObject. Use Builder's BlankSlate before then.
+unless defined? BasicObject
+  require 'rubygems'
+  require 'builder'
+  BasicObject = Builder::BlankSlate
+end
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index 0d3016a690..fd9b505c2f 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -4,7 +4,7 @@ module ActiveSupport
   # such as in this example:
   #
   #   1.month.ago       # equivalent to Time.now.advance(:months => -1)
-  class Duration < Builder::BlankSlate
+  class Duration < BasicObject
     attr_accessor :value, :parts
     
     def initialize(value, parts) #:nodoc:
@@ -83,4 +83,4 @@ module ActiveSupport
       value.send(method, *args)
     end
   end
-end
\ No newline at end of file
+end