prerender_rails_embedded 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzU2Y2U3YWRmMTViMjMxMzFlMzc1ZmMzMGQ3NWVjN2Q5ZTllMjcxNw==
+    MmQ5YjlhZGVlNThiOTcwZDczNzNlMTRiNmEwMzA1YWFkOTQxNjMzMA==
   data.tar.gz: !binary |-
-    NzE3NGZmOWQxMGUwMWYxMDAwMmU2ZTViMzk4ZmQwZjc4MGM4OTQyZA==
+    NTFlYzNmOGM2Mzc0MmQxMmM3OTM3NzdmYTAwZDk4NTMwZmMwNmJkNA==
 SHA512:
   metadata.gz: !binary |-
-    YWE3ZTU2NGU0NjcxOWQyMmM2MTBlN2FkYmFkNmNmZDYwMmU3MjQ1ODAyMWYx
-    ZDBlN2QwMmVhYWUyNjU3OWYyZTc5MDhlOTdhZGQwMTg0NzNkMjc2YTdkZDY0
-    MjE2M2QyYTJhOGQyNDQ1N2YyNGNmMWI0MWUwMTA0MjE4NDY0NTM=
+    YmEyNmE3ZWE3ZWQ4MWM2NTgzN2VmZjljY2IwNjRhNWUyOWUxNGMzMmVhYzZl
+    MTNiMmI2YjE3Zjc5NjE0YmU4MTBjYzAyODM5ZWYyN2Y2NGU5YWNjOTc5ZDY4
+    ZDJlODExMDMyMThmZDY1OTQ2MDEwMTc2YWQ0YmI4ODkyYmU5NTY=
   data.tar.gz: !binary |-
-    ZTEzZDExYjAzMDc0NTIxYzZkM2U4MGU5OGYzYjY1MzQ2YzJiN2YyYjBjM2Ix
-    ZmE3MzNlODVkZWM2NmQwZDgyMDA0MDU1MDk2OTU3YWI3YTZkYmQxNjFkOTk4
-    MjI4YTUzMDkzYTVjMjM5NzMzNjI0MmU0ZjRkYjNmNTBjNTU5OWU=
+    YzA3ZTljYWNjNTRhODg4ZDE5MDU1MDc0MWM0NjYyMTllMTgxY2E1MjUwZDBk
+    ZjdhZjE4ZDNmMTgyZGVlMTQyOTI2NjEyYzEyYThjYzlhYWVhN2ZkYjU2NWJk
+    N2RlMzUwMTZjOWI2ZTBiMjQwNzZhYjczODQ3ODRiZTdkMDRhNGU=

data/README.md

@@ -38,7 +38,7 @@ To test the correct functioning of the `prerender_rails_embedded` gem just start
 with `rails s` and launch a curl to a (js generated) url like this:
 
     curl -H "User-Agent: Mozilla/5.0 baiduspider" \
-        "http://localhost:4000/articles/a0af82a84-d386-4690-9f68-81ac768bc6d3"
+        "http://localhost:3000/articles/a0af82a84-d386-4690-9f68-81ac768bc6d3"
 
 It should show a completely rendered page in standard output.
 
@@ -85,6 +85,13 @@ and launch the web server with the command:
     bundle exec unicorn -p 3000 -c ./config/unicorn.rb
 ```
 
+To test the actual invokation 
+```shell
+$ curl -H 'User-Agent: baiduspider' https://dev.etalia.net/articles/a6c37930c-a3df-482d-b9e5-b4333473e1ae
+```
+
+
+
 ### <a id='todos'></a>
 ## TODOs
 

data/lib/prerender_rails_embedded.js

@@ -8,46 +8,60 @@ var EVALUATE_JAVASCRIPT_CHECK_TIMEOUT = 50;
 
 var page = require('webpage').create(),
     system = require('system');
-
 var surrender = {};
+page.viewportSize = {
+  width: 1024,
+  height: 800
+};
 
 surrender.params = function() {
-    if (system.args.length === 1) {
-        throw 'Usage: googlizer.js <some URL>';
-    }
-    return { address: system.args[1]};
+  if (system.args.length === 1) {
+      throw 'Usage: googlizer.js <some URL>';
+  }
+  return { address: system.args[1]};
 };
 
+
 surrender.javascriptToExecuteOnPage = function() {
-    try {
-        var doctype = ''
-            , html = document && document.getElementsByTagName('html');
-
-        if(document.doctype) {
-            doctype = "<!DOCTYPE "
-                + document.doctype.name
-                + (document.doctype.publicId ? ' PUBLIC "' + document.doctype.publicId + '"' : '')
-                + (!document.doctype.publicId && document.doctype.systemId ? ' SYSTEM' : '')
-                + (document.doctype.systemId ? ' "' + document.doctype.systemId + '"' : '')
-                + '>';
-        }
-
-        if (html && html[0]) {
-            return {
-                html: doctype + html[0].outerHTML,
-                shouldWaitForPrerenderReady: typeof window.prerenderReady === 'boolean',
-                prerenderReady: window.prerenderReady
-            };
-        }
-
-    } catch (e) {
-        return  {
-            html: '',
-            shouldWaitForPrerenderReady: false,
-            prerenderReady: window.prerenderReady
-        };
+  var processHtml = function() {
+    if (!window.prerenderRailsEmbedded || !window.prerenderRailsEmbedded.filterHtmlOutput || typeof(window.prerenderRailsEmbedded.filterHtmlOutput) !== "function") {
+      return document.documentElement.innerHTML;
+    } else {
+      return window.prerenderRailsEmbedded.filterHtmlOutput.call(this);
+    }
+  }
+
+  try { 
+
+    if (!document) {
+      throw 'document is undefined. this function must be called inside page.evaluate ';
     }
+    var html = processHtml();
+    var doctype = '';
 
+    if(document && document.doctype) {
+      doctype = "<!DOCTYPE "
+        + document.doctype.name
+        + (document.doctype.publicId ? ' PUBLIC "' + document.doctype.publicId + '"' : '')
+        + (!document.doctype.publicId && document.doctype.systemId ? ' SYSTEM' : '')
+        + (document.doctype.systemId ? ' "' + document.doctype.systemId + '"' : '')
+        + '>';
+    }
+
+    return {
+      html: doctype + html,
+      shouldWaitForPrerenderReady: typeof window.prerenderReady === 'boolean',
+      prerenderReady: window.prerenderReady
+    };
+    
+  } catch (e) {
+    console.log('ERROR: ', e);
+    return  {
+      html: '',
+      shouldWaitForPrerenderReady: false,
+      prerenderReady: window.prerenderReady
+    };
+  }
 };
 
 surrender.serveHtml = function(html) {
@@ -56,31 +70,46 @@ surrender.serveHtml = function(html) {
 };
 
 surrender.evaluateJavascriptOnPage = function(t) {
-    var _this = t || this
-        , out = page.evaluate(_this.javascriptToExecuteOnPage);
+  var _this = t || this
+      , out = page.evaluate(_this.javascriptToExecuteOnPage);
 
-    if(!out.shouldWaitForPrerenderReady || (out.shouldWaitForPrerenderReady && out.prerenderReady)) {
-        _this.serveHtml(out.html);
-    } else {
-        setTimeout(function(){_this.evaluateJavascriptOnPage(_this)}, EVALUATE_JAVASCRIPT_CHECK_TIMEOUT);
-    }
-    return _this;
+  if(!out.shouldWaitForPrerenderReady || (out.shouldWaitForPrerenderReady && out.prerenderReady)) {
+      _this.serveHtml(out.html);
+  } else {
+      setTimeout(function(){_this.evaluateJavascriptOnPage(_this)}, EVALUATE_JAVASCRIPT_CHECK_TIMEOUT);
+  }
+  return _this;
 };
 
 surrender.run = function() {
-    try {
-        var _this = this;
-        page.address = this.params().address;
-
-        page.open(page.address, function (st) {
-            if (st !== 'success') throw 'FAIL to load the address';
-
-            _this.evaluateJavascriptOnPage();
-        });
-    } catch(e) {
-        console.log(e);
-        phantom.exit(1);
+  try {
+    var _this = this;
+    page.address = this.params().address;
+    page.settings.userAgent = 'EtaliaBotAgent';
+    page.open(page.address, function (st) {
+      if (st !== 'success') throw 'FAIL to load the address';
+      _this.evaluateJavascriptOnPage();
+    });
+  } catch(e) {
+      console.log(e);
+      phantom.exit(1);
+  }
+
+  page.onError = function(msg, trace) {
+    var msgStack = ['ERROR: ' + msg];
+    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(msg, lineNum, sourceId) {
+    console.log('CONSOLE: ' + msg + ' (from line #' + lineNum + ' in "' + sourceId + '")');
+  };
+
 };
 
 surrender.run();

data/prerender_rails_embedded.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'prerender_rails_embedded'
-  spec.version       = '0.1.1'
-  spec.authors       = ['Gian Carlo Pace']
+  spec.version       = '0.2.0'
+  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}
   spec.summary       = %q{Prerender your backbone/angular/javascript rendered application on the fly when search engines crawl}

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: prerender_rails_embedded
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gian Carlo Pace
+- Luca Mirra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,4 +82,3 @@ specification_version: 4
 summary: Prerender your backbone/angular/javascript rendered application on the fly
   when search engines crawl
 test_files: []
-has_rdoc: