prerender_rails_embedded 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTQwZjkwYmEyMTlkNDNiMzFlMGY4N2E2ZDFhNzkyMThmMmFiMWFjZA==
+    N2JmZjlkMzkxMTc2NTA3M2M1NzA1YjY0MTIzODMyMDM1MDk2OTFkOQ==
   data.tar.gz: !binary |-
-    MjhkYmE5ZTFjOWZmMDFjYjIwMDhjNjdlZTc4MzllODI2ZmQ4MjM3ZA==
+    MDVlMjA2MzI1NWI4NjA0MGNkYmM2OTEzOTViNzRjNTQxZjlhMmJmZA==
 SHA512:
   metadata.gz: !binary |-
-    Njg3YjU0YjIyNmZjMmJjODJlNjU4MWNlNDlkMjA4OGNkMWNkNmQwNDI4ODdh
-    MzU0ZjMxYWE4NTE4ZGExM2NjYmQ0ZDg3ZDg1YTZkOTkyZmJhMTdkZmUzMDgy
-    OTdkY2E3ODIzNjc5ZjBiYmYzZjMxMjc2YjJmMjgyMzA5N2VjZTA=
+    YzJlMWIxNzQ0NzQzYWJlNTkwM2Y4N2RjMTlkNmMyZGU4OWQ3MWE0MDRkMWQz
+    NWZhYmM2ZWFjN2UwYjQ0NzU3ZDdjODUwMmM4ZjQyZjhlNmU4ZjlkYWE1ZGMw
+    ZjVmMjU4MGM0NDQ3Y2IwNzJlM2MzMDA3NjIwMGU3MjQ1ZjQyMjM=
   data.tar.gz: !binary |-
-    OTIxNDU2NDNlNGJmZmE2NmJkMDhhNzI4ZjlkNTcyNWM3M2U4OWU1YjE4OWM5
-    Njg1NTIyZjA2OGI1N2U5NDNjZThiMjU0ZjBjYTA3OTg4NWMwMjRlYjU2M2U2
-    ZmE1MjI4ZDFhZDZiMDc4MmMzMWM3ZTVhYWEwNDQzMDMwNTdiOTQ=
+    MjJmNGQ5ZGQzM2JhNzA1MWVjN2UxYmYzNDYwODRlYzZkZmIwZGM2ZmIzODM4
+    NDhmYjYzNTYxYjUwYzQzOTg2ZTQxZWQ3N2U5NmYxYjk3NzY5ZGI3OGYxYzk1
+    YTc3ZGYyZWZiZDY0NWJmYmM2OGJmMzc1MjJlMTY1NjE0YTVlYTg=

data/lib/prerender_rails_embedded.js

@@ -68,7 +68,8 @@ surrender.javascriptToExecuteOnPage = function() {
 
 surrender.serveHtml = function(html) {
     system.stdout.writeLine(html);
-    phantom.exit();
+    this.logDebug('page returned to rails: ' + page.address);
+    phantom.exit(0);
 };
 
 surrender.evaluateJavascriptOnPage = function(t, msPassed) {
@@ -79,11 +80,13 @@ surrender.evaluateJavascriptOnPage = function(t, msPassed) {
 
   if(!out.shouldWaitForPrerenderReady || (out.shouldWaitForPrerenderReady && out.prerenderReady) || msPassed >= 20000) {
 
-    if (msPassed >= 20000) _this.logError("prerenderReady=true not found after 20s for page: " + page.url);
+    if (msPassed >= 20000) _this.logWarning("prerenderReady=true not found after 20s for page: " + page.url);
+
+    _this.logDebug('js evaluated: ' + page.address);
+    _this.serveHtml(out.html);
 
-      _this.serveHtml(out.html);
   } else {
-      setTimeout(function(){_this.evaluateJavascriptOnPage(_this, msPassed + EVALUATE_JAVASCRIPT_CHECK_TIMEOUT)}, EVALUATE_JAVASCRIPT_CHECK_TIMEOUT);
+      _this.evaluateJavascriptTimeout = setTimeout(function(){_this.evaluateJavascriptOnPage(_this, msPassed + EVALUATE_JAVASCRIPT_CHECK_TIMEOUT)}, EVALUATE_JAVASCRIPT_CHECK_TIMEOUT);
   }
   return _this;
 };
@@ -92,32 +95,33 @@ surrender.run = function() {
   var _this = this;
 
   try {
+
     page.address = this.removeEscapedFragmentParameter(this.params().address);
     page.settings.userAgent = 'EtaliaBotAgent';
-    page.settings.resourceTimeout = 30000;
+    page.settings.resourceTimeout = 10000;
+
+    _this.logDebug('requested: ' + page.address);
+
     page.open(page.address, function (st) {
+      _this.logDebug('opened: ' + page.address + 'with status: ' + st);
+
       if (st !== 'success') throw 'FAIL to load the address';
+
       _this.evaluateJavascriptOnPage();
     });
+
   } catch(e) {
+      _this.logError(e);
       console.log(e);
       phantom.exit(1);
   }
 
   page.onError = function(message, trace) {
     _this.logError(message);
-
-    //if (trace && trace.length) {
-    //  msgStack.push('TRACE:');
-    //  trace.forEach(function(t) {
-    //    msgStack.push(' -> ' + t.file + ': ' + t.line + (t.function ? ' (in function "' + t.function +'")' : ''));
-    //  });
-    //}
-  //  console.log(msgStack.join('\n'));
   };
 
   page.onConsoleMessage = function(message, lineNum, sourceId) {
-    _this.logInfo('CONSOLE: ' + message + '(' + sourceId + '/L#"' + lineNum + '")');
+    //_this.logInfo('CONSOLE: ' + message + '(' + sourceId + '/L#"' + lineNum + '")');
   };
 
   page.onResourceTimeout = function(request) {

data/lib/prerender_rails_embedded.rb

@@ -1,8 +1,51 @@
 module PrerenderRailsEmbedded
+  require 'timeout'
   require 'phantomjs'
 
   def self.flatten_js_to_html(url)
-    Phantomjs.run('--load-images=false', '--ignore-ssl-errors=true', '--ssl-protocol=tlsv1', '--disk-cache=yes', '--max-disk-cache-size=524228', "#{File.dirname(__FILE__)}/prerender_rails_embedded.js", url)
+    out = ''
+    thread = nil
+    pid = -1
+    begin
+    Timeout::timeout(30) do
+      thread = Thread.new do
+        IO.popen(phantomjs_invocation(url)) do |io|
+          pid = io.pid
+          Rails.logger.debug("Spawing new phantomjs processo with pid: #{pid}")
+          io.read
+        end
+      end
+      out += thread.value
+    end
+    rescue Timeout::Error
+      Rails.logger.debug('triggering timed out')
+
+      if pid_exists?(pid)
+        Rails.logger.warn("phantomjs with pid##{pid} timed out")
+
+        Process.kill 9, pid
+        out += '<html><head><meta name="robots" content="noindex, noarchive " /></head><body></body></html>'
+      end
+      if thread && thread.alive?
+        Thread.kill(thread)
+      end
+    end
+    out
+  end
+
+
+  def self.pid_exists?(pid)
+    begin
+      Process.kill 0, pid
+      return true
+    rescue Errno::ESRCH
+      return false
+    end
+
+  end
+
+  def self.phantomjs_invocation(url)
+    [Phantomjs.path , '--load-images=false', '--ignore-ssl-errors=true', '--ssl-protocol=TLSv1', '--disk-cache=yes', '--max-disk-cache-size=524228', "#{File.dirname(__FILE__)}/prerender_rails_embedded.js", url]
   end
 
   def self.local_renderer

data/prerender_rails_embedded.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'prerender_rails_embedded'
-  spec.version       = '0.2.7'
+  spec.version       = '0.2.8'
   spec.authors       = ['Gian Carlo Pace', 'Luca Mirra']
   spec.email         = %w(giancarlo.pace@etalia.net)
   spec.description   = %q{A plugin for prerender_rails middleware to render JavaScript web app on the fly calling phantomjs directly}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prerender_rails_embedded
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Gian Carlo Pace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Prerender your backbone/angular/javascript rendered application on the fly