wovnrb 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c68e13bb355b5325edc102eb098dc838b7d7a1
-  data.tar.gz: cfd66046dd86597d2b37b65dc9e7623b465d3c51
+  metadata.gz: c527a83e2c6ab94014f55fb166f516fd5bf56941
+  data.tar.gz: 767806ed70c4ae6a32fd75e17dd7518417b7b51f
 SHA512:
-  metadata.gz: 945493670a717f362bab0fc2099af3d0525600327c2828d941b3afa65720718f616a81aeee14353f674b4bcf7df6e9d8b6c9bd4d7068f4caf836514ff7ae6923
-  data.tar.gz: 83fbe6ec6a455d472710b6b2b0acd0b38500b81327a1c287af5446dd654323dbb34090d4d813494d81dca152019b416a2a30019ea7ec828ca293a734683ce0b7
+  metadata.gz: 00208abab45da12764dbb0eed8914fe69996de815a0f1e5f3e762924f48410419df89068eef4aea4e5a9839d0554134782e5c462e3e4e287295f24f3ae08ca76
+  data.tar.gz: ce166e7836b300fba7ea2e8ac02f815118f558e9fb6ed9beace3fa7d6ea810b83fb75c53662917cc2116af0037df00f1ce3091c53ecfeee699a6abc08ec2df9f

data/lib/wovnrb/html_replacers/image_replacer.rb

@@ -1,10 +1,11 @@
 module Wovnrb
   class ImageReplacer < ReplacerBase
-    def initialize(url, text_index, src_index, img_src_prefix)
+    def initialize(url, text_index, src_index, img_src_prefix, host_aliases)
       @url = url
       @text_index = text_index
       @src_index = src_index
       @img_src_prefix = img_src_prefix
+      @host_aliases = host_aliases
     end
 
     def replace(dom, lang)
@@ -26,9 +27,18 @@ module Wovnrb
             end
           end
 
-          # shouldn't need size check, but for now...
-          if @src_index[src] && @src_index[src][lang.lang_code] && @src_index[src][lang.lang_code].size > 0
-            node.attribute('src').value = "#{@img_src_prefix}#{@src_index[src][lang.lang_code][0]['data']}"
+          unless replace_src_if_match(node, lang, src)
+            # host name exclude port number
+            host_match = %r!://([^/:]+)!.match(src)
+            host_name = host_match ? host_match[1] : ''
+
+            # replace image if match host alias
+            if host_match and @host_aliases.include?(host_name)
+              @host_aliases.find do |host_alias|
+                src_alias = src.gsub(host_name, host_alias)
+                replace_src_if_match(node, lang, src_alias)
+              end
+            end
           end
         end
 
@@ -43,6 +53,13 @@ module Wovnrb
     end
 
     private
+    def replace_src_if_match(node, lang, src)
+      # shouldn't need size check, but for now...
+      if @src_index[src] && @src_index[src][lang.lang_code] && @src_index[src][lang.lang_code].size > 0
+        node.attribute('src').value = "#{@img_src_prefix}#{@src_index[src][lang.lang_code][0]['data']}"
+      end
+    end
+
     def join_path(x, y)
       separator = (x[-1] != '/' and y[0] != '/') ? '/' : ''
       "#{x}#{separator}#{y}"

data/lib/wovnrb/lang.rb

@@ -21,6 +21,7 @@ module Wovnrb
       'ko' => {name: '한국어',            code: 'ko',     en: 'Korean'},
       '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'},
       'pl' => {name: 'Polski',            code: 'pl',     en: 'Polish'},
       'pt' => {name: 'Português',         code: 'pt',     en: 'Portuguese'},
@@ -170,6 +171,7 @@ module Wovnrb
       text_index = values['text_vals'] || {}
       src_index = values['img_vals'] || {}
       img_src_prefix = values['img_src_prefix'] || ''
+      host_aliases = values['host_aliases'] || []
 
       replacers = []
       # add lang code to anchors href if not default lang
@@ -181,7 +183,7 @@ module Wovnrb
       replacers << TextReplacer.new(text_index)
       replacers << MetaReplacer.new(text_index)
       replacers << InputReplacer.new(text_index)
-      replacers << ImageReplacer.new(url, text_index, src_index, img_src_prefix)
+      replacers << ImageReplacer.new(url, text_index, src_index, img_src_prefix, host_aliases)
       replacers << ScriptReplacer.new(store)
 
       replacers.each do |replacer|

data/lib/wovnrb/store.rb

@@ -4,6 +4,8 @@ require 'cgi'
 require 'singleton'
 require 'wovnrb/services/wovn_logger'
 require 'wovnrb/services/glob'
+require 'active_support'
+require 'active_support/core_ext'
 
 module Wovnrb
   class Store

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

data/test/lib/headers_test.rb

@@ -5975,7 +5975,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings)
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(29, keys.size)
+      assert_equal(30, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("wovn.io/#{key}", key)
@@ -5989,7 +5989,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(29, keys.size)
+      assert_equal(30, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)
@@ -6012,7 +6012,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'query'))
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(29, keys.size)
+      assert_equal(30, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("wovn.io/?wovn=#{key}", key)
@@ -6026,7 +6026,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(29, keys.size)
+      assert_equal(30, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)
@@ -6049,7 +6049,7 @@ module Wovnrb
       h = Wovnrb::Headers.new(Wovnrb.get_env, Wovnrb.get_settings('url_pattern' => 'subdomain'))
 
       keys = Wovnrb::Lang::LANG.keys
-      assert_equal(29, keys.size)
+      assert_equal(30, keys.size)
 
       for key in keys
         uri_without_scheme = h.remove_lang("#{key.downcase}.wovn.io/", key)
@@ -6063,7 +6063,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(29, keys.size)
+      assert_equal(30, keys.size)
 
       uri_without_scheme = h.remove_lang('wovn.io', nil)
       assert_equal('wovn.io', uri_without_scheme)

data/test/lib/html_replacers/image_replacer_test.rb

@@ -17,7 +17,7 @@ module Wovnrb
         'http://www.example.com/test.img' => {'ja' => [{'data' => 'http://test.com/ttt.img'}]}
       }
       img_src_prefix = 'prefix::'
-      replacer = ImageReplacer.new(url, text_index, src_index, img_src_prefix)
+      replacer = ImageReplacer.new(url, text_index, src_index, img_src_prefix, [])
 
       dom = Wovnrb.get_dom('<img src="http://www.example.com/test.img" alt="Hello"')
       replacer.replace(dom, Lang.new('ja'))
@@ -38,7 +38,7 @@ module Wovnrb
       src_index = {
         'http://www.example.com/hello/test.img' => {'ja' => [{'data' => 'http://test.com/ttt.img'}]}
       }
-      replacer = ImageReplacer.new(url, text_index, src_index, '')
+      replacer = ImageReplacer.new(url, text_index, src_index, '', [])
 
       dom = Wovnrb.get_dom('<img src="test.img"')
       replacer.replace(dom, Lang.new('ja'))
@@ -58,7 +58,7 @@ module Wovnrb
       src_index = {
         'http://www.example.com/test.img' => {'ja' => [{'data' => 'http://test.com/ttt.img'}]}
       }
-      replacer = ImageReplacer.new(url, text_index, src_index, '')
+      replacer = ImageReplacer.new(url, text_index, src_index, '', [])
 
       dom = Wovnrb.get_dom('<img src="/test.img"')
       replacer.replace(dom, Lang.new('ja'))
@@ -91,10 +91,45 @@ module Wovnrb
       src_index = {
         'http://www.test.com/test.img' => {'ja' => [{'data' => 'http://test.com/ttt.img'}]}
       }
-      replacer = ImageReplacer.new(url, text_index, src_index, '')
+      replacer = ImageReplacer.new(url, text_index, src_index, '', [])
       dom = Wovnrb.get_dom('<img src="http://www.test.com/test.img"')
       replacer.replace(dom, Lang.new('ja'))
       dom.xpath('//img')[0]
     end
+
+    def test_replace_host_alias
+      url = {
+        :protocol => 'http',
+        :host => 'www.example.com',
+        :path => '/hello/'
+      }
+      src_index = {
+        'http://www.test.com/test.img' => {'ja' => [{'data' => 'http://test.com/ttt.img'}]}
+      }
+      path = '/test.img'
+
+      # no replace image if not exist host alias
+      img = img_dom_helper(url, src_index, path, [])
+      assert_equal('/test.img', img.get_attribute('src'))
+      img = img_dom_helper(url, src_index, path, ['www.test.com'])
+      assert_equal('/test.img', img.get_attribute('src'))
+      img = img_dom_helper(url, src_index, path, ['www.example.com'])
+      assert_equal('/test.img', img.get_attribute('src'))
+      img = img_dom_helper(url, src_index, path, ['www.test.com', 'www.wrong.com'])
+      assert_equal('/test.img', img.get_attribute('src'))
+
+      # replace image if exist host alias
+      img = img_dom_helper(url, src_index, path, ['www.test.com', 'www.example.com'])
+      assert_equal('http://test.com/ttt.img', img.get_attribute('src'))
+    end
+
+    private
+    def img_dom_helper(url, src_index, path, host_aliases)
+      text_index = {}
+      replacer = ImageReplacer.new(url, text_index, src_index, '', host_aliases)
+      dom = Wovnrb.get_dom('<img src="' + path + '"')
+      replacer.replace(dom, Lang.new('ja'))
+      dom.xpath('//img')[0]
+    end
   end
 end

data/test/lib/lang_test.rb

@@ -10,7 +10,7 @@ module Wovnrb
     end
 
     def test_langs_length
-      assert_equal(29, Wovnrb::Lang::LANG.length)
+      assert_equal(30, Wovnrb::Lang::LANG.length)
     end
 
     def test_keys_exist
@@ -41,6 +41,7 @@ module Wovnrb
        assert_equal('ko',       Lang::iso_639_1_normalization('ko'))
        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('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'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -397,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Gem for WOVN.io
@@ -423,3 +423,4 @@ test_files:
 - test/lib/wovnrb_test.rb
 - test/services/url_test.rb
 - test/test_helper.rb
+has_rdoc: