wovnrb 0.1.73 → 0.1.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7ef7a1161b61dce7b74993fd639656c4bcf09e
-  data.tar.gz: 7d8b28812d421e091ad98ee767fa070eb85f5195
+  metadata.gz: 51a6555bd22447e63a037e35da135602df0dd6bf
+  data.tar.gz: cfec1c9ec7244ce8837d59604a2c529e10117e85
 SHA512:
-  metadata.gz: e214f2d3e56db1e707d31d1eebad888b4eb732f2a61aace803513e08dd8c56af021665d3519774f7305e2a8c273da767333ea91f9f33cda724c73bf7cd09a6e0
-  data.tar.gz: 92e385175be75b2e8e9e28200027f8be532f3784e8e090e05a9589bdac554e7e645ef089f3400882a598a7eb8ec67ddeeea2cbbe9ce857858cf589a405b68746
+  metadata.gz: d05d528781813b39f5858bde8f18b04350f947077362d3fd4ce676a0d0f0c495ece6513bb9104fc302bcda3cc11fa172577824c7730a446338cabf4dd88e4fea
+  data.tar.gz: b045b5b0813f1e99d141d809fbdf5a72e421d204801c35850e6856663d8210fe891618a857ad8bbe352ff0718ad413b9254073913078aa555c30a0558018fa51

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.1.73"
+  VERSION = "0.1.74"
 end

data/lib/wovnrb.rb

@@ -26,25 +26,16 @@ module Wovnrb
         return @app.call(env)
       end
       # redirect if the path is set to the default language (for SEO purposes)
-      #if (headers.path_lang == STORE.settings['default_lang'])
-      #  redirect_headers = headers.redirect(STORE.settings['default_lang'])
-      #  return [307, redirect_headers, ['']]
-      #end
+      if (headers.path_lang == STORE.settings['default_lang'])
+        redirect_headers = headers.redirect(STORE.settings['default_lang'])
+        return [307, redirect_headers, ['']]
+      end
       lang = headers.lang_code
 
       # pass to application
       status, res_headers, body = @app.call(headers.request_out)
 
       if res_headers["Content-Type"] =~ /html/ # && !body[0].nil?
-        puts ""
-        puts ""
-        puts "WOVNRB LOGGING"
-        puts "H-PATHLANG: " + headers.path_lang
-        puts "DEF_LANG: " + STORE.settings['default_lang']
-        puts "WOVNRB LOGGING"
-        puts ""
-        puts ""
-
         values = STORE.get_values(headers.redis_url)
         url = {
             :protocol => headers.protocol,
@@ -124,6 +115,16 @@ module Wovnrb
       new_href
     end
 
+    # returns true if a wovn_ignore is found in the tree from the node to the body tag
+    def check_wovn_ignore(node)
+      if !node.get_attribute('wovn-ignore').nil?
+        return true
+      elsif node.name === 'html'
+        return false
+      end
+      check_wovn_ignore(node.parent)
+    end
+
     def switch_lang(body, values, url, lang=STORE.settings['default_lang'], headers)
       lang = Lang.get_code(lang)
       text_index = values['text_vals'] || {}
@@ -138,6 +139,7 @@ module Wovnrb
         # add lang code to anchors href if not default lang 
         if lang != STORE.settings['default_lang']
           d.xpath('//a').each do |a|
+            next if check_wovn_ignore(a)
             href = a.get_attribute('href')
             new_href = add_lang_code(href, STORE.settings['url_pattern'], lang, headers)
             a.set_attribute('href', new_href)
@@ -146,6 +148,7 @@ module Wovnrb
 
         # swap text
         d.xpath('//text()').each do |node|
+          next if check_wovn_ignore(node)
           node_text = node.content.strip
 # shouldn't need size check, but for now...
           if text_index[node_text] && text_index[node_text][lang] && text_index[node_text][lang].size > 0
@@ -154,6 +157,7 @@ module Wovnrb
         end
         # swap meta tag values
         d.xpath('//meta').select { |t|
+          next if check_wovn_ignore(t)
           (t.get_attribute('name') || t.get_attribute('property') || '') =~ /^(description|keywords|og:title|og:description)$/
         }.each do |node|
           node_content = node.get_attribute('content').strip
@@ -164,6 +168,7 @@ module Wovnrb
         end
         # swap img srcs
         d.xpath('//img').each do |node|
+          next if check_wovn_ignore(node)
           # use regular expressions to support case insensitivity (right?)
           if node.to_html =~ /src=['"][^'"]*['"]/i
             src = node.to_html.match(/src=['"]([^'"]*)['"]/i)[1]
@@ -198,7 +203,9 @@ module Wovnrb
 
         # INSERT BACKEND WIDGET
         insert_node = Nokogiri::XML::Node.new('script', d)
+        # TODO: CHANGE THIS BACK; Should be '//j.wovn.io/0' in production
         insert_node['src'] = '//j.wovn.io/0'
+        # insert_node['src'] = '//j.dev-wovn.io:3000/0'
         version = defined?(VERSION) ? VERSION : ''
         insert_node['data-wovnio'] = "key=#{STORE.settings['user_token']}&backend=true&currentLang=#{lang}&defaultLang=#{STORE.settings['default_lang']}&urlPattern=#{STORE.settings['url_pattern']}&version=#{version}"
         # do this so that there will be a closing tag (better compatibility with browsers)

data/test/lib/wovnrb_test.rb

@@ -26,7 +26,6 @@ class WovnrbTest < Minitest::Test
   # def test_get_langs(values)
   # end
 
-
   def test_add_lang_code
     i = Wovnrb::Interceptor.new(get_app)
     h = Wovnrb::Headers.new(get_env('url' => 'http://favy.tips'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
@@ -263,6 +262,166 @@ class WovnrbTest < Minitest::Test
   #    headers.expects(:pathname).returns('/hello/tab.html')
   #    assert_equal('/fr/hello/hey/index.html', i.add_lang_code('hey/index.html', 'path', 'fr', headers))
   #  end
+  def generate_body(param = "")
+    case param
+    when "ignore_parent"
+      body = "<html><body><h1>Mr. Belvedere Fan Club</h1>
+                <div wovn-ignore><p>Hello</p></div>
+              </body></html>"
+    when "ignore_everything"
+      body = "<html><body wovn-ignore><h1>Mr. Belvedere Fan Club</h1>
+                <div><p>Hello</p></div>
+              </body></html>"
+    when "ignore_parent_translated_in_japanese"
+      body = "<html lang=\"ja\">
+<head>
+<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">
+<script src=\"//j.wovn.io/0\" 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>
+                <div wovn-ignore=\"\"><p>Hello</p></div>
+              </body>
+</html>
+"
+    when "translated_in_japanese"
+      body = "<html lang=\"ja\">
+<head>
+<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">
+<script src=\"//j.wovn.io/0\" 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>
+              </body>
+</html>
+"
+    when "ignore_everything_translated"
+      body = "<html lang=\"ja\">
+<head>
+<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">
+<script src=\"//j.wovn.io/0\" 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 wovn-ignore=\"\">
+<h1>Mr. Belvedere Fan Club</h1>
+                <div><p>Hello</p></div>
+              </body>
+</html>
+"
+    when "empty"
+      body = "<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore><p>Hello</p></div></body></html>"
+    when "empty_single_quote"
+      body = "<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=''><p>Hello</p></div></body></html>"
+    when "empty_double_quote"
+      body = "<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=""><p>Hello</p></div></body></html>"
+    when "value_single_quote"
+      body = "<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore='value'><p>Hello</p></div></body></html>"
+    when "value_double_quote"
+      body = "<html><body><h1>Mr.BelvedereFanClub</h1><div wovn-ignore=\"value\"><p>Hello</p></div></body></html>"
+    when "empty_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/0\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=0.1.74\"> </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=\"\"><p>Hello</p></div>\n</body>\n</html>\n"
+    when "empty_single_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/0\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=0.1.74\"> </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=\"\"><p>Hello</p></div>\n</body>\n</html>\n"
+    when "empty_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/0\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=0.1.74\"> </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=\"\"><p>Hello</p></div>\n</body>\n</html>\n"
+    when "value_single_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/0\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=0.1.74\"> </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 "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/0\" data-wovnio=\"key=&amp;backend=true&amp;currentLang=ja&amp;defaultLang=en&amp;urlPattern=path&amp;version=0.1.74\"> </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"
+    else # "" case
+      body = "<html><body><h1>Mr. Belvedere Fan Club</h1>
+                <div><p>Hello</p></div>
+              </body></html>"
+    end
+    return [body]
+  end
+
+  def generate_values
+    values = {}
+    values['text_vals'] = {'Hello' => {'ja' => [{'data' => 'こんにちは'}]},
+    'Mr. Belvedere Fan Club' => {'ja' => [{'data' => 'ベルベデアさんファンクラブ'}]}}
+    return values
+  end
+
+  def test_switch_lang
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body()
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('translated_in_japanese'), swapped_body)
+  end
+
+  def test_switch_lang_wovn_ignore
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://ignore-page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body('ignore_parent')
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('ignore_parent_translated_in_japanese'), swapped_body)
+  end
+
+  def test_switch_lang_wovn_ignore_everything
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://ignore-page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body('ignore_everything')
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('ignore_everything_translated'), swapped_body)
+  end
+
+  def test_switch_lang_wovn_ignore_empty
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://ignore-page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body('empty')
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('empty_translated'), swapped_body)
+  end
+
+  def test_switch_lang_wovn_ignore_empty_single_quote
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://ignore-page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body('empty_single_quote')
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('empty_single_quote_translated'), swapped_body)
+  end
+
+  def test_switch_lang_wovn_ignore_empty_double_quote
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://ignore-page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body('empty_double_quote')
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('empty_double_quote_translated'), swapped_body)
+  end
+
+  def test_switch_lang_wovn_ignore_value_single_quote
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://ignore-page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body('value_single_quote')
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('value_single_quote_translated'), swapped_body)
+  end
+
+  def test_switch_lang_wovn_ignore_value_double_quote
+    i = Wovnrb::Interceptor.new(get_app)
+    h = Wovnrb::Headers.new(get_env('url' => 'http://ignore-page.com'), get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))
+    body = generate_body('value_double_quote')
+    values = generate_values
+    url = h.url
+    swapped_body = i.switch_lang(body, values, url, 'ja', h)
+    assert_equal(generate_body('value_double_quote_translated'), swapped_body)
+  end
 
   def get_settings(options={})
     settings = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.1.73
+  version: 0.1.74
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo