wovnrb 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bdcfd40914010805b291fbc68132434f9b95d20
-  data.tar.gz: 77a34e93cf0962516eab31bbe004ba2c4e4c8fd7
+  metadata.gz: 5f424f493421fb41f99437d20ecaa569a96d1848
+  data.tar.gz: 77b758db4390186f87962f8a1e1e6773215f749a
 SHA512:
-  metadata.gz: e91cb4c12e417853115fe9e6e4f175dcf6139218d388f96e1bedf6320749220f6ab16d18c323a79b5b305532bf095ef5896871861953f4012cab247883cdab33
-  data.tar.gz: 947e717e78b16d35597f68e91351444ac5d7cf62fa0bbf839fe02350e1699dc6335c9df4762639811f12386ff7612e13c6bb9b4489be82efa11b4d9925a4cdca
+  metadata.gz: ad31db23c9b0c731fbec6a7f7a9053442a36216d6f97dc6df92bc76580046f4de7ed739f2ccd9bb3207cc47e6aae00c6da18d1e152541641860ddb098ac45d5e
+  data.tar.gz: 6bcc8d868cad4c7d590d71a209f8e14148b5d493242eee9bddabd639a244647de42cce474ef41164495f2e9c3a2db425e2baf5903e865163ff55b203266b89eb

data/lib/wovnrb/headers.rb

@@ -39,6 +39,7 @@ module Wovnrb
       else
         @host = @env['HTTP_HOST']
       end
+      @env['wovnrb.target_lang'] = self.lang_code
       @host = settings['url_pattern'] == 'subdomain' ? remove_lang(@host, self.lang_code) : @host
       @pathname, @query = @env['REQUEST_URI'].split('?')
       @pathname = settings['url_pattern'] == 'path' ? remove_lang(@pathname, self.lang_code) : @pathname

data/lib/wovnrb/html_replacers/input_replacer.rb

@@ -5,23 +5,33 @@ module Wovnrb
     end
 
     def replace(dom, lang)
-      dom.xpath('//input').select { |node|
+      dom.xpath('//input').each do |node|
         next if wovn_ignore?(node)
-        (node.get_attribute('value') &&
-        node.get_attribute('value') != '' &&
-        node.get_attribute('type') &&
-        node.get_attribute('type') != 'text' &&
-        node.get_attribute('type') != 'hidden' &&
-        node.get_attribute('type') != 'password' &&
-        node.get_attribute('type') != 'url' &&
-        node.get_attribute('type') != 'search')
-      }.each do |node|
-        node_value = node.get_attribute('value').strip
-        # shouldn't need size check, but for now...
-        if @text_index[node_value] && @text_index[node_value][lang.lang_code] && @text_index[node_value][lang.lang_code].size > 0
-          node.set_attribute('value', replace_text(node.get_attribute('value'), @text_index[node_value][lang.lang_code][0]['data']))
-        end
+
+        set_attribute('value', node, lang)       if replaceable_value? node
+        set_attribute('placeholder', node, lang) if replaceable_placeholder? node
+      end
+    end
+
+    private
+
+    def set_attribute(name, node, lang)
+      node_value = node.get_attribute(name).strip
+      if @text_index[node_value] && @text_index[node_value][lang.lang_code] && @text_index[node_value][lang.lang_code].size > 0
+        node.set_attribute(name, replace_text(node_value, @text_index[node_value][lang.lang_code][0]['data']))
       end
     end
+
+    def replaceable_value?(node)
+      return false unless ['submit', 'reset'].include? node.get_attribute('type')
+
+      attribute_value = node.get_attribute('value')
+      attribute_value && !attribute_value.empty?
+    end
+
+    def replaceable_placeholder?(node)
+      attribute_placeholder = node.get_attribute('placeholder')
+      attribute_placeholder && !attribute_placeholder.empty?
+    end
   end
 end

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

data/test/lib/headers_test.rb

@@ -129,6 +129,43 @@ module Wovnrb
     # REQUEST_OUT
     #########################
 
+    def test_request_out_with_wovn_target_lang_header_using_subdomain
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env(
+          'SERVER_NAME' => 'ja.wovn.io',
+          'REQUEST_URI' => '/test',
+          'HTTP_REFERER' => 'http://ja.wovn.io/test',
+        ),
+        Wovnrb.get_settings(
+          'url_pattern' => 'subdomain',
+          'url_pattern_reg' => '^(?<lang>[^.]+).',
+        ),
+      )
+      env = h.request_out('ja')
+      assert_equal('ja', env['wovnrb.target_lang'])
+    end
+
+    def test_request_out_with_wovn_target_lang_header_using_path
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env('REQUEST_URI' => '/ja/test', 'HTTP_REFERER' => 'http://wovn.io/ja/test'),
+        Wovnrb.get_settings,
+      )
+      env = h.request_out('ja')
+      assert_equal('ja', env['wovnrb.target_lang'])
+    end
+
+    def test_request_out_with_wovn_target_lang_header_using_query
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env('REQUEST_URI' => 'test?wovn=ja', 'HTTP_REFERER' => 'http://wovn.io/test'),
+        Wovnrb.get_settings(
+          'url_pattern' => 'query',
+          'url_pattern_reg' => "((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)",
+        ),
+      )
+      env = h.request_out('ja')
+      assert_equal('ja', env['wovnrb.target_lang'])
+    end
+
     def test_request_out_with_use_proxy_false
       h = Wovnrb::Headers.new(
         Wovnrb.get_env('url' => 'http://localhost/contact', 'HTTP_X_FORWARDED_HOST' => 'ja.wovn.io'),
@@ -208,6 +245,43 @@ module Wovnrb
       assert_equal('http://staging-ja.wovn.io/test', h.out(headers)['Location'])
     end
 
+    def test_out_with_wovn_target_lang_header_using_subdomain
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env(
+          'SERVER_NAME' => 'ja.wovn.io',
+          'REQUEST_URI' => '/test',
+          'HTTP_REFERER' => 'http://ja.wovn.io/test',
+        ),
+        Wovnrb.get_settings(
+          'url_pattern' => 'subdomain',
+          'url_pattern_reg' => '^(?<lang>[^.]+).',
+        ),
+      )
+      headers = h.out(h.request_out('ja'))
+      assert_equal('ja', headers['wovnrb.target_lang'])
+    end
+
+    def test_out_with_wovn_target_lang_header_using_path
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env('REQUEST_URI' => '/ja/test', 'HTTP_REFERER' => 'http://wovn.io/ja/test'),
+        Wovnrb.get_settings,
+      )
+      headers = h.out(h.request_out('ja'))
+      assert_equal('ja', headers['wovnrb.target_lang'])
+    end
+
+    def test_out_with_wovn_target_lang_header_using_query
+      h = Wovnrb::Headers.new(
+        Wovnrb.get_env('REQUEST_URI' => 'test?wovn=ja', 'HTTP_REFERER' => 'http://wovn.io/test'),
+        Wovnrb.get_settings(
+          'url_pattern' => 'query',
+          'url_pattern_reg' => "((\\?.*&)|\\?)wovn=(?<lang>[^&]+)(&|$)",
+        ),
+      )
+      headers = h.out(h.request_out('ja'))
+      assert_equal('ja', headers['wovnrb.target_lang'])
+    end
+
     #########################
     # GET SETTINGS
     #########################

data/test/lib/html_replacers/input_replacer_test.rb

@@ -76,6 +76,21 @@ module Wovnrb
       assert_equal('Hello', content)
     end
 
+    def test_replace_type_password_placeholder
+      replacer = InputReplacer.new({
+        'Hello' => {'ja' => [{'data' => 'こんにちは'}]},
+        'Hi' => {'ja' => [{'data' => 'やぁ'}]},
+      })
+
+      dom = Wovnrb.get_dom('<input type="password" value="Hello" placeholder="Hi">')
+      replacer.replace(dom, Lang.new('ja'))
+
+      value_content = dom.xpath('//input')[0].get_attribute('value')
+      placeholder_content = dom.xpath('//input')[0].get_attribute('placeholder')
+      assert_equal('Hello', value_content)
+      assert_equal('やぁ', placeholder_content)
+    end
+
     def test_dont_replace_type_url_value
       replacer = InputReplacer.new({
         'Hello' => {'ja' => [{'data' => 'こんにちは'}]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo