wovnrb 3.8.0 → 3.10.0

data/test/lib/custom_domain/custom_domain_langs_test.rb

@@ -0,0 +1,82 @@
+require 'test_helper'
+require 'wovnrb/custom_domain/custom_domain_langs'
+
+module Wovnrb
+  class CustomDomainLangsTest < WovnMiniTest
+    def setup
+      custom_domain_langs_setting = {
+        'fr' => { 'url' => 'foo.com/' },
+        'ja' => { 'url' => 'foo.com/path', 'source' => 'japan.foo.com/' },
+        'zh-CHS' => { 'url' => 'foo.com/dir/path' },
+        'en' => { 'url' => 'english.foo.com/', 'source' => 'global.foo.com/' }
+      }
+      @custom_domain_langs = CustomDomainLangs.new(custom_domain_langs_setting)
+    end
+
+    def test_get_custom_domain_lang_by_lang
+      assert_nil(@custom_domain_langs.custom_domain_lang_by_lang('unknown'))
+
+      assert_equal('fr', lang_for(@custom_domain_langs.custom_domain_lang_by_lang('fr')))
+      assert_equal('ja', lang_for(@custom_domain_langs.custom_domain_lang_by_lang('ja')))
+      assert_equal('zh-CHS', lang_for(@custom_domain_langs.custom_domain_lang_by_lang('zh-CHS')))
+      assert_equal('en', lang_for(@custom_domain_langs.custom_domain_lang_by_lang('en')))
+    end
+
+    def test_get_custom_domain_lang_by_url
+      assert_nil(@custom_domain_langs.custom_domain_lang_by_url('http://otherdomain.com'))
+      assert_nil(@custom_domain_langs.custom_domain_lang_by_url('http://otherdomain.com/path/test.html'))
+      assert_nil(@custom_domain_langs.custom_domain_lang_by_url('http://otherdomain.com/dir/path/test.html'))
+
+      assert_equal('fr', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com')))
+      assert_equal('fr', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/')))
+      assert_equal('fr', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/test.html')))
+
+      assert_equal('ja', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/path')))
+      assert_equal('ja', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/path/')))
+      assert_equal('ja', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/path/dir')))
+      assert_equal('ja', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/path/test.html')))
+
+      assert_equal('zh-CHS', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/dir/path')))
+      assert_equal('zh-CHS', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/dir/path/')))
+      assert_equal('zh-CHS', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/dir/path/dir')))
+      assert_equal('zh-CHS', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://foo.com/dir/path/test.html')))
+
+      assert_equal('en', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://english.foo.com/dir/path')))
+      assert_equal('en', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://english.foo.com/dir/path/')))
+      assert_equal('en', lang_for(@custom_domain_langs.custom_domain_lang_by_url('http://english.foo.com/dir/path/test.html')))
+    end
+
+    def test_get_custom_domain_lang_by_url_with_nested_paths
+      custom_domain_langs_setting = {
+        'ja' => { 'url' => 'foo.com/path' },
+        'en' => { 'url' => 'foo.com/path/en' },
+        'fr' => { 'url' => 'foo.com/path/fr' }
+      }
+      custom_domain_langs = CustomDomainLangs.new(custom_domain_langs_setting)
+      assert_equal('ja', lang_for(custom_domain_langs.custom_domain_lang_by_url('http://foo.com/path')))
+      assert_equal('en', lang_for(custom_domain_langs.custom_domain_lang_by_url('http://foo.com/path/en')))
+      assert_equal('fr', lang_for(custom_domain_langs.custom_domain_lang_by_url('http://foo.com/path/fr')))
+    end
+
+    def test_to_html_swapper_hash
+      expected = {
+        'foo.com' => 'fr',
+        'foo.com/path' => 'ja',
+        'foo.com/dir/path' => 'zh-CHS',
+        'english.foo.com' => 'en'
+      }
+
+      assert(hash_equals(expected, @custom_domain_langs.to_html_swapper_hash))
+    end
+
+    private
+
+    def lang_for(custom_domain_lang)
+      custom_domain_lang.lang
+    end
+
+    def hash_equals(orig_hash, test_hash)
+      (orig_hash <=> test_hash) == 0
+    end
+  end
+end

data/test/lib/headers_test.rb

@@ -55,7 +55,7 @@ module Wovnrb
       {
         'env' => { 'url' => 'https://wovn.io/en' },
         'setting' => { 'url_pattern' => 'path' },
-        'name' => 'test_initialize_with_path_language',
+        'name' => 'test_initialize_with_url_language',
         'expected' => {
           'url' => 'wovn.io/'
         }
@@ -71,7 +71,7 @@ module Wovnrb
       {
         'env' => { 'url' => 'https://wovn.io/en/?wovn=zh-CHS' },
         'setting' => { 'url_pattern' => 'path' },
-        'name' => 'test_initialize_with_path_language_with_query',
+        'name' => 'test_initialize_with_url_language_with_query',
         'expected' => {
           'url' => 'wovn.io/?wovn=zh-CHS'
         }
@@ -87,7 +87,7 @@ module Wovnrb
       {
         'env' => { 'url' => 'https://wovn.io/en?wovn=zh-CHS' },
         'setting' => { 'url_pattern' => 'path' },
-        'name' => 'test_initialize_with_path_language_with_query_without_slash',
+        'name' => 'test_initialize_with_url_language_with_query_without_slash',
         'expected' => {
           'url' => 'wovn.io/?wovn=zh-CHS'
         }
@@ -177,7 +177,7 @@ module Wovnrb
       {
         'env' => { 'REQUEST_URI' => 'http://page.com/ja/test/' },
         'setting' => { 'url_pattern' => 'path', 'url_pattern_reg' => '/(?<lang>[^/.?]+)' },
-        'name' => 'test_pathname_with_trailing_slash_if_present_with_path_lang_when_trailing_slash_is_present',
+        'name' => 'test_pathname_with_trailing_slash_if_present_with_url_language_when_trailing_slash_is_present',
         'expected' => {
           'pathname_with_trailing_slash_if_present' => '/test/'
         }
@@ -308,7 +308,7 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('ja', request_out_env['wovnrb.target_lang'])
     end
 
@@ -321,7 +321,7 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('ja', request_out_env['wovnrb.target_lang'])
     end
 
@@ -338,7 +338,7 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('ja', request_out_env['wovnrb.target_lang'])
     end
 
@@ -355,7 +355,7 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('ja.wovn.io', request_out_env['HTTP_X_FORWARDED_HOST'])
     end
 
@@ -373,7 +373,7 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('wovn.io', request_out_env['HTTP_X_FORWARDED_HOST'])
     end
 
@@ -391,7 +391,7 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('http://wovn.io/test', request_out_env['HTTP_REFERER'])
     end
 
@@ -405,7 +405,7 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('http://wovn.io/test', request_out_env['HTTP_REFERER'])
     end
 
@@ -424,10 +424,32 @@ module Wovnrb
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
 
-      request_out_env = header.request_out('ja')
+      request_out_env = header.request_out
       assert_equal('http://wovn.io/test', request_out_env['HTTP_REFERER'])
     end
 
+    def test_request_out_custom_domain
+      settings = Wovnrb.get_settings({
+                                       'url_pattern' => 'custom_domain',
+                                       'custom_domain_langs' => {
+                                         'en' => { 'url' => 'wovn.io' },
+                                         'ja' => { 'url' => 'ja.wovn.io' }
+                                       }
+                                     })
+      store = Wovnrb.get_store(settings)
+      env = Wovnrb.get_env({
+                             'HTTP_REFERER' => 'ja.wovn.io',
+                             'SERVER_NAME' => 'ja.wovn.io',
+                             'REQUEST_URI' => '/dummy'
+                           })
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+      header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
+
+      request_out_env = header.request_out
+      assert_equal('wovn.io', request_out_env['HTTP_REFERER'])
+      assert_equal('wovn.io', request_out_env['SERVER_NAME'])
+    end
+
     def test_out_should_add_lang_code_to_redirection
       settings = Wovnrb.get_settings({
                                        'default_lang' => 'en',
@@ -485,7 +507,7 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.request_out('ja')
+      headers = header.request_out
       assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
       headers['Location'] = headers['HTTP_REFERER']
       assert_equal('http://staging-ja.wovn.io/test', header.out(headers)['Location'])
@@ -504,7 +526,7 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.request_out(header.lang_code)
+      headers = header.request_out
       assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
       headers['Location'] = headers['HTTP_REFERER']
       assert_equal('http://wovn.io/test', header.out(headers)['Location'])
@@ -523,7 +545,7 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.request_out(header.lang_code)
+      headers = header.request_out
       assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
       headers['Location'] = headers['HTTP_REFERER']
       assert_equal('http://wovn.io/test', header.out(headers)['Location'])
@@ -542,7 +564,7 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.request_out(header.lang_code)
+      headers = header.request_out
       assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
       headers['Location'] = headers['HTTP_REFERER']
       assert_equal('http://wovn.io/test', header.out(headers)['Location'])
@@ -561,7 +583,7 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.out(header.request_out('ja'))
+      headers = header.out(header.request_out)
       assert_equal('ja', headers['wovnrb.target_lang'])
     end
 
@@ -574,7 +596,7 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.out(header.request_out('ja'))
+      headers = header.out(header.request_out)
       assert_equal('ja', headers['wovnrb.target_lang'])
     end
 
@@ -590,7 +612,7 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.out(header.request_out('ja'))
+      headers = header.out(header.request_out)
       assert_equal('ja', headers['wovnrb.target_lang'])
     end
 
@@ -607,10 +629,102 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      headers = header.out(header.request_out('ja'))
+      headers = header.out(header.request_out)
       assert_equal('ja', headers['wovnrb.target_lang'])
     end
 
+    def test_out_with_custom_domain
+      settings = Wovnrb.get_settings({
+                                       'default_lang' => 'en',
+                                       'url_pattern' => 'custom_domain',
+                                       'custom_domain_langs' => {
+                                         'en' => { 'url' => 'wovn.io' },
+                                         'ja' => { 'url' => 'wovn.io/ja' }
+                                       }
+                                     })
+      store = Wovnrb.get_store(settings)
+      env = Wovnrb.get_env({
+                             'SERVER_NAME' => 'wovn.io',
+                             'REQUEST_URI' => '/ja/test',
+                             'HTTP_REFERER' => 'http://wovn.io/ja/test'
+                           })
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+      header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
+      headers = {
+        'Location' => 'http://wovn.io/'
+      }
+      assert_equal('http://wovn.io/ja/', header.out(headers)['Location'])
+    end
+
+    def test_out_with_custom_domain__absolute_url_redirect
+      settings = Wovnrb.get_settings({
+                                       'default_lang' => 'en',
+                                       'url_pattern' => 'custom_domain',
+                                       'custom_domain_langs' => {
+                                         'en' => { 'url' => 'wovn.io' },
+                                         'ja' => { 'url' => 'wovn.io/ja' }
+                                       }
+                                     })
+      store = Wovnrb.get_store(settings)
+      env = Wovnrb.get_env({
+                             'SERVER_NAME' => 'wovn.io',
+                             'REQUEST_URI' => '/ja/test',
+                             'HTTP_REFERER' => 'http://wovn.io/ja/test'
+                           })
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+      header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
+      headers = {
+        'Location' => 'http://wovn.io/foo'
+      }
+      assert_equal('http://wovn.io/ja/foo', header.out(headers)['Location'])
+    end
+
+    def test_out_with_custom_domain__absolute_path_redirect
+      settings = Wovnrb.get_settings({
+                                       'default_lang' => 'en',
+                                       'url_pattern' => 'custom_domain',
+                                       'custom_domain_langs' => {
+                                         'en' => { 'url' => 'wovn.io' },
+                                         'ja' => { 'url' => 'wovn.io/ja' }
+                                       }
+                                     })
+      store = Wovnrb.get_store(settings)
+      env = Wovnrb.get_env({
+                             'SERVER_NAME' => 'wovn.io',
+                             'REQUEST_URI' => '/ja/test',
+                             'HTTP_REFERER' => 'http://wovn.io/ja/test'
+                           })
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+      header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
+      headers = {
+        'Location' => '/foo'
+      }
+      assert_equal('http://wovn.io/ja/foo', header.out(headers)['Location'])
+    end
+
+    def test_out_with_custom_domain__relative_url_redirect
+      settings = Wovnrb.get_settings({
+                                       'default_lang' => 'en',
+                                       'url_pattern' => 'custom_domain',
+                                       'custom_domain_langs' => {
+                                         'en' => { 'url' => 'wovn.io' },
+                                         'ja' => { 'url' => 'wovn.io/ja' }
+                                       }
+                                     })
+      store = Wovnrb.get_store(settings)
+      env = Wovnrb.get_env({
+                             'SERVER_NAME' => 'wovn.io',
+                             'REQUEST_URI' => '/ja/test',
+                             'HTTP_REFERER' => 'http://wovn.io/ja/test'
+                           })
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+      header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
+      headers = {
+        'Location' => 'foo/page.html'
+      }
+      assert_equal('http://wovn.io/ja/foo/page.html', header.out(headers)['Location'])
+    end
+
     def test_get_settings_valid
       # TODO: check if Wovnrb.get_settings is valid (store.rb, valid_settings)
       # s = Wovnrb::Store.new
@@ -627,42 +741,42 @@ module Wovnrb
         name = "test path lang subdomain #{lang}"
         env = { 'url' => "https://#{subdomain}.wovn.io" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang subdomain #{lang} with slash"
         env = { 'url' => "https://#{subdomain}.wovn.io/" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang subdomain #{lang} with port"
         env = { 'url' => "https://#{subdomain}.wovn.io:1234" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang subdomain #{lang} with slash and port"
         env = { 'url' => "https://#{subdomain}.wovn.io:1234/" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang subdomain #{lang} insecure"
         env = { 'url' => "http://#{subdomain}.wovn.io" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang subdomain #{lang} insecure with slash"
         env = { 'url' => "http://#{subdomain}.wovn.io/" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang subdomain #{lang} insecure with port"
         env = { 'url' => "http://#{subdomain}.wovn.io:1234" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang subdomain #{lang} insecure with port and slash"
         env = { 'url' => "http://#{subdomain}.wovn.io:1234/" }
         settings = { 'url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+)\.' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
       end
     end
 
@@ -672,42 +786,42 @@ module Wovnrb
         name = "test path lang query #{lang}"
         env = { 'url' => "https://wovn.io?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang query #{lang} with slash"
         env = { 'url' => "https://wovn.io/?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang query #{lang} with port"
         env = { 'url' => "https://wovn.io:1234?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang query #{lang} with port and slash"
         env = { 'url' => "https://wovn.io:1234/?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang query #{lang} insecure"
         env = { 'url' => "http://wovn.io?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang query #{lang} with slash insecure"
         env = { 'url' => "http://wovn.io/?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang query #{lang} with port insecure"
         env = { 'url' => "http://wovn.io:1234?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang query #{lang} with port and slash insecure"
         env = { 'url' => "http://wovn.io:1234/?wovn=#{query}" }
         settings = { 'url_pattern' => 'query', 'url_pattern_reg' => '((\?.*&)|\?)wovn=(?<lang>[^&]+)(&|$)' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
       end
     end
 
@@ -717,46 +831,46 @@ module Wovnrb
         name = "test path lang path #{lang}"
         env = { 'url' => "https://wovn.io/#{query}" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang path #{lang} with slash"
         env = { 'url' => "https://wovn.io/#{query}/" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang path #{lang} with port"
         env = { 'url' => "https://wovn.io:1234/#{query}" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang path #{lang} with port and slash"
         env = { 'url' => "https://wovn.io:1234/#{query}/" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang path #{lang} insecure"
         env = { 'url' => "http://wovn.io/#{query}" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang path #{lang} with slash insecure"
         env = { 'url' => "http://wovn.io/#{query}/" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang path #{lang} with port insecure"
         env = { 'url' => "http://wovn.io:1234/#{query}" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
 
         name = "test path lang path #{lang} with port and slash insecure"
         env = { 'url' => "http://wovn.io:1234/#{query}/" }
         settings = { 'url_pattern' => 'path' }
-        utility_universal_assertion(env, settings, { 'path_lang' => lang }, name)
+        utility_universal_assertion(env, settings, { 'url_language' => lang }, name)
       end
     end
 
-    def test_path_lang_sudomain_with_use_proxy_false
+    def test_url_language_sudomain_with_use_proxy_false
       settings = Wovnrb.get_settings({
                                        'url_pattern' => 'subdomain',
                                        'url_pattern_reg' => '^(?<lang>[^.]+)\.'
@@ -768,10 +882,10 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      assert_equal('', header.path_lang)
+      assert_equal('', header.url_language)
     end
 
-    def test_path_lang_sudomain_with_use_proxy_true
+    def test_url_language_sudomain_with_use_proxy_true
       settings = Wovnrb.get_settings({
                                        'url_pattern' => 'subdomain',
                                        'url_pattern_reg' => '^(?<lang>[^.]+)\.',
@@ -784,7 +898,54 @@ module Wovnrb
                            })
       url_lang_switcher = UrlLanguageSwitcher.new(store)
       header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
-      assert_equal('zh-CHT', header.path_lang)
+      assert_equal('zh-CHT', header.url_language)
+    end
+
+    def test_url_language_with_custom_domain
+      custom_domain_langs = {
+        'en' => { 'url' => 'my-site.com' },
+        'en-US' => { 'url' => 'en-us.my-site.com' },
+        'ja' => { 'url' => 'my-site.com/ja' },
+        'zh-CHS' => { 'url' => 'my-site.com/zh/chs' },
+        'zh-Hant-HK' => { 'url' => 'zh-hant-hk.com/zh' }
+      }
+      settings = {
+        'url_pattern' => 'custom_domain',
+        'custom_domain_langs' => custom_domain_langs
+      }
+      test_cases = [
+        [{ 'SERVER_NAME' => 'my-site.com', 'REQUEST_URI' => '/' }, 'en'],
+        [{ 'SERVER_NAME' => 'en-us.my-site.com', 'REQUEST_URI' => '/' }, 'en-US'],
+        [{ 'SERVER_NAME' => 'my-site.com', 'REQUEST_URI' => '/ja' }, 'ja'],
+        [{ 'SERVER_NAME' => 'my-site.com', 'REQUEST_URI' => '/zh/chs' }, 'zh-CHS'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh' }, 'zh-Hant-HK'],
+
+        # request uri pattern
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh' }, 'zh-Hant-HK'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh/' }, 'zh-Hant-HK'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh/index.html' }, 'zh-Hant-HK'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh/dir' }, 'zh-Hant-HK'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh/dir/' }, 'zh-Hant-HK'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh/dir/index.html' }, 'zh-Hant-HK'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh?query=1' }, 'zh-Hant-HK'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/zh#hash' }, 'zh-Hant-HK'],
+
+        # should be default lang
+        [{ 'SERVER_NAME' => 'my-site.com', 'REQUEST_URI' => '/japan' }, 'en'],
+        [{ 'SERVER_NAME' => 'my-site.com', 'REQUEST_URI' => '/' }, 'en'],
+        [{ 'SERVER_NAME' => 'zh-hant-hk.com', 'REQUEST_URI' => '/' }, '']
+      ]
+
+      test_cases.each do |test_case|
+        env_hash, expected_lang_code = test_case
+        settings = Wovnrb.get_settings(settings)
+        store = Wovnrb.get_store(settings)
+        env = Wovnrb.get_env(env_hash)
+        url_lang_switcher = UrlLanguageSwitcher.new(store)
+        header = Wovnrb::Headers.new(env, settings, url_lang_switcher)
+
+        assert_equal(expected_lang_code, header.url_language)
+      end
     end
   end
 end