wovnrb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18e9f78a0a42c2249870011353adc16baf05eed
-  data.tar.gz: 2d5d4fa65d4d5304e664ba8184744090b3a77e43
+  metadata.gz: 3ad74f869ecc0be459d21358a460e978cd01a30f
+  data.tar.gz: db9d85d8c7b8557b9b844852115b3773b76cffaf
 SHA512:
-  metadata.gz: 2088f60ce143c7ce93f1945a679d845aa2f6f0597b26489a34980158e9e9a1c9cd39f1a815743014cf0a0bb0eba2e7d80afc1477c7e00f4969f9b2f1cbca5820
-  data.tar.gz: 327a2f82d56db2dbbec8e16298f99e1b6d62bdf0dafade734edf43d4fe34c90f259a975491808b7a6b2ab5506aba4c526a7a660db383cbd7dfd877942497c234
+  metadata.gz: 3895654264d2a0d400a3cc1e1e7531a71164abc3536d8448b07d7a8aae22cbf439d2068e9a5fe00fad8c4c58d7cad98d570501c953087d2b8421ba6ebeb72005
+  data.tar.gz: db48ead4d587534e334449850e5ebbc5dfd35089a4afc0a4c79d4c858cba3e831dad8d5f79b5d6cdd9f0ec9c5d4856c28e96a255f53f36520d532a44d265b964

data/lib/wovnrb/html_replacers/meta_replacer.rb

@@ -1,15 +1,22 @@
 module Wovnrb
   class MetaReplacer < ReplacerBase
-    def initialize(text_index)
+    def initialize(text_index, pattern = nil, headers = nil)
       @text_index = text_index
+      @pattern = pattern
+      @headers = headers
     end
 
     def replace(dom, lang)
       dom.xpath('//meta').select { |node|
         next if wovn_ignore?(node)
-        (node.get_attribute('name') || node.get_attribute('property') || '') =~ /^(description|title|og:title|og:description|twitter:title|twitter:description)$/
+        (node.get_attribute('name') || node.get_attribute('property') || '') =~ /^(description|title|og:title|og:description|og:url|twitter:title|twitter:description)$/
       }.each do |node|
         node_content = node.get_attribute('content').strip
+        if @headers && @pattern && node.get_attribute('property') && node.get_attribute('property') === 'og:url'
+          new_url = lang.add_lang_code(node_content, @pattern, @headers)
+          node.set_attribute('content', new_url)
+          next
+        end
         # shouldn't need size check, but for now...
         if @text_index[node_content] && @text_index[node_content][lang.lang_code] && @text_index[node_content][lang.lang_code].size > 0
           node.set_attribute('content', replace_text(node.get_attribute('content'), @text_index[node_content][lang.lang_code][0]['data']))

data/lib/wovnrb/lang.rb

@@ -7,7 +7,10 @@ module Wovnrb
     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'},
@@ -15,26 +18,32 @@ module Wovnrb
       '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'},
     }
 
@@ -204,7 +213,7 @@ module Wovnrb
       end
 
       replacers << TextReplacer.new(text_index)
-      replacers << MetaReplacer.new(text_index)
+      replacers << MetaReplacer.new(text_index, pattern, headers)
       replacers << InputReplacer.new(text_index)
       replacers << ImageReplacer.new(url, text_index, src_index, img_src_prefix, host_aliases)
       replacers << ScriptReplacer.new(store)

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/lib/headers_test.rb

@@ -6103,7 +6103,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings)
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(30, keys.size)
+      assert_equal(39, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("wovn.io/#{key}", key)
@@ -6117,7 +6117,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(30, keys.size)
+      assert_equal(39, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)
@@ -6140,7 +6140,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query'))
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(30, keys.size)
+      assert_equal(39, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("wovn.io/?wovn=#{key}", key)
@@ -6154,7 +6154,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(30, keys.size)
+      assert_equal(39, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)
@@ -6177,7 +6177,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(30, keys.size)
+      assert_equal(39, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("#{key.downcase}.wovn.io/", key)
@@ -6191,7 +6191,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(30, keys.size)
+      assert_equal(39, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)

data/test/lib/html_replacers/meta_replacer_test.rb

@@ -90,5 +90,18 @@ module Wovnrb
       content = dom.xpath('//meta')[0].get_attribute('content')
       assert_equal('Hello', content)
     end
+
+    def test_replace_wovn_ignore
+      headers = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'https://test.com'), Wovnrb.get_settings)
+      replacer = MetaReplacer.new({
+        'Hello' => {'ja' => [{'data' => 'こんにちは'}]},
+      }, 'path', headers)
+
+      dom = Wovnrb.get_dom('<meta property="og:url" content="https://test.com">')
+      replacer.replace(dom, Lang.new('ja'))
+
+      content = dom.xpath('//meta')[0].get_attribute('content')
+      assert_equal('https://test.com/ja/', content)
+    end
   end
 end

data/test/lib/lang_test.rb

@@ -10,7 +10,7 @@ module Wovnrb
     end
 
     def test_langs_length
-      assert_equal(30, Wovnrb::Lang::LANG.length)
+      assert_equal(39, Wovnrb::Lang::LANG.length)
     end
 
     def test_keys_exist
@@ -24,7 +24,10 @@ module Wovnrb
 
     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'))
@@ -32,26 +35,32 @@ module Wovnrb
        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'))
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -437,4 +437,3 @@ test_files:
 - test/lib/wovnrb_test.rb
 - test/services/url_test.rb
 - test/test_helper.rb
-has_rdoc: