phantom_proxy 1.2.8 → 1.2.9

data/lib/phantom_proxy/phantomjs.rb

@@ -4,15 +4,15 @@ module PhantomJSProxy
 	class PhantomJS
 		attr_accessor :dom
 		attr_accessor :image
-		attr_accessor :ready
+    attr_accessor :ready
 	
 		def initialize()
-			@ready = false
+			@ready = 503
 		end
 		
 		def getUrl(url, pictureOnly=true, loadIFrames=true)
 			puts("PhantomJS: "+url)
-			@ready = false
+			@ready = 503
 			
 			pictureFile = nil
 			picture = "none"
@@ -65,7 +65,7 @@ module PhantomJSProxy
 				end
 				@ready = 200
 			end
-			if /FAILED_LOADING_URL/.match(@dom)
+			if /URL_ERROR_CODE/.match(@dom)
         puts("LOAD_ERROR_CODE")
 			  @ready = getHTTPCode @dom
         puts("LOAD_ERROR_CODE_DONE")
@@ -81,8 +81,8 @@ module PhantomJSProxy
 		end
 		
 		def getHTTPCode data
-		  tmp = data.split('FAILED_LOADING_URL:')[1];
-      tmp = tmp.split('FAILED_LOADING_URL_END')[0]
+		  tmp = data.split('URL_ERROR_CODE: ')[1];
+      tmp = tmp.split('URL_ERROR_CODE_END')[0]
 		  #tmp = /FAILED_LOADING_URL: (.*?)FAILED_LOADING_URL_END/.match(data)[1]
 		  tmp.to_i
 		end
@@ -95,7 +95,7 @@ module PhantomJSProxy
 			argString = " "+args.join(" ")
 			puts("Call phantomJS with: "+argString)
 			out = ""
-			IO.popen(PHANTOMJS_BIN+" --cookies-file=/tmp/phantom_proxy/cookies.txt "+script+argString) {|io|
+			IO.popen(PHANTOMJS_BIN+" --cookies-file=/tmp/phantom_proxy/cookies.txt --ignore-ssl-errors=yes "+script+argString) {|io|
 			  out = io.readlines.join
 			}
       #puts("PHANTOMJS_OUT: "+out)

data/lib/phantom_proxy/scripts/proxy.js

@@ -4,6 +4,7 @@ var framesWorked = 0;
 var frameCount = 1;
 var frameContent = [];
 var masterURL = "";
+var masterPage = null;
 
 function evaluateWithVars(page, func, vars)
 {
@@ -21,6 +22,9 @@ function evaluateWithVars(page, func, vars)
 }
 
 function insertFrames(url) {
+	
+	var page = masterPage;
+	/*
 	var page = require('webpage').create();
 	page.onConsoleMessage = function (msg) { console.log(msg); };
 	page.onAlert = function(msg) { console.log(msg);};
@@ -30,7 +34,7 @@ function insertFrames(url) {
 	page.open(url, function (status) {
 		if (status !== 'success') {
             console.log('FAILED_LOADING_URL: '+url);
-        } else {
+        } else {*/
         	page.evaluate(function () {
         		var framestmp = document.getElementsByTagName('IFRAME');
 		      	var frames = []
@@ -41,18 +45,19 @@ function insertFrames(url) {
 		      	for (var i in frames) {
 		      		frames[i].innerHTML = "PHANTOMJS_PROXY_IFRAME"+i;
 		      	}
-					});
-					//replace iframes with their data
-					var content = new String(page.content);
-					for (var i in frameContent) {
-						content = content.replace("PHANTOMJS_PROXY_IFRAME"+i, "<phantomjsframe>"+frameContent[i]+"</phantomjsframe>");
-		      }
-		      console.log("PHANTOMJS_DOMDATA_WRITE:"+content);
-		      console.log('PHANTOMJS_DOMDATA_END');
-        }
+			});
+			
+			//replace iframes with their data
+			var content = new String(page.content);
+			for (var i in frameContent) {
+				content = content.replace("PHANTOMJS_PROXY_IFRAME"+i, "<phantomjsframe>"+frameContent[i]+"</phantomjsframe>");
+			}
+			console.log("PHANTOMJS_DOMDATA_WRITE:"+content);
+			console.log('PHANTOMJS_DOMDATA_END');
+        //}
         console.log('WHATEVER');
         phantom.exit();
-  });
+  //});
 };
 
 function exit() {
@@ -91,11 +96,12 @@ function loadIFrames(page) {
 		return frames;
 	});
 
+	frameCount = frames.length+1;
+	
 	for (var i=0;i<frames.length;i++) {
 		console.log("Frame: "+i+" : "+frames[i]);
 		loadpage(frames[i]);
 	}
-	frameCount = frames.length+1;
 }
 
 function main() {
@@ -127,17 +133,19 @@ function main() {
 
 		masterURL = address;
 		
+		masterPage = page;
+		
 		//catches status != 200 and throws error immidiatly
 		page.onResourceReceived = function (response) {
 			if (response.stage == "end" && response.url == address && response.status != 200)
 			{
-				console.log('FAILED_LOADING_URL: '+response.status+'FAILED_LOADING_URL_END');
+				console.log('URL_ERROR_CODE: '+response.status+'URL_ERROR_CODE_END');
 				//phantom.exit();
 			}
 		};
 
 		page.open(address, function (status) {
-			if (status !== 'success') {
+			if (status != 'success') {
 				console.log('FAILED_LOADING_URL');
 			} else {
 				console.log('DONE_LOADING_URL');

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phantom_proxy
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 2
-  - 8
-  version: 1.2.8
+  - 9
+  version: 1.2.9
 platform: ruby
 authors: 
 - Daniel Sudmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-26 00:00:00 +02:00
+date: 2012-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency