metazilla 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73475d91bed1c7be91b5b4f04098e4fe29fba77
-  data.tar.gz: f98750b74d3174646714fee94e41699e4ec916c4
+  metadata.gz: 2b437234b4e8f5b090d18e3be3071d10160e4e3d
+  data.tar.gz: fa633ca88fdb42169dd22ad3a1b2aa3bf7d5bd5c
 SHA512:
-  metadata.gz: ce6e2680705523bad3777ef5e76c72f67c11e4c235ed54169a917722035278d2c651d05e42338554468f1f095cfb21089443ec82a35da0155235e7b548a7a2ab
-  data.tar.gz: 15179e16b9d06ea2dafa6b2a1794e21dbabdc2f99fefee92d0952dba4181bd2cf1c8f50d93ac67d2baff1d44b15f521f4d6ab7874b2433df1ba77669ab036620
+  metadata.gz: 28307cce118017453d89d9623c1a550aafdb1578583a5dbfe7130bce34ae3d8e75a48f73ccd3a705eb97c24ff89980ec197ea030f82f7a778b3f77a71779fa83
+  data.tar.gz: a09ad92e0c29397da5d8a196bef3ef7b4259b5c134116945a110cacebe9b5824ffcd881beba7713564b95cadb16fd3a122089ef6809a290ba694ffe45a2b33d1

data/lib/metazilla/version.rb

@@ -1,3 +1,3 @@
 module Metazilla
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/metazilla/view_helper.rb

@@ -1,12 +1,10 @@
-require "metazilla/translator"
-
 module Metazilla
   module ViewHelper
     def title(value = nil)
       if value.present?
         _meta_store[:page_title] = value
       else
-        _meta_store[:page_title] || _translator.lookup_for_current_path(:title)
+        _meta_store[:page_title] || _meta_lookup("title")
       end
     end
 
@@ -14,7 +12,7 @@ module Metazilla
       if value.present?
         _meta_store[:app_title] = value
       else
-        _meta_store[:app_title] || _translator.lookup(:app)
+        _meta_store[:app_title] || _meta_lookup("app")
       end
     end
 
@@ -30,7 +28,7 @@ module Metazilla
       if content.present?
         _meta_store[name] = content
       else
-        _meta_store[name] || _translator.lookup_for_current_path(:"meta.#{name}")
+        _meta_store[name] || _meta_lookup("meta_#{name}")
       end
     end
 
@@ -44,8 +42,12 @@ module Metazilla
       @_meta_store ||= {}
     end
 
-    def _translator
-      @_translator ||= Translator.new(controller_path, action_name, controller.view_assigns.symbolize_keys)
+    def _meta_lookup(key)
+      options = controller.view_assigns.symbolize_keys
+      options[:cascade] = true
+      mapped_action = (Metazilla.configuration.mapping[action_name.to_sym] || action_name)
+
+      t [controller_path.split("/"), mapped_action, key].flatten.join("."), options
     end
   end
 end

data/lib/metazilla.rb

@@ -25,4 +25,5 @@ module Metazilla
   end
 end
 
+I18n.backend.class.send :include, I18n::Backend::Cascade
 ActionView::Base.send :include, Metazilla::ViewHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metazilla
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Eugene Likholetov
@@ -68,7 +68,6 @@ files:
 - bin/console
 - bin/setup
 - lib/metazilla.rb
-- lib/metazilla/translator.rb
 - lib/metazilla/version.rb
 - lib/metazilla/view_helper.rb
 - metazilla.gemspec

data/lib/metazilla/translator.rb

@@ -1,51 +0,0 @@
-module Metazilla
-  class Translator
-    attr_reader :namespace, :controller, :action, :context
-
-    def initialize(controller_path, action, context = {})
-      @namespace, @controller = parse_namespace_and_controller(controller_path)
-      @action = action.to_s.freeze
-      @context = context
-    end
-
-    def lookup(key)
-      lookup_recursively key, namespace
-    end
-
-    def lookup_for_current_path(key)
-      lookup_recursively(key, [namespace, controller, mapped_action].flatten)
-    end
-
-    private
-
-    def parse_namespace_and_controller(controller_path)
-      parts = controller_path.to_s.split("/")
-      if parts.size > 1
-        [parts[0...-1], parts[-1]]
-      else
-        [[], parts[0]]
-      end
-    end
-
-    def lookup_recursively(key, namespace)
-      namespace.size.downto(0).each do |depth|
-        result = lookup_in_namespace(key, namespace.first(depth))
-        return result if result
-      end
-      nil
-    end
-
-    def mapped_action
-      (Metazilla.configuration.mapping[action.to_sym] || action).to_s.freeze
-    end
-
-    def lookup_in_namespace(key, namespace = [])
-      t_key = [namespace, key].flatten.compact.join('.')
-      i18n_set?(t_key) ? I18n.t(t_key, context) : nil
-    end
-
-    def i18n_set?(key)
-      I18n.t(key, raise: true) rescue false
-    end
-  end
-end