Merge remote branch 'rails/master'

12 files changed, 92 insertions, 15 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index f24a1b1c6c..0652a20035 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.0.0 [beta 4/release candidate] (unreleased)*
 
+* Deprecate {{}} as interpolation syntax for I18n in favor of %{} [José Valim]
+
 * Array#to_xml is more powerful and able to handle the same types as Hash#to_xml #4490 [Neeraj Singh]
 
 * Harmonize the caching API and refactor the backends.  #4452 [Brian Durand]
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 0fea84a6ef..cfd85f61c9 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
 
-  s.add_dependency('i18n',            '~> 0.4.0.beta')
+  s.add_dependency('i18n',            '~> 0.4.0.beta1')
   s.add_dependency('tzinfo',          '~> 0.3.16')
   s.add_dependency('builder',         '~> 2.1.2')
   s.add_dependency('memcache-client', '>= 1.7.5')
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index ec5007c284..2605a3f2b8 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -502,7 +502,7 @@ module ActiveSupport
           if self.class.instrument
             payload = { :key => key }
             payload.merge!(options) if options.is_a?(Hash)
-            ActiveSupport::Notifications.instrument("active_support.cache_#{operation}", payload){ yield }
+            ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload){ yield }
           else
             yield
           end
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 9d2ad2bbcf..fef49e1003 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -7,12 +7,12 @@ class Date
   class << self
     # Returns a new Date representing the date 1 day ago (i.e. yesterday's date).
     def yesterday
-      ::Date.today.yesterday
+      ::Date.current.yesterday
     end
 
     # Returns a new Date representing the date 1 day after today (i.e. tomorrow's date).
     def tomorrow
-      ::Date.today.tomorrow
+      ::Date.current.tomorrow
     end
 
     # Returns Time.zone.today when config.time_zone is set, otherwise just returns Date.today.
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index 90ab1eb281..13ef703f49 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -1,5 +1,6 @@
 require 'date'
 require 'active_support/inflector'
