copy_tuner_client 0.17.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 387528f7427d7cc41117899444a50220fe5592acb66f335a1631dff4af05e557
-  data.tar.gz: 6eecdd3ba6cd2bda1e4bbc87826a6adacf8cf256171faab7bbcf53828e91b382
+  metadata.gz: 835387c50adc34ebee7981c52d9d823f6e3ff2652308b088c95846b6fa98e9f4
+  data.tar.gz: 8aba55013580f79332739062ac41c65585e1a434e74228a24398dd7ebb5cab88
 SHA512:
-  metadata.gz: cc3f90e4dcba9bf60ae3713c157a98bb05c01dd77e0938784b31843c2a006d118a5a0a3b0043a6cf4c0ff0d3c74792dc0c161338aa40e79aa1f6c47d2b49b57b
-  data.tar.gz: 0d64b9fa930e3e3604a67d2721291e93226c6507c689af5ed18af9c2e17f3b6013d466afb2d4739dbc0acce359c1fbf494a1ce821e9a39261b3389c8ab696bd8
+  metadata.gz: 1d361717f3f6ac6ad26f29a14e61979e2e7293f07df766fd80d766aa63cb1fad57a9f323ef3807cbe3f17f3e7cda4fbc6c949e73f7d19a9c61988821c09e5b5b
+  data.tar.gz: 6da23e3bd4602be2fc05331896620675c15783c227dabb64644be347f2fe689b87f8784052aa100a2d484df742cdb87acd4ffe20a0108aba321d84548b6bdf33

data/.github/workflows/rspec.yml

@@ -22,17 +22,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        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"
+        ruby: [3.1, 3.2, 3,3]
+        gemfile: ["7.0", "7.1", "7.2", "main"]
+        exclude: []
     steps:
       - name: Install packages
         run: |

data/README.md

@@ -34,16 +34,6 @@ bundle exec rake copy_tuner:export
 
 これで、`config/locales/copy_tuner.yml` に翻訳ファイルが作成されます。
 
-## IE等のレガシーブラウザ対応が必要な場合
-
-以下のスクリプトタグを追加する。(必要なpolyfillを個別に読み込んでも可)
-
-```
-<script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
-```
-
-[Polyfill service](https://cdn.polyfill.io/v2/docs/)
-
 Development
 =================
 

data/copy_tuner_client.gemspec

@@ -1,13 +1,12 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'copy_tuner_client/version'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 3.0.0'
+  s.required_ruby_version = '>= 3.1.0'
   s.add_dependency 'i18n', '>= 0.5.0'
   s.add_dependency 'json'
   s.add_dependency 'nokogiri'
-  s.add_development_dependency 'rails', '~> 6.1'
+  s.add_development_dependency 'rails', '~> 7.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'sham_rack'
@@ -17,14 +16,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'yard'
   s.authors = ['SonicGarden']
-  s.email  = 'info@sonicgarden.jp'
+  s.email = 'info@sonicgarden.jp'
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.files = `git ls-files`.split("\n")
   s.homepage = 'https://github.com/SonicGarden/copy-tuner-ruby-client'
-  s.name  = 'copy_tuner_client'
+  s.name = 'copy_tuner_client'
   s.platform = Gem::Platform::RUBY
   s.require_paths = ['lib']
   s.summary = 'Client for the CopyTuner copy management service'
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = CopyTunerClient::VERSION
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

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

@@ -11,15 +11,14 @@ require 'copy_tuner_client/copyray_middleware'
 module CopyTunerClient
   # Used to set up and modify settings for the client.
   class Configuration
-
     # These options will be present in the Hash returned by {#to_hash}.
-    OPTIONS = [:api_key, :development_environments, :environment_name, :host,
-        :http_open_timeout, :http_read_timeout, :client_name, :client_url,
-        :client_version, :port, :protocol, :proxy_host, :proxy_pass,
-        :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, :ignored_keys, :ignored_key_handler].freeze
+    OPTIONS = %i[api_key development_environments environment_name host
+                 http_open_timeout http_read_timeout client_name client_url
+                 client_version port protocol proxy_host proxy_pass
+                 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 ignored_keys ignored_key_handler].freeze
 
     # @return [String] The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -137,14 +136,14 @@ module CopyTunerClient
     # @return [Proc]
     attr_accessor :ignored_key_handler
 
-    alias_method :secure?, :secure
+    alias secure? secure
 
     # Instantiated from {CopyTunerClient.configure}. Sets defaults.
     def initialize
       self.client_name = 'CopyTuner Client'
       self.client_url = 'https://rubygems.org/gems/copy_tuner_client'
       self.client_version = VERSION
-      self.development_environments = %w(development staging)
+      self.development_environments = %w[development staging]
       self.host = 'copy-tuner.com'
       self.http_open_timeout = 5
       self.http_read_timeout = 5
@@ -153,14 +152,14 @@ module CopyTunerClient
       self.sync_interval = 60
       self.sync_interval_staging = 0
       self.secure = true
-      self.test_environments = %w(test cucumber)
+      self.test_environments = %w[test cucumber]
       self.upload_disabled_environments = %w[production staging]
-      self.s3_host = 'copy-tuner-data-prod.s3.amazonaws.com'
+      self.s3_host = 'copy-tuner.sg-apps.com' # NOTE: cloudfront host
       self.disable_copyray_comment_injection = false
       # TODO: 0.18.0以降のバージョンで初期値をtrueにしたい
       self.html_escape = nil
       self.ignored_keys = []
-      self.ignored_key_handler = -> (e) { raise e }
+      self.ignored_key_handler = ->(e) { raise e }
 
       @applied = false
     end
@@ -238,13 +237,11 @@ module CopyTunerClient
     #
     # When {#test?} returns +false+, the poller will be started.
     def apply
-      self.locales ||= begin
-        if defined?(::Rails)
-          self.locales = ::Rails.application.config.i18n.available_locales.presence || Array(::Rails.application.config.i18n.default_locale)
-        else
-          self.locales = [:en]
-        end
-      end
+      self.locales ||= self.locales = if defined?(::Rails)
+                                        ::Rails.application.config.i18n.available_locales.presence || Array(::Rails.application.config.i18n.default_locale)
+                                      else
+                                        [:en]
+                                      end
 
       self.client ||= Client.new(to_hash)
       self.cache ||= Cache.new(client, to_hash)
@@ -253,8 +250,8 @@ module CopyTunerClient
       I18n.backend = I18nBackend.new(cache)
 
       if enable_middleware?
-        logger.info "Using copytuner sync middleware"
-        request_sync_options = {:poller => @poller, :cache => cache, :interval => sync_interval, :ignore_regex => sync_ignore_path_regex}
+        logger.info 'Using copytuner sync middleware'
+        request_sync_options = { poller: @poller, cache:, interval: sync_interval, ignore_regex: sync_ignore_path_regex }
         if middleware_position.is_a?(Hash) && middleware_position[:before]
           middleware.insert_before middleware_position[:before], RequestSync, request_sync_options
           middleware.insert_before middleware_position[:before], CopyTunerClient::CopyrayMiddleware
@@ -266,7 +263,7 @@ module CopyTunerClient
           middleware.use CopyTunerClient::CopyrayMiddleware
         end
       else
-        logger.info "[[[Warn]]] Not using copytuner sync middleware" unless middleware
+        logger.info '[[[Warn]]] Not using copytuner sync middleware' unless middleware
       end
 
       @applied = true
@@ -278,8 +275,8 @@ module CopyTunerClient
         process_guard.start
       end
 
-      if !(test? && disable_test_translation)
-        logger.info "Download translation now"
+      unless test? && disable_test_translation
+        logger.info 'Download translation now'
         cache.download
       end
     end
@@ -302,19 +299,19 @@ module CopyTunerClient
     # @return [String] a description of the environment in which this configuration was built.
     def environment_info
       parts = ["Ruby: #{RUBY_VERSION}", framework, "Env: #{environment_name}"]
-      parts.compact.map { |part| "[#{part}]" }.join(" ")
+      parts.compact.map { |part| "[#{part}]" }.join(' ')
     end
 
     # Wraps the given logger in a PrefixedLogger. This way, CopyTunerClient
     # log messages are recognizable.
     # @param original_logger [Logger] the upstream logger to use, which must respond to the standard +Logger+ severity methods.
     def logger=(original_logger)
-      @logger = PrefixedLogger.new("** [CopyTuner]", original_logger)
+      @logger = PrefixedLogger.new('** [CopyTuner]', original_logger)
     end
 
     # Sync interval for Rack Middleware
     def sync_interval
-      if environment_name == "staging"
+      if environment_name == 'staging'
         @sync_interval_staging
       else
         @sync_interval
@@ -323,7 +320,7 @@ module CopyTunerClient
 
     # @return [String] current project url by api_key
     def project_url
-      URI::Generic.build(:scheme => self.protocol, :host => self.host, :port => self.port.to_i, :path => "/projects/#{self.api_key}").to_s
+      URI::Generic.build(scheme: self.protocol, host: self.host, port: self.port.to_i, path: "/projects/#{self.api_key}").to_s
     end
 
     private

data/lib/copy_tuner_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.19.0
 platform: ruby
 authors:
 - SonicGarden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -201,9 +201,9 @@ files:
 - app/assets/javascripts/copytuner.js
 - app/assets/stylesheets/copytuner.css
 - copy_tuner_client.gemspec
-- gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
 - gemfiles/7.1.gemfile
+- gemfiles/7.2.gemfile
 - gemfiles/main.gemfile
 - index.html
 - lib/copy_tuner_client.rb
@@ -266,7 +266,8 @@ files:
 - yarn.lock
 homepage: https://github.com/SonicGarden/copy-tuner-ruby-client
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -275,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -286,27 +287,4 @@ rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Client for the CopyTuner copy management service
-test_files:
-- spec/copy_tuner_client/cache_spec.rb
-- spec/copy_tuner_client/client_spec.rb
-- 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
-- spec/copy_tuner_client/process_guard_spec.rb
-- spec/copy_tuner_client/request_sync_spec.rb
-- spec/copy_tuner_client_spec.rb
-- spec/spec_helper.rb
-- spec/support/client_spec_helpers.rb
-- spec/support/defines_constants.rb
-- spec/support/fake_client.rb
-- spec/support/fake_copy_tuner_app.rb
-- spec/support/fake_html_safe_string.rb
-- spec/support/fake_logger.rb
-- spec/support/fake_passenger.rb
-- spec/support/fake_unicorn.rb
-- spec/support/middleware_stack.rb
-- spec/support/writing_cache.rb
+test_files: []