wovnrb 3.8.0 → 3.9.0

data/lib/wovnrb/store.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'uri'
 require 'cgi'
 require 'singleton'
+require 'wovnrb/custom_domain/custom_domain_langs'
 require 'wovnrb/services/wovn_logger'
 require 'wovnrb/services/glob'
 require 'wovnrb/settings'
@@ -38,7 +39,8 @@ module Wovnrb
         'widget_url' => 'https://j.wovn.io/1',
         'wovn_dev_mode' => false,
         'compress_api_requests' => true,
-        'translate_canonical_tag' => true
+        'translate_canonical_tag' => true,
+        'custom_domain_langs' => {}
       )
     end
 
@@ -51,6 +53,7 @@ module Wovnrb
     # @return [nil]
     def reset
       @settings = Store.default_settings
+      @custom_domain_langs = nil
       # When Store is initialized, the Rails.configuration object is not yet initialized
       @config_loaded = false
     end
@@ -152,6 +155,8 @@ module Wovnrb
         @settings['url_pattern_reg'] = "((\\?.*&)|\\?)#{@settings['lang_param_name']}=(?<lang>[^&]+)(&|$)"
       when 'subdomain'
         @settings['url_pattern_reg'] = '^(?<lang>[^.]+)\.'
+      when 'custom_domain'
+        # Do not use regex
       end
 
       @settings['test_mode'] = !(@settings['test_mode'] != true || @settings['test_mode'] != 'on')
@@ -200,6 +205,10 @@ module Wovnrb
       @settings['url_pattern']
     end
 
+    def custom_domain_langs
+      @custom_domain_langs ||= CustomDomainLangs.new(@settings['custom_domain_langs'])
+    end
+
     private
 
     def stringify_keys!(hash)

data/lib/wovnrb/url_language_switcher.rb

@@ -1,3 +1,4 @@
+require 'wovnrb/custom_domain/custom_domain_lang_url_handler'
 require 'wovnrb/services/url'
 
 module Wovnrb
@@ -28,10 +29,11 @@ module Wovnrb
 
     # Removes language code from a URI component (path, hostname, query etc), and returns it.
     #
-    # @param uri  [String] original URI component
-    # @param lang [String] language code
-    # @return     [String] removed URI
-    def remove_lang_from_uri_component(uri, lang)
+    # @param uri     [String] original URI component
+    # @param lang    [String] language code
+    # @param headers [Header] headers
+    # @return        [String] removed URI
+    def remove_lang_from_uri_component(uri, lang, headers = nil)
       lang_code = @store.settings['custom_lang_aliases'][lang] || lang
 
       return uri if lang_code.blank?
@@ -49,6 +51,25 @@ module Wovnrb
         # (/|$)         3: path or end-of-string
         lang_code_pattern = %r{^(.*://|//)?([^/]*/)?#{lang_code}(/|$)}
         uri.sub(lang_code_pattern, '\1\2')
+      when 'custom_domain'
+        custom_domain_langs = @store.custom_domain_langs
+        custom_domain_lang_to_remove = custom_domain_langs.custom_domain_lang_by_lang(lang_code)
+        default_custom_domain_lang = custom_domain_langs.custom_domain_lang_by_lang(@store.default_lang)
+        new_uri = uri
+        if Wovnrb::URL.absolute_url?(uri)
+          new_uri = CustomDomainLangUrlHandler.change_to_new_custom_domain_lang(uri, custom_domain_lang_to_remove, default_custom_domain_lang)
+        elsif Wovnrb::URL.absolute_path?(uri)
+          absolute_url = "#{headers.protocol}://#{headers.unmasked_host}#{uri}"
+          absolute_url_with_lang = CustomDomainLangUrlHandler.change_to_new_custom_domain_lang(absolute_url, custom_domain_lang_to_remove, default_custom_domain_lang)
+          segments = make_segments_from_absolute_url(absolute_url_with_lang)
+          new_uri = segments['others']
+        elsif uri == custom_domain_lang_to_remove.host
+          absolute_url = "#{headers.protocol}://#{uri}#{headers.unmasked_pathname}"
+          absolute_url_with_lang = CustomDomainLangUrlHandler.change_to_new_custom_domain_lang(absolute_url, custom_domain_lang_to_remove, default_custom_domain_lang)
+          segments = make_segments_from_absolute_url(absolute_url_with_lang)
+          new_uri = segments['host']
+        end
+        new_uri
       else
         raise RuntimeError("Invalid URL pattern: #{@store.settings['url_pattern']}")
       end
@@ -80,6 +101,8 @@ module Wovnrb
                  end
                when 'query'
                  add_query_lang_code(href, code_to_add)
+               when 'custom_domain'
+                 CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url(href, code_to_add, @store.custom_domain_langs)
                else # path
                  href_uri.path = add_lang_code_for_path(href_uri.path, code_to_add, headers)
                  href_uri.to_s
@@ -105,6 +128,9 @@ module Wovnrb
         "#{headers.protocol}://#{code_to_add.downcase}.#{headers.host}#{abs_path}"
       when 'query'
         add_query_lang_code(href, code_to_add)
+      when 'custom_domain'
+        absolute_url = "#{headers.protocol}://#{headers.host}#{abs_path}"
+        CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url(absolute_url, code_to_add, @store.custom_domain_langs)
       else # path
         add_lang_code_for_path(href, code_to_add, headers)
       end
@@ -148,5 +174,19 @@ module Wovnrb
     def build_lang_path(lang_code)
       lang_code.blank? ? '' : URL.prepend_path_slash(lang_code)
     end
+
+    def make_segments_from_absolute_url(absolute_uri)
+      # 1: schema (optional) like https://
+      # 2: host (optional) like wovn.io
+      # 3: path with query or hash
+      regex = %r{^(.*://|//)?([^/?]*)?((?:/|\?|#).*)?$}
+      matches = regex.match(absolute_uri)
+
+      {
+        'schema' => matches[1],
+        'host' => matches[2],
+        'others' => matches[3]
+      }.transform_values(&:to_s)
+    end
   end
 end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '3.8.0'.freeze
+  VERSION = '3.9.0'.freeze
 end

data/lib/wovnrb.rb

@@ -36,7 +36,7 @@ module Wovnrb
       return @app.call(env) if @store.settings['test_mode'] && @store.settings['test_url'] != headers.url
 
       # redirect if the path is set to the default language (for SEO purposes)
-      if headers.path_lang == default_lang
+      if explicit_default_lang?(headers)
         redirect_headers = headers.redirect(default_lang)
         return [307, redirect_headers, ['']]
       end
@@ -51,7 +51,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 /html/.match?(res_headers['Content-Type'])
+      return output(headers, status, res_headers, body) unless res_headers['Content-Type']&.include?('html')
 
       request = Rack::Request.new(env)
 
@@ -129,5 +129,10 @@ module Wovnrb
 
       !!(html_attributes['amp'] || html_attributes["\u26A1"])
     end
+
+    def explicit_default_lang?(headers)
+      default_lang, url_pattern = @store.settings.values_at('default_lang', 'url_pattern')
+      default_lang == headers.url_language && url_pattern != 'custom_domain'
+    end
   end
 end

data/test/lib/custom_domain/custom_domain_lang_test.rb

@@ -0,0 +1,85 @@
+require 'test_helper'
+require 'wovnrb/custom_domain/custom_domain_lang'
+
+module Wovnrb
+  class CustomDomainLangTest < WovnMiniTest
+    def setup
+      @custom_domain_root_path = CustomDomainLang.new('foo.com', '/', 'fr')
+      @custom_domain_with_path_no_trailing_slash = CustomDomainLang.new('foo.com', '/path', 'fr')
+      @custom_domain_with_path_trailing_slash = CustomDomainLang.new('foo.com', '/path/', 'fr')
+      @custom_domain_path_encoded_spaces = CustomDomainLang.new('foo.com', '/dir%20path', 'fr')
+    end
+
+    def test_custom_domain_lang_params
+      assert_equal('foo.com', @custom_domain_root_path.host)
+      assert_equal('/', @custom_domain_root_path.path)
+      assert_equal('fr', @custom_domain_root_path.lang)
+      assert_equal('foo.com', @custom_domain_root_path.host_and_path_without_trailing_slash)
+
+      assert_equal('foo.com', @custom_domain_with_path_no_trailing_slash.host)
+      assert_equal('/path/', @custom_domain_with_path_no_trailing_slash.path)
+      assert_equal('fr', @custom_domain_with_path_no_trailing_slash.lang)
+      assert_equal('foo.com/path', @custom_domain_with_path_no_trailing_slash.host_and_path_without_trailing_slash)
+
+      assert_equal('foo.com', @custom_domain_with_path_trailing_slash.host)
+      assert_equal('/path/', @custom_domain_with_path_trailing_slash.path)
+      assert_equal('fr', @custom_domain_with_path_trailing_slash.lang)
+      assert_equal('foo.com/path', @custom_domain_with_path_trailing_slash.host_and_path_without_trailing_slash)
+
+      assert_equal('foo.com', @custom_domain_path_encoded_spaces.host)
+      assert_equal('/dir%20path/', @custom_domain_path_encoded_spaces.path)
+      assert_equal('fr', @custom_domain_path_encoded_spaces.lang)
+      assert_equal('foo.com/dir%20path', @custom_domain_path_encoded_spaces.host_and_path_without_trailing_slash)
+    end
+
+    def test_is_match_with_different_domain
+      refute(@custom_domain_root_path.match?(Addressable::URI.parse('http://otherdomain.com/other/test.html')))
+    end
+
+    def test_is_match_with_different_port_number_should_be_ignored
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com:3000/other/test.html')))
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com:80/other/test.html')))
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com/other/test.html')))
+    end
+
+    def test_is_match_with_domain_containing_substring_should_be_false
+      refute(@custom_domain_root_path.match?(Addressable::URI.parse('http://en.foo.com/other/test.html')))
+    end
+
+    def test_is_match_with_same_domain_should_be_true
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com/other/test.html')))
+    end
+
+    def test_is_match_with_same_domain_different_casing_should_be_true
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com/other/test.html')))
+    end
+
+    def test_is_match_with_path_starts_with_custom_path_should_be_true
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com')))
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com/')))
+      assert(@custom_domain_root_path.match?(Addressable::URI.parse('http://foo.com/other/test.html?foo=bar')))
+
+      assert(@custom_domain_with_path_no_trailing_slash.match?(Addressable::URI.parse('http://foo.com/path')))
+      assert(@custom_domain_with_path_no_trailing_slash.match?(Addressable::URI.parse('http://foo.com/path/')))
+      assert(@custom_domain_with_path_no_trailing_slash.match?(Addressable::URI.parse('http://foo.com/path/other/test.html?foo=bar')))
+
+      assert(@custom_domain_with_path_trailing_slash.match?(Addressable::URI.parse('http://foo.com/path')))
+      assert(@custom_domain_with_path_trailing_slash.match?(Addressable::URI.parse('http://foo.com/path/')))
+      assert(@custom_domain_with_path_trailing_slash.match?(Addressable::URI.parse('http://foo.com/path/other/test.html?foo=bar')))
+
+      assert(@custom_domain_path_encoded_spaces.match?(Addressable::URI.parse('http://foo.com/dir%20path')))
+      assert(@custom_domain_path_encoded_spaces.match?(Addressable::URI.parse('http://foo.com/dir%20path?foo=bar')))
+    end
+
+    def test_is_match_with_path_matches_substring_should_be_false
+      refute(@custom_domain_with_path_no_trailing_slash.match?(Addressable::URI.parse('http://foo.com/pathsuffix/other/test.html')))
+      refute(@custom_domain_with_path_trailing_slash.match?(Addressable::URI.parse('http://foo.com/pathsuffix/other/test.html')))
+      refute(@custom_domain_path_encoded_spaces.match?(Addressable::URI.parse('http://foo.com/dir%20pathsuffix/other/test.html')))
+    end
+
+    def test_is_match_with_path_matches_custom_path_as_suffix_should_be_false
+      refute(@custom_domain_with_path_no_trailing_slash.match?(Addressable::URI.parse('http://foo.com/images/path/foo.png')))
+      refute(@custom_domain_with_path_trailing_slash.match?(Addressable::URI.parse('http://foo.com/images/path/foo.png')))
+    end
+  end
+end

data/test/lib/custom_domain/custom_domain_lang_url_handler_test.rb

@@ -0,0 +1,75 @@
+require 'test_helper'
+require 'wovnrb/custom_domain/custom_domain_langs'
+require 'wovnrb/custom_domain/custom_domain_lang_url_handler'
+
+module Wovnrb
+  class CustomDomainLangUrlHandlerTest < WovnMiniTest
+    def setup
+      custom_domain_langs_setting = {
+        'fr' => { 'url' => 'foo.com/' },
+        'ja' => { 'url' => 'foo.com/path' },
+        'zh-CHS' => { 'url' => 'foo.com/dir/path' },
+        'en' => { 'url' => 'english.foo.com/' },
+        'zh-Hant-HK' => { 'url' => 'zh-hant-hk.foo.com/zh' },
+        'pt' => { 'url' => '17797-trial2.foo.com/' }
+      }
+      @custom_domain_langs = CustomDomainLangs.new(custom_domain_langs_setting)
+    end
+
+    def test_add_custom_domain_lang_to_absolute_url
+      # apply to original lang
+      assert_equal('foo.com', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com', 'fr', @custom_domain_langs))
+      assert_equal('foo.com/path', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com', 'ja', @custom_domain_langs))
+      assert_equal('foo.com/dir/path', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com', 'zh-CHS', @custom_domain_langs))
+      assert_equal('english.foo.com', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com', 'en', @custom_domain_langs))
+      assert_equal('zh-hant-hk.foo.com/zh', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com', 'zh-Hant-HK', @custom_domain_langs))
+
+      # apply to target lang
+      assert_equal('foo.com', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('zh-hant-hk.foo.com/zh', 'fr', @custom_domain_langs))
+      assert_equal('foo.com/path', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('zh-hant-hk.foo.com/zh', 'ja', @custom_domain_langs))
+      assert_equal('foo.com/dir/path', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('zh-hant-hk.foo.com/zh', 'zh-CHS', @custom_domain_langs))
+      assert_equal('english.foo.com', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('zh-hant-hk.foo.com/zh', 'en', @custom_domain_langs))
+      assert_equal('zh-hant-hk.foo.com/zh', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('zh-hant-hk.foo.com/zh', 'zh-Hant-HK', @custom_domain_langs))
+
+      assert_equal('zh-hant-hk.foo.com/zh', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com/path', 'zh-Hant-HK', @custom_domain_langs))
+      assert_equal('zh-hant-hk.foo.com/zh/', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com/path/', 'zh-Hant-HK', @custom_domain_langs))
+      assert_equal('zh-hant-hk.foo.com/zh/index.html', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com/path/index.html', 'zh-Hant-HK', @custom_domain_langs))
+      assert_equal('zh-hant-hk.foo.com/zh/path2/index.html', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com/path/path2/index.html', 'zh-Hant-HK', @custom_domain_langs))
+      assert_equal('zh-hant-hk.foo.com/zh/path2/index.html?test=1', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com/path/path2/index.html?test=1', 'zh-Hant-HK', @custom_domain_langs))
+      assert_equal('zh-hant-hk.foo.com/zh/path2/index.html#hash', CustomDomainLangUrlHandler.add_custom_domain_lang_to_absolute_url('foo.com/path/path2/index.html#hash', 'zh-Hant-HK', @custom_domain_langs))
+    end
+
+    def test_change_to_new_custom_domain_lang
+      fr = @custom_domain_langs.custom_domain_lang_by_lang('fr')
+      ja = @custom_domain_langs.custom_domain_lang_by_lang('ja')
+      zh_chs = @custom_domain_langs.custom_domain_lang_by_lang('zh-CHS')
+      en = @custom_domain_langs.custom_domain_lang_by_lang('en')
+      zh_hant_hk = @custom_domain_langs.custom_domain_lang_by_lang('zh-Hant-HK')
+      pt = @custom_domain_langs.custom_domain_lang_by_lang('pt')
+
+      assert_equal('foo.com', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('foo.com', fr, fr))
+      assert_equal('foo.com/path', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('foo.com', fr, ja))
+      assert_equal('foo.com/dir/path', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('foo.com', fr, zh_chs))
+      assert_equal('english.foo.com', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('foo.com', fr, en))
+      assert_equal('zh-hant-hk.foo.com/zh', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('foo.com', fr, zh_hant_hk))
+
+      assert_equal('foo.com', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh', zh_hant_hk, fr))
+      assert_equal('foo.com/path', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh', zh_hant_hk, ja))
+      assert_equal('foo.com/dir/path', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh', zh_hant_hk, zh_chs))
+      assert_equal('english.foo.com', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh', zh_hant_hk, en))
+      assert_equal('zh-hant-hk.foo.com/zh', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh', zh_hant_hk, zh_hant_hk))
+
+      assert_equal('foo.com/path', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh', zh_hant_hk, ja))
+      assert_equal('foo.com/path/', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh/', zh_hant_hk, ja))
+      assert_equal('foo.com/path/index.html', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh/index.html', zh_hant_hk, ja))
+      assert_equal('foo.com/path/path', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh/path', zh_hant_hk, ja))
+      assert_equal('foo.com/path/path/index.html', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh/path/index.html', zh_hant_hk, ja))
+      assert_equal('foo.com/path/path/index.html?test=1', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh/path/index.html?test=1', zh_hant_hk, ja))
+      assert_equal('foo.com/path/path/index.html#hash', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zh/path/index.html#hash', zh_hant_hk, ja))
+
+      assert_equal('zh-hant-hk.foo.com/zhtrap', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('zh-hant-hk.foo.com/zhtrap', zh_hant_hk, ja))
+      assert_equal('english.foo.com/zhtrap', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('17797-trial2.foo.com/zhtrap', pt, en))
+      assert_equal('17797-trial2.foo.com/zhtrap', CustomDomainLangUrlHandler.change_to_new_custom_domain_lang('17797-trial2.foo.com/zhtrap', pt, pt))
+    end
+  end
+end

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