From f4bf318db061daa8c6ebb2b700fd15034e031310 Mon Sep 17 00:00:00 2001
From: Greg Borenstein <greg@mfdz.com>
Date: Mon, 19 Jan 2009 11:44:55 -0800
Subject: add an inspect method to OrderedHash to make it clear that it is not
 a species of Array

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1782 state:committed]
---
 activesupport/lib/active_support/ordered_hash.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 25ea505813..66aab9e562 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -92,6 +92,10 @@ module ActiveSupport
         dup.merge!(other_hash)
       end
 
+      def inspect
+        "#<OrderedHash #{self.to_hash.inspect}>"
+      end
+
     private
 
       def sync_keys!
-- 
cgit v1.2.3


From 5c062bf1000886d26b3a4c3b08dfb6618a4adcdf Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Thu, 8 Jan 2009 22:14:24 -0600
Subject: add #available_locales to I18n and I18n::SimpleBackend, flatten
 translations load_path when loading translations [#1714 state:resolved]
 Signed-off-by: Joshua Peek <josh@joshpeek.com>

---
 .../active_support/vendor/i18n-0.1.1/lib/i18n.rb   |  5 +++++
 .../vendor/i18n-0.1.1/lib/i18n/backend/simple.rb   |  8 +++++++-
 .../vendor/i18n-0.1.1/test/simple_backend_test.rb  | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb b/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb
index b5ad094d0e..76361bed90 100755
--- a/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb
@@ -45,6 +45,11 @@ module I18n
       Thread.current[:locale] = locale
     end
 
+    # Returns an array of locales for which translations are available
+    def available_locales
+      backend.available_locales
+    end
+
     # Sets the exception handler.
     def exception_handler=(exception_handler)
       @@exception_handler = exception_handler
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb b/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb
index d298b3a85a..b54164d496 100644
--- a/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb
@@ -69,6 +69,12 @@ module I18n
         @initialized ||= false
       end
 
+      # Returns an array of locales for which translations are available
+      def available_locales
+        init_translations unless initialized?
+        translations.keys
+      end
+
       def reload!
         @initialized = false
         @translations = nil
@@ -76,7 +82,7 @@ module I18n
 
       protected
         def init_translations
-          load_translations(*I18n.load_path)
+          load_translations(*I18n.load_path.flatten)
           @initialized = true
         end
 
diff --git a/activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb b/activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb
index e181975f38..8ba7036abf 100644
--- a/activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb
@@ -124,6 +124,16 @@ class I18nSimpleBackendTranslationsTest < Test::Unit::TestCase
   end
 end
 
+class I18nSimpleBackendAvailableLocalesTest < Test::Unit::TestCase
+  def test_available_locales
+    @backend = I18n::Backend::Simple.new
+    @backend.store_translations 'de', :foo => 'bar'
+    @backend.store_translations 'en', :foo => 'foo'
+
+    assert_equal ['de', 'en'], @backend.available_locales.map{|locale| locale.to_s }.sort
+  end
+end
+
 class I18nSimpleBackendTranslateTest < Test::Unit::TestCase
   include I18nSimpleBackendTestSetup
 
@@ -472,6 +482,18 @@ class I18nSimpleBackendLoadTranslationsTest < Test::Unit::TestCase
   end
 end
 
+class I18nSimpleBackendLoadPathTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def test_nested_load_paths_do_not_break_locale_loading
+    @backend = I18n::Backend::Simple.new
+    I18n.load_path = [[File.dirname(__FILE__) + '/locale/en.yml']]
+    assert_nil backend_get_translations
+    assert_nothing_raised { @backend.send :init_translations }
+    assert_not_nil backend_get_translations
+  end
+end
+
 class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase
   include I18nSimpleBackendTestSetup
   
-- 
cgit v1.2.3


From 2e69db18ce2815c25eee64fc2978e7f6b57f6e1f Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 28 Jan 2009 21:20:46 -0600
Subject: Only dup local cache values if duplicable [#1653 state:resolved]

---
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 621358d701..d83e259a2a 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -41,7 +41,7 @@ module ActiveSupport
             value
           else
             # forcing the value to be immutable
-            value.dup
+            value.duplicable? ? value.dup : value
           end
         end
 
-- 
cgit v1.2.3