wovnrb 3.3.1 → 3.6.0

data/test/lib/wovnrb_test.rb

@@ -256,7 +256,8 @@ HTML
     store, headers = store_headers_factory(subdomain, original_lang)
     if api_expected
       dom = Wovnrb::Helpers::NokogumboHelper.parse_html(body)
-      converter = Wovnrb::HtmlConverter.new(dom, store, headers)
+      url_lang_switcher = Wovnrb::UrlLanguageSwitcher.new(store)
+      converter = Wovnrb::HtmlConverter.new(dom, store, headers, url_lang_switcher)
       apified_body, = converter.build_api_compatible_html
       mock_translation_api_response(apified_body, expected_body)
     end

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'
@@ -30,9 +30,11 @@ require 'wovnrb/store'
 require 'wovnrb/helpers/nokogumbo_helper'
 require 'wovnrb/services/html_converter'
 require 'wovnrb/services/html_replace_marker'
+require 'wovnrb/url_language_switcher'
+require 'wovnrb/services/url'
 
 module Wovnrb
-  class WovnMiniTest < Minitest::Test
+  class WovnMiniTest < ActiveSupport::TestCase
     def before_setup
       super
       Wovnrb::Store.instance.reset
@@ -81,6 +83,7 @@ module Wovnrb
     env['SERVER_NAME'] = 'wovn.io'
     env['HTTP_COOKIE'] = 'olfsk=olfsk021093478426337242; hblid=KB8AAMzxzu2DSxnB4X7BJ26rBGVeF0yJ; optimizelyEndUserId=oeu1426233718869r0.5398541854228824; __zlcmid=UFeZqrVo6Mv3Yl; wovn_selected_lang=en; optimizelySegments=%7B%7D; optimizelyBuckets=%7B%7D; _equalizer_session=eDFwM3M2QUZJZFhoby9JZlArckcvSUJwNFRINXhUeUxtNnltQXZhV0tqdGhZQjJMZ01URnZTK05ydFVWYmM3U0dtMVN0M0Z0UnNDVG8vdUNDTUtPc21jY0FHREgrZ05CUnBTb0hyUlkvYlBWQVhQR3RZdnhjMWsrRW5rOVp1Z3V3bkgyd3NpSlRZQWU1dlZvNmM1THp6aUZVeE83Y1pWWENRNTBUVFIrV05WeTdDMlFlem1tUzdxaEtndFZBd2dtUjU2ak5EUmJPa3RWWmMyT1pSVWdMTm8zOVZhUWhHdGQ3L1c5bm91RmNSdFRrcC90Tml4N2t3ZWlBaDRya2lLT1I0S0J2TURhUWl6Uk5rOTQ4Y1MwM3VKYnlLMUYraEt5clhRdFd1eGdEWXdZd3pFbWQvdE9vQndhdDVQbXNLcHBURm9CbnZKenU2YnNXRFdqRVl0MVV3bmRyYjhvMDExcGtUVU9tK1lqUGswM3p6M05tbVRnTjE3TUl5cEdpTTZ4a2gray8xK0FvTC9wUDVka1JSeE5GM1prZmRjWDdyVzRhWW5uS2Mxc1BxOEVVTTZFS3N5bTlVN2p5eE5YSjNZWGI2UHd3Vzc0bDM5QjIwL0l5Mm85NmQyWFAwdVQ3ZzJYYk1QOHY2NVJpY2c9LS1KNU96eHVycVJxSDJMbEc4Rm9KVXpBPT0%3D--17e47555d692fb9cde20ef78a09a5eabbf805bb3; mp_a0452663eb7abb7dfa9c94007ebb0090_mixpanel=%7B%22distinct_id%22%3A%20%2253ed9ffa4a65662e37000000%22%2C%22%24initial_referrer%22%3A%20%22http%3A%2F%2Fp.dev-wovn.io%3A8080%2Fhttp%3A%2F%2Fdev-wovn.io%3A3000%22%2C%22%24initial_referring_domain%22%3A%20%22p.dev-wovn.io%3A8080%22%2C%22__mps%22%3A%20%7B%7D%2C%22__mpso%22%3A%20%7B%7D%2C%22__mpa%22%3A%20%7B%7D%2C%22__mpu%22%3A%20%7B%7D%2C%22__mpap%22%3A%20%5B%5D%7D'
     env['HTTP_ACCEPT_LANGUAGE'] = 'ja,en-US;q=0.8,en;q=0.6'
+    env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36'
     env['ORIGINAL_FULLPATH'] = '/dashboard?param=val&hey=you'
     # env['HTTP_REFERER'] =
     env['REQUEST_PATH'] = '/dashboard'

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.3.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Wovn Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2022-02-16 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
@@ -418,8 +412,16 @@ files:
 - README.ja.md
 - README.md
 - Rakefile
+- build.sh
 - docker/docker-compose.yml
+- docker/nginx/Dockerfile
+- docker/nginx/README.md
+- docker/nginx/build.sh
+- docker/nginx/scripts/configure_sshd.sh
+- docker/nginx/scripts/startup.sh
+- docker/nginx/wovnrb.conf
 - docker/rails/Dockerfile
+- docker/rails/Dockerfile.ECS
 - docker/rails/TestSite/.browserslistrc
 - docker/rails/TestSite/.gitignore
 - docker/rails/TestSite/Gemfile
@@ -506,6 +508,7 @@ files:
 - docker/rails/TestSite/public/testpage.html
 - docker/rails/TestSite/public/wovn_index.html
 - docker/rails/TestSite/start.sh
+- docker/rails/TestSite/start_rails.sh
 - docker/rails/TestSite/storage/.keep
 - docker/rails/TestSite/test/application_system_test_case.rb
 - docker/rails/TestSite/test/channels/application_cable/connection_test.rb
@@ -521,6 +524,10 @@ files:
 - docker/rails/TestSite/test/system/.keep
 - docker/rails/TestSite/test/test_helper.rb
 - docker/rails/TestSite/yarn.lock
+- docker/scripts/jenkins/build.sh
+- docker/scripts/jenkins/tag_and_push_image.sh
+- docker/scripts/jenkins/taskdef.json
+- docker/scripts/jenkins/taskdef.json.bak
 - lib/wovnrb.rb
 - lib/wovnrb/api_translator.rb
 - lib/wovnrb/headers.rb
@@ -530,9 +537,11 @@ files:
 - lib/wovnrb/services/glob.rb
 - lib/wovnrb/services/html_converter.rb
 - lib/wovnrb/services/html_replace_marker.rb
+- lib/wovnrb/services/url.rb
 - lib/wovnrb/services/wovn_logger.rb
 - lib/wovnrb/settings.rb
 - lib/wovnrb/store.rb
+- lib/wovnrb/url_language_switcher.rb
 - lib/wovnrb/version.rb
 - makefile
 - test/fixtures/html/test.html
@@ -543,15 +552,18 @@ files:
 - test/lib/services/glob_test.rb
 - test/lib/services/html_converter_test.rb
 - test/lib/services/html_replace_marker_test.rb
+- test/lib/services/url_test.rb
 - test/lib/services/wovn_logger_test.rb
 - test/lib/store_test.rb
+- test/lib/url_language_switcher_test.rb
 - test/lib/wovnrb_test.rb
 - test/test_helper.rb
 - wovnrb.gemspec
 homepage: https://wovn.io
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -567,7 +579,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Gem for WOVN.io
@@ -580,7 +592,9 @@ test_files:
 - test/lib/services/glob_test.rb
 - test/lib/services/html_converter_test.rb
 - test/lib/services/html_replace_marker_test.rb
+- test/lib/services/url_test.rb
 - test/lib/services/wovn_logger_test.rb
 - test/lib/store_test.rb
+- test/lib/url_language_switcher_test.rb
 - test/lib/wovnrb_test.rb
 - test/test_helper.rb