copy_tuner_client 0.8.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757532de573065d4b93a08c8bd5061a17c8fbef293d5f14a8ff24bb3815f3323
-  data.tar.gz: 5d6ceefe8fcb9b2d21ad9592e07d8e0ac68c9ef8684824e57e2a24d5f22afeb1
+  metadata.gz: 02e158d00caa261a1c3cf73b38648bde2307f5160708fcf39e7e84b542c2ecc6
+  data.tar.gz: ca6f9c714f15afbace17d89d3ef67a71546d5b414be83ff09e59c6b9b1974958
 SHA512:
-  metadata.gz: e1effa31089ac5b0b480196ff1fb9700b92b80a2137393467923c84150a252688c2bc4b33f5a1a63c84a58af9128866a22a784111dcd16842a24b0a00437e11f
-  data.tar.gz: 8e987b21c4b30714b056f2685f57b9b4157f505fb4ef6857b853ab1dd82b3bbaffd442f8add04c8ffed8d0c80d1f52e2eb00d2a452be6859cd42aa048c5ef602
+  metadata.gz: ffb1ebc5fb6f78326f820527646f32eb6fcbf09c622f90d299d61a96778c27ad0954d0c8db784d96a4c93534a5eee0acb01eed824ddd1cbcee0aa5fae5cd35cc
+  data.tar.gz: 1ebe88eb8278fee882c0129908c562157b0ca16e6b7ac0181ae9774f53df84e5df3fcd63a843586302ab6010d369bf19d78bae8453cdc28fbf463977b8d7ede7

data/.github/workflows/rspec.yml

@@ -9,7 +9,7 @@ name: Ruby
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
 
 jobs:
@@ -18,36 +18,32 @@ jobs:
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7]
-        gemfile: [
-          "gemfiles/5.2.gemfile",
-          "gemfiles/6.0.gemfile",
-        ]
+        ruby: [2.6, 2.7, 3.0]
+        gemfile: ["5.2", "6.0", "6.1", "main"]
+        exclude:
+          - ruby: 2.6
+            gemfile: main
+          - ruby: 3.0
+            gemfile: 5.2
+          - ruby: 3.0
+            gemfile: "6.0"
     steps:
-    - name: Install packages
-      run: |
-        sudo apt update -y
-        sudo apt install -y libsqlite3-dev
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v1
-      with:
-        path: /home/runner/bundle
-        key: bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}
-        restore-keys: |
-          bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        bundle config path /home/runner/bundle
-        bundle config --global gemfile ${{ matrix.gemfile }}
-        bundle install
-        bundle update
-        bundle clean
-    - name: Run rspec
-      run: bundle exec rspec
+      - name: Install packages
+        run: |
+          sudo apt update -y
+          sudo apt install -y libsqlite3-dev
+
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run rspec
+        run: bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.7.4

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.12.0
+
+- Add `config.ignored_keys` and `config.ignored_key_handler`
+
+## 0.11.0
+
+- Remove deprecated rescue_format option
+- Fix ruby@2.7 keyword warning
+
+## 0.10.0
+
+- Add copy_tuner:detect_html_incompatible_keys task
+
+## 0.9.0
+
+- Do not upload invalid type keys
+
 ## 0.8.1
 
 - Fix bug in `CopyrayMiddleware`

data/Gemfile

@@ -2,4 +2,4 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'sgcop', git: 'git://github.com/SonicGarden/sgcop.git'
+gem 'sgcop', github: 'SonicGarden/sgcop'

data/Gemfile.lock

@@ -1,227 +1,250 @@
 GIT
-  remote: git://github.com/SonicGarden/sgcop.git
-  revision: cbe7f18b9e81e9e3cda2e4bc5f64735fa014dc9b
+  remote: https://github.com/SonicGarden/sgcop.git
+  revision: e708293619ea29e2a7a326db3dfaa3be63939c69
   specs:
-    sgcop (0.0.36)
-      brakeman
-      brakeman_translate_checkstyle_format
-      haml_lint (~> 0.34.0)
-      rubocop (~> 0.81.0)
-      rubocop-performance (~> 1.5.2)
-      rubocop-rails (~> 2.5.2)
-      rubocop-rspec (~> 1.38.1)
+    sgcop (0.4.14)
+      haml_lint (~> 0.37.0)
+      rubocop (~> 1.21.0)
+      rubocop-performance (~> 1.11.5)
+      rubocop-rails (~> 2.12.2)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.4.0)
 
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.8.1)
+    copy_tuner_client (0.12.0)
       i18n (>= 0.5.0)
       json
+      nokogiri
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (5.2.4.2)
-      actionpack (= 5.2.4.2)
+    actioncable (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
+    actionmailbox (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.2)
-      actionview (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.2)
-      activesupport (= 5.2.4.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.2)
-      activesupport (= 5.2.4.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.4.1)
+      activesupport (= 6.1.4.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.2)
-      activesupport (= 5.2.4.2)
-    activerecord (5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
-      arel (>= 9.0)
-    activestorage (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.2)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activestorage (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    arel (9.0.0)
-    ast (2.4.0)
-    brakeman (4.8.1)
-    brakeman_translate_checkstyle_format (0.0.1)
-      thor
+    ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    concurrent-ruby (1.1.9)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    daemons (1.3.1)
-    diff-lcs (1.3)
-    erubi (1.9.0)
+    daemons (1.4.1)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
     eventmachine (1.2.7)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    haml (5.1.2)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.34.2)
-      haml (>= 4.0, < 5.2)
+    haml_lint (0.37.1)
+      haml (>= 4.0, < 5.3)
+      parallel (~> 1.10)
       rainbow
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
     hashdiff (1.0.1)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (2.5.1)
-    loofah (2.5.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mimemagic (0.3.4)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    mini_mime (1.1.1)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    public_suffix (4.0.4)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
+    nio4r (2.5.8)
+    nokogiri (1.12.4)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.2)
-      actioncable (= 5.2.4.2)
-      actionmailer (= 5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      activestorage (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
-      bundler (>= 1.3.0)
-      railties (= 5.2.4.2)
+    rails (6.1.4.1)
+      actioncable (= 6.1.4.1)
+      actionmailbox (= 6.1.4.1)
+      actionmailer (= 6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actiontext (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rexml (3.2.4)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.6)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.2)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.21.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.5.2)
-      activesupport
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.12.2)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    safe_yaml (1.0.5)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     sham_rack (1.4.1)
       rack
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sprockets (4.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
     sysexits (1.2.0)
     temple (0.8.2)
-    thin (1.7.2)
+    thin (1.8.1)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.1.0)
     tilt (2.0.10)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    yard (0.9.24)
+    websocket-extensions (0.1.5)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   copy_tuner_client!
-  rails (~> 5.2.4.2)
+  rails (~> 6.1)
   rake
-  rspec (= 3.8.0)
+  rspec
   sgcop!
   sham_rack
   sinatra

data/README.md

@@ -61,12 +61,15 @@ $ npm run build   # Compile to a <script> containing a self-executing function
 
 ### default spec
 
-    $ bundle exec rake
+```
+$ bundle exec rspec
+```
 
-### Appraisal for Multi Version Rails spec
+### testing against all target rails versions
 
-    $ bundle exec appraisal install
-    $ bundle exec rake appraisal
+```
+$ ./test.sh
+```
 
 ## release gem
 

data/copy_tuner_client.gemspec

@@ -6,9 +6,10 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5.0'
   s.add_dependency 'i18n', '>= 0.5.0'
   s.add_dependency 'json'
-  s.add_development_dependency 'rails', '~> 5.2.4.2'
+  s.add_dependency 'nokogiri'
+  s.add_development_dependency 'rails', '~> 6.1'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '3.8.0' # NOTE: 3.9.0だとundefined method `synchronize'でコケるテストがある
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'sham_rack'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'sqlite3'

data/gemfiles/5.2.gemfile

@@ -1,7 +1,5 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
-gem "rails", "5.2.4.2"
+gem "rails", "~> 5.2"
 
 gemspec :path => "../"

data/gemfiles/6.0.gemfile

@@ -1,7 +1,5 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
-gem "rails", "6.0.2.2"
+gem "rails", "~> 6.0"
 
 gemspec :path => "../"

data/gemfiles/6.1.gemfile

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

data/gemfiles/main.gemfile

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

data/lib/copy_tuner_client/configuration.rb

@@ -19,7 +19,7 @@ module CopyTunerClient
         :proxy_port, :proxy_user, :secure, :polling_delay, :sync_interval,
         :sync_interval_staging, :sync_ignore_path_regex, :logger,
         :framework, :middleware, :disable_middleware, :disable_test_translation,
-        :ca_file, :exclude_key_regexp, :s3_host, :locales].freeze
+        :ca_file, :exclude_key_regexp, :s3_host, :locales, :ignored_keys, :ignored_key_handler].freeze
 
     # @return [String] The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -131,6 +131,12 @@ module CopyTunerClient
     # @return [Boolean] Html escape
     attr_accessor :html_escape
 
+    # @return [Array<String>] A list of ignored keys
+    attr_accessor :ignored_keys
+
+    # @return [Proc]
+    attr_accessor :ignored_key_handler
+
     alias_method :secure?, :secure
 
     # Instantiated from {CopyTunerClient.configure}. Sets defaults.
@@ -152,6 +158,8 @@ module CopyTunerClient
       self.s3_host = 'copy-tuner-data-prod.s3.amazonaws.com'
       self.disable_copyray_comment_injection = false
       self.html_escape = false
+      self.ignored_keys = []
+      self.ignored_key_handler = -> (e) { raise e }
 
       @applied = false
     end

data/lib/copy_tuner_client/engine.rb

@@ -1,5 +1,6 @@
 require 'copy_tuner_client/copyray'
 require 'copy_tuner_client/translation_log'
+require 'copy_tuner_client/helper_extension'
 
 module CopyTunerClient
   # Connects to integration points for Rails 3 applications
@@ -10,36 +11,10 @@ module CopyTunerClient
 
     initializer :initialize_copy_tuner_hook_methods, :after => :load_config_initializers do |app|
       ActiveSupport.on_load(:action_view) do
-        ActionView::Helpers::TranslationHelper.class_eval do
-          def translate_with_copyray_comment(key, options = {})
-            source = translate_without_copyray_comment(key, options)
-            # TODO: 0.6.0以降で options[:rescue_format] == text を消す
-            if CopyTunerClient.configuration.disable_copyray_comment_injection || options[:rescue_format] == :text
-              if options[:rescue_format] == :text
-                ActiveSupport::Deprecation.warn('rescue_format option is deprecated in copy_tuner_client@0.6.0')
-              end
-              source
-            else
-              separator = options[:separator] || I18n.default_separator
-              scope = options[:scope]
-              normalized_key =
-                if key.to_s.first == '.'
-                  scope_key_by_partial(key)
-                else
-                  I18n.normalize_keys(nil, key, scope, separator).join(separator)
-                end
-              CopyTunerClient::Copyray.augment_template(source, normalized_key)
-            end
-          end
-          if CopyTunerClient.configuration.enable_middleware?
-            alias_method :translate_without_copyray_comment, :translate
-            alias_method :translate, :translate_with_copyray_comment
-            alias :t :translate
-            alias :tt :translate_without_copyray_comment
-          else
-            alias :tt :translate
-          end
-        end
+        CopyTunerClient::HelperExtension.hook_translation_helper(
+          ActionView::Helpers::TranslationHelper, 
+          middleware_enabled: CopyTunerClient.configuration.enable_middleware?
+        )
       end
 
       if CopyTunerClient.configuration.enable_middleware?

data/lib/copy_tuner_client/errors.rb

@@ -9,4 +9,7 @@ module CopyTunerClient
   # server does not recognize. Polling is aborted when this error is raised.
   class InvalidApiKey < StandardError
   end
+
+  class IgnoredKey < StandardError
+  end
 end

data/lib/copy_tuner_client/helper_extension.rb

@@ -0,0 +1,34 @@
+module CopyTunerClient
+  module HelperExtension
+    class << self
+      def hook_translation_helper(mod, middleware_enabled:)
+        mod.class_eval do
+          def translate_with_copyray_comment(key, **options)
+            source = translate_without_copyray_comment(key, **options)
+            if CopyTunerClient.configuration.disable_copyray_comment_injection
+              source
+            else
+              separator = options[:separator] || I18n.default_separator
+              scope = options[:scope]
+              normalized_key =
+                if key.to_s.first == '.'
+                  scope_key_by_partial(key)
+                else
+                  I18n.normalize_keys(nil, key, scope, separator).join(separator)
+                end
+              CopyTunerClient::Copyray.augment_template(source, normalized_key)
+            end
+          end
+          if middleware_enabled
+            alias_method :translate_without_copyray_comment, :translate
+            alias_method :translate, :translate_with_copyray_comment
+            alias :t :translate
+            alias :tt :translate_without_copyray_comment
+          else
+            alias :tt :translate
+          end
+        end
+      end
+    end
+  end
+end

data/lib/copy_tuner_client/i18n_backend.rb

@@ -61,8 +61,16 @@ module CopyTunerClient
     private
 
     def lookup(locale, key, scope = [], options = {})
+      return nil if !key.is_a?(String) && !key.is_a?(Symbol)
+
       parts = I18n.normalize_keys(locale, key, scope, options[:separator])
       key_with_locale = parts.join('.')
+      key_without_locale = parts[1..].join('.')
+
+      if CopyTunerClient::configuration.ignored_keys.include?(key_without_locale)
+        CopyTunerClient::configuration.ignored_key_handler.call(IgnoredKey.new("Ignored key: #{key_without_locale}"))
+      end
+
       content = cache[key_with_locale] || super
       cache[key_with_locale] = nil if content.nil?
       content
@@ -86,6 +94,8 @@ module CopyTunerClient
 
     def default(locale, object, subject, options = {})
       content = super(locale, object, subject, options)
+      return content if !object.is_a?(String) && !object.is_a?(Symbol)
+
       if content.respond_to?(:to_str)
         parts = I18n.normalize_keys(locale, object, options[:scope], options[:separator])
         # NOTE: ActionView::Helpers::TranslationHelper#translate wraps default String in an Array

data/lib/copy_tuner_client/i18n_compat.rb

@@ -0,0 +1,14 @@
+require 'nokogiri'
+
+module CopyTunerClient
+  module I18nCompat
+    def select_html_incompatible_blurbs(blurbs)
+      non_html_key_blurbs = blurbs.reject { |key| key.ends_with?('.html') || key.ends_with?('_html') }
+      html_blurbs = non_html_key_blurbs.select do |key, content|
+        Nokogiri::HTML.fragment(content).children.any? { |node| node.name != 'text' }
+      end
+    end
+
+    module_function :select_html_incompatible_blurbs
+  end
+end

data/lib/copy_tuner_client/translation_log.rb

@@ -19,7 +19,7 @@ module CopyTunerClient
     def self.install_hook
       I18n.class_eval do
         class << self
-          def translate_with_copy_tuner_hook(key, **options)
+          def translate_with_copy_tuner_hook(key = nil, **options)
             scope = options[:scope]
             scope = scope.dup if scope.is_a?(Array) || scope.is_a?(String)
             result = translate_without_copy_tuner_hook(key, **options)

data/lib/copy_tuner_client/version.rb

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

data/lib/tasks/copy_tuner_client_tasks.rake

@@ -25,8 +25,21 @@ namespace :copy_tuner do
     if conflict_keys.empty?
       puts 'All success'
     else
-      pp conflict_keys
-      raise 'Exists invalid keys'
+      puts conflict_keys.sort.join("\n")
+      exit 1
+    end
+  end
+
+  desc "Detect html incompatible keys."
+  task :detect_html_incompatible_keys => :environment do
+    require 'copy_tuner_client/i18n_compat'
+    html_incompatible_blurbs = CopyTunerClient::I18nCompat.select_html_incompatible_blurbs(CopyTunerClient.cache.blurbs)
+
+    if html_incompatible_blurbs.empty?
+      puts 'All success'
+    else
+      puts html_incompatible_blurbs.keys.sort.join("\n")
+      exit 1
     end
   end
 end

data/spec/copy_tuner_client/helper_extension_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+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
+  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'
+  end
+end

data/spec/copy_tuner_client/i18n_backend_spec.rb

@@ -139,6 +139,13 @@ describe CopyTunerClient::I18nBackend do
     end
   end
 
+  context 'non-string key' do
+    it 'Not to be registered in the cache' do
+      expect { subject.translate('en', {}) }.to throw_symbol(:exception)
+      expect(cache).not_to have_key 'en.{}'
+    end
+  end
+
   describe "with stored translations" do
     subject { build_backend }
 

data/test.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+BUNDLE_GEMFILE=gemfiles/5.2.gemfile bundle install && BUNDLE_GEMFILE=gemfiles/5.2.gemfile bundle exec rspec spec
+BUNDLE_GEMFILE=gemfiles/6.0.gemfile bundle install && BUNDLE_GEMFILE=gemfiles/6.0.gemfile bundle exec rspec spec
+BUNDLE_GEMFILE=gemfiles/6.1.gemfile bundle install && BUNDLE_GEMFILE=gemfiles/6.1.gemfile bundle exec rspec spec
+BUNDLE_GEMFILE=gemfiles/main.gemfile bundle install && BUNDLE_GEMFILE=gemfiles/main.gemfile bundle exec rspec spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.12.0
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -38,20 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4.2
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4.2
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +202,8 @@ files:
 - copy_tuner_client.gemspec
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/main.gemfile
 - lib/copy_tuner_client.rb
 - lib/copy_tuner_client/cache.rb
 - lib/copy_tuner_client/client.rb
@@ -197,7 +213,9 @@ files:
 - lib/copy_tuner_client/dotted_hash.rb
 - lib/copy_tuner_client/engine.rb
 - lib/copy_tuner_client/errors.rb
+- lib/copy_tuner_client/helper_extension.rb
 - lib/copy_tuner_client/i18n_backend.rb
+- lib/copy_tuner_client/i18n_compat.rb
 - lib/copy_tuner_client/poller.rb
 - lib/copy_tuner_client/prefixed_logger.rb
 - lib/copy_tuner_client/process_guard.rb
@@ -216,6 +234,7 @@ files:
 - spec/copy_tuner_client/configuration_spec.rb
 - spec/copy_tuner_client/copyray_spec.rb
 - spec/copy_tuner_client/dotted_hash_spec.rb
+- spec/copy_tuner_client/helper_extension_spec.rb
 - spec/copy_tuner_client/i18n_backend_spec.rb
 - spec/copy_tuner_client/poller_spec.rb
 - spec/copy_tuner_client/prefixed_logger_spec.rb
@@ -239,6 +258,7 @@ files:
 - src/main.js
 - src/specimen.js
 - src/util.js
+- test.sh
 - ui/views/copytuner/index.html.erb
 - ui/views/layouts/copytuner_default.html.erb
 homepage: https://github.com/SonicGarden/copy-tuner-ruby-client
@@ -259,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Client for the CopyTuner copy management service
@@ -269,6 +289,7 @@ test_files:
 - spec/copy_tuner_client/configuration_spec.rb
 - spec/copy_tuner_client/copyray_spec.rb
 - spec/copy_tuner_client/dotted_hash_spec.rb
+- spec/copy_tuner_client/helper_extension_spec.rb
 - spec/copy_tuner_client/i18n_backend_spec.rb
 - spec/copy_tuner_client/poller_spec.rb
 - spec/copy_tuner_client/prefixed_logger_spec.rb