satis 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 467de347e9ddb8e9db29d0cde98d1e047e1de5ba86a09fdb8c276548ef3712cd
-  data.tar.gz: 7fdba4bdbe01342fe65d547b6c3beceb58bdc829b3008156d720ac4842c90263
+  metadata.gz: 2c8b8f688d732d57a4df263b47f48f1b072f709c1d9ae5b224cc1e7197e5fc08
+  data.tar.gz: 42d9edfb45401ad6cb797ffa95195acceff18b3a1aa8b8931c95d29afacba49f
 SHA512:
-  metadata.gz: ef091872ca731e27988e02d45d36321fae901d54eedda2d9c59dfa2d68f524f2a30b86c0633d7018b16357e8c194733ca48199cbc2518256eeb7b07c3cd1f022
-  data.tar.gz: 936bb15f39c3261c57592e9347e228d63db6f853b418480a1a5350b3f9a10d628bdafa8ebb888bf4e1a2822f315477c87ad84670d4c4a1f6166d4fa5601093ac
+  metadata.gz: 4bbf1820f21de79035eb8c5285de9ac084f7609a1b33ba57dc8261592d65d122e79d73d808d772aa40b55d1dddc60962b218e7803bb2798c51b506d057186b38
+  data.tar.gz: ac095ab29b95766986c70e2f15322a4f1e16cfc8014ee365b56fc58e628ced330392eddb6b5f67479b3637d8e0004153b58329bbe2c9a7ea7dc3d13038ee86ee

data/app/components/satis/application_component.rb

@@ -21,6 +21,15 @@ module Satis
       super()
     end
 
+    def render_in(view_context, &)
+      self.original_view_context ||= view_context
+      self.original_virtual_path ||= Satis.current_original_virtual_path.presence || view_context.instance_variable_get(:@virtual_path)
+
+      Satis.with_original_virtual_path(original_virtual_path) do
+        super
+      end
+    end
+
     def component_name
       self.class.name.sub(/::Component$/, "").sub(/^Satis::/, "").underscore
     end

data/app/components/satis/tabs/component.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-# FIXME:
-# translation scope seems wrong:
-#   old/okay) title="translation missing: en.users.edit.card.profile.tab.about"
-# new/broken) title="translation missing: en.users.edit.tabs.main.tab.about"
-
 module Satis
   module Tabs
     class Component < Satis::ApplicationComponent

data/lib/satis/concerns/contextual_translations.rb

@@ -8,6 +8,8 @@ module Satis
       extend ActiveSupport::Concern
 
       included do
+        attr_accessor :original_virtual_path
+
         #
         # This provides us with a translation helper which scopes into the original view
         # and thereby conveniently scopes the translations.
@@ -41,9 +43,25 @@ module Satis
         end
 
         def original_i18n_scope
+          virtual_path = original_virtual_path.presence || original_view_context_virtual_path
+
+          return virtual_path.gsub(%r{/_?}, ".").split(".") if virtual_path.present? && !satis_component_virtual_path?(virtual_path)
+
           [original_view_context.controller_path.tr("/", "."), original_view_context.action_name]
         end
 
+        def satis_component_virtual_path?(virtual_path)
+          virtual_path.start_with?("satis/")
+        end
+
+        def original_view_context_virtual_path
+          if original_view_context.respond_to?(:virtual_path)
+            original_view_context.virtual_path
+          elsif original_view_context.instance_variable_defined?(:@virtual_path)
+            original_view_context.instance_variable_get(:@virtual_path)
+          end
+        end
+
         def i18n_scope
           self.class.name.split('::').second.underscore.to_sym
         end

data/lib/satis/helpers/container.rb

@@ -78,7 +78,6 @@ module Satis
           else
             component.new(*original_args, **kwargs)
           end
-          instance.original_view_context = action_view
           action_view.render(instance, &block)
         end
       end

data/lib/satis/version.rb

@@ -1,3 +1,3 @@
 module Satis
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

data/lib/satis.rb

@@ -27,6 +27,21 @@ module Satis
       Satis::Helpers::Container.add_helper(name, component)
     end
 
+    def current_original_virtual_path
+      original_virtual_path_stack.last
+    end
+
+    def with_original_virtual_path(virtual_path)
+      original_virtual_path_stack.push(virtual_path)
+      yield
+    ensure
+      original_virtual_path_stack.pop
+    end
+
+    def original_virtual_path_stack
+      Thread.current[:satis_original_virtual_path_stack] ||= []
+    end
+
     def add_component_helper(component_name, name, component)
       klass = "Satis::#{component_name.to_s.classify}::Component".safe_constantize
       return if klass.blank?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: satis
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Tom de Grunt