copy_tuner_client 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375dbe69369421e9f764466f5b92f63b3eacda2235ddc0a42892620ae6474342
-  data.tar.gz: '07638a3f438bee6a23fa8fa3109cd620585821f417c15693bfcac4589ca053d0'
+  metadata.gz: d026c94fe7b434afec7fa13369e91ddd784ed649336de71bb5d2d0a373201e0f
+  data.tar.gz: f882fbc15358fb560d5ba695e138f2ca904ed3f1e4e5b29ccac1a4c3d7e9fe06
 SHA512:
-  metadata.gz: bc8bee8ccf7f8668e3d7abb146fe568692a0e765d9fad2bc9137185d34115703a342e2bdd79a5db3a3a0a45e5fabeedd1d70cffa7fc70fc9bd5d81c28cddd3e0
-  data.tar.gz: 15f30baf267916980605c002524e07818e66aa7dcec62173c9c907acf54e849302862b05cf245bd3cb065668b67dcf39bb0636b62a499af709d99d2c58fdada8
+  metadata.gz: fc0818f17179df0462efa7a739edbd1126d4b0170d550e15834980eeaf15c61197345b2a82dc2affc911d7914a82abbb5c5a70ff71b9e8d418425841f2f51bf8
+  data.tar.gz: ac73b7c43742c17061f318c32ff2f642d53afaa9dad02703a5e166181ac2027312a8a4f5c70626fb77923e29410c026f834db7b4ba1948fe306b6384396fc6d5

data/CHANGELOG.md

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

data/lib/copy_tuner_client/helper_extension.rb

@@ -5,6 +5,16 @@ module CopyTunerClient
         mod.class_eval do
           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
+            I18n.t(key, **options) if options.key?(:default)
+
             if CopyTunerClient.configuration.disable_copyray_comment_injection
               source
             else

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.0'.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

@@ -3,36 +3,22 @@ require 'copy_tuner_client/helper_extension'
 require 'copy_tuner_client/copyray'
 
 describe CopyTunerClient::HelperExtension do
-  # rails <= 6.0.x
-  module HashArgumentHelper
-    def translate(key, options = {})
-      "Hello, #{options[:name]}"
-    end
-  end
-
-  # rails >= 6.1.x
   module KeywordArgumentsHelper
     def translate(key, **options)
       "Hello, #{options[:name]}"
     end
-  end
 
-  class HashArgumentView
-    include HashArgumentHelper
+    def controller
+      nil
+    end
   end
 
   class KeywordArgumentsView
     include KeywordArgumentsHelper
   end
 
-  CopyTunerClient::HelperExtension.hook_translation_helper(HashArgumentHelper, middleware_enabled: true)
   CopyTunerClient::HelperExtension.hook_translation_helper(KeywordArgumentsHelper, middleware_enabled: true)
 
-  it 'works with hash argument method' do
-    view = HashArgumentView.new
-    expect(view.translate('some.key', name: 'World')).to eq '<!--COPYRAY some.key-->Hello, World'
-  end
-
   it 'works with keyword argument method' do
     view = KeywordArgumentsView.new
     expect(view.translate('some.key', name: 'World')).to eq '<!--COPYRAY some.key-->Hello, World'

data/spec/copy_tuner_client/i18n_backend_spec.rb

@@ -39,8 +39,6 @@ describe CopyTunerClient::I18nBackend do
   end
 
   it "finds available locales from locale files and cache" do
-    # TODO: ruby@2.7サポート終わったらこっちは不要
-    allow(YAML).to receive(:load_file).and_return({ 'es' => { 'key' => 'value' } })
     allow(YAML).to receive(:unsafe_load_file).and_return({ 'es' => { 'key' => 'value' } })
     allow(I18n).to receive(:load_path).and_return(["test.yml"])
 

metadata

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