copy_tuner_client 0.16.3 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec2291128893fab1a165cd4566605c86006fb0180ceaa4bf647d27a868aa838
-  data.tar.gz: 8d6b910e1f7c3bf72c5a51ed13f45757a05cf33e068518f9959973576b742128
+  metadata.gz: 3dd1bd5be09dae5d4711ef62bae587223ed112843b7d504afd3010c8f64f313b
+  data.tar.gz: 9409ad92981ad447560663e177f555c1b1d327c54edf04169533e6329bbe69b4
 SHA512:
-  metadata.gz: 3273fb00eb37001abe028d8e1d16ce6f44270d70411fe6c9b33fb07a77a3f256ee4b9d4f406403ae01a0e1050094a9191d461e389ef8dd778e8288d9c72752f2
-  data.tar.gz: 07ebfbb46b756142eb846359b4597c43bdeaee36089bfa070a6dd3162e8bdfeffd42fe5388f02a96ce01a34ef8c7f8b36818b239856a034349f8c79e696669fc
+  metadata.gz: 9402dac344ec22379237ecbeed0cc6f71cfeca6733d69f65e5e022f0ef5f46b98175671b0cd4db1042cf65fb058dc8eb97ad3bceaa597024a3002808febf6d46
+  data.tar.gz: 6c954506bb852fd34aa9608276ab93b3f786db53e5c691c8c4e96481334b4e01d52d8e3efefa6a945676b5da2ea5a7bddcdcc44d47114cadff95fbfc01dc3515

data/.github/workflows/rspec.yml

@@ -22,13 +22,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", 3.1, 3.2]
-        gemfile: ["6.1", "7.0", "main"]
+        ruby: ["3.0", 3.1, 3.2, 3,3]
+        gemfile: ["6.1", "7.0", "7.1", "main"]
         exclude:
+          - ruby: "3.0"
+            gemfile: "main"
           - ruby: "3.1"
             gemfile: "6.1"
           - ruby: "3.2"
             gemfile: "6.1"
+          - ruby: "3.3"
+            gemfile: "6.1"
     steps:
       - name: Install packages
         run: |

data/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
+    "source.fixAll.eslint": "explicit"
   },
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.preferences.importModuleSpecifier": "non-relative",

data/gemfiles/7.1.gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 7.1"
+
+gemspec :path => "../"

data/lib/copy_tuner_client/cache.rb

@@ -18,6 +18,8 @@ module CopyTunerClient
       @mutex = Mutex.new
       @exclude_key_regexp = options[:exclude_key_regexp]
       @upload_disabled = options[:upload_disabled]
+      @ignored_keys = options.fetch(:ignored_keys, [])
+      @ignored_key_handler = options.fetch(:ignored_key_handler, -> (e) { raise e })
       @locales = Array(options[:locales]).map(&:to_s)
       # mutable states
       @blurbs = {}
@@ -44,6 +46,12 @@ module CopyTunerClient
       return if @locales.present? && !@locales.member?(key.split('.').first)
       return if @upload_disabled
 
+      # NOTE: config/locales以下のファイルに除外キーが残っていた場合の対応
+      key_without_locale = key.split('.')[1..].join('.')
+      if @ignored_keys.include?(key_without_locale)
+        @ignored_key_handler.call(IgnoredKey.new("Ignored key: #{key_without_locale}"))
+      end
+
       lock do
         return if @blank_keys.member?(key) || @blurbs.key?(key)
 

data/lib/copy_tuner_client/configuration.rb

@@ -157,13 +157,20 @@ module CopyTunerClient
       self.upload_disabled_environments = %w[production staging]
       self.s3_host = 'copy-tuner-data-prod.s3.amazonaws.com'
       self.disable_copyray_comment_injection = false
-      self.html_escape = false
+      # TODO: 0.18.0以降のバージョンで初期値をtrueにしたい
+      self.html_escape = nil
       self.ignored_keys = []
       self.ignored_key_handler = -> (e) { raise e }
 
       @applied = false
     end
 
+    def html_escape
+      raise 'CopyTunerClient.configuration.html_escape is required' if @html_escape.nil?
+
+      @html_escape
+    end
+
     # Allows config options to be read like a hash
     #
     # @param [Symbol] option Key for a given attribute

data/lib/copy_tuner_client/request_sync.rb

@@ -121,7 +121,7 @@ module CopyTunerClient
     # you have to pass a binding to this (a proc) so that ERB can have
     # access to helper functions and local variables
     def render_without_layout(view, binding)
-      ERB.new(File.read(File.join(VIEW_PATH, 'copytuner', view.to_s + '.html.erb')), nil, nil, 'frobnitz').result(binding)
+      ERB.new(File.read(File.join(VIEW_PATH, 'copytuner', view.to_s + '.html.erb')), eoutvar: 'frobnitz').result(binding)
     end
 
     def cancel_sync?(env)

data/lib/copy_tuner_client/version.rb

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

data/spec/copy_tuner_client/i18n_backend_spec.rb

@@ -111,10 +111,10 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to eq 'default %{interpolate}'
   end
 
-  it "marks strings as html safe" do
+  it "dose not mark strings as html safe" do
     cache['en.test.key'] = FakeHtmlSafeString.new("Hello")
     backend = build_backend
-    expect(backend.translate('en', 'test.key')).to be_html_safe
+    expect(backend.translate('en', 'test.key')).to_not be_html_safe
   end
 
   it "looks up an array of defaults" do

data/spec/support/client_spec_helpers.rb

@@ -4,6 +4,7 @@ module ClientSpecHelpers
     CopyTunerClient.configure(false) do |config|
       config.api_key = 'abc123'
       config.s3_host = 'copy-tuner.com'
+      config.html_escape = true
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.18.0
 platform: ruby
 authors:
 - SonicGarden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -203,6 +203,7 @@ files:
 - copy_tuner_client.gemspec
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
+- gemfiles/7.1.gemfile
 - gemfiles/main.gemfile
 - index.html
 - lib/copy_tuner_client.rb