wovnrb 3.10.3 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a84546815e1636edb448a8c2f323b6edbf663a908000b5ecfd69b9a72ff14bf9
-  data.tar.gz: 4b77c5b14ee1db412c8c493be90a36bbb3ff4c541622d1c0f2797fca752fcbb4
+  metadata.gz: 363a963f8aa66c621e8a5a9c74e539ab34aa5b691db5b13c184d10b2a9d3bdce
+  data.tar.gz: 6f3aad667b5a978fbb3c4df193ec25eeb567193d7b8be46ca32b4abb2d4f3257
 SHA512:
-  metadata.gz: 444e6126427329e19fb1d327a8719ba7067c1b308664ee877408e5ce00520228f267e37e803ec99098b6c90ab75bf27545a33393ad1497f0c6a240c60c06a5ba
-  data.tar.gz: fb8922dfa76c4a303e37f16e12a6c172ab9066e406bbe986bfb2aaab4b9954366f2f89cf051934405892e64a5e71b7ee3315c1c288f3b04a6922dfc01cf240bb
+  metadata.gz: d9b16d7c6fe502f7d4669f32360a7f1827ffb6b889fffc609ad1aed1a577209e56737916ced62d891116f3dcd747f69ba136850a1ca52d5aaf06e2dd30e3c3c4
+  data.tar.gz: 633ef1dbc42ed6943b789133f0574e758bda8867101392dae272353d97d79cb308c37108740aa7aa0499ef48acfbfc59244e1c47f91c69f7781a53c96e1d93a8

data/lib/wovnrb/store.rb

@@ -41,7 +41,8 @@ module Wovnrb
         'compress_api_requests' => true,
         'translate_canonical_tag' => true,
         'custom_domain_langs' => {},
-        'insert_hreflangs' => true
+        'insert_hreflangs' => true,
+        'use_cookie_lang' => false
       )
     end
 

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '3.10.3'.freeze
+  VERSION = '3.11.1'.freeze
 end

data/lib/wovnrb.rb

@@ -25,7 +25,8 @@ module Wovnrb
 
     def call(env)
       # disabled by previous Rack middleware
-      return @app.call(env) if Rack::Request.new(env).params['wovn_disable'] == true
+      request = Rack::Request.new(env)
+      return @app.call(env) if request.params['wovn_disable'] == true
 
       @store.settings.clear_dynamic_settings!
       return @app.call(env) unless Store.instance.valid_settings?
@@ -35,8 +36,17 @@ module Wovnrb
       default_lang = @store.settings['default_lang']
       return @app.call(env) if @store.settings['test_mode'] && @store.settings['test_url'] != headers.url
 
+      cookie_lang = request.cookies['wovn_selected_lang']
+      request_lang = headers.lang_code
+      is_get_request = request.get?
+
+      if @store.settings['use_cookie_lang'] && cookie_lang.present? && request_lang != cookie_lang && request_lang == @store.default_lang && is_get_request
+        redirect_headers = headers.redirect(cookie_lang)
+        return [302, redirect_headers, ['']]
+      end
+
       # redirect if the path is set to the default language (for SEO purposes)
-      if explicit_default_lang?(headers)
+      if explicit_default_lang?(headers) && is_get_request
         redirect_headers = headers.redirect(default_lang)
         return [307, redirect_headers, ['']]
       end
@@ -53,8 +63,6 @@ module Wovnrb
       # disabled by next Rack middleware
       return output(headers, status, res_headers, body) unless res_headers['Content-Type']&.include?('html')
 
-      request = Rack::Request.new(env)
-
       return output(headers, status, res_headers, body) if request.params['wovn_disable'] == true
 
       @store.settings.update_dynamic_settings!(request.params)

data/test/lib/wovnrb_test.rb

@@ -239,6 +239,7 @@ HTML
       'rack.request.form_input' => '',
       'rack.request.form_hash' => {},
       'rack.request.form_pairs' => [],
+      'rack.request.cookie_hash' => {},
       'HTTP_HOST' => 'test.com',
       'REQUEST_URI' => '/en/ignored',
       'PATH_INFO' => '/en/ignored'
@@ -247,6 +248,140 @@ HTML
     assert_call_affects_env(settings, env, mock_api: false, affected: false)
   end
 
+  def test_call__with_use_cookie_lang_true__cookie_lang_is_target_lang__should_redirect
+    settings = {
+      'project_token' => '123456',
+      'url_pattern' => 'path',
+      'default_lang' => 'ja',
+      'supported_langs' => %w[ja en],
+      'use_cookie_lang' => true
+    }
+    env = Wovnrb.get_env(
+      {
+        'url' => 'http://test.com/foo',
+        'HTTP_COOKIE' => 'wovn_selected_lang=en'
+      }
+    )
+
+    sut = Wovnrb::Interceptor.new(get_app, settings)
+    status, res_headers, _body = sut.call(env)
+
+    assert_equal(302, status)
+    assert_equal('http://test.com/en/foo', res_headers['location'])
+  end
+
+  def test_call__with_use_cookie_lang_true__request_method_is_post__should_not_redirect
+    settings = {
+      'project_token' => '123456',
+      'url_pattern' => 'path',
+      'default_lang' => 'ja',
+      'supported_langs' => %w[ja en],
+      'use_cookie_lang' => true
+    }
+    env = Wovnrb.get_env(
+      {
+        'url' => 'http://test.com/foo',
+        'HTTP_COOKIE' => 'wovn_selected_lang=en',
+        'REQUEST_METHOD' => 'POST'
+      }
+    )
+
+    sut = Wovnrb::Interceptor.new(get_app, settings)
+    status, res_headers, _body = sut.call(env)
+
+    assert_equal(200, status)
+    assert_nil(res_headers['location'])
+  end
+
+  def test_call__with_use_cookie_lang_true__cookie_lang_is_default_lang__should_not_redirect
+    settings = {
+      'project_token' => '123456',
+      'url_pattern' => 'path',
+      'default_lang' => 'ja',
+      'supported_langs' => %w[ja en],
+      'use_cookie_lang' => true
+    }
+    env = Wovnrb.get_env(
+      {
+        'url' => 'http://test.com/foo',
+        'HTTP_COOKIE' => 'wovn_selected_lang=ja'
+      }
+    )
+
+    sut = Wovnrb::Interceptor.new(get_app, settings)
+    status, res_headers, _body = sut.call(env)
+
+    assert_equal(200, status)
+    assert_nil(res_headers['location'])
+  end
+
+  def test_call__with_use_cookie_lang_true__cookie_lang_is_different_target_lang__should_not_redirect
+    settings = {
+      'project_token' => '123456',
+      'url_pattern' => 'path',
+      'default_lang' => 'ja',
+      'supported_langs' => %w[ja en fr],
+      'use_cookie_lang' => true
+    }
+    env = Wovnrb.get_env(
+      {
+        'url' => 'http://test.com/en/foo',
+        'HTTP_COOKIE' => 'wovn_selected_lang=fr'
+      }
+    )
+
+    mock_translation_api_response('', '')
+    sut = Wovnrb::Interceptor.new(get_app, settings)
+    status, res_headers, _body = sut.call(env)
+
+    assert_equal(200, status)
+    assert_nil(res_headers['location'])
+  end
+
+  def test_call__with_use_cookie_lang_true__cookie_lang_is_empty__should_not_redirect
+    settings = {
+      'project_token' => '123456',
+      'url_pattern' => 'path',
+      'default_lang' => 'ja',
+      'supported_langs' => %w[ja en],
+      'use_cookie_lang' => true
+    }
+    env = Wovnrb.get_env(
+      {
+        'url' => 'http://test.com/foo',
+        'HTTP_COOKIE' => ''
+      }
+    )
+
+    sut = Wovnrb::Interceptor.new(get_app, settings)
+    status, res_headers, _body = sut.call(env)
+
+    assert_equal(200, status)
+    assert_nil(res_headers['location'])
+  end
+
+  def test_call__with_use_cookie_lang_false__should_not_redirect
+    settings = {
+      'project_token' => '123456',
+      'url_pattern' => 'path',
+      'default_lang' => 'ja',
+      'supported_langs' => %w[ja en],
+      'use_cookie_lang' => false
+    }
+    env = Wovnrb.get_env(
+      {
+        'url' => 'http://test.com/foo',
+        'HTTP_COOKIE' => 'wovn_selected_lang=en'
+      }
+    )
+
+    sut = Wovnrb::Interceptor.new(get_app, settings)
+    status, res_headers, _body = sut.call(env)
+
+    assert_equal(200, status)
+    assert_nil(res_headers['location'])
+  end
+
   private
 
   def assert_call_affects_env(settings, env, mock_api:, affected:)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 3.10.3
+  version: 3.11.1
 platform: ruby
 authors:
 - Wovn Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport