wovnrb 2.2.3 → 3.0.1

data/lib/wovnrb.rb

@@ -109,7 +109,7 @@ module Wovnrb
     end
 
     def wovn_ignored?(html_body)
-      !html_body.xpath('//html[@wovn-ignore]').empty?
+      !html_body.xpath('//html[@wovn-ignore or @data-wovn-ignore]').empty?
     end
 
     def ignore_path?(path)

data/lib/wovnrb/api_translator.rb

@@ -109,7 +109,7 @@ module Wovnrb
     end
 
     def api_uri
-      Addressable::URI.parse(@store.settings['api_url'])
+      Addressable::URI.parse(@store.settings['api_url'] + '/v0/')
     end
 
     def api_timeout

data/lib/wovnrb/headers.rb

@@ -8,7 +8,6 @@ module Wovnrb
     attr_reader :unmasked_pathname
     attr_reader :pathname
     attr_reader :pathname_with_trailing_slash_if_present
-    attr_reader :redis_url
 
     # Generates new instance of Wovnrb::Headers.
     # Its parameters are set by parsing env variable.
@@ -62,7 +61,6 @@ module Wovnrb
       @query = remove_lang(@query, lang_code)
       @pathname_with_trailing_slash_if_present = @pathname
       @pathname = @pathname.gsub(/\/$/, '')
-      @redis_url = "#{@host}#{@pathname}#{@query}"
     end
 
     def unmasked_pathname_without_trailing_slash
@@ -98,27 +96,7 @@ module Wovnrb
       @path_lang
     end
 
-    def browser_lang
-      if @browser_lang.nil?
-        match = (@env['HTTP_COOKIE'] || '').match(/wovn_selected_lang\s*=\s*(?<lang>[^;\s]+)/)
-        if match && match[:lang] && Lang.get_lang(match[:lang])
-          @browser_lang = match[:lang]
-        else
-          # IS THIS RIGHT?
-          @browser_lang = ''
-          accept_langs = (@env['HTTP_ACCEPT_LANGUAGE'] || '').split(/[,;]/)
-          accept_langs.each do |l|
-            if Lang.get_lang(l)
-              @browser_lang = l
-              break
-            end
-          end
-        end
-      end
-      @browser_lang
-    end
-
-    def redirect(lang = browser_lang)
+    def redirect(lang)
       redirect_headers = {}
       redirect_headers['location'] = redirect_location(lang)
       redirect_headers['content-length'] = '0'

data/lib/wovnrb/lang.rb

@@ -3,46 +3,83 @@ require 'addressable'
 module Wovnrb
   class Lang
     LANG = {
-      # http://msdn.microsoft.com/en-us/library/hh456380.aspx
-      'ar' => { name: 'العربية',           code: 'ar',     en: 'Arabic' },
-      'eu' => { name: 'Euskara',           code: 'eu',     en: 'Basque' },
-      'bn' => { name: 'বাংলা ভাষা',             code: 'bn',     en: 'Bengali' },
-      'bg' => { name: 'Български',         code: 'bg',     en: 'Bulgarian' },
-      'ca' => { name: 'Català',            code: 'ca',     en: 'Catalan' },
-      'zh-CHS' => { name: '简体中文',      code: 'zh-CHS', en: 'Simp Chinese' },
-      'zh-CHT' => { name: '繁體中文',      code: 'zh-CHT', en: 'Trad Chinese' },
-      'da' => { name: 'Dansk',             code: 'da',     en: 'Danish' },
-      'nl' => { name: 'Nederlands',        code: 'nl',     en: 'Dutch' },
-      'en' => { name: 'English',           code: 'en',     en: 'English' },
-      'fi' => { name: 'Suomi',             code: 'fi',     en: 'Finnish' },
-      'fr' => { name: 'Français',          code: 'fr',     en: 'French' },
-      'gl' => { name: 'Galego',            code: 'gl',     en: 'Galician' },
-      'de' => { name: 'Deutsch',           code: 'de',     en: 'German' },
-      'el' => { name: 'Ελληνικά',          code: 'el',     en: 'Greek' },
-      'he' => { name: 'עברית',             code: 'he',     en: 'Hebrew' },
-      'hu' => { name: 'Magyar',            code: 'hu',     en: 'Hungarian' },
-      'id' => { name: 'Bahasa Indonesia',  code: 'id',     en: 'Indonesian' },
-      'it' => { name: 'Italiano',          code: 'it',     en: 'Italian' },
-      'ja' => { name: '日本語',            code: 'ja',     en: 'Japanese' },
-      'ko' => { name: '한국어',            code: 'ko',     en: 'Korean' },
-      'lv' => { name: 'Latviešu',          code: 'lv',     en: 'Latvian' },
-      'ms' => { name: 'Bahasa Melayu',     code: 'ms',     en: 'Malay' },
-      'my' => { name: 'ဗမာစာ',             code: 'my',     en: 'Burmese' },
-      'ne' => { name: 'नेपाली भाषा',            code: 'ne',     en: 'Nepali' },
-      'fa' => { name: 'زبان_فارسی',        code: 'fa',     en: 'Persian' },
-      'no' => { name: 'Norsk',             code: 'no',     en: 'Norwegian' },
-      'pl' => { name: 'Polski',            code: 'pl',     en: 'Polish' },
-      'pt' => { name: 'Português',         code: 'pt',     en: 'Portuguese' },
-      'ru' => { name: 'Русский',           code: 'ru',     en: 'Russian' },
-      'es' => { name: 'Español',           code: 'es',     en: 'Spanish' },
-      'sw' => { name: 'Kiswahili',         code: 'sw',     en: 'Swahili' },
-      'sv' => { name: 'Svensk',            code: 'sv',     en: 'Swedish' },
-      'th' => { name: 'ภาษาไทย',           code: 'th',     en: 'Thai' },
-      'hi' => { name: 'हिन्दी',               code: 'hi',     en: 'Hindi' },
-      'tr' => { name: 'Türkçe',            code: 'tr',     en: 'Turkish' },
-      'uk' => { name: 'Українська',        code: 'uk',     en: 'Ukrainian' },
-      'ur' => { name: 'اردو',              code: 'ur',     en: 'Urdu' },
-      'vi' => { name: 'Tiếng Việt',        code: 'vi',     en: 'Vietnamese' }
+      'ar' => { name: 'العربية',                    code: 'ar',         en: 'Arabic' },
+      'eu' => { name: 'Euskara',                  code: 'eu',         en: 'Basque' },
+      'bn' => { name: 'বাংলা ভাষা',                code: 'bn',         en: 'Bengali' },
+      'bg' => { name: 'Български',                code: 'bg',         en: 'Bulgarian' },
+      'ca' => { name: 'Català',                   code: 'ca',         en: 'Catalan' },
+      'zh-CN' => { name: '简体中文（中国）',         code: 'zh-CN',      en: 'Simp Chinese (China)' },
+      'zh-CHS' => { name: '简体中文',                 code: 'zh-CHS',     en: 'Simp Chinese' },
+      'zh-Hant-HK' => { name: '繁體中文（香港）',         code: 'zh-Hant-HK', en: 'Trad Chinese (Hong Kong)' },
+      'zh-Hant-TW' => { name: '繁體中文（台湾）',         code: 'zh-Hant-TW', en: 'Trad Chinese (Taiwan)' },
+      'zh-CHT' => { name: '繁體中文',                 code: 'zh-CHT',     en: 'Trad Chinese' },
+      'da' => { name: 'Dansk',                    code: 'da',         en: 'Danish' },
+      'nl' => { name: 'Nederlands',               code: 'nl',         en: 'Dutch' },
+      'en' => { name: 'English',                  code: 'en',         en: 'English' },
+      'en-AU' => { name: 'English (Australia)',      code: 'en-AU',      en: 'English (Australia)' },
+      'en-CA' => { name: 'English (Canada)',         code: 'en-CA',      en: 'English (Canada)' },
+      'en-IN' => { name: 'English (India)',          code: 'en-IN',      en: 'English (India)' },
+      'en-NZ' => { name: 'English (New Zealand)',    code: 'en-NZ',      en: 'English (New Zealand)' },
+      'en-ZA' => { name: 'English (South Africa)',   code: 'en-ZA',      en: 'English (South Africa)' },
+      'en-GB' => { name: 'English (United Kingdom)', code: 'en-GB',      en: 'English (United Kingdom)' },
+      'en-SG' => { name: 'English (Singapore)',      code: 'en-SG',      en: 'English (Singapore)' },
+      'en-US' => { name: 'English (United States)',  code: 'en-US',      en: 'English (United States)' },
+      'fi' => { name: 'Suomi',                    code: 'fi',         en: 'Finnish' },
+      'fr' => { name: 'Français',                 code: 'fr',         en: 'French' },
+      'fr-CA' => { name: 'Français (Canada)',        code: 'fr-CA',      en: 'French (Canada)' },
+      'fr-FR' => { name: 'Français (France)',        code: 'fr-FR',      en: 'French (France)' },
+      'fr-CH' => { name: 'Français (Suisse)',        code: 'fr-CH',      en: 'French (Switzerland)' },
+      'gl' => { name: 'Galego',                   code: 'gl',         en: 'Galician' },
+      'de' => { name: 'Deutsch',                  code: 'de',         en: 'German' },
+      'de-AT' => { name: 'Deutsch (Österreich)',     code: 'de-AT',      en: 'German (Austria)' },
+      'de-DE' => { name: 'Deutsch (Deutschland)',    code: 'de-DE',      en: 'German (Germany)' },
+      'de-LI' => { name: 'Deutsch (Liechtenstien)',  code: 'de-LI',      en: 'German (Liechtenstien)' },
+      'de-CH' => { name: 'Deutsch (Schweiz)',        code: 'de-CH',      en: 'German (Switzerland)' },
+      'el' => { name: 'Ελληνικά',                 code: 'el',         en: 'Greek' },
+      'he' => { name: 'עברית',                    code: 'he',         en: 'Hebrew' },
+      'hu' => { name: 'Magyar',                   code: 'hu',         en: 'Hungarian' },
+      'id' => { name: 'Bahasa Indonesia',         code: 'id',         en: 'Indonesian' },
+      'it' => { name: 'Italiano',                 code: 'it',         en: 'Italian' },
+      'it-IT' => { name: 'Italiano (Italia)',        code: 'it-IT',      en: 'Italian (Italy)' },
+      'it-CH' => { name: 'Italiano (Svizzera)',      code: 'it-CH',      en: 'Italian (Switzerland)' },
+      'ja' => { name: '日本語',                   code: 'ja',         en: 'Japanese' },
+      'ko' => { name: '한국어',                    code: 'ko',         en: 'Korean' },
+      'lv' => { name: 'Latviešu',                 code: 'lv',         en: 'Latvian' },
+      'ms' => { name: 'Bahasa Melayu',            code: 'ms',         en: 'Malay' },
+      'my' => { name: 'ဗမာစာ',                   code: 'my',         en: 'Burmese' },
+      'ne' => { name: 'नेपाली भाषा',                code: 'ne',         en: 'Nepali' },
+      'no' => { name: 'Norsk',                    code: 'no',         en: 'Norwegian' },
+      'fa' => { name: 'زبان_فارسی',                code: 'fa',         en: 'Persian' },
+      'pl' => { name: 'Polski',                   code: 'pl',         en: 'Polish' },
+      'pt' => { name: 'Português',                code: 'pt',         en: 'Portuguese' },
+      'pt-BR' => { name: 'Português (Brasil)',       code: 'pt-BR',      en: 'Portuguese (Brazil)' },
+      '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-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)' },
+      'es-HN' => { name: 'Español (Honduras)',       code: 'es-HN',      en: 'Spanish (Honduras)' },
+      'es-419' => { name: 'Español (Latinoamérica)',  code: 'es-419',     en: 'Spanish (Latin America)' },
+      'es-MX' => { name: 'Español (México)',         code: 'es-MX',      en: 'Spanish (Mexico)' },
+      'es-PE' => { name: 'Español (Perú)',           code: 'es-PE',      en: 'Spanish (Peru)' },
+      'es-ES' => { name: 'Español (España)',         code: 'es-ES',      en: 'Spanish (Spain)' },
+      'es-US' => { name: 'Español (Estados Unidos)', code: 'es-US',      en: 'Spanish (United States)' },
+      'es-UY' => { name: 'Español (Uruguay)',        code: 'es-UY',      en: 'Spanish (Uruguay)' },
+      'es-VE' => { name: 'Español (Venezuela)',      code: 'es-VE',      en: 'Spanish (Venezuela)' },
+      'sw' => { name: 'Kiswahili',                code: 'sw',         en: 'Swahili' },
+      'sv' => { name: 'Svensk',                   code: 'sv',         en: 'Swedish' },
+      'tl' => { name: 'Tagalog',                  code: 'tl',         en: 'Tagalog' },
+      'th' => { name: 'ภาษาไทย',                 code: 'th',         en: 'Thai' },
+      'hi' => { name: 'हिन्दी',                     code: 'hi',         en: 'Hindi' },
+      'tr' => { name: 'Türkçe',                   code: 'tr',         en: 'Turkish' },
+      'uk' => { name: 'Українська',               code: 'uk',         en: 'Ukrainian' },
+      'ur' => { name: 'اردو',                      code: 'ur',         en: 'Urdu' },
+      'vi' => { name: 'Tiếng Việt',               code: 'vi',         en: 'Vietnamese' },
+      'km' => { name: 'ភាសាខ្មែរ',               code: 'km',         en: 'Khmer' },
+      'ta' => { name: 'தமிழ்',               code: 'ta',         en: 'Tamil' },
+      'si' => { name: 'සිංහල',               code: 'si',         en: 'Sinhala' }
     }.freeze
 
     # Provides the ISO639-1 code for a given lang code.

data/lib/wovnrb/railtie.rb

@@ -1,21 +1,7 @@
 module Wovnrb
-  def self.middleware_inserted?(app, middleware)
-    app.middleware.send(:operations).each do |_, middlewares, _|
-      return true if middlewares.include?(middleware)
-    end
-
-    false
-  end
-
   class Railtie < Rails::Railtie
     initializer 'wovnrb.configure_rails_initialization' do |app|
-      unless Wovnrb.middleware_inserted?(app, Wovnrb::Interceptor)
-        if defined?(Rack::Deflater) && Wovnrb.middleware_inserted?(app, Rack::Deflater)
-          app.middleware.insert_after(Rack::Deflater, Wovnrb::Interceptor)
-        else
-          app.middleware.insert_before(0, Wovnrb::Interceptor)
-        end
-      end
+      app.middleware.insert_before(0, Wovnrb::Interceptor) if Rails.configuration.wovnrb[:install_middleware]
     end
   end
 end

data/lib/wovnrb/services/html_converter.rb

@@ -43,6 +43,7 @@ module Wovnrb
 
       insert_snippet(true)
       insert_hreflang_tags
+      inject_lang_html_tag
 
       html
     end
@@ -84,7 +85,7 @@ module Wovnrb
     end
 
     def strip_wovn_ignore(node, marker)
-      put_replace_marker(node, marker) if node && node.get_attribute('wovn-ignore')
+      put_replace_marker(node, marker) if node && (node.get_attribute('wovn-ignore') || node.get_attribute('data-wovn-ignore'))
     end
 
     def put_replace_marker(node, marker)
@@ -108,15 +109,9 @@ module Wovnrb
     def inject_lang_html_tag
       root = @dom.at_css('html')
       return unless root
+      return if root['lang']
 
-      current_lang = @headers.lang_code
-      default_lang = @store.default_lang
-
-      if current_lang != default_lang
-        root['lang'] = current_lang
-      else
-        root.delete('lang')
-      end
+      root['lang'] = @store.default_lang
     end
 
     def replace_hreflangs
@@ -147,10 +142,14 @@ module Wovnrb
     # Remove wovn snippet code from dom
     def strip_snippet
       @dom.xpath('//script').each do |script_node|
-        script_node.remove if script_node['src'] && script_node['src'] =~ /^\/\/j.(dev-)?wovn.io(:3000)?\//
+        script_node.remove if (script_node['src'] && widget_urls.any? { |url| script_node['src'].include? url }) || script_node['data-wovnio'].present?
       end
     end
 
+    def widget_urls
+      [@store.settings['api_url'] + '/widget', 'j.wovn.io', 'j.dev-wovn.io:3000']
+    end
+
     def insert_snippet(adds_backend_error_mark = true)
       parent_node = @dom.at_css('head') || @dom.at_css('body') || @dom.at_css('html')
       return unless parent_node

data/lib/wovnrb/store.rb

@@ -23,7 +23,7 @@ module Wovnrb
         'lang_param_name' => 'wovn',
         'query' => [],
         'ignore_class' => [],
-        'api_url' => 'https://wovn.global.ssl.fastly.net/v0/',
+        'api_url' => 'https://wovn.global.ssl.fastly.net',
         'api_timeout_seconds' => 1.0,
         'default_lang' => 'en',
         'supported_langs' => ['en'],
@@ -157,7 +157,7 @@ module Wovnrb
 
       if @settings['wovn_dev_mode']
         if @settings['api_url'] == self.class.default_settings['api_url']
-          @settings['api_url'] = 'http://dev-wovn.io:3001/v0/'
+          @settings['api_url'] = 'http://dev-wovn.io:3001'
         end
 
         if @settings['api_timeout_seconds'] == self.class.default_settings['api_timeout_seconds']
@@ -185,7 +185,7 @@ module Wovnrb
 
     def wovn_host
       if @settings['wovn_dev_mode']
-        'dev-wovn.io:3000'
+        'dev-wovn.io'
       else
         'wovn.io'
       end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = '2.2.3'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/makefile

@@ -0,0 +1,16 @@
+DOCKER_COMPOSE_YML = docker/docker-compose.yml
+
+.PHONY: build stop start clean
+
+build:
+	docker-compose -f $(DOCKER_COMPOSE_YML) build
+
+stop:
+	docker-compose -f $(DOCKER_COMPOSE_YML) rm -sf
+
+start:
+	docker-compose -f $(DOCKER_COMPOSE_YML) up
+
+clean:
+	docker-compose -f $(DOCKER_COMPOSE_YML) down --rmi all --volumes
+

data/test/lib/headers_test.rb

@@ -74,24 +74,6 @@ module Wovnrb
       assert_equal('localhost', env['SERVER_NAME'])
     end
 
-    def test_initialize_without_query
-      env = Wovnrb.get_env
-      h = Wovnrb::Headers.new(env, Wovnrb.get_settings)
-      assert_equal('wovn.io/dashboard', h.redis_url)
-    end
-
-    def test_initialize_with_query
-      env = Wovnrb.get_env
-      h = Wovnrb::Headers.new(env, Wovnrb.get_settings('query' => ['param']))
-      assert_equal('wovn.io/dashboard?param=val', h.redis_url)
-    end
-
-    def test_initialize_with_not_matching_query
-      env = Wovnrb.get_env
-      h = Wovnrb::Headers.new(env, Wovnrb.get_settings('query' => ['aaa']))
-      assert_equal('wovn.io/dashboard', h.redis_url)
-    end
-
     def test_initialize_with_proto_header
       env = Wovnrb.get_env('url' => 'http://page.com', 'HTTP_X_FORWARDED_PROTO' => 'https')
       h = Wovnrb::Headers.new(env, Wovnrb.get_settings('query' => ['aaa']))
@@ -6232,7 +6214,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings)
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(39, keys.size)
+      assert_equal(77, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("wovn.io/#{key}", key)
@@ -6246,7 +6228,7 @@ module Wovnrb
     def test_remove_lang_path_with_nil_lang
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings)
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(39, keys.size)
+      assert_equal(77, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)
@@ -6269,7 +6251,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query'))
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(39, keys.size)
+      assert_equal(77, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("wovn.io/?wovn=#{key}", key)
@@ -6284,7 +6266,7 @@ module Wovnrb
       sut = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query', 'lang_param_name' => 'lang'))
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(39, keys.size)
+      assert_equal(77, keys.size)
 
       for key in keys
         uri_without_custom_lang_param = "wovn.io/?wovn=#{key}"
@@ -6302,7 +6284,7 @@ module Wovnrb
     def test_remove_lang_query_with_nil_lang
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query'))
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(39, keys.size)
+      assert_equal(77, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)
@@ -6325,7 +6307,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(39, keys.size)
+      assert_equal(77, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("#{key.downcase}.wovn.io/", key)
@@ -6339,7 +6321,7 @@ module Wovnrb
     def test_remove_lang_subdomain_with_nil_lang
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(39, keys.size)
+      assert_equal(77, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)

data/test/lib/lang_test.rb

@@ -7,7 +7,7 @@ module Wovnrb
     end
 
     def test_langs_length
-      assert_equal(39, Wovnrb::Lang::LANG.length)
+      assert_equal(77, Wovnrb::Lang::LANG.length)
     end
 
     def test_keys_exist
@@ -20,45 +20,15 @@ module Wovnrb
     end
 
     def test_iso_639_1_normalization
-      assert_equal('ar', Lang.iso_639_1_normalization('ar'))
-      assert_equal('eu',       Lang.iso_639_1_normalization('eu'))
-      assert_equal('bn',       Lang.iso_639_1_normalization('bn'))
-      assert_equal('bg',       Lang.iso_639_1_normalization('bg'))
-      assert_equal('ca',       Lang.iso_639_1_normalization('ca'))
-      assert_equal('zh-Hans',  Lang.iso_639_1_normalization('zh-CHS'))
-      assert_equal('zh-Hant',  Lang.iso_639_1_normalization('zh-CHT'))
-      assert_equal('da',       Lang.iso_639_1_normalization('da'))
-      assert_equal('nl',       Lang.iso_639_1_normalization('nl'))
-      assert_equal('en',       Lang.iso_639_1_normalization('en'))
-      assert_equal('fi',       Lang.iso_639_1_normalization('fi'))
-      assert_equal('fr',       Lang.iso_639_1_normalization('fr'))
-      assert_equal('gl',       Lang.iso_639_1_normalization('gl'))
-      assert_equal('de',       Lang.iso_639_1_normalization('de'))
-      assert_equal('el',       Lang.iso_639_1_normalization('el'))
-      assert_equal('he',       Lang.iso_639_1_normalization('he'))
-      assert_equal('hu',       Lang.iso_639_1_normalization('hu'))
-      assert_equal('id',       Lang.iso_639_1_normalization('id'))
-      assert_equal('it',       Lang.iso_639_1_normalization('it'))
-      assert_equal('ja',       Lang.iso_639_1_normalization('ja'))
-      assert_equal('ko',       Lang.iso_639_1_normalization('ko'))
-      assert_equal('lv',       Lang.iso_639_1_normalization('lv'))
-      assert_equal('ms',       Lang.iso_639_1_normalization('ms'))
-      assert_equal('my',       Lang.iso_639_1_normalization('my'))
-      assert_equal('ne',       Lang.iso_639_1_normalization('ne'))
-      assert_equal('fa',       Lang.iso_639_1_normalization('fa'))
-      assert_equal('no',       Lang.iso_639_1_normalization('no'))
-      assert_equal('pl',       Lang.iso_639_1_normalization('pl'))
-      assert_equal('pt',       Lang.iso_639_1_normalization('pt'))
-      assert_equal('ru',       Lang.iso_639_1_normalization('ru'))
-      assert_equal('es',       Lang.iso_639_1_normalization('es'))
-      assert_equal('sw',       Lang.iso_639_1_normalization('sw'))
-      assert_equal('sv',       Lang.iso_639_1_normalization('sv'))
-      assert_equal('th',       Lang.iso_639_1_normalization('th'))
-      assert_equal('hi',       Lang.iso_639_1_normalization('hi'))
-      assert_equal('tr',       Lang.iso_639_1_normalization('tr'))
-      assert_equal('uk',       Lang.iso_639_1_normalization('uk'))
-      assert_equal('ur',       Lang.iso_639_1_normalization('ur'))
-      assert_equal('vi',       Lang.iso_639_1_normalization('vi'))
+      Wovnrb::Lang::LANG.each do |_, l|
+        if l[:code] == 'zh-CHS'
+          assert_equal('zh-Hans',  Lang.iso_639_1_normalization('zh-CHS'))
+        elsif l[:code] == 'zh-CHT'
+          assert_equal('zh-Hant',  Lang.iso_639_1_normalization('zh-CHT'))
+        else
+          assert_equal(l[:code], Lang.iso_639_1_normalization(l[:code]))
+        end
+      end
     end
 
     def test_get_code_with_valid_code