wovnrb 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 844be0f5a9ee0ac6e995181311d020956f456ed7
-  data.tar.gz: 10fc8b27efd2ea6c5ad091031916cbee54b75d00
+  metadata.gz: af6226de682d474cd3545ca245bdac14994375c4
+  data.tar.gz: 56a4592feebf0944fe01b94c91e14025e24a8ea6
 SHA512:
-  metadata.gz: fbc82de4f3344432c508dc28b43fe727e99c8ac1b30691d90aac8c71e6a696d44dd3f06d5503dd78317ad0b3069b56d5684c7460e490cd76a2bbe1d53e43352f
-  data.tar.gz: 056f1cc3176e6fca9fe867e57d35139eb7605bd3a6bebbecc271cafcf17a50e22d051daa5a2ed38f1f62a7ec70c201127e20b12eca5d225cf44a5ae6438a31eb
+  metadata.gz: 7b6a2b7aee2bd5fccbcea2e263fac158bae20e362a9fee1964a0ec810b68fbf45c8e28b61f03dc8523702c986825e6ac94c2378e05cf2cde844f3f3fe4f5ca97
+  data.tar.gz: fa1629f62d31efb45894a76338a0f775ac30de878ba22205266b9e4a0e6c83a5c3998cf6e76d4188f21ba19e6ca1a38b970773737ba2ccffa3a74e891512b6fc

data/lib/wovnrb.rb

@@ -47,35 +47,42 @@ module Wovnrb
       # pass to application
       status, res_headers, body = @app.call(headers.request_out)
 
-      if res_headers["Content-Type"] =~ /html/
-
-        request = Rack::Request.new(env)
-        unless request.params['wovn_disable'] == true
-          @store.settings.update_dynamic_settings!(request.params)
-          unless @store.settings['ignore_globs'].any?{|g| g.match?(headers.pathname)}
-
-            # ApiData creates request for external server, but cannot use async.
-            # Because some server not allow multi thread. (env['async.callback'] is not supported at all Server).
-            api_data = ApiData.new(headers.redis_url, @store)
-            values = api_data.get_data
-            url = {
-              :protocol => headers.protocol,
-              :host => headers.host,
-              :pathname => headers.pathname
-            }
-            body = switch_lang(body, values, url, lang, headers) unless status.to_s =~ /^1|302/
-
-            content_length = 0
-            body.each { |b| content_length += b.respond_to?(:bytesize) ? b.bytesize : 0 }
-            res_headers["Content-Length"] = content_length.to_s
-          end
-        end
+      unless res_headers["Content-Type"] =~ /html/
+        return output(headers, status, res_headers, body)
+      end
+
+      request = Rack::Request.new(env)
 
+      if request.params['wovn_disable'] == true
+        return output(headers, status, res_headers, body)
       end
 
-      headers.out(res_headers)
-      [status, res_headers, body]
-      #[status, res_headers, d.transform()]
+      @store.settings.update_dynamic_settings!(request.params)
+      if @store.settings['ignore_globs'].any?{|g| g.match?(headers.pathname)}
+        return output(headers, status, res_headers, body)
+      end
+
+      # ApiData creates request for external server, but cannot use async.
+      # Because some server not allow multi thread. (env['async.callback'] is not supported at all Server).
+      api_data = ApiData.new(headers.redis_url, @store)
+      values = api_data.get_data
+
+      unless have_data?(values)
+        return output(headers, status, res_headers, body)
+      end
+
+      url = {
+        :protocol => headers.protocol,
+        :host => headers.host,
+        :pathname => headers.pathname
+      }
+      body = switch_lang(body, values, url, lang, headers) unless status.to_s =~ /^1|302/
+
+      content_length = 0
+      body.each { |b| content_length += b.respond_to?(:bytesize) ? b.bytesize : 0 }
+      res_headers["Content-Length"] = content_length.to_s
+
+      output(headers, status, res_headers, body)
     end
 
     def switch_lang(body, values, url, lang=@store.settings['default_lang'], headers)
@@ -113,6 +120,15 @@ module Wovnrb
 
     private
 
+    def output(headers, status, res_headers, body)
+      headers.out(res_headers)
+      [status, res_headers, body]
+    end
+
+    def have_data?(values)
+      values.count > 0
+    end
+
     def put_back_noscripts!(output, noscripts)
       noscripts.each_with_index do |noscript, index|
         noscript_identifier = "<noscript wovn-id=\"#{index}\"></noscript>"

data/lib/wovnrb/headers.rb

@@ -14,9 +14,11 @@ module Wovnrb
     # Its parameters are set by parsing env variable.
     #
     def initialize(env, settings)
+      request = Rack::Request.new(env)
+
       @env = env
       @settings = settings
-      @protocol = @env['rack.url_scheme']
+      @protocol = request.scheme
       if settings['use_proxy'] && @env.has_key?('HTTP_X_FORWARDED_HOST')
         @unmasked_host = @env['HTTP_X_FORWARDED_HOST']
       else

data/lib/wovnrb/version.rb

@@ -1,3 +1,3 @@
 module Wovnrb
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/test/lib/headers_test.rb

@@ -104,6 +104,12 @@ module Wovnrb
       assert_equal('wovn.io/dashboard', h.redis_url)
     end
 
+    def test_initialize_with_proto_header
+      env = Wovnrb.get_env('url' => 'http://page.com', 'HTTP_X_FORWARDED_PROTO' => 'https')
+      h = Wovnrb::Headers.new(env, Wovnrb.get_settings('query' => ['aaa']))
+      assert_equal('https', h.protocol)
+    end
+
     #########################
     # REDIRECT_LOCATION
     #########################

data/test/lib/lang_test.rb

@@ -480,6 +480,18 @@ module Wovnrb
       assert(!(/html lang="zh-CHT"/ =~ swapped_body))
     end
 
+    def test_switch_dom_lang_when_proxy_change_protocol
+      lang = Lang.new('en')
+      env = Wovnrb.get_env('url' => 'http://page.com', 'HTTP_X_FORWARDED_PROTO' => 'https')
+      header = Wovnrb::Headers.new(env, Wovnrb.get_settings)
+      html = '<html></html>'
+      dom = Wovnrb.to_dom(html)
+      url = header.url
+      swapped_body = lang.switch_dom_lang(dom, Store.instance, generate_values, url, header)
+      assert(swapped_body.include?('hreflang="ja" href="https://page.com/ja/"'))
+      assert(swapped_body.include?('hreflang="en" href="https://page.com/"'))
+    end
+
     def test_switch_lang
       lang = Lang.new('ja')
       h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://page.com'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))

data/test/lib/wovnrb_test.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'test_helper'
 require 'wovnrb'
 require 'wovnrb/headers'
 require 'minitest/autorun'
@@ -119,6 +120,25 @@ class WovnrbTest < Minitest::Test
     assert_requested(stub, :times => 0)
   end
 
+  def test_request_to_not_published_page
+    settings = Wovnrb.get_settings
+    default_token = 'token0'
+    request_token = 'token1'
+    settings['project_token'] = default_token
+    url = 'wovn.io/dashboard'
+    stub = stub_request(:get, "#{settings['api_url']}?token=#{request_token}&url=#{url}").
+      to_return(:body => '{"code":423,"message":"Page is not published"}', status: 423)
+
+    app = get_app(:params => {'wovn_token' => request_token})
+    i = Wovnrb::Interceptor.new(app, settings)
+    env = Wovnrb.get_env
+    i.stub(:switch_lang, ->{raise 'must not called'}) do
+      i.call(env)
+    end
+
+    assert_requested(stub, :times => 1)
+  end
+
   def test_switch_lang
     i = Wovnrb::Interceptor.new(get_app)
     h = Wovnrb::Headers.new(Wovnrb.get_env('url' => 'http://page.com'), Wovnrb.get_settings('url_pattern' => 'subdomain', 'url_pattern_reg' => '^(?<lang>[^.]+).'))

data/test/test_helper.rb

@@ -14,10 +14,12 @@ SimpleCov.start do
 end
 
 require 'nokogumbo'
+require 'rack'
 require 'wovnrb/headers'
 require 'wovnrb/lang'
 require 'wovnrb/store'
 require 'wovnrb/html_replacers/replacer_base'
+require 'wovnrb/html_replacers/input_replacer'
 require 'wovnrb/html_replacers/link_replacer'
 require 'wovnrb/html_replacers/text_replacer'
 require 'wovnrb/html_replacers/meta_replacer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wovnrb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Jeff Sandford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogumbo
@@ -412,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Gem for WOVN.io