phantompdf 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae86097f0600f67b8b4dcce04e387310a0616080
-  data.tar.gz: ffaf226240d70a72325ed280f3c9175eca110cbf
+  metadata.gz: 38258c9e01c5fcd60729363baafab69f2789eefc
+  data.tar.gz: 7e8057ee830c08e5fb193dae4041d0053765b31a
 SHA512:
-  metadata.gz: a84c1aff47a454b516861c7eafd346543ff09d11e0bd33b1d9fd088efba218dbc0d4b9736aff92dd50938689d72d9b82616389ca5eea1a36fb8f59b29dc3cda6
-  data.tar.gz: 824fc062d2c2e429192f5ff69679a1cf5ac6e38f25f20aa0f1cf7e3b92417e3dd93ba1fe7bc0695e4dc17995d3f77bee7ab9f547ce38978d9aed2b132c7cd293
+  metadata.gz: c8e32f3283c0f663c11ef1391020304435c653c77c01ccd4942e5631cc20615767998de92f97438a8a2b2d02cf3daef607f98f336d64a67dab1daa99ad6a8c4d
+  data.tar.gz: 4a1bc43c970df6de138dbaa521c29e3b53b3f2a753d1696721fb1f7d560c32be7e8fb27e024bd523c54029b96ded18225d99753bc6f2ed3c2b9425c026b342f9

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 # using PhantomJS github repo
-gem 'phantomjs', :github => 'colszowka/phantomjs-gem'
+gem 'phantomjs', '>= 1.8.0'

data/Gemfile.lock

@@ -1,13 +1,7 @@
-GIT
-  remote: git://github.com/colszowka/phantomjs-gem.git
-  revision: f8a30905c28dac99490efaa608f1af59618616cb
-  specs:
-    phantomjs (1.9.2.0)
-
 PATH
   remote: .
   specs:
-    phantompdf (1.1.0)
+    phantompdf (1.1.1)
       json
       phantomjs
       rack
@@ -17,20 +11,21 @@ GEM
   specs:
     Ascii85 (1.0.2)
     afm (0.2.0)
-    byebug (2.3.0)
+    byebug (2.3.1)
       columnize (~> 0.3.6)
       debugger-linecache (~> 1.2.0)
     columnize (0.3.6)
     debugger-linecache (1.2.0)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     hashery (2.1.1)
-    json (1.8.0)
+    json (1.8.1)
     pdf-reader (1.3.3)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.0)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
+    phantomjs (1.9.2.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -38,10 +33,10 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
     ruby-rc4 (0.1.5)
     ttfunk (1.0.3)
 
@@ -51,7 +46,7 @@ PLATFORMS
 DEPENDENCIES
   byebug
   pdf-reader
-  phantomjs!
+  phantomjs (>= 1.8.0)
   phantompdf!
   rack-test
   rspec

data/lib/phantompdf/generator.rb

@@ -63,14 +63,14 @@ module PhantomPDF
       format, header, footer = options[:format], options[:header], options[:footer]
       zoom, margin, orientation = options[:zoom], options[:margin], options[:orientation]
       rendering_timeout, timeout = options[:rendering_timeout], options[:timeout]
-      cookie_file = dump_cookies(options[:cookies])
+      cookies = dump_cookies(options[:cookies])
 
       [Assets.javascripts('rasterize'),
-       @input.to_s,
+       @input,
        @output,
        format, dump_header(header), dump_footer(footer),
        margin, orientation, zoom,
-       cookie_file,
+       cookies,
        rendering_timeout, timeout].map(&:to_s)
     end
 
@@ -91,14 +91,7 @@ module PhantomPDF
     end
 
     def dump_cookies(cookies)
-      cookie_host = @input.url? ? URI::parse(@input.to_s).host : '/'
-
-      cookie_json = cookies.inject([]) {|ck, (k, v)| ck.push({:name => k, :value => v, :domain => cookie_host}); ck}.to_json
-      return nil if cookie_json.empty?
-
-      cookie_file = Tempfile.new('temp_cookie_file')
-      cookie_file.write(cookie_json)
-      cookie_file.path
+      JSON.dump(cookies)
     end
   end
 end

data/lib/phantompdf/version.rb

@@ -1,3 +1,3 @@
 module PhantomPDF
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/vendor/assets/javascripts/rasterize.js

@@ -2,6 +2,7 @@ var page = require('webpage').create(),
     fs = require('fs'),
     system = require('system'),
     system_args_len = system.args.length,
+    timer = null,
     phantom_exit = function(code, message){
       if (message) {
         console.log(message);
@@ -11,14 +12,34 @@ var page = require('webpage').create(),
         page.close();
       }
 
+      if (timer) {
+        clearTimeout(timer);
+      }
+
       phantom.exit(code || 0);
     };
+if (phantom.version.major < 1 || phantom.version.minor < 7) {
+  phantom_exit(1, "PhantomJS version must greater than 1.7!");
+}
 if (system_args_len < 3 || system_args_len > 12) {
-  phantom_exit(1, "Usage: phantomjs rasterize.js SOURCE DESTINATION [paperWidth*paperHeight|paperFormat] [header] [footer] [margin] [orientation] [zoom] [cookie_file] [render_timeout] [timeout]\n     : paper (pdf output) examples: \"5in*7.5in\", \"10cm*20cm\", \"A4\", \"Letter\"");
+  phantom_exit(1, "Usage: phantomjs rasterize.js SOURCE DESTINATION [paperWidth*paperHeight|paperFormat] [header] [footer] [margin] [orientation] [zoom] [cookies] [render_timeout] [timeout]\n     : paper (pdf output) examples: \"5in*7.5in\", \"10cm*20cm\", \"A4\", \"Letter\"");
 }
 
-var // PhantomJS CAN NOT handle images in custom header/footer,
+var input = system.args[1],
+    output = system.args[2],
+
+    margin = system.args[6] || '0cm',
+    orientation = system.args[7] || 'portrait',
+    zoom = system.args[8] || '1.0',
+
+    cookies = system.args[9],
+
+    render_timeout = system.args[10] || 10000,
+    timeout = system.args[11] || 90000,
+
+    // PhantomJS CAN NOT handle images in custom header/footer,
     // and this is used to fix the issue.
+    // NOTE: You must pass HTML content if you want to use this feature!
     io_images = [],
 
     is_http = function(s){
@@ -82,7 +103,7 @@ var // PhantomJS CAN NOT handle images in custom header/footer,
         page.content = inject_images(html);
       }
 
-      window.setTimeout(function(){
+      timer = window.setTimeout(function(){
         var output_tmp = output + '_tmp.pdf';
 
         page.render(output_tmp);
@@ -105,22 +126,10 @@ var // PhantomJS CAN NOT handle images in custom header/footer,
 
         phantom_exit()
       }, render_timeout);
-    },
-
-    input = system.args[1],
-    output = system.args[2],
-
-    margin = system.args[6] || '0cm',
-    orientation = system.args[7] || 'portrait',
-    zoom = system.args[8] || '1.0',
-
-    cookie_file = system.args[9],
-    cookies = {},
-
-    render_timeout = system.args[10] || 10000,
-    timeout = system.args[11] || 90000;
+    };
 
-window.setTimeout(function(){
+var overtimer = window.setTimeout(function(){
+  clearTimeout(overtimer);
   phantom_exit(1, "Shit's being weird no result within " + timeout + "ms");
 }, timeout);
 
@@ -166,17 +175,15 @@ if (output.substr(-4) === '.pdf') {
 page.zoomFactor = zoom;
 
 // cookies injection
-if (cookie_file) {
+phantom.cookiesEnabled = false;
+if (cookies) {
   try {
-    fd = fs.open(cookie_file, 'r');
-    cookies = JSON.parse(fd.read());
-    fs.remove(cookie_file);
-
+    cookies = JSON.parse(cookies);
 
     phantom.cookiesEnabled = true;
     phantom.cookies = cookies;
   } catch (e) {
-    // ignore
+    phantom.cookiesEnabled = false;
   }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phantompdf
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Spring MC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phantomjs
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A PhantomJS based PDF generator
@@ -173,4 +173,3 @@ test_files:
 - spec/phantompdf/middleware_spec.rb
 - spec/phantompdf/source_spec.rb
 - spec/spec_helper.rb
-has_rdoc: