wovnrb 0.2.07.1 → 0.2.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65bd099a98b9832deb8a8ad6c0a76b2442727ec
-  data.tar.gz: 2d65eb16175398584a2bebe3f80732d74d7cc3ec
+  metadata.gz: e03644873d29f35ebef11aa8713151b2a9d06ce3
+  data.tar.gz: b0b05d53c20087c7a693ec8b96d3c376c0ff7789
 SHA512:
-  metadata.gz: 629628750b2196824f4e2be03e0f299f94989d115fc1042a43adc146f22d627d3dbabc78435f39e25d473cef2c72ac6449766ca2779e51c54082e4b12fa681c4
-  data.tar.gz: fa5f22df24ad7726ab9a056718a0ac037ae95482142de2dc6e834a59d55d369398b584125bcb938b6c3a7d3d09d2ceff839e73f1ec6f68294bf4925ff43c8255
+  metadata.gz: 8a0faf6a9080d11261c51334f2e90f9b1e21117c28f5e4dc1c25edeecfc9ea78cd69bdb74c07f347d078c545e4ef3460b1e28060ed6da47c34f737b1d85c1af5
+  data.tar.gz: 5635239e563ed0397fa408c5a436aa0930cc84fefce5bab336089c263ec333d36bef0536005597ff4e82f06a3b97698d304b6abd5a89110ee6f5c287f077886d

data/lib/wovnrb/headers.rb

@@ -205,7 +205,7 @@ module Wovnrb
 
     def out(headers)
       r = Regexp.new("//" + @host)
-      if lang_code != @settings['default_lang'] && headers.has_key?("Location") && headers["Location"] =~ r
+      if headers.has_key?("Location") && headers["Location"] =~ r
         case @settings['url_pattern']
         when 'query'
           if headers["Location"] =~ /\?/

data/lib/wovnrb/lang.rb

@@ -33,6 +33,16 @@ module Wovnrb
       'vi' => {name: 'Tiếng Việt',        code: 'vi',     en: 'Vietnamese'},
     }
 
+    # Provides the ISO639-1 code for a given lang code.
+    # Source: https://support.google.com/webmasters/answer/189077?hl=en
+    #
+    # @param lang_code [String] lang_code Code of the language.
+    #
+    # @return [String] The ISO639-1 code of the language.
+    def self.iso_639_1_normalization(lang_code)
+      return lang_code.sub(/zh-CHT/i, 'zh-Hant').sub(/zh-CHS/i, 'zh-Hans')
+    end
+
     def self.get_code(lang_name)
       return nil if lang_name.nil?
       return lang_name if LANG[lang_name]
@@ -137,7 +147,7 @@ module Wovnrb
       published_langs.each do |l|
         insert_node = Nokogiri::XML::Node.new('link', dom)
         insert_node['rel'] = 'alternate'
-        insert_node['hreflang'] = l
+        insert_node['hreflang'] = Lang::iso_639_1_normalization(l)
         insert_node['href'] = headers.redirect_location(l)
         parent_node.add_child(insert_node)
       end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.07.1"
+  VERSION = "0.2.08"
 end

data/test/lib/headers_test.rb

@@ -150,60 +150,6 @@ class HeadersTest < Minitest::Test
     assert_equal('http://wovn.io/test', env['HTTP_REFERER'])
   end
 
-	def test_out_original_lang_with_subdomain_url_pattern
-		h = Wovnrb::Headers.new(
-			Wovnrb.get_env(
-				'SERVER_NAME' => 'wovn.io',
-				'REQUEST_URI' => '/test',
-				'HTTP_REFERER' => 'http://wovn.io/test',
-			),
-			Wovnrb.get_settings(
-				'url_pattern' => 'subdomain',
-				'url_pattern_reg' => '^(?<lang>[^.]+).',
-			),
-		)
-		headers = h.request_out(h.lang_code)
-		assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
-		headers['Location'] = headers['HTTP_REFERER']
-		assert_equal('http://wovn.io/test', h.out(headers)['Location'])
-	end
-
-	def test_out_original_lang_with_path_url_pattern
-		h = Wovnrb::Headers.new(
-			Wovnrb.get_env(
-				'SERVER_NAME' => 'wovn.io',
-				'REQUEST_URI' => '/test',
-				'HTTP_REFERER' => 'http://wovn.io/test',
-			),
-			Wovnrb.get_settings(
-				'url_pattern' => 'path',
-				'url_pattern_reg' => '/(?<lang>[^/.?]+)',
-			),
-		)
-		headers = h.request_out(h.lang_code)
-		assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
-		headers['Location'] = headers['HTTP_REFERER']
-		assert_equal('http://wovn.io/test', h.out(headers)['Location'])
-	end
-
-	def test_out_original_lang_with_query_url_pattern
-		h = Wovnrb::Headers.new(
-			Wovnrb.get_env(
-				'SERVER_NAME' => 'wovn.io',
-				'REQUEST_URI' => '/test',
-				'HTTP_REFERER' => 'http://wovn.io/test',
-			),
-			Wovnrb.get_settings(
-				'url_pattern' => 'query',
-				'url_pattern_reg' => '((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)',
-			),
-		)
-		headers = h.request_out(h.lang_code)
-		assert_equal('http://wovn.io/test', headers['HTTP_REFERER'])
-		headers['Location'] = headers['HTTP_REFERER']
-		assert_equal('http://wovn.io/test', h.out(headers)['Location'])
-	end
-
   #########################
   # GET SETTINGS
   #########################

data/test/lib/lang_test.rb

@@ -22,6 +22,37 @@ module Wovnrb
       end
     end
 
+    def test_iso_639_1_normalization
+       assert_equal('ar',       Lang::iso_639_1_normalization('ar'));
+       assert_equal('bg',       Lang::iso_639_1_normalization('bg'));
+       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('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('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('ms',       Lang::iso_639_1_normalization('ms'));
+       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('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('vi',       Lang::iso_639_1_normalization('vi'));
+    end
+
     def test_get_code_with_valid_code
       assert_equal('ms', Wovnrb::Lang.get_code('ms'))
     end
@@ -372,6 +403,32 @@ module Wovnrb
       return values
     end
 
+    def test_switch_dom_lang_for_simplified_chinese
+      lang = Lang.new('ja')
+      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://page.com'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+      dom = generate_dom
+      values = generate_values
+      values['text_vals']['Simplified Chinese'] = {'zh-CHS' => [{data: 'test'}]}
+      url = h.url
+
+      swapped_body = lang.switch_dom_lang(dom, Store.instance, values, url, h)
+      assert(/hreflang="zh-Hans"/ =~ swapped_body)
+      assert(!(/hreflang="zh-CHS"/ =~ swapped_body))
+    end
+
+    def test_switch_dom_lang_for_traditional_chinese
+      lang = Lang.new('ja')
+      h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://page.com'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+      dom = generate_dom
+      values = generate_values
+      values['text_vals']['Traditional Chinese'] = {'zh-CHT' => [{data: 'test'}]}
+      url = h.url
+
+      swapped_body = lang.switch_dom_lang(dom, Store.instance, values, url, h)
+      assert(/hreflang="zh-Hant"/ =~ swapped_body)
+      assert(!(/hreflang="zh-CHT"/ =~ swapped_body))
+    end
+
     def test_switch_lang
       lang = Lang.new('ja')
       h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://page.com'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))

data/wovnrb.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   #spec.extensions    = spec.files.grep(%r{/extconf\.rb$})
 
   spec.add_dependency "nokogumbo", "1.3.0"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", "4.2.6"
   spec.add_dependency "lz4-ruby"
 
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.07.1
+  version: 0.2.08
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -29,16 +29,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: lz4-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -364,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Gem for WOVN.io