wovnrb 3.6.0 → 3.7.2

data/test/lib/lang_test.rb

@@ -59,270 +59,5 @@ module Wovnrb
     def test_get_code_with_nil
       assert_nil(Wovnrb::Lang.get_code(nil))
     end
-
-    def test_add_lang_code
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://www.facebook.com', lang.add_lang_code('http://www.facebook.com', 'subdomain', h))
-    end
-
-    def test_add_lang_code_relative_slash_href_url_with_path
-      lang = Lang.new('fr')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://fr.wovn.io/topics/44'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://fr.wovn.io/topics/50', lang.add_lang_code('/topics/50', 'subdomain', h))
-    end
-
-    def test_add_lang_code_relative_dot_href_url_with_path
-      lang = Lang.new('fr')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://fr.wovn.io/topics/44'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://fr.wovn.io/topics/44/topics/50', lang.add_lang_code('./topics/50', 'subdomain', h))
-    end
-
-    def test_add_lang_code_relative_two_dots_href_url_with_path
-      lang = Lang.new('fr')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://fr.wovn.io/topics/44'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://fr.wovn.io/topics/50', lang.add_lang_code('../topics/50', 'subdomain', h))
-    end
-
-    def test_add_lang_code_trad_chinese
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('http://wovn.io/topics/31', 'subdomain', h))
-    end
-
-    def test_add_lang_code_trad_chinese2
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://zh-cht.wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('/topics/31', 'subdomain', h))
-    end
-
-    def test_add_lang_code_trad_chinese_lang_in_link_already
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://zh-cht.wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('http://zh-cht.wovn.io/topics/31', 'subdomain', h))
-    end
-
-    def test_add_lang_code_no_protocol
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'https://zh-cht.google.com'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('//zh-cht.google.com', lang.add_lang_code('//google.com', 'subdomain', h))
-    end
-
-    def test_add_lang_code_no_protocol2
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'https://zh-cht.wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('//google.com', lang.add_lang_code('//google.com', 'subdomain', h))
-    end
-
-    def test_add_lang_code_invalid_url
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://www.facebook.com/sharer.php?u=http://wovn.io/topics/50&amp;amp;t=Gourmet Tofu World: Vegetarian-Friendly Japanese Food is Here!', lang.add_lang_code('http://www.facebook.com/sharer.php?u=http://wovn.io/topics/50&amp;amp;t=Gourmet Tofu World: Vegetarian-Friendly Japanese Food is Here!', 'subdomain', h))
-    end
-
-    def test_add_lang_code_path_only_with_slash
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('/topics/31', 'subdomain', h))
-    end
-
-    def test_add_lang_code_path_only_no_slash
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('topics/31', 'subdomain', h))
-    end
-
-    def test_add_lang_code_path_explicit_page_no_slash
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31.html', lang.add_lang_code('topics/31.html', 'subdomain', h))
-    end
-
-    def test_add_lang_code_path_explicit_page_with_slash
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31.html', lang.add_lang_code('/topics/31.html', 'subdomain', h))
-    end
-
-    def test_add_lang_code_no_protocol_with_path_explicit_page
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('//www.google.com/topics/31.php', lang.add_lang_code('//www.google.com/topics/31.php', 'subdomain', h))
-    end
-
-    def test_add_lang_code_protocol_with_path_explicit_page
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://www.google.com/topics/31.php', lang.add_lang_code('http://www.google.com/topics/31.php', 'subdomain', h))
-    end
-
-    def test_add_lang_code_relative_path_double_period
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('../topics/31', 'subdomain', h))
-    end
-
-    def test_add_lang_code_relative_path_single_period
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://zh-cht.wovn.io/topics/31', lang.add_lang_code('./topics/31', 'subdomain', h))
-    end
-
-    def test_add_lang_code_empty_href
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('', lang.add_lang_code('', 'subdomain', h))
-    end
-
-    def test_add_lang_code_hash_href
-      lang = Lang.new('zh-cht')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('#', lang.add_lang_code('#', 'subdomain', h))
-    end
-
-    def test_add_lang_code_nil_href
-      lang = Lang.new('en')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings)
-      assert_nil(lang.add_lang_code(nil, 'path', h))
-    end
-
-    def test_add_lang_code_absolute_different_host
-      lang = Lang.new('fr')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://yahoo.co.jp', lang.add_lang_code('http://yahoo.co.jp', 'path', h))
-    end
-
-    def test_add_lang_code_absolute_subdomain_no_subdomain
-      lang = Lang.new('fr')
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://fr.google.com', lang.add_lang_code('http://google.com', 'subdomain', h))
-    end
-
-    def test_add_lang_code_absolute_subdomain_with_subdomain
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://home.google.com'), Wovnrb.get_settings)
-      assert_equal('http://fr.home.google.com', lang.add_lang_code('http://home.google.com', 'subdomain', headers))
-    end
-
-    def test_add_lang_code_with_query_and_lang_param_name
-      Store.instance.update_settings('url_pattern_name' => 'query', 'lang_param_name' => 'lang')
-
-      sut = Lang.new('fr')
-      headers = Wovnrb::Headers.new(
-        Wovnrb.get_env('url' => 'http://google.com'),
-        Store.instance.settings
-      )
-
-      assert_equal('http://google.com?hey=yo&lang=fr', sut.add_lang_code('http://google.com?hey=yo', 'query', headers))
-    end
-
-    def test_add_lang_code_absolute_query_no_query
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://google.com?wovn=fr', lang.add_lang_code('http://google.com', 'query', headers))
-    end
-
-    def test_add_lang_code_absolute_query_with_query
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://google.com?hey=yo&wovn=fr', lang.add_lang_code('http://google.com?hey=yo', 'query', headers))
-    end
-
-    def test_add_lang_code_absolute_query_with_hash
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://google.com?wovn=fr#test', lang.add_lang_code('http://google.com#test', 'query', headers))
-    end
-
-    def test_add_lang_code_absolute_path_no_pathname
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://google.com/fr/', lang.add_lang_code('http://google.com', 'path', headers))
-    end
-
-    def test_add_lang_code_absolute_path_with_pathname
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://google.com/fr/index.html', lang.add_lang_code('http://google.com/index.html', 'path', headers))
-    end
-
-    def test_add_lang_code_absolute_path_with_long_pathname
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://google.com/fr/hello/long/path/index.html', lang.add_lang_code('http://google.com/hello/long/path/index.html', 'path', headers))
-    end
-
-    def test_add_lang_code_relative_subdomain_leading_slash
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://fr.google.com/', lang.add_lang_code('/', 'subdomain', headers))
-    end
-
-    def test_add_lang_code_relative_subdomain_leading_slash_filename
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com'), Wovnrb.get_settings)
-      assert_equal('http://fr.google.com/index.html', lang.add_lang_code('/index.html', 'subdomain', headers))
-    end
-
-    def test_add_lang_code_relative_subdomain_no_leading_slash_filename
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)
-      assert_equal('http://fr.google.com/index.html', lang.add_lang_code('index.html', 'subdomain', headers))
-    end
-
-    def test_add_lang_code_relative_query_with_no_query
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)
-      assert_equal('/index.html?wovn=fr', lang.add_lang_code('/index.html', 'query', headers))
-    end
-
-    def test_add_lang_code_relative_query_with_query
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)
-      assert_equal('/index.html?hey=yo&wovn=fr', lang.add_lang_code('/index.html?hey=yo', 'query', headers))
-    end
-
-    def test_add_lang_code_relative_query_with_hash
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)
-      assert_equal('/index.html?hey=yo&wovn=fr', lang.add_lang_code('/index.html?hey=yo', 'query', headers))
-    end
-
-    def test_add_lang_code_relative_path_with_leading_slash
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)
-      assert_equal('/fr/index.html', lang.add_lang_code('/index.html', 'path', headers))
-    end
-
-    def test_add_lang_code_relative_path_without_leading_slash_different_pathname
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/hello/tab.html'), Wovnrb.get_settings)
-      assert_equal('/fr/hello/index.html', lang.add_lang_code('index.html', 'path', headers))
-    end
-
-    def test_add_lang_code_relative_path_without_leading_slash_different_pathname2
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/hello/tab.html'), Wovnrb.get_settings)
-      assert_equal('/fr/hello/hey/index.html', lang.add_lang_code('hey/index.html', 'path', headers))
-    end
-
-    def test_add_lang_code_relative_path_at_root
-      lang = Lang.new('fr')
-      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://google.com/'), Wovnrb.get_settings)
-      assert_equal('/fr/index.html', lang.add_lang_code('index.html', 'path', headers))
-    end
-
-    def test_get_code_from_custom_lang
-      store = Store.instance
-      store.settings['custom_lang_aliases'] = { 'ja' => 'staging-ja' }
-      assert_equal('ja', Wovnrb::Lang.get_code('staging-ja'))
-    end
-
-    def test_add_lang_code_with_custom_lang_aliases
-      lang = Lang.new('fr')
-      Store.instance.update_settings('custom_lang_aliases' => { 'fr' => 'staging-fr' })
-      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://wovn.io'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
-      assert_equal('http://staging-fr.wovn.io/topics/50', lang.add_lang_code('/topics/50', 'subdomain', h))
-    end
   end
 end

data/test/lib/services/html_converter_test.rb

@@ -295,7 +295,8 @@ module Wovnrb
 
       headers = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => 'http://my-site.com/'),
-        Wovnrb.get_settings(settings)
+        Wovnrb.get_settings(settings),
+        UrlLanguageSwitcher.new(store)
       )
       url_lang_switcher = Wovnrb::UrlLanguageSwitcher.new(store)
       converter = HtmlConverter.new(get_dom('<html><body>hello</body></html>'), store, headers, url_lang_switcher)
@@ -311,7 +312,8 @@ module Wovnrb
 
       headers = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => 'http://my-site.com/'),
-        Wovnrb.get_settings(settings)
+        Wovnrb.get_settings(settings),
+        UrlLanguageSwitcher.new(store)
       )
       url_lang_switcher = Wovnrb::UrlLanguageSwitcher.new(store)
       converter = HtmlConverter.new(get_dom('<html lang="th"><body>hello</body></html>'), store, headers, url_lang_switcher)
@@ -327,7 +329,8 @@ module Wovnrb
 
       headers = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => 'http://my-site.com/?wovn=fr'),
-        store.settings
+        store.settings,
+        UrlLanguageSwitcher.new(store)
       )
       url_lang_switcher = Wovnrb::UrlLanguageSwitcher.new(store)
       converter = HtmlConverter.new(get_dom('<html lang="th"><head><link rel="canonical" href="http://my-site.com" /></head><body>hello</body></html>'), store, headers, url_lang_switcher)
@@ -346,7 +349,8 @@ module Wovnrb
 
       headers = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => 'http://my-site.com/fr/'),
-        store.settings
+        store.settings,
+        UrlLanguageSwitcher.new(store)
       )
       url_lang_switcher = Wovnrb::UrlLanguageSwitcher.new(store)
       converter = HtmlConverter.new(get_dom('<html lang="th"><head><link rel="canonical" href="http://my-site.com/" /></head><body>hello</body></html>'), store, headers, url_lang_switcher)
@@ -366,7 +370,8 @@ module Wovnrb
 
       headers = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => 'http://my-site.com/fr/'),
-        store.settings
+        store.settings,
+        UrlLanguageSwitcher.new(store)
       )
       url_lang_switcher = Wovnrb::UrlLanguageSwitcher.new(store)
       converter = HtmlConverter.new(get_dom('<html lang="th"><head><link rel="canonical" href="http://my-site.com/fr/" /></head><body>hello</body></html>'), store, headers, url_lang_switcher)
@@ -392,7 +397,8 @@ module Wovnrb
 
       headers = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => url),
-        store.settings
+        store.settings,
+        UrlLanguageSwitcher.new(store)
       )
 
       [store, headers]

data/test/lib/store_test.rb

@@ -44,7 +44,7 @@ module Wovnrb
     def test_settings_url_pattern_subdomain
       s = Wovnrb::Store.instance
       s.update_settings('url_pattern' => 'subdomain')
-      assert_equal("^(?<lang>[^.]+)\.", s.settings['url_pattern_reg'])
+      assert_equal('^(?<lang>[^.]+)\.', s.settings['url_pattern_reg'])
       assert_equal('subdomain', s.settings['url_pattern'])
     end
 

data/test/lib/url_language_switcher_test.rb

@@ -771,14 +771,165 @@ module Wovnrb
       assert_equal('/th/', url_lang_switcher.add_lang_code(href_trailing_slash, 'th', headers))
     end
 
+    def test_remove_lang_query_with_lang_param_name
+      settings = Wovnrb.get_settings('url_pattern' => 'query', 'lang_param_name' => 'lang')
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+
+      keys = Wovnrb::Lang::LANG.keys
+      assert_equal(77, keys.size)
+
+      keys.each do |key|
+        uri_without_custom_lang_param = "wovn.io/?wovn=#{key}"
+        unchanged_uri = url_lang_switcher.remove_lang_from_uri_component(uri_without_custom_lang_param, key)
+        assert_equal(uri_without_custom_lang_param, unchanged_uri)
+
+        uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component("wovn.io/?lang=#{key}", key)
+        assert_equal('wovn.io/', uri_without_scheme)
+
+        uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component("https://wovn.io?lang=#{key}", key)
+        assert_equal('https://wovn.io', uri_with_scheme)
+      end
+    end
+
+    def test_remove_lang_query_with_nil_lang
+      settings = Wovnrb.get_settings('url_pattern' => 'query')
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+
+      keys = Wovnrb::Lang::LANG.keys
+      assert_equal(77, keys.size)
+
+      uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component('wovn.io', nil)
+      assert_equal('wovn.io', uri_without_scheme)
+
+      uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component('https://wovn.io/', nil)
+      assert_equal('https://wovn.io/', uri_with_scheme)
+    end
+
+    def test_remove_lang_query_with_empty_lang
+      settings = Wovnrb.get_settings('url_pattern' => 'query')
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+
+      uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component('wovn.io', '')
+      assert_equal('wovn.io', uri_without_scheme)
+
+      uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component('https://wovn.io/', '')
+      assert_equal('https://wovn.io/', uri_with_scheme)
+    end
+
+    def test_remove_lang_subdomain
+      settings = Wovnrb.get_settings('url_pattern' => 'subdomain')
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+
+      keys = Wovnrb::Lang::LANG.keys
+      assert_equal(77, keys.size)
+
+      keys.each do |key|
+        uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component("#{key.downcase}.wovn.io/", key)
+        assert_equal('wovn.io/', uri_without_scheme)
+
+        uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component("https://#{key.downcase}.wovn.io", key)
+        assert_equal('https://wovn.io', uri_with_scheme)
+      end
+    end
+
+    def test_remove_lang_subdomain_with_nil_lang
+      settings = Wovnrb.get_settings('url_pattern' => 'subdomain')
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+      keys = Wovnrb::Lang::LANG.keys
+      assert_equal(77, keys.size)
+
+      uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component('wovn.io', nil)
+      assert_equal('wovn.io', uri_without_scheme)
+
+      uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component('https://wovn.io/', nil)
+      assert_equal('https://wovn.io/', uri_with_scheme)
+    end
+
+    def test_remove_lang_subdomain_with_empty_lang
+      settings = Wovnrb.get_settings('url_pattern' => 'subdomain')
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+
+      uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component('wovn.io', '')
+      assert_equal('wovn.io', uri_without_scheme)
+
+      uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component('https://wovn.io/', '')
+      assert_equal('https://wovn.io/', uri_with_scheme)
+    end
+
+    def test_remove_lang_subdomain_with_custom_lang_alias
+      Store.instance.update_settings('custom_lang_aliases' => { 'fr' => 'staging-fr' }, 'url_pattern' => 'subdomain')
+      url_lang_switcher = UrlLanguageSwitcher.new(Store.instance)
+
+      uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component('staging-fr.wovn.io/', 'fr')
+      assert_equal('wovn.io/', uri_without_scheme)
+
+      uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component('https://staging-fr.wovn.io', 'fr')
+      assert_equal('https://wovn.io', uri_with_scheme)
+    end
+
+    def test_remove_lang_path
+      settings = Wovnrb.get_settings
+      store = Wovnrb.get_store(settings)
+      sut = UrlLanguageSwitcher.new(store)
+
+      keys = Wovnrb::Lang::LANG.keys
+      assert_equal(77, keys.size)
+
+      keys.each do |key|
+        assert_equal('/', sut.remove_lang_from_uri_component("/#{key}", key))
+        assert_equal("/dir/#{key}/page.html", sut.remove_lang_from_uri_component("/#{key}/dir/#{key}/page.html", key))
+        assert_equal('?query', sut.remove_lang_from_uri_component('?query', key))
+        assert_equal('wovn.io/', sut.remove_lang_from_uri_component("wovn.io/#{key}", key))
+        assert_equal("wovn.io/dir/#{key}/page.html", sut.remove_lang_from_uri_component("wovn.io/#{key}/dir/#{key}/page.html", key))
+        assert_equal("wovn.io:5000/dir/#{key}/page.html", sut.remove_lang_from_uri_component("wovn.io:5000/#{key}/dir/#{key}/page.html", key))
+        assert_equal('https://wovn.io/', sut.remove_lang_from_uri_component("https://wovn.io/#{key}/", key))
+        assert_equal("https://wovn.io/dir/#{key}/page.html", sut.remove_lang_from_uri_component("https://wovn.io/#{key}/dir/#{key}/page.html", key))
+      end
+    end
+
+    def test_remove_lang_path_with_nil_lang
+      settings = Wovnrb.get_settings
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+
+      keys = Wovnrb::Lang::LANG.keys
+      assert_equal(77, keys.size)
+
+      uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component('wovn.io', nil)
+      assert_equal('wovn.io', uri_without_scheme)
+
+      uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component('https://wovn.io/', nil)
+      assert_equal('https://wovn.io/', uri_with_scheme)
+    end
+
+    def test_remove_lang_path_with_empty_lang
+      settings = Wovnrb.get_settings
+      store = Wovnrb.get_store(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
+
+      uri_without_scheme = url_lang_switcher.remove_lang_from_uri_component('wovn.io', '')
+      assert_equal('wovn.io', uri_without_scheme)
+
+      uri_with_scheme = url_lang_switcher.remove_lang_from_uri_component('https://wovn.io/', '')
+      assert_equal('https://wovn.io/', uri_with_scheme)
+    end
+
     def store_headers_factory(setting_opts = {}, url = 'http://my-site.com')
       settings = default_store_settings.merge(setting_opts)
       store = Wovnrb::Store.instance
       store.update_settings(settings)
+      url_lang_switcher = UrlLanguageSwitcher.new(store)
 
       headers = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => url),
-        store.settings
+        store.settings,
+        url_lang_switcher
       )
 
       [store, headers]

data/test/lib/wovnrb_test.rb

@@ -148,6 +148,8 @@ HTML
       'rack.input' => '',
       'rack.request.query_string' => '',
       'rack.request.query_hash' => {},
+      'rack.request.form_input' => '',
+      'rack.request.form_hash' => {},
       'HTTP_HOST' => 'test.com',
       'REQUEST_URI' => '/en/not_ignored',
       'PATH_INFO' => '/en/not_ignored'
@@ -168,6 +170,8 @@ HTML
       'rack.input' => '',
       'rack.request.query_string' => '',
       'rack.request.query_hash' => {},
+      'rack.request.form_input' => '',
+      'rack.request.form_hash' => {},
       'HTTP_HOST' => 'test.com',
       'REQUEST_URI' => '/ignored',
       'PATH_INFO' => '/ignored'
@@ -188,6 +192,8 @@ HTML
       'rack.input' => '',
       'rack.request.query_string' => '',
       'rack.request.query_hash' => {},
+      'rack.request.form_input' => '',
+      'rack.request.form_hash' => {},
       'HTTP_HOST' => 'test.com',
       'REQUEST_URI' => '/en/ignored',
       'PATH_INFO' => '/en/ignored'
@@ -208,6 +214,8 @@ HTML
       'rack.input' => '',
       'rack.request.query_string' => '',
       'rack.request.query_hash' => {},
+      'rack.request.form_input' => '',
+      'rack.request.form_hash' => {},
       'HTTP_HOST' => 'test.com',
       'REQUEST_URI' => '/ignored',
       'PATH_INFO' => '/ignored'
@@ -228,6 +236,8 @@ HTML
       'rack.input' => '',
       'rack.request.query_string' => '',
       'rack.request.query_hash' => {},
+      'rack.request.form_input' => '',
+      'rack.request.form_hash' => {},
       'HTTP_HOST' => 'test.com',
       'REQUEST_URI' => '/en/ignored',
       'PATH_INFO' => '/en/ignored'
@@ -273,7 +283,7 @@ HTML
       'custom_lang_aliases' => {},
       'default_lang' => original_lang,
       'url_pattern' => 'subdomain',
-      'url_pattern_reg' => '^(?<lang>[^.]+).'
+      'url_pattern_reg' => '^(?<lang>[^.]+)\.'
     }
 
     store = Wovnrb::Store.instance
@@ -281,7 +291,8 @@ HTML
 
     headers = Wovnrb::Headers.new(
       Wovnrb.get_env('url' => "http://#{subdomain}page.com"),
-      Wovnrb.get_settings(settings)
+      Wovnrb.get_settings(settings),
+      Wovnrb::UrlLanguageSwitcher.new(store)
     )
 
     [store, headers]

data/test/test_helper.rb

@@ -2,8 +2,9 @@ require 'simplecov'
 require 'pry'
 
 # save to CircleCI's artifacts directory if we're on CircleCI
-if ENV['CIRCLE_ARTIFACTS']
-  dir = File.join(ENV['CIRCLE_ARTIFACTS'], 'coverage')
+circle_artifacts = ENV.fetch('CIRCLE_ARTIFACTS', nil)
+if circle_artifacts
+  dir = File.join(circle_artifacts, 'coverage')
   SimpleCov.coverage_dir(dir)
 end
 
@@ -75,6 +76,13 @@ module Wovnrb
     Wovnrb::Settings.new.merge(settings.merge(options))
   end
 
+  def get_store(options = {})
+    settings = get_settings(options)
+    store = Store.instance
+    store.update_settings(settings)
+    store
+  end
+
   def get_env(options = {})
     env = {}
     env['rack.url_scheme'] = 'http'
@@ -116,7 +124,7 @@ module Wovnrb
     to_dom("<html><body>#{inner_html}</body></html>")
   end
 
-  module_function :get_env, :get_settings, :to_dom, :get_dom
+  module_function :get_env, :get_settings, :to_dom, :get_dom, :get_store
 
   def build_api_data(custom_page_values: {}, custom_project_data: {})
     page_values = default_page_values.merge(custom_page_values)

data/wovnrb.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   files.delete('BEFORE_PUSHING')
   spec.files         = files
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'