wovnrb 3.1.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d23f8ac05cb8fbefe04b2c8ae96f9932b280762e2491c80552bd20314d17e6d
-  data.tar.gz: 44118f0db0276085f492b631eeba2af8fe349f6b9d7ef96627590dda63793d80
+  metadata.gz: 964d0d3b7325badb2202f50fe61b2a82554138346c183c0784b313c683aa26c8
+  data.tar.gz: b622aaf71523728ae235d8ba1d6de060c906970dbc471a0408de8e274a545482
 SHA512:
-  metadata.gz: a71cbbd14782608c0c445d146bc262d5dfcf6bd7fca9cbfb467aad6f62caf9f979a98ae29a3e0fee38d77202217960b39e5ac9755975ba1fbd5e3899d5d7e69b
-  data.tar.gz: 9576ec7bd9d7053be56a116286ee9fe45df7a1f0c9e826dc114b0c77963d5e7c4ae53245655269fa8287cb45aa2ea0e56fdeecdf4cb81e4ce397d7f5595c31ef
+  metadata.gz: 3ba07bb7792de8c7e2f8e53128cc69b5e5a22b7cdbeb87ec7d87f7d026fac2a3907f838e9f88234c237b119aed8ee66aa7980d79f86db3391619422ce7254a17
+  data.tar.gz: c285d5d65556fa7953345f38c295250546dc041bea372b32ec559d7a44ef9783b8b9c36ced77b24b464dbcccf783ffd2994680e720bb147fe162080c258b20bd

data/.rubocop.yml

@@ -1 +1,6 @@
+require: rubocop-performance
+
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+  SuggestExtensions: false

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/rails/TestSite/yarn.lock

@@ -5129,9 +5129,9 @@ path-key@^2.0.0, path-key@^2.0.1:
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"

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)
@@ -23,18 +24,19 @@ module Wovnrb
 
       case response
       when Net::HTTPSuccess
-        if response.header['Content-Encoding'] == 'gzip'
-          response_body = Zlib::GzipReader.new(StringIO.new(response.body)).read
-
-          JSON.parse(response_body)['body'] || body
-        elsif @store.dev_mode?
-          JSON.parse(response.body)['body'] || body
-        else
-          WovnLogger.error("Received invalid content (\"#{response.header['Content-Encoding']}\") from WOVNio translation API.")
+        begin
+          raw_response_body = @store.dev_mode? ? response.body : Zlib::GzipReader.new(StringIO.new(response.body)).read
+        rescue Zlib::GzipFile::Error
+          raw_response_body = response.body
+        end
+
+        begin
+          JSON.parse(raw_response_body)['body'] || body
+        rescue JSON::JSONError
           body
         end
       else
-        WovnLogger.error("Received \"#{response.message}\" from WOVNio translation API.")
+        WovnLogger.error("HTML-swapper call failed. Received \"#{response.message}\" from WOVNio translation API.")
         body
       end
     end
@@ -51,24 +53,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 +104,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 +116,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 +132,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

@@ -18,11 +18,11 @@ module Wovnrb
                        end
       unless @env.key?('REQUEST_URI')
         # Add '/' to PATH_INFO as a possible fix for pow server
-        @env['REQUEST_URI'] = (@env['PATH_INFO'] =~ /^[^\/]/ ? '/' : '') + @env['PATH_INFO'] + (@env['QUERY_STRING'].empty? ? '' : "?#{@env['QUERY_STRING']}")
+        @env['REQUEST_URI'] = (/^[^\/]/.match?(@env['PATH_INFO']) ? '/' : '') + @env['PATH_INFO'] + (@env['QUERY_STRING'].empty? ? '' : "?#{@env['QUERY_STRING']}")
       end
       # REQUEST_URI is expected to not contain the server name
       # heroku contains http://...
-      @env['REQUEST_URI'] = @env['REQUEST_URI'].sub(/^https?:\/\/[^\/]+/, '') if @env['REQUEST_URI'] =~ /^https?:\/\//
+      @env['REQUEST_URI'] = @env['REQUEST_URI'].sub(/^https?:\/\/[^\/]+/, '') if /^https?:\/\//.match?(@env['REQUEST_URI'])
       @unmasked_pathname = @env['REQUEST_URI'].split('?')[0]
       @unmasked_pathname += '/' unless @unmasked_pathname =~ /\/$/ || @unmasked_pathname =~ /\/[^\/.]+\.[^\/.]+$/
       @unmasked_url = "#{@protocol}://#{@unmasked_host}#{@unmasked_pathname}"
@@ -108,7 +108,7 @@ module Wovnrb
         case @settings['url_pattern']
         when 'query'
           lang_param_name = @settings['lang_param_name']
-          location = if location =~ /\?/
+          location = if /\?/.match?(location)
                        "#{location}&#{lang_param_name}=#{lang_code}"
                      else
                        "#{location}?#{lang_param_name}=#{lang_code}"
@@ -180,7 +180,7 @@ module Wovnrb
       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'] =~ /\?/
+          headers['Location'] += if /\?/.match?(headers['Location'])
                                    '&'
                                  else
                                    '?'

data/lib/wovnrb/helpers/nokogumbo_helper.rb

@@ -2,7 +2,7 @@ module Wovnrb
   module Helpers
     module NokogumboHelper
       def parse_html(html_string, encoding = 'UTF-8')
-        if html_string.strip[0..999] =~ /<html/i
+        if /<html/i.match?(html_string.strip[0..999])
           d = Nokogiri::HTML5(html_string)
           d.encoding = encoding
           d

data/lib/wovnrb/lang.rb

@@ -126,7 +126,7 @@ module Wovnrb
     # @param  [Wovnrb::Header] headers instance of Wovn::Header. It generates new env variable for original request.
     # @return [String]                 URL added langauge code.
     def add_lang_code(href, pattern, headers)
-      return href if href =~ /^(#.*)?$/
+      return href if /^(#.*)?$/.match?(href)
 
       settings = Store.instance.settings
       code_to_add = settings['custom_lang_aliases'][@lang_code] || @lang_code
@@ -181,7 +181,7 @@ module Wovnrb
         when 'query'
           new_href = add_query_lang_code(href, code_to_add, lang_param_name)
         else # path
-          if href =~ /^\//
+          if /^\//.match?(href)
             new_href = "/#{code_to_add}#{href}"
           else
             current_dir = headers.pathname.sub(/[^\/]*\.[^.]{2,6}$/, '')
@@ -250,7 +250,7 @@ module Wovnrb
     end
 
     def add_query_lang_code(href, lang_code, lang_param_name)
-      query_separator = href =~ /\?/ ? '&' : '?'
+      query_separator = /\?/.match?(href) ? '&' : '?'
 
       href.sub(/(#|$)/, "#{query_separator}#{lang_param_name}=#{lang_code}\\1")
     end

data/lib/wovnrb/services/html_converter.rb

@@ -21,6 +21,10 @@ module Wovnrb
     private
 
     def html
+      # Ensure a Content-Type declaration in the header. This mimics Nokogumbo
+      # 1.5.0 default serialization behavior.
+      @dom.meta_encoding = 'UTF-8' if @dom.respond_to?(:meta_encoding=)
+
       @dom.to_html(save_with: 0).strip
     end
 

data/lib/wovnrb/services/wovn_logger.rb

@@ -3,15 +3,22 @@ require 'logger' unless defined?(Logger)
 
 module Wovnrb
   class WovnLogger
+    attr_reader :uuid
+
     include Singleton
 
     class << self
       def error(message)
         instance.error(message)
       end
+
+      def uuid
+        instance.uuid
+      end
     end
 
     def initialize
+      @uuid = SecureRandom.uuid
       path = Store.instance.settings['log_path']
       if path
         begin
@@ -40,9 +47,9 @@ module Wovnrb
 
     def error(message)
       if @logger == $stderr
-        @logger.puts "Wovnrb Error: #{message}"
+        @logger.puts "[#{@uuid}] Wovnrb Error: #{message}"
       else
-        @logger.error message
+        @logger.error "[#{@uuid}] #{message}"
       end
     end
   end

data/lib/wovnrb/store.rb

@@ -25,8 +25,8 @@ module Wovnrb
         'ignore_class' => [],
         'api_url' => 'https://wovn.global.ssl.fastly.net',
         'api_timeout_seconds' => 1.0,
-        'default_lang' => 'en',
-        'supported_langs' => ['en'],
+        'default_lang' => 'ja',
+        'supported_langs' => %w[en ja],
         'test_mode' => false,
         'test_url' => '',
         'cache_megabytes' => nil,
@@ -35,7 +35,8 @@ module Wovnrb
         'custom_lang_aliases' => {},
         'translate_fragment' => true,
         'widget_url' => 'https://j.wovn.io/1',
-        'wovn_dev_mode' => false
+        'wovn_dev_mode' => false,
+        'compress_api_requests' => true
       )
     end
 
@@ -181,6 +182,10 @@ module Wovnrb
       @settings['supported_langs'] || []
     end
 
+    def compress_api_requests?
+      @settings['compress_api_requests']
+    end
+
     def widget_url
       @settings['widget_url'] || 'https://j.wovn.io/1'
     end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.4.1'.freeze
 end

data/lib/wovnrb.rb

@@ -5,7 +5,7 @@ require 'wovnrb/store'
 require 'wovnrb/lang'
 require 'wovnrb/services/html_converter'
 require 'wovnrb/services/html_replace_marker'
-require 'nokogumbo'
+require 'nokogiri'
 require 'active_support'
 require 'json'
 require 'wovnrb/helpers/nokogumbo_helper'
@@ -49,7 +49,7 @@ module Wovnrb
       status, res_headers, body = @app.call(headers.request_out)
 
       # disabled by next Rack middleware
-      return output(headers, status, res_headers, body) unless res_headers['Content-Type'] =~ /html/
+      return output(headers, status, res_headers, body) unless /html/.match?(res_headers['Content-Type'])
 
       request = Rack::Request.new(env)
 
@@ -58,7 +58,7 @@ module Wovnrb
       @store.settings.update_dynamic_settings!(request.params)
       return output(headers, status, res_headers, body) if ignore_path?(headers.pathname)
 
-      body = switch_lang(headers, body) unless status.to_s =~ /^1|302/
+      body = switch_lang(headers, body) unless /^1|302/.match?(status.to_s)
 
       content_length = 0
       body.each { |b| content_length += b.respond_to?(:bytesize) ? b.bytesize : 0 }
@@ -80,7 +80,7 @@ module Wovnrb
 
         if needs_api?(html_body, headers)
           converted_html, marker = html_converter.build_api_compatible_html
-          translated_content = ApiTranslator.new(@store, headers).translate(converted_html)
+          translated_content = ApiTranslator.new(@store, headers, WovnLogger.uuid).translate(converted_html)
           translated_body.push(marker.revert(translated_content))
         else
           string_body = html_converter.build if html_body.html?

data/test/lib/api_translator_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 module Wovnrb
+  REQUEST_UUID = 'ABCD'.freeze
+
   class ApiTranslatorTest < WovnMiniTest
     def test_translate
       assert_translation('test.html', 'test_translated.html', true)
@@ -8,28 +10,64 @@ module Wovnrb
 
     def test_translate_falls_back_to_original_body_if_exception
       Net::HTTP.any_instance.expects(:request).raises
-      assert_translation('test.html', 'test_translated.html', false, nil)
+      assert_translation('test.html', 'test_translated.html', false, response: nil)
     end
 
     def test_translate_falls_back_to_original_body_if_api_error
-      assert_translation('test.html', 'test_translated.html', false, status_code: 500)
+      assert_translation('test.html', 'test_translated.html', false, response: { encoding: 'text/json', status_code: 500 })
+    end
+
+    def test_translate_continues_if_api_response_is_not_compressed
+      assert_translation('test.html', 'test_translated.html', true, response: { encoding: 'unknown', status: 200 }, compress_data: false)
     end
 
-    def test_translate_falls_back_to_original_body_if_api_response_is_not_compressed
-      assert_translation('test.html', 'test_translated.html', false, encoding: 'unknown')
+    def test_translate_continues_if_api_response_is_compressed
+      assert_translation('test.html', 'test_translated.html', true, response: { encoding: 'unknown', status: 200 })
     end
 
     def test_translate_accepts_uncompressed_response_from_api_in_dev_mode
       Wovnrb::Store.instance.update_settings('wovn_dev_mode' => true)
-      assert_translation('test.html', 'test_translated.html', true, encoding: 'text/json')
+      assert_translation('test.html', 'test_translated.html', true, response: { encoding: 'text/json', status: 200 }, compress_data: false)
+    end
+
+    def test_translate_without_api_compression_sends_json
+      Wovnrb::Store.instance.update_settings('compress_api_requests' => false)
+      sut, _store, _headers = create_sut
+      html_body = 'foo'
+
+      stub_request(:post, %r{http://wovn\.global\.ssl\.fastly\.net/v0/translation\?cache_key=.*})
+        .to_return(status: 200, body: { 'body' => 'translated_body' }.to_json)
+
+      sut.translate(html_body)
+
+      assert_requested :post, %r{http://wovn\.global\.ssl\.fastly\.net/v0/translation\?cache_key=.*},
+                       headers: {
+                         'Accept' => '*/*',
+                         'Accept-Encoding' => 'gzip',
+                         'Content-Type' => 'application/json',
+                         'User-Agent' => 'Ruby',
+                         'X-Request-Id' => REQUEST_UUID
+                       },
+                       body: {
+                         'url' => 'http://wovn.io/test',
+                         'token' => '123456',
+                         'lang_code' => 'fr',
+                         'url_pattern' => 'subdomain',
+                         'lang_param_name' => 'lang',
+                         'product' => 'WOVN.rb',
+                         'version' => VERSION,
+                         'body' => 'foo',
+                         'custom_lang_aliases' => { 'ja' => 'Japanese' }.to_json
+                       }.to_json,
+                       times: 1
     end
 
     private
 
-    def assert_translation(original_html_fixture, translated_html_fixture, success_expected, response = { encoding: 'gzip', status_code: 200 })
+    def assert_translation(original_html_fixture, translated_html_fixture, success_expected, response: { encoding: 'gzip', status_code: 200 }, compress_data: true)
       original_html = File.read("test/fixtures/html/#{original_html_fixture}")
       translated_html = File.read("test/fixtures/html/#{translated_html_fixture}")
-      actual_translated_html = translate(original_html, translated_html, response)
+      actual_translated_html = translate(original_html, translated_html, response, compress_data: compress_data)
 
       if success_expected
         assert_equal(actual_translated_html, translated_html)
@@ -38,7 +76,16 @@ module Wovnrb
       end
     end
 
-    def translate(original_html, translated_html, response)
+    def translate(original_html, translated_html, response, compress_data: true)
+      api_translator, store, _headers = create_sut
+      translation_request_stub = stub_translation_api_request(store, original_html, translated_html, response, compress_data: compress_data)
+
+      actual_translated_html = api_translator.translate(original_html)
+      assert_requested(translation_request_stub, times: 1) if translation_request_stub
+      actual_translated_html
+    end
+
+    def create_sut
       settings = {
         'project_token' => '123456',
         'custom_lang_aliases' => { 'ja' => 'Japanese' },
@@ -53,15 +100,12 @@ module Wovnrb
         Wovnrb.get_env('url' => 'http://fr.wovn.io/test'),
         Wovnrb.get_settings(settings)
       )
-      api_translator = ApiTranslator.new(store, headers)
-      translation_request_stub = stub_translation_api_request(store, headers, original_html, translated_html, response)
+      api_translator = ApiTranslator.new(store, headers, REQUEST_UUID)
 
-      actual_translated_html = api_translator.translate(original_html)
-      assert_requested(translation_request_stub, times: 1) if translation_request_stub
-      actual_translated_html
+      [api_translator, store, headers]
     end
 
-    def stub_translation_api_request(store, headers, original_html, translated_html, response)
+    def stub_translation_api_request(store, original_html, translated_html, response, compress_data: true)
       if response
         cache_key = generate_cache_key(store, original_html)
         api_host = if store.dev_mode?
@@ -79,10 +123,10 @@ module Wovnrb
           'User-Agent' => 'Ruby'
         }
         stub_response_json = "{\"body\":\"#{translated_html.gsub("\n", '\n')}\"}"
-        stub_response = if store.dev_mode?
-                          stub_response_json
-                        else
+        stub_response = if compress_data
                           compress(stub_response_json)
+                        else
+                          stub_response_json
                         end
         response_headers = { 'Content-Encoding' => response[:encoding] || 'gzip' }
         stub_request(:post, api_url)

data/test/lib/headers_test.rb

@@ -170,7 +170,7 @@ module Wovnrb
         Wovnrb.get_env('url' => 'http://wovn.io/contact', 'HTTP_X_FORWARDED_HOST' => 'wovn.io'),
         Store.instance.settings
       )
-      assert_equal('http://wovn.io/contact?wovn=ja', sut.redirect_location('ja'))
+      assert_equal('http://wovn.io/contact?wovn=en', sut.redirect_location('en'))
     end
 
     def test_redirect_location_with_lang_param_name
@@ -179,7 +179,7 @@ module Wovnrb
         Wovnrb.get_env('url' => 'http://wovn.io/contact', 'HTTP_X_FORWARDED_HOST' => 'wovn.io'),
         Store.instance.settings
       )
-      assert_equal('http://wovn.io/contact?lang=ja', sut.redirect_location('ja'))
+      assert_equal('http://wovn.io/contact?lang=en', sut.redirect_location('en'))
     end
 
     #########################

data/test/lib/services/html_converter_test.rb

@@ -45,7 +45,7 @@ module Wovnrb
       converter = prepare_html_converter(html, ignore_class: ['ignore-me'])
       converted_html, = converter.build_api_compatible_html
 
-      expected_convert_html = "<html lang=\"en\"><head><script src=\"https://j.wovn.io/1\" async=\"true\" data-wovnio=\"key=123456&amp;backend=true&amp;currentLang=en&amp;defaultLang=en&amp;urlPattern=query&amp;langCodeAliases={}&amp;langParamName=wovn&amp;version=WOVN.rb_#{VERSION}\" data-wovnio-type=\"fallback_snippet\"></script><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://my-site.com/\"><link rel=\"alternate\" hreflang=\"fr\" href=\"http://my-site.com/?wovn=fr\"><link rel=\"alternate\" hreflang=\"ja\" href=\"http://my-site.com/?wovn=ja\"><link rel=\"alternate\" hreflang=\"vi\" href=\"http://my-site.com/?wovn=vi\"></head><body><p>Hello <span wovn-ignore=\"\"><!-- __wovn-backend-ignored-key-0 --></span></p><p></p><p>Hello <span data-wovn-ignore=\"\"><!-- __wovn-backend-ignored-key-1 --></span></p><p></p><div><span class=\"ignore-me\"><!-- __wovn-backend-ignored-key-2 --></span></div><span>Have a nice day!</span></body></html>"
+      expected_convert_html = "<html lang=\"en\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"https://j.wovn.io/1\" async=\"true\" data-wovnio=\"key=123456&amp;backend=true&amp;currentLang=en&amp;defaultLang=en&amp;urlPattern=query&amp;langCodeAliases={}&amp;langParamName=wovn&amp;version=WOVN.rb_#{VERSION}\" data-wovnio-type=\"fallback_snippet\"></script><link rel=\"alternate\" hreflang=\"en\" href=\"http://my-site.com/\"><link rel=\"alternate\" hreflang=\"fr\" href=\"http://my-site.com/?wovn=fr\"><link rel=\"alternate\" hreflang=\"ja\" href=\"http://my-site.com/?wovn=ja\"><link rel=\"alternate\" hreflang=\"vi\" href=\"http://my-site.com/?wovn=vi\"></head><body><p>Hello <span wovn-ignore=\"\"><!-- __wovn-backend-ignored-key-0 --></span></p><p></p><p>Hello <span data-wovn-ignore=\"\"><!-- __wovn-backend-ignored-key-1 --></span></p><p></p><div><span class=\"ignore-me\"><!-- __wovn-backend-ignored-key-2 --></span></div><span>Have a nice day!</span></body></html>"
       assert_equal(expected_convert_html, converted_html)
     end
 
@@ -62,7 +62,7 @@ module Wovnrb
       converter = prepare_html_converter(html, ignore_class: [])
       converted_html, = converter.build_api_compatible_html
 
-      expected_convert_html = "<html lang=\"en\"><head><script src=\"https://j.wovn.io/1\" async=\"true\" data-wovnio=\"key=123456&amp;backend=true&amp;currentLang=en&amp;defaultLang=en&amp;urlPattern=query&amp;langCodeAliases={}&amp;langParamName=wovn&amp;version=WOVN.rb_#{VERSION}\" data-wovnio-type=\"fallback_snippet\"></script><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><link rel=\"alternate\" hreflang=\"en\" href=\"http://my-site.com/\"><link rel=\"alternate\" hreflang=\"fr\" href=\"http://my-site.com/?wovn=fr\"><link rel=\"alternate\" hreflang=\"ja\" href=\"http://my-site.com/?wovn=ja\"><link rel=\"alternate\" hreflang=\"vi\" href=\"http://my-site.com/?wovn=vi\"></head><body><form action=\"/test\" method=\"POST\"><!-- __wovn-backend-ignored-key-0 --></form></body></html>"
+      expected_convert_html = "<html lang=\"en\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><script src=\"https://j.wovn.io/1\" async=\"true\" data-wovnio=\"key=123456&amp;backend=true&amp;currentLang=en&amp;defaultLang=en&amp;urlPattern=query&amp;langCodeAliases={}&amp;langParamName=wovn&amp;version=WOVN.rb_#{VERSION}\" data-wovnio-type=\"fallback_snippet\"></script><link rel=\"alternate\" hreflang=\"en\" href=\"http://my-site.com/\"><link rel=\"alternate\" hreflang=\"fr\" href=\"http://my-site.com/?wovn=fr\"><link rel=\"alternate\" hreflang=\"ja\" href=\"http://my-site.com/?wovn=ja\"><link rel=\"alternate\" hreflang=\"vi\" href=\"http://my-site.com/?wovn=vi\"></head><body><form action=\"/test\" method=\"POST\"><!-- __wovn-backend-ignored-key-0 --></form></body></html>"
       assert_equal(expected_convert_html, converted_html)
     end
 

data/test/lib/services/wovn_logger_test.rb

@@ -31,9 +31,11 @@ module Wovnrb
     end
 
     def test_error
-      mock = LogMock.mock_log
-      WovnLogger.instance.error('aaa')
-      assert_equal(['aaa'], mock.errors)
+      SecureRandom.stub(:uuid, 'a') do
+        mock = LogMock.mock_log
+        WovnLogger.instance.error('aaa')
+        assert_equal(['[a] aaa'], mock.errors)
+      end
     end
   end
 end

data/test/lib/store_test.rb

@@ -78,12 +78,14 @@ module Wovnrb
     end
 
     def test_invalid_settings
-      mock = LogMock.mock_log
-      store = Wovnrb::Store.instance
-      valid = store.valid_settings?
+      SecureRandom.stub(:uuid, 'a') do
+        mock = LogMock.mock_log
+        store = Wovnrb::Store.instance
+        valid = store.valid_settings?
 
-      assert_equal(false, valid)
-      assert_equal(['Project token  is not valid.'], mock.errors)
+        assert_equal(false, valid)
+        assert_equal(['[a] Project token  is not valid.'], mock.errors)
+      end
     end
 
     def test_settings_ignore_paths
@@ -110,12 +112,14 @@ module Wovnrb
     end
 
     def test_settings_invalid_ignore_paths
-      mock = LogMock.mock_log
-      store = Wovnrb::Store.instance
-      store.update_settings('ignore_paths' => 'aaaa')
-
-      assert_equal(false, store.valid_settings?)
-      assert_equal(['Project token  is not valid.', 'Ignore Paths aaaa should be Array.'], mock.errors)
+      SecureRandom.stub(:uuid, 'a') do
+        mock = LogMock.mock_log
+        store = Wovnrb::Store.instance
+        store.update_settings('ignore_paths' => 'aaaa')
+
+        assert_equal(false, store.valid_settings?)
+        assert_equal(['[a] Project token  is not valid.', '[a] Ignore Paths aaaa should be Array.'], mock.errors)
+      end
     end
 
     def test_settings_ignore_glob_injection

data/test/test_helper.rb

@@ -14,7 +14,7 @@ SimpleCov.start do
   track_files 'lib/**/*.rb'
 end
 
-require 'nokogumbo'
+require 'nokogiri'
 require 'rack'
 require 'minitest/autorun'
 require 'mocha/minitest'

data/wovnrb.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://wovn.io'
   spec.license       = 'MIT'
   spec.required_ruby_version = '>= 2.5'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   files = `git ls-files -z`.split("\x0")
   files.delete('BEFORE_PUSHING')
@@ -23,8 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'addressable'
   spec.add_dependency 'lz4-ruby'
-  spec.add_dependency 'nokogiri', '>= 1.8.1', '<= 1.11'
-  spec.add_dependency 'nokogumbo', '>= 1.4.0', '< 2.0.0'
+  spec.add_dependency 'nokogiri', '>= 1.12', '<2'
   spec.add_dependency 'rack'
 
   spec.add_development_dependency 'bundler', '>= 1.7'
@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'timecop'
 
   # NOTE; it need to use webmock 2.3.2 for avoiding error when we use ruby 2.4.x.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Wovn Technologies, Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,40 +58,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: nokogumbo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +324,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -551,8 +545,9 @@ files:
 homepage: https://wovn.io
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -568,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Gem for WOVN.io
 test_files: