Minor changes to PR

- Make sure as_image is parsed correctly
- Don't set viewport size if as_image isn't set
- Bump package version

Author: Tomtomgo

.gitignore

@@ -1,3 +1,4 @@
 node_modules/*
 assets/*.xcf
 test.js
+screenshots/*

lib/worker.js

@@ -1,6 +1,6 @@
 {
   "name": "phearjs",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "homepage": "http://phear.io",
   "description": "Render any dynamic Javascript webpage to JSON with PhantomJS.",
   "keywords": [

package.json

@@ -76,7 +76,7 @@
   };
 
   handle_request = function(req, res) {
-    var cache_key, cache_namespace, error1, respond, thread_number;
+    var cache_key, cache_namespace, respond, thread_number;
     thread_number = next_thread_number();
     res.header("Access-Control-Allow-Origin", "*");
     res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
@@ -134,16 +134,16 @@
             timeout: config.global_timeout
           };
           return request(options, function(error, response, body) {
-            var err, error2, ref1;
+            var err, ref1;
             try {
               if (response.statusCode === 200) {
                 memcached.set(cache_key, body, config.cache_ttl, function() {
                   return logger.info("phear-" + thread_number, "Stored " + req.query.fetch_url + " in cache");
                 });
               }
               return respond(response.statusCode, body);
-            } catch (error2) {
-              err = error2;
+            } catch (error1) {
+              err = error1;
               res.statusCode = 500;
               close_response("phear-" + thread_number, "Request failed due to an internal server error.", res);
               if ((ref1 = worker.process.status) !== "stopping" && ref1 !== "stopped") {

phear.js

@@ -53,7 +53,7 @@ run_server = ->
     get_cookies = request_url.query?.get_cookies or config.get_cookies
 
     # Check for rendering images
-    as_image = request_url.query?.as_image or config.as_image
+    as_image = request_url.query?.as_image in ["true", "1"] or config.as_image
     as_image_config = config.as_image_config
 
     # Check width and heigth
@@ -149,11 +149,6 @@ fetch_url = (url, response, this_inst, parse_delay, request_headers, get_request
   # Create an instance of PhantomJS's webpage (the actual fetching and parsing happens here)
   page_inst.open url, (status) ->
 
-    page_inst.viewportSize = {
-      width: viewport_width,
-      height: viewport_height
-    }
-
     # Prevent double execution
     if done then return true else done = true
 
@@ -191,6 +186,10 @@ fetch_url = (url, response, this_inst, parse_delay, request_headers, get_request
           return
 
         if as_image
+          page_inst.viewportSize = {
+            width: viewport_width,
+            height: viewport_height
+          }
           iso_date = new Date().toISOString()
           path_to_image = "
             #{as_image_config.path}#{iso_date.substr(0, 10)}/#{iso_date.substr(11, 12)}
@@ -213,7 +212,7 @@ fetch_url = (url, response, this_inst, parse_delay, request_headers, get_request
           cookies: cookie_inst.cookies if get_cookies in ["true", "1"]
           had_js_errors: had_js_errors
           content: strip_scripts(page_inst.content)
-          rendered: path_to_image
+          rendered: path_to_image if as_image
         )
         close_response this_inst, status, response
         page_inst.close()