Merge pull request #11 from samtgarson/handle-timeout

Handle a timeout to the renderer

Author: samtgarson

lib/vueport.rb

@@ -12,11 +12,12 @@ def config
       server_port: 5000,
       server_config_file: 'config/vueport/webpack.server.conf',
       client_config_file: 'config/vueport/webpack.prod.conf',
-      ssr_enabled: false
+      ssr_enabled: false,
+      ssr_timeout: 3
     }
   end
 
-  def configure(&_block)
+  def configure(&_)
     yield config if block_given?
   end
 end

lib/vueport/node_client.rb

@@ -25,11 +25,17 @@ def render
       end
 
       def response
-        @response ||= http.post path, content, 'Content-Type' => 'text/plain'
+        @response ||= http
+                      .tap { |http| http.read_timeout = timeout }
+                      .post path, content, 'Content-Type' => 'text/plain'
       end
 
       def http
         @http ||= Net::HTTP.new Vueport.config[:server_host], Vueport.config[:server_port]
       end
+
+      def timeout
+        Vueport.config[:ssr_timeout] || 3
+      end
   end
 end

lib/vueport/renderer.rb

@@ -28,12 +28,12 @@ def template
 
       def ssr_content
         Vueport::NodeClient.new(wrapper(content), path: path).run!
-      rescue Vueport::RenderError
+      rescue
         wrapper
       end
 
-      def wrapper(content = '')
-        content_tag :div, content, id: CONTENT_WRAPPER_ID, 'v-bind:class' => 'wrapperClass'
+      def wrapper(inner = '')
+        content_tag :div, inner, id: CONTENT_WRAPPER_ID, 'v-bind:class' => 'wrapperClass'
       end
 
       def ssr_enabled?

lib/vueport/version.rb

@@ -1,3 +1,3 @@
 module Vueport
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

spec/vueport/renderer_spec.rb

@@ -68,6 +68,15 @@
 
         it_behaves_like 'a basic renderer'
       end
+
+      context 'and node times out' do
+        before do
+          allow(Vueport::NodeClient).to receive(:new).and_call_original
+          allow_any_instance_of(Net::HTTP).to receive(:post).and_raise(Net::ReadTimeout)
+        end
+
+        it_behaves_like 'a basic renderer'
+      end
     end
   end