with_locale now returns yielded value, added spec

twitter · Jan 12, 2013 · d50d7ba · d50d7ba
1 parent 75da55c
commit d50d7ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/twitter_cldr.rb b/lib/twitter_cldr.rb
@@ -75,8 +75,9 @@ def with_locale(locale)
       raise "Unsupported locale" unless supported_locale?(locale)
       old_locale = @locale
       @locale = locale
-      yield
+      result = yield
       @locale = old_locale
+      result
     end
 
     def register_locale_fallback(proc_or_locale)

diff --git a/spec/twitter_cldr_spec.rb b/spec/twitter_cldr_spec.rb
@@ -162,6 +162,14 @@
     end
   end
 
+  describe "#with_locale" do
+    it "should only change the locale in the context of the block" do
+      TwitterCldr::Shared::Languages.from_code(:es).should == "Spanish"
+      TwitterCldr.with_locale(:es) { TwitterCldr::Shared::Languages.from_code(:es) }.should match_normalized("español")
+      TwitterCldr::Shared::Languages.from_code(:es).should == "Spanish"
+    end
+  end
+
   describe '#resources' do
     it 'returns @resources' do
       resources = TwitterCldr::Resources::Loader.new