wovnrb 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2f6b32bbb1a1ae62581625150e7192a97e7536
-  data.tar.gz: 700ff16d073253ea5e761a1fbba50fa31db4d293
+  metadata.gz: f1372d56b49f0c1760b2b4bdaf7041f014cb8d59
+  data.tar.gz: 41a174a792c2dd1d43d7efef0fda9be1165fa6eb
 SHA512:
-  metadata.gz: c8081098e724536d3eaed17c9ba986f1d09a5fcfad40b59cc34393cac266f3dff2cddb42c9c383d334a8a8c60d884fa98304bdd76f18a81628e7e761269f27b2
-  data.tar.gz: 09747ebd43f2298e0e2daea26b77603bae9fd2bb43cf2334c20ef80d8fde8cb8d4f8ee8db801d74c8989a9828b1072461962ad8605af774c3e60c46670b45284
+  metadata.gz: 9d3a94f093c7829e0c5c19bf3a68e8e3ba646df5516bb8cd7bc45487b37cd6b52796d8e2c36a4fb46c7501b466b4d6986d60e5f216d382f92a005a0d74f3f6f9
+  data.tar.gz: e73d5a1d9a010a3b438aa6dd77cad5b03565184ccfedc0f95de2baf9713541c179edb658ac534b59e80402167ffae9c26d42b9f187e387b5d8bce286051677fa

data/lib/wovnrb/html_replacers/image_replacer.rb

@@ -35,6 +35,7 @@ module Wovnrb
         if node.get_attribute('alt')
           alt = node.get_attribute('alt').strip
           if @text_index[alt] && @text_index[alt][lang.lang_code] && @text_index[alt][lang.lang_code].size > 0
+            add_comment_node(node, alt)
             node.attribute('alt').value = replace_text(alt, @text_index[alt][lang.lang_code][0]['data'])
           end
         end

data/lib/wovnrb/html_replacers/link_replacer.rb

@@ -10,6 +10,7 @@ module Wovnrb
         next if wovn_ignore?(node)
 
         href = node.get_attribute('href')
+        next if href =~ /^\s*\{\{.+\}\}\s*$/
         new_href = lang.add_lang_code(href, @pattern, @headers)
         node.set_attribute('href', new_href)
       end

data/lib/wovnrb/html_replacers/replacer_base.rb

@@ -14,6 +14,18 @@ module Wovnrb
       wovn_ignore?(node.parent)
     end
 
+    # Add comment-node node to remember original src
+    # <title> may not contain other markup, so add comment-node to node's previous
+    # @see https://www.w3.org/TR/html401/struct/global.html#h-7.4.2
+    def add_comment_node(node, text)
+      comment_node = Nokogiri::XML::Comment.new(node, "wovn-src:#{text}")
+      if node.parent.name == 'title'
+        node.parent.add_previous_sibling(comment_node)
+      else
+        node.add_previous_sibling(comment_node)
+      end
+    end
+
     def replace_text(from, to)
       from.gsub(/\A(\s*)[\S\s]*?(\s*)\Z/, '\1' + to + '\2')
     end

data/lib/wovnrb/html_replacers/text_replacer.rb

@@ -11,6 +11,7 @@ module Wovnrb
         node_text = node.content.strip
         # shouldn't need size check, but for now...
         if @text_index[node_text] && @text_index[node_text][lang.lang_code] && @text_index[node_text][lang.lang_code].size > 0
+          add_comment_node(node, node_text)
           node.content = replace_text(node.content, @text_index[node_text][lang.lang_code][0]['data'])
         end
       end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

data/test/lib/html_replacers/image_replacer_test.rb

@@ -25,6 +25,7 @@ module Wovnrb
       img = dom.xpath('//img')[0]
       assert_equal('prefix::http://test.com/ttt.img', img.get_attribute('src'))
       assert_equal('こんにちは', img.get_attribute('alt'))
+      assert_equal('wovn-src:Hello', img.previous.content)
     end
 
     def test_replace_relative_path
@@ -44,6 +45,7 @@ module Wovnrb
 
       img = dom.xpath('//img')[0]
       assert_equal('http://test.com/ttt.img', img.get_attribute('src'))
+      assert_equal(nil, img.previous)
     end
 
     def test_replace_root_path
@@ -63,6 +65,7 @@ module Wovnrb
 
       img = dom.xpath('//img')[0]
       assert_equal('http://test.com/ttt.img', img.get_attribute('src'))
+      assert_equal(nil, img.previous)
     end
 
     def test_replace_absolute_path
@@ -82,6 +85,7 @@ module Wovnrb
 
       img = dom.xpath('//img')[0]
       assert_equal('http://test.com/ttt.img', img.get_attribute('src'))
+      assert_equal(nil, img.previous)
     end
   end
 end

data/test/lib/html_replacers/link_replacer_test.rb

@@ -33,6 +33,21 @@ module Wovnrb
       assert_equal('/index.html', link)
     end
 
+    def test_replace_mustache
+      replacer = LinkReplacer.new('query', get_header)
+      dom = Wovnrb.get_dom('<a href="{{hello}}">link text</a>')
+      replacer.replace(dom, Lang.new('en'))
+
+      link = dom.xpath('//a')[0].get_attribute('href')
+      assert_equal('{{hello}}', link)
+
+      dom = Wovnrb.get_dom('<a href=" {{hello}} ">link text</a>')
+      replacer.replace(dom, Lang.new('en'))
+
+      link = dom.xpath('//a')[0].get_attribute('href')
+      assert_equal(' {{hello}} ', link)
+    end
+
 
 
     def get_header

data/test/lib/html_replacers/text_replacer_test.rb

@@ -12,8 +12,9 @@ module Wovnrb
       dom = Wovnrb.get_dom('Hello')
       replacer.replace(dom, Lang.new('ja'))
 
-      content = dom.xpath('//text()')[0].content
-      assert_equal('こんにちは', content)
+      node = dom.xpath('//text()')[0]
+      assert_equal('こんにちは', node.content)
+      assert_equal('wovn-src:Hello', node.previous.content)
     end
 
     def test_replace_multiple
@@ -25,10 +26,12 @@ module Wovnrb
       dom = Wovnrb.get_dom('<span>Hello</span><span>Bye</span>')
       replacer.replace(dom, Lang.new('ja'))
 
-      content = dom.xpath('//text()')[0].content
-      content2 = dom.xpath('//text()')[1].content
-      assert_equal('こんにちは', content)
-      assert_equal('さようなら', content2)
+      node = dom.xpath('//text()')[0]
+      node2 = dom.xpath('//text()')[1]
+      assert_equal('こんにちは', node.content)
+      assert_equal('wovn-src:Hello', node.previous.content)
+      assert_equal('さようなら', node2.content)
+      assert_equal('wovn-src:Bye', node2.previous.content)
     end
 
     def test_replace_wovn_ignore
@@ -39,8 +42,9 @@ module Wovnrb
       dom = Wovnrb.get_dom('<div wovn-ignore>Hello</div>')
       replacer.replace(dom, Lang.new('ja'))
 
-      content = dom.xpath('//text()')[0].content
-      assert_equal('Hello', content)
+      node = dom.xpath('//text()')[0]
+      assert_equal('Hello', node.content)
+      assert_equal(nil, node.previous)
     end
   end
 end

data/test/lib/lang_test.rb

@@ -325,7 +325,8 @@ module Wovnrb
 <script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
                 <div wovn-ignore=\"\"><p>Hello</p></div>
               </body>
 </html>
@@ -337,8 +338,9 @@ module Wovnrb
 <script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
-                <div><p>こんにちは</p></div>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
+                <div><p><!--wovn-src:Hello-->こんにちは</p></div>
               </body>
 </html>
 "
@@ -375,7 +377,8 @@ module Wovnrb
         when "value_double_quote_translated"
           body = "<html lang=\"ja\">\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n<script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.ignore-page.com/\">\n</head>\n<body>\n<h1>Mr.BelvedereFanClub</h1>\n<div wovn-ignore=\"value\"><p>Hello</p></div>\n</body>\n</html>\n"
         when "meta_img_alt_tags_translated"
-          body = "<html lang=\"ja\">\n<head>\n<script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=#{Wovnrb::VERSION}\"> </script><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n<meta name=\"description\" content=\"こんにちは\">\n<meta name=\"title\" content=\"こんにちは\">\n<meta property=\"og:title\" content=\"こんにちは\">\n<meta property=\"og:description\" content=\"こんにちは\">\n<meta property=\"twitter:title\" content=\"こんにちは\">\n<meta property=\"twitter:description\" content=\"こんにちは\">\n<link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">\n</head>\n<body>\n<h1>ベルベデアさんファンクラブ</h1>\n<div><p>こんにちは</p></div>\n<img src=\"http://example.com/photo.png\" alt=\"こんにちは\">\n</body>\n</html>\n"
+          body = "<html lang=\"ja\">\n<head>\n<script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=#{Wovnrb::VERSION}\"> </script><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n<meta name=\"description\" content=\"こんにちは\">\n<meta name=\"title\" content=\"こんにちは\">\n<meta property=\"og:title\" content=\"こんにちは\">\n<meta property=\"og:description\" content=\"こんにちは\">\n<meta property=\"twitter:title\" content=\"こんにちは\">\n<meta property=\"twitter:description\" content=\"こんにちは\">\n<link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">\n</head>\n<body>\n<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>\n<div><p><!--wovn-src:Hello-->こんにちは</p></div>\n<!--wovn-src:Hello--><img src=\"http://example.com/photo.png\" alt=\"こんにちは\">\n</body>\n</html>\n"
         when  "meta_img_alt_tags"
           body = "<html><head><meta name =\"description\" content=\"Hello\">\n<meta name=\"title\" content=\"Hello\">\n<meta property=\"og:title\" content=\"Hello\">\n<meta property=\"og:description\" content=\"Hello\">\n<meta property=\"twitter:title\" content=\"Hello\">\n<meta property=\"twitter:description\" content=\"Hello\"></head>
 <body><h1>Mr. Belvedere Fan Club</h1>

data/test/lib/wovnrb_test.rb

@@ -66,8 +66,9 @@ class WovnrbTest < Minitest::Test
 <script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=#{Wovnrb::VERSION}\"> </script><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
-                <div><p>こんにちは</p></div>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
+                <div><p><!--wovn-src:Hello-->こんにちは</p></div>
               </body>
 </html>
 "
@@ -91,8 +92,9 @@ class WovnrbTest < Minitest::Test
 <link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
-                <div><p>こんにちは</p></div>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
+                <div><p><!--wovn-src:Hello-->こんにちは</p></div>
               </body>
 </html>
 "
@@ -120,8 +122,9 @@ class WovnrbTest < Minitest::Test
 <link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
-                <div><p>こんにちは</p></div>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
+                <div><p><!--wovn-src:Hello-->こんにちは</p></div>
               </body>
 </html>
 "
@@ -147,8 +150,9 @@ class WovnrbTest < Minitest::Test
 <link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
-                <div><p>こんにちは</p></div>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
+                <div><p><!--wovn-src:Hello-->こんにちは</p></div>
               </body>
 </html>
 "
@@ -172,8 +176,9 @@ class WovnrbTest < Minitest::Test
 <link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
-                <div><p>こんにちは</p></div>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
+                <div><p><!--wovn-src:Hello-->こんにちは</p></div>
               </body>
 </html>
 "
@@ -196,8 +201,9 @@ class WovnrbTest < Minitest::Test
 <script src=\"//j.wovn.io/1\" async=\"true\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=#{Wovnrb::VERSION}\"> </script><!--<noscript><div>test</div></noscript>--><link rel=\"alternate\" hreflang=\"ja\" href=\"http://ja.page.com/\">
 </head>
 <body>
-<h1>ベルベデアさんファンクラブ</h1>
-                <div><p>こんにちは</p></div>
+<h1>
+<!--wovn-src:Mr. Belvedere Fan Club-->ベルベデアさんファンクラブ</h1>
+                <div><p><!--wovn-src:Hello-->こんにちは</p></div>
               </body>
 </html>
 "

data/wovnrb.gemspec

@@ -26,6 +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 "nokogiri", "< 1.6.8.1"
   spec.add_dependency "activesupport", "< 5"
   spec.add_dependency "lz4-ruby"
 
@@ -48,7 +49,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "geminabox"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "webmock", '~> 2.1.0'
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "public_suffix", '~> 1.4.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -25,6 +25,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -267,16 +281,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -291,6 +305,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 description: Ruby gem for WOVN backend on Rack.
 email:
 - jeff@wovn.io