i18n_lookup 0.1.0 → 0.2.0

data/i18n_lookup.rb

@@ -8,18 +8,27 @@ module I18nLookup
   protected
 
   def lookup(locale, key, scope = [], options = {})
+    @@i18n_fallbacks ||= []
+    @@last_key ||= nil
+
     result = super(locale, key, scope, options)
     keys = I18n.normalize_keys(locale, key, scope, options[:separator])
 
-    unless (same_key?(keys) && same_caller?)
-      @last_key ||= keys.last
+    if same_key?(keys) && (@@i18n_fallbacks.include?(key) || same_caller?)
+      @@i18n_fallbacks << options[:default]
+      @@i18n_fallbacks << key
+      @@i18n_fallbacks.flatten!
+    else
+      @@last_key ||= keys.last
+      @@i18n_fallbacks = [options[:default], key].flatten
+
       print_main_key(keys)
     end
 
     if result
       print_keys(keys, 33)
       print_result(result)
-      @last_key = nil
+      @@last_key = nil
     else
       print_keys(keys, 31)
     end
@@ -40,7 +49,7 @@ module I18nLookup
   end
 
   def same_key?(keys)
-    @last_key && @last_key.eql?(keys.last)
+    @@last_key && @@last_key.eql?(keys.last)
   end
 
   def print_main_key(keys, color_code = 34)

data/i18n_lookup_spec.rb

@@ -22,7 +22,7 @@ describe I18nLookup do
       {:en =>{:attributes => {:my_attribute => 'My Attribute'}}}
     end
 
-    it 'should x' do
+    it 'should print the keys as group with a result' do
       expected_result = translations[:en][:attributes][:my_attribute]
       main_key        = [:en, :activemodel, :attributes, :active_model_test, :my_attribute]
       second_key      = [:en, :attributes, :my_attribute]
@@ -35,7 +35,7 @@ describe I18nLookup do
       ActiveModelTest.human_attribute_name('my_attribute')
     end
 
-    it 'should y' do
+    it 'should print the keys as group without a result' do
       main_key   = [:en, :activemodel, :attributes, :active_model_test, :my_attribute_2]
       second_key = [:en, :attributes, :my_attribute_2]
 
@@ -52,7 +52,7 @@ describe I18nLookup do
       {:en => {:test => 'My Test'}}
     end
 
-    it 'should z' do
+    it 'should print the key with a result' do
       expected_result = translations[:en][:test]
       main_key        = [:en, :test]
 
@@ -62,5 +62,24 @@ describe I18nLookup do
 
       I18n.t :test
     end
+
+    context 'with a default' do
+      let(:translations) do
+        {:en => {:test2 => {:my_attr => 'My Test'}}}
+      end
+
+      it 'should print the key with a result' do
+        expected_result = translations[:en][:test2][:my_attr]
+        main_key        = [:en, :test, :my_attr]
+        second_key      = [:en, :test2, :my_attr]
+
+        subject.should_receive(:print_main_key).with(main_key)
+        subject.should_receive(:print_keys).with(main_key, 31)
+        subject.should_receive(:print_keys).with(second_key, 33)
+        subject.should_receive(:print_result).with(expected_result)
+
+        I18n.t :'test.my_attr', :default => :'test2.my_attr'
+      end
+    end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: i18n_lookup
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Metzmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n