wovnrb 3.7.2 → 3.9.0

data/lib/wovnrb/api_translator.rb

@@ -118,6 +118,7 @@ module Wovnrb
       }
 
       result['custom_lang_aliases'] = JSON.dump(custom_lang_aliases) unless custom_lang_aliases.empty?
+      result['custom_domain_langs'] = JSON.dump(custom_domain_langs) unless custom_domain_langs.empty?
 
       result
     end
@@ -162,6 +163,10 @@ module Wovnrb
       @store.settings['translate_canonical_tag']
     end
 
+    def custom_domain_langs
+      @store.custom_domain_langs.to_html_swapper_hash
+    end
+
     def page_url
       "#{@headers.protocol}://#{@headers.url}"
     end

data/lib/wovnrb/custom_domain/custom_domain_lang.rb

@@ -0,0 +1,31 @@
+module Wovnrb
+  # Represents a custom domain for a given language
+  class CustomDomainLang
+    attr_accessor :host, :path, :lang
+
+    def initialize(host, path, lang)
+      @host = host
+      @path = path.end_with?('/') ? path : "#{path}/"
+      @lang = lang
+    end
+
+    # @param uri [Addressable::URI]
+    def match?(parsed_uri)
+      @host.casecmp?(parsed_uri.host) && path_is_equal_or_subset_of?(@path, parsed_uri.path)
+    end
+
+    def host_and_path_without_trailing_slash
+      host_and_path = @host + @path
+      host_and_path.end_with?('/') ? host_and_path.delete_suffix('/') : host_and_path
+    end
+
+    private
+
+    def path_is_equal_or_subset_of?(path1, path2)
+      path1_segments = path1.split('/').reject(&:empty?)
+      path2_segments = path2.split('/').reject(&:empty?)
+
+      path1_segments == path2_segments.slice(0, path1_segments.length)
+    end
+  end
+end

data/lib/wovnrb/custom_domain/custom_domain_lang_url_handler.rb

@@ -0,0 +1,27 @@
+require 'wovnrb/custom_domain/custom_domain_lang'
+
+module Wovnrb
+  # Helper class for transforming actual domains to user-defined custom domains
+  class CustomDomainLangUrlHandler
+    class << self
+      def add_custom_domain_lang_to_absolute_url(absolute_url, target_lang, custom_domain_langs)
+        current_custom_domain = custom_domain_langs.custom_domain_lang_by_url(absolute_url)
+        new_lang_custom_domain = custom_domain_langs.custom_domain_lang_by_lang(target_lang)
+        change_to_new_custom_domain_lang(absolute_url, current_custom_domain, new_lang_custom_domain)
+      end
+
+      def change_to_new_custom_domain_lang(absolute_url, current_custom_domain, new_lang_custom_domain)
+        return absolute_url unless current_custom_domain.present? && new_lang_custom_domain.present?
+
+        current_host_and_path = current_custom_domain.host_and_path_without_trailing_slash
+        new_host_and_path = new_lang_custom_domain.host_and_path_without_trailing_slash
+
+        # ^(.*://|//)?               1: schema, e.g. https://
+        # (#{current_host_and_path}) 2: host and path, e.g. wovn.io/foo
+        # ((?:/|\?|#).*)?$           3: other / query params, e.g. ?hello=world
+        regex = %r{^(.*://|//)?(#{current_host_and_path})((?:/|\?|#).*)?$}
+        absolute_url.gsub(regex) { "#{Regexp.last_match(1)}#{new_host_and_path}#{Regexp.last_match(3)}" }
+      end
+    end
+  end
+end

data/lib/wovnrb/custom_domain/custom_domain_langs.rb

@@ -0,0 +1,40 @@
+require 'wovnrb/custom_domain/custom_domain_lang'
+
+module Wovnrb
+  # Represents a list of custom domains with corresponding languages
+  class CustomDomainLangs
+    def initialize(setting)
+      @custom_domain_langs = setting.map do |lang_code, config|
+        parsed_uri = Addressable::URI.parse(add_protocol_if_needed(config['url']))
+        CustomDomainLang.new(parsed_uri.host, parsed_uri.path, lang_code)
+      end
+    end
+
+    def custom_domain_lang_by_lang(lang_code)
+      @custom_domain_langs.find { |c| c.lang == lang_code }
+    end
+
+    def custom_domain_lang_by_url(uri)
+      parsed_uri = Addressable::URI.parse(add_protocol_if_needed(uri))
+
+      # "/" path will naturally match every URL, so by comparing longest paths first we will get the best match
+      @custom_domain_langs
+        .sort_by { |c| -c.path.length }
+        .find { |c| c.match?(parsed_uri) }
+    end
+
+    def to_html_swapper_hash
+      result = {}
+      @custom_domain_langs.each do |custom_domain_lang|
+        result[custom_domain_lang.host_and_path_without_trailing_slash] = custom_domain_lang.lang
+      end
+      result
+    end
+
+    private
+
+    def add_protocol_if_needed(url)
+      url.match?(%r{https?://}) ? url : "http://#{url}"
+    end
+  end
+end

data/lib/wovnrb/headers.rb

@@ -1,3 +1,5 @@
+require 'wovnrb/custom_domain/custom_domain_lang_url_handler'
+
 module Wovnrb
   class Headers
     attr_reader :unmasked_url, :url, :protocol, :unmasked_host, :host, :unmasked_pathname, :pathname, :pathname_with_trailing_slash_if_present
@@ -31,9 +33,9 @@ module Wovnrb
               else
                 @env['HTTP_HOST']
               end
-      @host = settings['url_pattern'] == 'subdomain' ? @url_lang_switcher.remove_lang_from_uri_component(@host, lang_code) : @host
+      @host = %w[subdomain custom_domain].include?(settings['url_pattern']) ? @url_lang_switcher.remove_lang_from_uri_component(@host, lang_code, self) : @host
       @pathname, @query = @env['REQUEST_URI'].split('?')
-      @pathname = settings['url_pattern'] == 'path' ? @url_lang_switcher.remove_lang_from_uri_component(@pathname, lang_code) : @pathname
+      @pathname = %w[path custom_domain].include?(settings['url_pattern']) ? @url_lang_switcher.remove_lang_from_uri_component(@pathname, lang_code, self) : @pathname
       @query ||= ''
       @url = "#{@host}#{@pathname}#{(@query.empty? ? '' : '?') + @url_lang_switcher.remove_lang_from_uri_component(@query, lang_code)}"
       if settings['query'].empty?
@@ -68,7 +70,7 @@ module Wovnrb
     #
     # @return [String] The lang code of the current page
     def lang_code
-      path_lang && !path_lang.empty? ? path_lang : @settings['default_lang']
+      url_language && !url_language.empty? ? url_language : @settings['default_lang']
     end
 
     # picks up language code from requested URL by using url_pattern_reg setting.
@@ -76,21 +78,27 @@ module Wovnrb
     # if you want examples, please see test/lib/headers_test.rb.
     #
     # @return [String] language code in requrested URL.
-    def path_lang
-      if @path_lang.nil?
-        rp = Regexp.new(@settings['url_pattern_reg'])
-        match = if @settings['use_proxy'] && @env.key?('HTTP_X_FORWARDED_HOST')
-                  "#{@env['HTTP_X_FORWARDED_HOST']}#{@env['REQUEST_URI']}".match(rp)
-                else
-                  "#{@env['SERVER_NAME']}#{@env['REQUEST_URI']}".match(rp)
-                end
-        @path_lang = if match && match[:lang] && Lang.get_lang(match[:lang])
-                       Lang.get_code(match[:lang])
-                     else
-                       ''
-                     end
+    def url_language
+      if @url_language.nil?
+        full_url = if @settings['use_proxy'] && @env.key?('HTTP_X_FORWARDED_HOST')
+                     "#{@env['HTTP_X_FORWARDED_HOST']}#{@env['REQUEST_URI']}"
+                   else
+                     "#{@env['SERVER_NAME']}#{@env['REQUEST_URI']}"
+                   end
+
+        new_lang_code = nil
+        if @settings['url_pattern'] == 'custom_domain'
+          custom_domain_langs = Store.instance.custom_domain_langs
+          custom_domain = custom_domain_langs.custom_domain_lang_by_url(full_url)
+          new_lang_code = custom_domain.lang if custom_domain.present?
+        else
+          rp = Regexp.new(@settings['url_pattern_reg'])
+          match = full_url.match(rp)
+          new_lang_code = Lang.get_code(match[:lang]) if match && match[:lang] && Lang.get_lang(match[:lang])
+        end
+        @url_language = new_lang_code.presence || ''
       end
-      @path_lang
+      @url_language
     end
 
     def redirect(lang)
@@ -109,51 +117,28 @@ module Wovnrb
       @url_lang_switcher.add_lang_code(url_with_scheme, lang, self)
     end
 
-    def request_out(_def_lang = @settings['default_lang'])
+    def request_out
       @env['wovnrb.target_lang'] = lang_code
       case @settings['url_pattern']
       when 'query'
-        @env['REQUEST_URI'] = @url_lang_switcher.remove_lang_from_uri_component(@env['REQUEST_URI'], lang_code) if @env.key?('REQUEST_URI')
-        @env['QUERY_STRING'] = @url_lang_switcher.remove_lang_from_uri_component(@env['QUERY_STRING'], lang_code) if @env.key?('QUERY_STRING')
-        @env['ORIGINAL_FULLPATH'] = @url_lang_switcher.remove_lang_from_uri_component(@env['ORIGINAL_FULLPATH'], lang_code) if @env.key?('ORIGINAL_FULLPATH')
+        remove_lang_from_query
       when 'subdomain'
-        if @settings['use_proxy'] && @env.key?('HTTP_X_FORWARDED_HOST')
-          @env['HTTP_X_FORWARDED_HOST'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_X_FORWARDED_HOST'], lang_code)
-        else
-          @env['HTTP_HOST'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_HOST'], lang_code)
-          @env['SERVER_NAME'] = @url_lang_switcher.remove_lang_from_uri_component(@env['SERVER_NAME'], lang_code)
-        end
-        @env['HTTP_REFERER'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_REFERER'], lang_code) if @env.key?('HTTP_REFERER')
-      # when 'path'
+        remove_lang_from_host
+      when 'custom_domain'
+        remove_lang_from_host
+        remove_lang_from_path
+        # when 'path'
       else
-        @env['REQUEST_URI'] = @url_lang_switcher.remove_lang_from_uri_component(@env['REQUEST_URI'], lang_code)
-        @env['REQUEST_PATH'] = @url_lang_switcher.remove_lang_from_uri_component(@env['REQUEST_PATH'], lang_code) if @env.key?('REQUEST_PATH')
-        @env['PATH_INFO'] = @url_lang_switcher.remove_lang_from_uri_component(@env['PATH_INFO'], lang_code)
-        @env['ORIGINAL_FULLPATH'] = @url_lang_switcher.remove_lang_from_uri_component(@env['ORIGINAL_FULLPATH'], lang_code) if @env.key?('ORIGINAL_FULLPATH')
-        @env['HTTP_REFERER'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_REFERER'], lang_code) if @env.key?('HTTP_REFERER')
+        remove_lang_from_path
       end
       @env
     end
 
     def out(headers)
-      r = Regexp.new("//#{@host}")
       lang_code = Store.instance.settings['custom_lang_aliases'][self.lang_code] || self.lang_code
-      if lang_code != @settings['default_lang'] && headers.key?('Location') && headers['Location'] =~ r && !@settings['ignore_globs'].ignore?(headers['Location'])
-        case @settings['url_pattern']
-        when 'query'
-          headers['Location'] += if /\?/.match?(headers['Location'])
-                                   '&'
-                                 else
-                                   '?'
-                                 end
-          headers['Location'] += "#{@settings['lang_param_name']}=#{lang_code}"
-        when 'subdomain'
-          headers['Location'] = headers['Location'].sub(/\/\/([^.]+)/, "//#{lang_code}.\\1")
-        # when 'path'
-        else
-          headers['Location'] = headers['Location'].sub(/(\/\/[^\/]+)/, "\\1/#{lang_code}")
-        end
-      end
+      should_add_lang_code = lang_code != @settings['default_lang'] && headers.key?('Location') && !@settings['ignore_globs'].ignore?(headers['Location'])
+
+      headers['Location'] = @url_lang_switcher.add_lang_code(headers['Location'], lang_code, self) if should_add_lang_code
       headers
     end
 
@@ -177,5 +162,31 @@ module Wovnrb
       absolute_path = absolute_path.starts_with?('/') ? absolute_path : URL.join_paths(dirname, absolute_path)
       URL.normalize_path_slash(path, absolute_path)
     end
+
+    private
+
+    def remove_lang_from_query
+      @env['REQUEST_URI'] = @url_lang_switcher.remove_lang_from_uri_component(@env['REQUEST_URI'], lang_code) if @env.key?('REQUEST_URI')
+      @env['QUERY_STRING'] = @url_lang_switcher.remove_lang_from_uri_component(@env['QUERY_STRING'], lang_code) if @env.key?('QUERY_STRING')
+      @env['ORIGINAL_FULLPATH'] = @url_lang_switcher.remove_lang_from_uri_component(@env['ORIGINAL_FULLPATH'], lang_code) if @env.key?('ORIGINAL_FULLPATH')
+    end
+
+    def remove_lang_from_host
+      if @settings['use_proxy'] && @env.key?('HTTP_X_FORWARDED_HOST')
+        @env['HTTP_X_FORWARDED_HOST'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_X_FORWARDED_HOST'], lang_code, self)
+      else
+        @env['HTTP_HOST'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_HOST'], lang_code, self)
+        @env['SERVER_NAME'] = @url_lang_switcher.remove_lang_from_uri_component(@env['SERVER_NAME'], lang_code, self)
+      end
+      @env['HTTP_REFERER'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_REFERER'], lang_code, self) if @env.key?('HTTP_REFERER')
+    end
+
+    def remove_lang_from_path
+      @env['REQUEST_URI'] = @url_lang_switcher.remove_lang_from_uri_component(@env['REQUEST_URI'], lang_code, self)
+      @env['REQUEST_PATH'] = @url_lang_switcher.remove_lang_from_uri_component(@env['REQUEST_PATH'], lang_code, self) if @env.key?('REQUEST_PATH')
+      @env['PATH_INFO'] = @url_lang_switcher.remove_lang_from_uri_component(@env['PATH_INFO'], lang_code, self)
+      @env['ORIGINAL_FULLPATH'] = @url_lang_switcher.remove_lang_from_uri_component(@env['ORIGINAL_FULLPATH'], lang_code, self) if @env.key?('ORIGINAL_FULLPATH')
+      @env['HTTP_REFERER'] = @url_lang_switcher.remove_lang_from_uri_component(@env['HTTP_REFERER'], lang_code, self) if @env.key?('HTTP_REFERER')
+    end
   end
 end

data/lib/wovnrb/lang.rb

@@ -56,7 +56,7 @@ module Wovnrb
       'pt-PT' => { name: 'Português (Portugal)',     code: 'pt-PT',      en: 'Portuguese (Portugal)' },
       'ru' => { name: 'Русский',                  code: 'ru',         en: 'Russian' },
       'es' => { name: 'Español',                  code: 'es',         en: 'Spanish' },
-      'es-RA' => { name: 'Español (Argentina)',      code: 'es-RA',      en: 'Spanish (Argentina)' },
+      'es-AR' => { name: 'Español (Argentina)',      code: 'es-AR',      en: 'Spanish (Argentina)' },
       'es-CL' => { name: 'Español (Chile)',          code: 'es-CL',      en: 'Spanish (Chile)' },
       'es-CO' => { name: 'Español (Colombia)',       code: 'es-CO',      en: 'Spanish (Colombia)' },
       'es-CR' => { name: 'Español (Costa Rica)',     code: 'es-CR',      en: 'Spanish (Costa Rica)' },
@@ -250,7 +250,7 @@ module Wovnrb
     end
 
     def add_query_lang_code(href, lang_code, lang_param_name)
-      query_separator = /\?/.match?(href) ? '&' : '?'
+      query_separator = href.include?('?') ? '&' : '?'
 
       href.sub(/(#|$)/, "#{query_separator}#{lang_param_name}=#{lang_code}\\1")
     end

data/lib/wovnrb/services/html_converter.rb

@@ -15,12 +15,23 @@ module Wovnrb
     def build_api_compatible_html
       marker = HtmlReplaceMarker.new
       converted_html = replace_dom(marker)
-
+      converted_html = remove_backend_wovn_ignore_comments(converted_html, marker)
       [converted_html, marker]
     end
 
     private
 
+    def remove_backend_wovn_ignore_comments(html, marker)
+      backend_ignore_regex = /(<!--\s*backend-wovn-ignore\s*-->)(.+?)(<!--\s*\/backend-wovn-ignore\s*-->)/m
+      html.gsub(backend_ignore_regex) do |_match|
+        comment_start = Regexp.last_match(1)
+        ignored_content = Regexp.last_match(2)
+        comment_end = Regexp.last_match(3)
+        key = marker.add_comment_value(ignored_content)
+        comment_start + key + comment_end
+      end
+    end
+
     def html
       # Ensure a Content-Type declaration in the header. This mimics Nokogumbo
       # 1.5.0 default serialization behavior.
@@ -196,8 +207,9 @@ module Wovnrb
       url_pattern = @store.settings['url_pattern']
       lang_code_aliases_json = JSON.generate(@store.settings['custom_lang_aliases'])
       lang_param_name = @store.settings['lang_param_name']
+      custom_domain_langs = @store.custom_domain_langs.to_html_swapper_hash
 
-      [
+      result = [
         "key=#{token}",
         'backend=true',
         "currentLang=#{current_lang}",
@@ -206,7 +218,9 @@ module Wovnrb
         "langCodeAliases=#{lang_code_aliases_json}",
         "langParamName=#{lang_param_name}",
         "version=WOVN.rb_#{VERSION}"
-      ].join('&')
+      ]
+      result << "customDomainLangs=#{JSON.generate(custom_domain_langs)}" unless custom_domain_langs.empty?
+      result.join('&')
     end
   end
 end

data/lib/wovnrb/services/html_replace_marker.rb

@@ -32,6 +32,10 @@ module Wovnrb
       marked_html
     end
 
+    def keys
+      @mapped_values.map { |v| v[0] }
+    end
+
     private
 
     def generate_key

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.7.2'.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