wovnrb 3.0.1 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b52fa4c2f9eb449a733283bbe12420dcf4f60dd606ade7f919ffa43274659d4
-  data.tar.gz: e5b4113a7e9e09aa352efc2a53cbafa26930f3aca5f4ade9e2fe0b46e7754686
+  metadata.gz: e5c458ea4be1b5bc1325a0c54a9672f7fd744b864975699ae48e70acde6d5265
+  data.tar.gz: 318102aa29ae9bbb03d5cf0b1ccffa3f39ada7a8fc963daad856b058f46e46ec
 SHA512:
-  metadata.gz: 9010845d1a66b75de3093a5446571081598092183db5c02b8299492bc09319ab9372782467c694c2c86f62d4dd21238c31770267871542c819c87748ac4f4c20
-  data.tar.gz: 712d54ef68e854dec1017ef57bb147924fcbc4ecdb456af2d797aeb497a8d469045c35b9e5dd41d6dda0c74c6659f32c7560c236c0b1a3c4c1baa9961c479df9
+  metadata.gz: fd81bc766461ce8212a32afafc0a673790985213304c55765322e42591e34107a649d70e1133a597b88c6cda3ee0813cd1b4efbac1ff45d2d794f52d78c80814
+  data.tar.gz: fd4304143e2226ab1b9a887d45e2326da8b8b452e0a60bcbb94f3b680fc4280459e47fb3b025d6660c2d338a1d3150617fc279b279e68693b0566a41050bd3de

data/.circleci/config.yml

@@ -1,18 +1,29 @@
-version: 2
+version: 2.1
+
+orbs:
+  # https://github.com/CircleCI-Public/ruby-orb
+  ruby: circleci/ruby@1.1
 
 jobs:
-  build:
+  test:
+    parameters:
+      ruby-version:
+        type: string
     docker:
-      - image: circleci/ruby:2.3-jessie
+      - image: cimg/ruby:<< parameters.ruby-version >>
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - bundler-
       - run: bundle install --path vendor/bundle --jobs=4
-      - save_cache:
-          key: bundler-{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
       - run: bundle exec rubocop
       - run: bundle exec rake test
+
+# https://circleci.com/blog/circleci-matrix-jobs/
+workflows:
+  build_and_test:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              # https://github.com/CircleCI-Public/cimg-ruby
+              # only supports the last three ruby versions
+              ruby-version: ["2.5", "2.6", "2.7"]

data/.rubocop_todo.yml

@@ -6,17 +6,8 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundAccessModifier:
-  Exclude:
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundMethodBody:
-  Exclude:
-    - 'test/lib/text_caches/memory_cache_test.rb'
+Gemspec/RequiredRubyVersion:
+  Enabled: false
 
 # Offense count: 11
 # Cop supports --auto-correct.
@@ -25,13 +16,9 @@ Layout/ExtraSpacing:
   Exclude:
     - 'lib/wovnrb/lang.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/FirstHashElementIndentation:
+Style/HashEachMethods:
   Exclude:
-    - 'lib/wovnrb/text_caches/cache_base.rb'
+    - 'lib/wovnrb/store.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -42,13 +29,6 @@ Layout/HeredocIndentation:
     - 'test/lib/lang_test.rb'
     - 'test/lib/wovnrb_test.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
-
 # Offense count: 3
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
@@ -70,13 +50,6 @@ Lint/ImplicitStringConcatenation:
   Exclude:
     - 'test/lib/lang_test.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/wovnrb/text_caches/cache_base.rb'
-
 # Offense count: 5
 Lint/UselessAssignment:
   Exclude:
@@ -116,12 +89,13 @@ Metrics/MethodLength:
 # Offense count: 12
 Metrics/PerceivedComplexity:
   Max: 22
+  Exclude:
+    - 'lib/wovnrb/headers.rb'
 
 # Offense count: 3
 Naming/AccessorMethodName:
   Exclude:
     - 'lib/wovnrb/services/wovn_logger.rb'
-    - 'lib/wovnrb/text_caches/cache_base.rb'
 
 # Offense count: 120
 # Configuration parameters: .
@@ -153,12 +127,6 @@ Style/ClassCheck:
   Exclude:
     - 'lib/wovnrb/store.rb'
 
-# Offense count: 6
-Style/ClassVars:
-  Exclude:
-    - 'lib/wovnrb/text_caches/cache_base.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Keywords.
@@ -183,8 +151,6 @@ Style/Documentation:
     - 'lib/wovnrb/services/wovn_logger.rb'
     - 'lib/wovnrb/settings.rb'
     - 'lib/wovnrb/store.rb'
-    - 'lib/wovnrb/text_caches/cache_base.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
 
 # Offense count: 2
 Style/DoubleNegation:
@@ -224,7 +190,6 @@ Style/IfUnlessModifier:
     - 'Rakefile'
     - 'lib/wovnrb/helpers/nokogumbo_helper.rb'
     - 'lib/wovnrb/store.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -241,7 +206,6 @@ Style/NegatedIf:
 Style/PreferredHashMethods:
   Exclude:
     - 'lib/wovnrb/store.rb'
-    - 'lib/wovnrb/text_caches/memory_cache.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -297,7 +261,7 @@ Style/ZeroLengthPredicate:
 # Offense count: 1436
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 1424
 
 Style/FrozenStringLiteralComment:
@@ -310,6 +274,7 @@ Style/SafeNavigation:
   Enabled: false
 
 AllCops:
+  NewCops: enable
   Exclude:
     - 'docker/**/*'
-    - 'vendor/**/*'
+    - 'vendor/**/*'

data/Gemfile

@@ -1,7 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in wovn.gemspec
-if RUBY_VERSION < '2.2.2'
-  gem 'activesupport', '< 5.0.0'
-end
 gemspec

data/README.en.md

@@ -39,8 +39,8 @@ Insert the following into either config/application.rb or config/environments/.
 
 config.wovnrb = {
   :project_token => 'EnS!t3',
-  :default_lang => 'en',
-  :supported_langs => ['en'],
+  :default_lang => 'ja',
+  :supported_langs => ['ja', en'],
   :url_pattern => 'path'
 }
 
@@ -60,8 +60,8 @@ require 'wovnrb'
 
 use Wovnrb::Interceptor, {
   :project_token => 'EnS!t3',
-  :default_lang => 'en',
-  :supported_langs => ['en'],
+  :default_lang => 'ja',
+  :supported_langs => ['ja', 'en'],
   :url_pattern => 'path'
 }
 
@@ -74,18 +74,19 @@ After completing setup, start the Ruby Application, and make sure the WOVN.io li
 
 The following is a list of the WOVN.io Ruby Library's valid parameters.
 
-Parameter Name     | Required | Default Setting
------------------- | -------- | ----------------
-project_token      | yes      | ''
-default_lang       | yes      | 'en'
-supported_langs    | yes      | ['en']
-url_pattern        | yes      | 'path'
-lang_param_name    |          | 'wovn'
-query              |          | []
-ignore_class       |          | []
-translate_fragment |          | true
-ignore_paths       |          | []
-install_middleware |          | true
+Parameter Name        | Required | Default Setting
+----------------------| -------- | ----------------
+project_token         | yes      | ''
+default_lang          | yes      | 'ja'
+supported_langs       | yes      | ['ja', 'en']
+url_pattern           | yes      | 'path'
+lang_param_name       |          | 'wovn'
+query                 |          | []
+ignore_class          |          | []
+translate_fragment    |          | true
+ignore_paths          |          | []
+install_middleware    |          | true
+compress_api_requests |          | true
 
 ### 2.1. project_token
 
@@ -196,3 +197,7 @@ WOVN.rb needs to be added after any compression middleware.
     :install_middleware => false
   }
 ```
+
+### 2.11 compress_api_requests
+
+By default, requests to the translation API will be sent with gzip compression. Set to false to disable compression.

data/README.ja.md

@@ -44,8 +44,8 @@ bundle install
 
 config.wovnrb = {
   :project_token => 'EnS!t3',
-  :default_lang => 'en',
-  :supported_langs => ['en'],
+  :default_lang => 'ja',
+  :supported_langs => ['ja', en'],
   :url_pattern => 'path'
 }
 
@@ -63,8 +63,8 @@ require 'wovnrb'
 
 use Wovnrb::Interceptor, {
   :project_token => 'EnS!t3',
-  :default_lang => 'en',
-  :supported_langs => ['en'],
+  :default_lang => 'ja',
+  :supported_langs => ['ja', 'en'],
   :url_pattern => 'path'
 }
 
@@ -80,8 +80,8 @@ use Wovnrb::Interceptor, {
 パラメータ名       | 必須     | デフォルト設定
 ------------------ | -------- | ----------------
 project_token      | yes      | ''
-default_lang       | yes      | 'en'
-supported_langs    | yes      | ['en']
+default_lang       | yes      | 'ja'
+supported_langs    | yes      | ['ja', 'en']
 url_pattern        | yes      | 'path'
 lang_param_name    |          | 'wovn'
 query              |          | []

data/docker/docker-compose.yml

@@ -9,3 +9,8 @@ services:
       - 4000:4000
     volumes:
       - ../:/usr/src/app/wovnrb
+    networks:
+      - backend-network
+networks:
+  backend-network:
+    name: 'backend-network'

data/docker/rails/TestSite/Gemfile

@@ -53,4 +53,4 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'wovnrb', path: './wovnrb'
+gem 'wovnrb', path: './wovnrb'

data/docker/rails/TestSite/app/controllers/custom_response_controller.rb

@@ -0,0 +1,16 @@
+class CustomResponseController < ApplicationController
+  skip_before_action :verify_authenticity_token2
+
+  def make_response
+    response_args_json = params[:response]
+    raise ActionController::BadRequest unless response_args_json
+
+    (response_args_json[:headers] || {}).each do |name, value|
+      response.headers[name] = value
+    end
+
+    render inline: response_args_json[:body],
+           status: response_args_json[:status],
+           content_type: response_args_json[:content_type]
+  end
+end

data/docker/rails/TestSite/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
   get "/redirecting_page" => "redirects#show"
+  get "/custom_response/*all" => "custom_response#make_response"
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 end

data/docker/rails/TestSite/start.sh

@@ -5,6 +5,7 @@ rm /usr/local/bin/bundle
 rm /usr/local/bin/bundler
 gem install bundler:2.1.4
 update --bundler
+bundle update
 bundle install
 apt update
 apt install npm -y

data/docker/rails/TestSite/yarn.lock

@@ -2592,9 +2592,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -5863,9 +5863,9 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     uniq "^1.0.1"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
-  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  version "7.0.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -7269,9 +7269,9 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
-  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
+  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
@@ -7581,9 +7581,9 @@ wrappy@1:
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 

data/lib/wovnrb/api_translator.rb

@@ -5,9 +5,10 @@ require 'zlib'
 
 module Wovnrb
   class ApiTranslator
-    def initialize(store, headers)
+    def initialize(store, headers, uuid)
       @store = store
       @headers = headers
+      @uuid = uuid
     end
 
     def translate(body)
@@ -51,24 +52,45 @@ module Wovnrb
     end
 
     def prepare_request(body)
-      data = compress_request_data(generate_request_data(body))
-      headers = {
-        'Accept-Encoding' => 'gzip',
-        'Content-Type' => 'application/octet-stream',
-        'Content-Length' => data.bytesize.to_s
-      }
-      request = Net::HTTP::Post.new(generate_request_path(body), headers)
+      if @store.compress_api_requests?
+        gzip_request(body)
+      else
+        json_request(body)
+      end
+    end
+
+    def gzip_request(html_body)
+      api_params = build_api_params(html_body)
+      compressed_body = compress_request_data(api_params)
+      request = Net::HTTP::Post.new(request_path(html_body), {
+                                      'Accept-Encoding' => 'gzip',
+                                      'Content-Type' => 'application/octet-stream',
+                                      'Content-Encoding' => 'gzip',
+                                      'Content-Length' => compressed_body.bytesize.to_s,
+                                      'X-Request-Id' => @uuid
+                                    })
+      request.body = compressed_body
+
+      request
+    end
 
-      request.body = data
+    def json_request(html_body)
+      api_params = build_api_params(html_body)
+      request = Net::HTTP::Post.new(request_path(html_body), {
+                                      'Accept-Encoding' => 'gzip',
+                                      'Content-Type' => 'application/json',
+                                      'X-Request-Id' => @uuid
+                                    })
+      request.body = api_params.to_json
 
       request
     end
 
-    def generate_request_path(body)
-      "#{api_uri.path.sub(/\/$/, '')}/translation?cache_key=#{generate_cache_key(body)}"
+    def request_path(body)
+      "#{api_uri.path}/translation?cache_key=#{cache_key(body)}"
     end
 
-    def generate_cache_key(body)
+    def cache_key(body)
       cache_key_components = {
         'token' => token,
         'settings_hash' => settings_hash,
@@ -81,8 +103,8 @@ module Wovnrb
       CGI.escape("(#{cache_key_components})")
     end
 
-    def generate_request_data(body)
-      data = {
+    def build_api_params(body)
+      result = {
         'url' => page_url,
         'token' => token,
         'lang_code' => lang_code,
@@ -93,9 +115,9 @@ module Wovnrb
         'body' => body
       }
 
-      data['custom_lang_aliases'] = JSON.dump(custom_lang_aliases) unless custom_lang_aliases.empty?
+      result['custom_lang_aliases'] = JSON.dump(custom_lang_aliases) unless custom_lang_aliases.empty?
 
-      data
+      result
     end
 
     def compress_request_data(data_hash)
@@ -109,7 +131,7 @@ module Wovnrb
     end
 
     def api_uri
-      Addressable::URI.parse(@store.settings['api_url'] + '/v0/')
+      Addressable::URI.parse("#{@store.settings['api_url']}/v0")
     end
 
     def api_timeout

data/lib/wovnrb/headers.rb

@@ -1,17 +1,10 @@
 module Wovnrb
   class Headers
-    attr_reader :unmasked_url
-    attr_reader :url
-    attr_reader :protocol
-    attr_reader :unmasked_host
-    attr_reader :host
-    attr_reader :unmasked_pathname
-    attr_reader :pathname
-    attr_reader :pathname_with_trailing_slash_if_present
+    attr_reader :unmasked_url, :url, :protocol, :unmasked_host, :host, :unmasked_pathname, :pathname, :pathname_with_trailing_slash_if_present
 
     # Generates new instance of Wovnrb::Headers.
     # Its parameters are set by parsing env variable.
-    #
+
     def initialize(env, settings)
       request = Rack::Request.new(env)
 
@@ -42,21 +35,21 @@ module Wovnrb
       @pathname, @query = @env['REQUEST_URI'].split('?')
       @pathname = settings['url_pattern'] == 'path' ? remove_lang(@pathname, lang_code) : @pathname
       @query ||= ''
-      @url = "#{@host}#{@pathname}#{(!@query.empty? ? '?' : '') + remove_lang(@query, lang_code)}"
-      if !settings['query'].empty?
+      @url = "#{@host}#{@pathname}#{(@query.empty? ? '' : '?') + remove_lang(@query, lang_code)}"
+      if settings['query'].empty?
+        @query = ''
+      else
         query_vals = []
         settings['query'].each do |qv|
           rx = Regexp.new("(^|&)(?<query_val>#{qv}[^&]+)(&|$)")
           m = @query.match(rx)
           query_vals.push(m[:query_val]) if m && m[:query_val]
         end
-        @query = if !query_vals.empty?
-                   "?#{query_vals.sort.join('&')}"
-                 else
+        @query = if query_vals.empty?
                    ''
+                 else
+                   "?#{query_vals.sort.join('&')}"
                  end
-      else
-        @query = ''
       end
       @query = remove_lang(@query, lang_code)
       @pathname_with_trailing_slash_if_present = @pathname
@@ -115,11 +108,11 @@ module Wovnrb
         case @settings['url_pattern']
         when 'query'
           lang_param_name = @settings['lang_param_name']
-          if location !~ /\?/
-            location = "#{location}?#{lang_param_name}=#{lang_code}"
-          else @env['REQUEST_URI'] !~ /(\?|&)#{lang_param_name}=/
-               location = "#{location}&#{lang_param_name}=#{lang_code}"
-          end
+          location = if location =~ /\?/
+                       "#{location}&#{lang_param_name}=#{lang_code}"
+                     else
+                       "#{location}?#{lang_param_name}=#{lang_code}"
+                     end
         when 'subdomain'
           location = "#{lang_code.downcase}.#{location}"
         # when 'path'
@@ -173,7 +166,7 @@ module Wovnrb
         lang_param_name = @settings['lang_param_name']
         uri.sub(/(^|\?|&)#{lang_param_name}=#{lang_code}(&|$)/, '\1').gsub(/(\?|&)$/, '')
       when 'subdomain'
-        rp = Regexp.new('(^|(//))' + lang_code + '\.', 'i')
+        rp = Regexp.new("(^|(//))#{lang_code}\\.", 'i')
         uri.sub(rp, '\1')
       # when 'path'
       else
@@ -182,24 +175,22 @@ module Wovnrb
     end
 
     def out(headers)
-      r = Regexp.new('//' + @host)
+      r = Regexp.new("//#{@host}")
       lang_code = Store.instance.settings['custom_lang_aliases'][self.lang_code] || self.lang_code
-      if lang_code != @settings['default_lang'] && headers.key?('Location') && headers['Location'] =~ r
-        unless @settings['ignore_globs'].ignore?(headers['Location'])
-          case @settings['url_pattern']
-          when 'query'
-            headers['Location'] += if headers['Location'] =~ /\?/
-                                     '&'
-                                   else
-                                     '?'
-                                   end
-            headers['Location'] += "#{@settings['lang_param_name']}=#{lang_code}"
-          when 'subdomain'
-            headers['Location'] = headers['Location'].sub(/\/\/([^.]+)/, '//' + lang_code + '.\1')
-          # when 'path'
-          else
-            headers['Location'] = headers['Location'].sub(/(\/\/[^\/]+)/, '\1/' + lang_code)
-          end
+      if lang_code != @settings['default_lang'] && headers.key?('Location') && headers['Location'] =~ r && !@settings['ignore_globs'].ignore?(headers['Location'])
+        case @settings['url_pattern']
+        when 'query'
+          headers['Location'] += if headers['Location'] =~ /\?/
+                                   '&'
+                                 else
+                                   '?'
+                                 end
+          headers['Location'] += "#{@settings['lang_param_name']}=#{lang_code}"
+        when 'subdomain'
+          headers['Location'] = headers['Location'].sub(/\/\/([^.]+)/, "//#{lang_code}.\\1")
+        # when 'path'
+        else
+          headers['Location'] = headers['Location'].sub(/(\/\/[^\/]+)/, "\\1/#{lang_code}")
         end
       end
       headers

data/lib/wovnrb/helpers/nokogumbo_helper.rb

@@ -2,15 +2,13 @@ module Wovnrb
   module Helpers
     module NokogumboHelper
       def parse_html(html_string, encoding = 'UTF-8')
-        dom = if html_string.strip[0..999] =~ /<html/i
-                d = Nokogiri::HTML5(html_string)
-                d.encoding = encoding
-                d
-              else
-                parse_fragment(html_string, encoding)
-              end
-
-        dom
+        if html_string.strip[0..999] =~ /<html/i
+          d = Nokogiri::HTML5(html_string)
+          d.encoding = encoding
+          d
+        else
+          parse_fragment(html_string, encoding)
+        end
       end
 
       # https://www.rubydoc.info/gems/nokogumbo/Nokogiri/HTML5#fragment-class_method