copy_tuner_client 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bee0aa592ac55f910bb251d75f275c40bd9674ddc545ce24b93b52bfc324a0a
-  data.tar.gz: 8a207dead36f198d23b34904664f6ffebebc81e99b997b42d1e589536fd79ecf
+  metadata.gz: d026c94fe7b434afec7fa13369e91ddd784ed649336de71bb5d2d0a373201e0f
+  data.tar.gz: f882fbc15358fb560d5ba695e138f2ca904ed3f1e4e5b29ccac1a4c3d7e9fe06
 SHA512:
-  metadata.gz: 3fcfff507f94229efafd05f0e8d5adbb03033a994dcba41dcdebbcc46cbee67b0702dac4382b41f6e947e8f764337563f8d46b4ec2ba2bb93ef7a92ac2b4b4b8
-  data.tar.gz: 29c4f29e1ab815e82c35d9328d1e57633a782b943fad22ef691e94c2c009c8dd8f3cdc96e29081cf91de8e956b4a9741628b1dc45c32a99a1b5c0f867d838fe2
+  metadata.gz: fc0818f17179df0462efa7a739edbd1126d4b0170d550e15834980eeaf15c61197345b2a82dc2affc911d7914a82abbb5c5a70ff71b9e8d418425841f2f51bf8
+  data.tar.gz: ac73b7c43742c17061f318c32ff2f642d53afaa9dad02703a5e166181ac2027312a8a4f5c70626fb77923e29410c026f834db7b4ba1948fe306b6384396fc6d5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.16.0
+
+- Railsエンジン内のviewではオリジナルのtヘルパが呼ばれるように修正
+
 ## 0.15.1
 
 - tヘルパーにdefault引数が渡された場合に初期値として登録されない問題を修正

data/lib/copy_tuner_client/helper_extension.rb

@@ -6,6 +6,10 @@ module CopyTunerClient
           def translate_with_copyray_comment(key, **options)
             source = translate_without_copyray_comment(key, **options)
 
+            if controller && CopyTunerClient::Rails.controller_of_rails_engine?(controller)
+              return source
+            end
+
             # TODO: test
             # NOTE: default引数が設定されている場合は、copytunerキャッシュの値をI18n.t呼び出しにより上書きしている
             # SEE: https://github.com/rails/rails/blob/6c43ebc220428ce9fc9569c2e5df90a38a4fc4e4/actionview/lib/action_view/helpers/translation_helper.rb#L82

data/lib/copy_tuner_client/rails.rb

@@ -17,11 +17,16 @@ module CopyTunerClient
         config.middleware       = ::Rails.configuration.middleware
       end
     end
+
+    def self.controller_of_rails_engine?(controller)
+      # SEE: https://github.com/rails/rails/blob/539144d2d61770dab66c8643e744441e52538e09/activesupport/lib/active_support/core_ext/module/introspection.rb#L39-L63
+      engine_namespaces.include?(controller.class.module_parents[-2])
+    end
+
+    def self.engine_namespaces
+      @engine_namespaces ||= ::Rails::Engine.subclasses.filter_map { _1.instance.railtie_namespace }
+    end
   end
 end
 
-if defined?(::Rails::Railtie)
-  require 'copy_tuner_client/engine'
-else
-  CopyTunerClient::Rails.initialize
-end
+require 'copy_tuner_client/engine'

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.15.1'.freeze
+  VERSION = '0.16.0'.freeze
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

data/spec/copy_tuner_client/helper_extension_spec.rb

@@ -7,6 +7,10 @@ describe CopyTunerClient::HelperExtension do
     def translate(key, **options)
       "Hello, #{options[:name]}"
     end
+
+    def controller
+      nil
+    end
   end
 
   class KeywordArgumentsView

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - SonicGarden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n