+require 'active_support/core_ext/time/calculations'
 
 class Date
   DATE_FORMATS = {
diff --git a/activesupport/lib/active_support/inflector/transliterate.rb b/activesupport/lib/active_support/inflector/transliterate.rb
index 5ec87372d0..2344bb1bb3 100644
--- a/activesupport/lib/active_support/inflector/transliterate.rb
+++ b/activesupport/lib/active_support/inflector/transliterate.rb
@@ -24,8 +24,9 @@ module ActiveSupport
     #   # Store the transliterations in locales/de.yml
     #   i18n:
     #     transliterate:
-    #       ü: "ue"
-    #       ö: "oe"
+    #       rule:
+    #         ü: "ue"
+    #         ö: "oe"
     #
     #   # Or set them using Ruby
     #   I18n.backend.store_translations(:de, :i18n => {
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index e692f6d142..02c233595d 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'bigdecimal'
 require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/big_decimal/conversions' # for #to_s
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/module/delegation'
@@ -178,6 +179,14 @@ class Numeric
 end
 
 class BigDecimal
+  # A BigDecimal would be naturally represented as a JSON number. Most libraries,
+  # however, parse non-integer JSON numbers directly as floats. Clients using
+  # those libraries would get in general a wrong number and no way to recover
+  # other than manually inspecting the string with the JSON code itself.
+  #
+  # That's why a JSON string is returned. The JSON literal is not numeric, but if
+  # the other end knows by contract that the data is supposed to be a BigDecimal,
+  # it still has the chance to post-process the string and get the real value.
   def as_json(options = nil) to_s end #:nodoc:
 end
 
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index f3d877efe7..7e89402822 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -12,12 +12,18 @@ module ActiveSupport
       end
 
       # Instrument the given block by measuring the time taken to execute it
-      # and publish it.
+      # and publish it. Notice that events get sent even if an error occurs
+      # in the passed-in block
       def instrument(name, payload={})
         time = Time.now
-        result = yield(payload) if block_given?
-        @notifier.publish(name, time, Time.now, @id, payload)
-        result
+        begin
+          yield(payload) if block_given?
+        rescue Exception => e
+          payload[:exception] = [e.class.name, e.message]
+          raise e
+        ensure
+          @notifier.publish(name, time, Time.now, @id, payload)
+        end
       end
 
       private
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 23c9bc7fb1..c403d7fb11 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -176,11 +176,47 @@ class DateExtCalculationsTest < Test::Unit::TestCase
   end
 
   def test_yesterday_constructor
-    assert_equal Date.today - 1, Date.yesterday
+    assert_equal Date.current - 1, Date.yesterday
+  end
+  
+  def test_yesterday_constructor_when_zone_default_is_not_set
+    with_env_tz 'UTC' do
+      with_tz_default do
+        Time.stubs(:now).returns Time.local(2000, 1, 1)
+        assert_equal Date.new(1999, 12, 31), Date.yesterday
+      end
+    end
+  end
+
+  def test_yesterday_constructor_when_zone_default_is_set
+    with_env_tz 'UTC' do
+      with_tz_default ActiveSupport::TimeZone['Eastern Time (US & Canada)'] do # UTC -5
+        Time.stubs(:now).returns Time.local(2000, 1, 1)
+        assert_equal Date.new(1999, 12, 30), Date.yesterday
+      end
+    end
   end
 
   def test_tomorrow_constructor
-    assert_equal Date.today + 1, Date.tomorrow
+    assert_equal Date.current + 1, Date.tomorrow
+  end
+
+  def test_tomorrow_constructor_when_zone_default_is_not_set
+    with_env_tz 'UTC' do
+      with_tz_default do
+        Time.stubs(:now).returns Time.local(1999, 12, 31)
+        assert_equal Date.new(2000, 1, 1), Date.tomorrow
+      end
+    end
+  end
+
+  def test_tomorrow_constructor_when_zone_default_is_set
+    with_env_tz 'UTC' do
+      with_tz_default ActiveSupport::TimeZone['Europe/Paris'] do # UTC +1
+        Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
+        assert_equal Date.new(2000, 1, 2), Date.tomorrow
+      end
+    end
   end
 
   def test_since
@@ -264,6 +300,14 @@ class DateExtCalculationsTest < Test::Unit::TestCase
     ensure
       old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
     end
+
+    def with_tz_default(tz = nil)
+      old_tz = Time.zone_default
+      Time.zone_default = tz
+      yield
+    ensure
+      Time.zone_default = old_tz
+    end
 end
 
 class DateExtBehaviorTest < Test::Unit::TestCase
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index ac7ca96c4d..a8ecf4e4cf 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -1,5 +1,7 @@
 # encoding: utf-8
 require 'abstract_unit'
+require 'bigdecimal'
+require 'active_support/core_ext/big_decimal/conversions'
 require 'active_support/json'
 
 class TestJSONEncoding < Test::Unit::TestCase
@@ -26,7 +28,7 @@ class TestJSONEncoding < Test::Unit::TestCase
   NilTests      = [[ nil,   %(null)  ]]
   NumericTests  = [[ 1,     %(1)     ],
                    [ 2.5,   %(2.5)   ],
-                   [ BigDecimal('2.5'), %("#{BigDecimal('2.5').to_s('F')}") ]]
+                   [ BigDecimal('2.5'), %("#{BigDecimal('2.5').to_s}") ]]
 
   StringTests   = [[ 'this is the <string>',     %("this is the \\u003Cstring\\u003E")],
                    [ 'a "string" with quotes & an ampersand', %("a \\"string\\" with quotes \\u0026 an ampersand") ],
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
index 2fba62bdd6..684b931176 100644
--- a/activesupport/test/message_encryptor_test.rb
+++ b/activesupport/test/message_encryptor_test.rb
@@ -1,4 +1,12 @@
 require 'abstract_unit'
+
+begin
+  require 'openssl'
+  OpenSSL::Digest::SHA1
+rescue LoadError, NameError
+  $stderr.puts "Skipping MessageEncryptor test: broken OpenSSL install"
+else
+
 require 'active_support/time'
 
 class MessageEncryptorTest < Test::Unit::TestCase
@@ -45,3 +53,5 @@ class MessageEncryptorTest < Test::Unit::TestCase
       ActiveSupport::Base64.encode64s(bits)
     end
 end
+
+end
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index c2e1c588f0..e11de5f67a 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -168,7 +168,7 @@ module Notifications
       assert_equal Hash[:payload => "notifications"], @events.last.payload
     end
 
-    def test_instrument_does_not_publish_when_exception_is_raised
+    def test_instrument_publishes_when_exception_is_raised
       begin
         instrument(:awesome, :payload => "notifications") do
           raise "FAIL"
@@ -178,7 +178,9 @@ module Notifications
       end
 
       drain
-      assert_equal 0, @events.size
+      assert_equal 1, @events.size
+      assert_equal Hash[:payload => "notifications",
+        :exception => ["RuntimeError", "FAIL"]], @events.last.payload
     end
 
     def test_event_is_pushed_even_without_block