titlezilla 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b86a9199b181239e752411d423764f57bb60f431
-  data.tar.gz: 743bf1cedb88954e8a747d4506dae2a9a2d89874
+  metadata.gz: 0eecbd86111fab30e1ca161d993a104d1834572c
+  data.tar.gz: baa72c194765f3d389eb7a6c6f78644c1c175cfd
 SHA512:
-  metadata.gz: 55b3f176b14501205bf99041b208868206aa4ed4f2ac82309655f85da770609fddced5b90b69c4db4bc9ba2cb5bfb31d69165ed81df6f02c79f2ec7b5436f926
-  data.tar.gz: 8533306134666c3f7a96602d3f44c4985d527543389f471f3e0c9770c85333144a6d56a4204f564f009429b7440298657292e2bd34ec14e3104cd409732d3541
+  metadata.gz: 89695306ef894bbc08471cf924b309c6ca98100c19c83f94a4275b0bcbf8f00abee049cc69cfb495d0ce2c83981ac2218b2fd648578649b057e2267f7f500757
+  data.tar.gz: 962b3735897a7f99a0bb330d90c2656d0a751bf81b8d85b2176f791cb254c4f76725d7945e4ecd257e30e7764d0ce6129c1026680b748d56637f4b96e81ea54e

data/lib/titlezilla/translator.rb

@@ -19,7 +19,7 @@ module Titlezilla
     end
 
     def application_title
-      @application_title ||= lookup('application')
+      @application_title ||= reverse_lookup('application')
     end
 
     def meta_title
@@ -34,12 +34,25 @@ module Titlezilla
       if parts.size > 1
         [parts[(0...-1)], parts[-1]]
       else
-        [nil, parts[0].to_s.freeze]
+        [[], parts[0].to_s.freeze]
       end
     end
 
     def lookup(*key)
-      t_key = [:titles, namespace, key].flatten.compact.join('.')
+      lookup_with_namespace(key, namespace)
+    end
+
+    def reverse_lookup(*key)
+      title_namespace = namespace.dup
+      begin
+        title = lookup_with_namespace(key, title_namespace)
+        return title if title
+        title_namespace.pop
+      end while title_namespace.size >= 0
+    end
+
+    def lookup_with_namespace(keys, namespace)
+      t_key = [:titles, namespace, keys].flatten.compact.join('.')
       i18n_set?(t_key) ? I18n.t(t_key, context) : nil
     end
 

data/lib/titlezilla/version.rb

@@ -1,3 +1,3 @@
 module Titlezilla
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/test/translator_test.rb

@@ -70,6 +70,12 @@ module Titlezilla
         t = Translator.new('admin/main', :index)
         t.application_title.must_equal 'App'
       end
+
+      it 'should lookup application title when no namespaced app title provided' do
+        load_translations({ application: 'App' })
+        t = Translator.new('admin/main', :index)
+        t.application_title.must_equal 'App'
+      end
     end
 
     describe '#meta_title' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: titlezilla
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Evgeny Likholetov