phantompdf 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b25c7eb048e875dbb10b202bce64574407c10000
-  data.tar.gz: b8ff0629829516f1d6ece912920d63482b1fa998
+  metadata.gz: ae86097f0600f67b8b4dcce04e387310a0616080
+  data.tar.gz: ffaf226240d70a72325ed280f3c9175eca110cbf
 SHA512:
-  metadata.gz: 84e3c4085a24964db92084b663b16dd8a84077b54cc2a15f6258dd7df93003da0a0e1f3ad633f67390c4f05f08e22e22ce1e4da5f7ca659dcf7a0d9090122d49
-  data.tar.gz: 48b868e89d180fd4f8360a1c1660104fcf3fd9b9c61c1d2c5fd0e0610d4b475ea5ff6a5df37b782f923cb62e433c716c6363a3a7c6b4a40d6620abce0ca7b1ca
+  metadata.gz: a84c1aff47a454b516861c7eafd346543ff09d11e0bd33b1d9fd088efba218dbc0d4b9736aff92dd50938689d72d9b82616389ca5eea1a36fb8f59b29dc3cda6
+  data.tar.gz: 824fc062d2c2e429192f5ff69679a1cf5ac6e38f25f20aa0f1cf7e3b92417e3dd93ba1fe7bc0695e4dc17995d3f77bee7ab9f547ce38978d9aed2b132c7cd293

data/Gemfile.lock

@@ -10,13 +10,14 @@ PATH
     phantompdf (1.1.0)
       json
       phantomjs
+      rack
 
 GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.2)
     afm (0.2.0)
-    byebug (2.2.2)
+    byebug (2.3.0)
       columnize (~> 0.3.6)
       debugger-linecache (~> 1.2.0)
     columnize (0.3.6)
@@ -30,7 +31,9 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    rake (10.1.0)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -50,5 +53,5 @@ DEPENDENCIES
   pdf-reader
   phantomjs!
   phantompdf!
-  rake
+  rack-test
   rspec

data/lib/phantompdf/generator.rb

@@ -85,7 +85,7 @@ module PhantomPDF
     def dump_footer(footer)
       return nil if footer.nil? || footer.empty?
 
-      return "0.7cm*#{header}" unless footer.split('*')[0].to_f > 0
+      return "0.7cm*#{footer}" unless footer.split('*')[0].to_f > 0
 
       footer
     end

data/lib/phantompdf/version.rb

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

data/phantompdf.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w(lib)
   spec.add_runtime_dependency 'phantomjs'
+  spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'json'
 
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pdf-reader'
   spec.add_development_dependency 'byebug'

data/spec/fixtures/phantompdf.html

@@ -11,6 +11,7 @@
         <p>
           This is a HTML file used for PhantomPDF testing.
         </p>
+        <img src="http://www.google.com/images/srpr/logo4w.png" />
       </div>
     </section>
     <footer>

data/spec/phantompdf/generator_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
 module PhantomPDF
-  describe Generator do
-    let(:fixtures_root) {
-      File.expand_path('../../fixtures', __FILE__)
-    }
+  fixtures_root = File.expand_path('../../fixtures', __FILE__)
+
+  resource = {
+    url: 'http://www.google.com',
+    file: "#{fixtures_root}/phantompdf.html",
+    html: File.read("#{fixtures_root}/phantompdf.html")
+  }.values.sample
 
-    subject { Generator.new("#{fixtures_root}/phantompdf.html") }
+  describe Generator do
+    subject { Generator.new(resource) }
 
     context "attributes" do
       [:input, :output, :config].each do |rwattr|
@@ -21,105 +25,103 @@ module PhantomPDF
     end
 
     context "#generate" do
-      fixtures_root = File.expand_path('../../fixtures', __FILE__)
-
-      {
-        url: 'http://www.google.com',
-        file: "#{fixtures_root}/phantompdf.html",
-        html: File.read("#{fixtures_root}/phantompdf.html")
-      }.each do |key, value|
-        context "with #{key}" do
-          it "should works" do
-            Generator.new(value).generate.should be_pdf_file
-          end
-        end
+      it "should works" do
+        Generator.new(resource).generate.should be_pdf_file
       end
 
       context "with output" do
-        before :all do
-          @url = 'http://www.google.com'
-          @file = '/tmp/google.pdf'
+        before :each do
+          @destination = '/tmp/google.pdf'
+
+          File.unlink(@destination) if File.exist?(@destination)
         end
 
         after :each do
-          File.exist?(@file) && File.unlink(@file)
+          File.unlink(@destination) if File.exist?(@destination)
         end
 
-        it "should generate pdf file following :output" do
-          File.exist?(@file).should be_false
-          Generator.new(@url, @file).generate
-          File.exist?(@file).should be_true
+        it "should generate pdf file following output" do
+          File.exist?(@destination).should be_false
+          Generator.new(resource, @destination).generate
+          File.exist?(@destination).should be_true
 
-          @file.should be_pdf_file
+          @destination.should be_pdf_file
         end
 
-        it "should raise PhantomPDF::DestinationTypeError when :output is not a string" do
+        it "should raise PhantomPDF::DestinationTypeError when output is not a string" do
           expect{
-            Generator.new(@url, Object.new)
+            Generator.new(resource, Object.new)
           }.to raise_error(PhantomPDF::DestinationTypeError)
         end
 
-        it "should raise PhantomPDF::DestinationPermitError when :output is not writable" do
+        pending "should raise PhantomPDF::DestinationPermitError when output is not writable" do
           File.stub(:writable?, '/tmp') { false }
 
           expect{
-            Generator.new(@url, @file)
+            Generator.new(resource, @destination)
           }.to raise_error(PhantomPDF::DestinationPermitError)
         end
       end
 
-      context "with options for pdf format" do
-        before :all do
-          @url = 'http://www.google.com'
-          @file = '/tmp/google.pdf'
-          @image = 'http://www.google.com/images/srpr/logo4w.png'
+      context "with options" do
+        before :each do
+          @destination = '/tmp/google.pdf'
+          @custom_image = 'http://www.google.com/images/srpr/logo4w.png'
+
+          File.unlink(@destination) if File.exist?(@destination)
         end
 
         after :each do
-          File.exist?(@file) && File.unlink(@file)
+          File.unlink(@destination) if File.exist?(@destination)
         end
 
-        pending "should support custom :header" do
+        it "should support custom header" do
           header = 'Hello, PhantomPDF header!'
 
-          Generator.new(@url, @file, {:header => header}).generate
+          Generator.new(resource, @destination, {:header => header}).generate.should be_pdf_file
 
-          pdf_content = PDF::Reader.new(@file).page(1).text
-          pdf_content.should include(header)
+          # we CANNOT reader the file as PDF
+          # pdf_content = PDF::Reader.new(@destination).page(1).text
+          # pdf_content.should include(header)
         end
 
         it "should support images in custom header" do
-          header = "1.8cm*PhantomPDF header!<img src=\"#{@image}\" style=\"float:right;\"/>"
+          header = "1.8cm*PhantomPDF header!<img src=\"#{@custom_image}\" style=\"float:right;\"/>"
 
-          Generator.new(@url, @file, {header: header}).generate.should be_pdf_file
+          Generator.new(resource, @destination, {:header => header}).generate.should be_pdf_file
+
+          # we CANNOT reader the file as PDF
+          # pdf_content = PDF::Reader.new(@destination).page(1).text
+          # pdf_content.should include(@custom_image)
         end
 
-        pending "should support custom :footer" do
-          header = 'Hello, PhantomPDF footer!'
+        it "should support custom footer" do
+          footer = 'Hello, PhantomPDF footer!'
 
-          Generator.new(@url, @file, {:footer => header}).generate
+          Generator.new(resource, @destination, {:footer => footer}).generate.should be_pdf_file
 
-          pdf_content = PDF::Reader.new(@file).page(1).text
-          pdf_content.should include(header)
+          # we CANNOT reader the file as PDF
+          # pdf_content = PDF::Reader.new(@destination).page(1).text
+          # pdf_content.should include(header)
         end
 
-        it "should support images in custom header or footer" do
-          footer = "1.8cm*PhantomPDF footer!<img src=\"#{@image}\" style=\"float:right;\"/>"
+        it "should support images in custom footer" do
+          footer = "1.8cm*PhantomPDF footer!<img src=\"#{@custom_image}\" style=\"float:right;\"/>"
+
+          Generator.new(resource, @destination, {:footer => footer}).generate.should be_pdf_file
 
-          Generator.new(@url, @file, {footer: footer}).generate.should be_pdf_file
+          # we CANNOT reader the file as PDF
+          # pdf_content = PDF::Reader.new(@destination).page(1).text
+          # pdf_content.should include(@custom_image)
         end
       end
     end
 
     context "#generate!" do
-      before :all do
-        @url = 'http://www.google.com'
-      end
-
       it "should raise PhantomPDF::RenderingError when failed to generate" do
         $?.stub(:exitstatus) { 1 }
 
-        generator = Generator.new(@url)
+        generator = Generator.new(resource)
         generator.stub(:run) { 'rendering error' }
 
         expect{
@@ -129,12 +131,8 @@ module PhantomPDF
     end
 
     context "#to_string" do
-      before :all do
-        @url = 'http://www.google.com'
-      end
-
-      it "should return string" do
-        Generator.new(@url).to_string.should be_pdf_string
+      it "should return string of PDF file" do
+        Generator.new(resource).to_string.should be_pdf_string
       end
     end
   end

data/vendor/assets/javascripts/rasterize.js

@@ -1,20 +1,32 @@
 var page = require('webpage').create(),
     fs = require('fs'),
     system = require('system'),
-    system_args_length = system.args.length;
-if (system_args_length < 3 || system_args_length > 12) {
-  console.log('Usage: phantomjs rasterize.js SOURCE DESTINATION [paperWidth*paperHeight|paperFormat] [header] [footer] [margin] [orientation] [zoom] [cookie_file] [render_timeout] [timeout]');
-  console.log('     : paper (pdf output) examples: "5in*7.5in", "10cm*20cm", "A4", "Letter"');
-  phantom.exit(1);
+    system_args_len = system.args.length,
+    phantom_exit = function(code, message){
+      if (message) {
+        console.log(message);
+      }
+
+      if (page) {
+        page.close();
+      }
+
+      phantom.exit(code || 0);
+    };
+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\"");
 }
 
 var // PhantomJS CAN NOT handle images in custom header/footer,
     // and this is used to fix the issue.
     io_images = [],
 
+    is_http = function(s){
+      return /https?:\/\/.+?/i.test(s) === true;
+    },
     is_html = function(s){
       return /<([a-z]+?\d*?)[^>]*?>[^\0]*?<\/\1>/i.test(s) === true;
-    },
+    }
 
     extract_images = function(html){
       var image_tags = html.match(/<img[^>]+?src=(["'])https?:\/\/[^>]+?\1[^>]*?\/?>/ig),
@@ -25,7 +37,6 @@ var // PhantomJS CAN NOT handle images in custom header/footer,
       }
 
       image_tags_len = image_tags.length;
-
       for (i=0; i<image_tags_len; i++) {
         image = image_tags[i].match(/src=(["'])(https?:\/\/[^>]+?)\1/i);
 
@@ -67,22 +78,16 @@ var // PhantomJS CAN NOT handle images in custom header/footer,
     },
 
     render_pdf = function(html){
-      if (!is_html(html)) {
-        console.log('Invalid HTML source for rendering!');
-
-        phantom.exit(1);
+      if (typeof(html) == 'string') {
+        page.content = inject_images(html);
       }
 
-      page.content = inject_images(html);
-
       window.setTimeout(function(){
         var output_tmp = output + '_tmp.pdf';
 
         page.render(output_tmp);
         if (!fs.exists(output_tmp)) {
-          console.log('Failed to render pdf tmp file!');
-
-          phantom.exit(1);
+          phantom_exit(1, 'Failed to render pdf tmp file!');
         }
 
         if (fs.exists(output)) {
@@ -90,17 +95,15 @@ var // PhantomJS CAN NOT handle images in custom header/footer,
         }
 
         try {
-          fs.move(output + '_tmp.pdf', output);
+          fs.move(output_tmp, output);
 
           // return pdf file path
           console.log(output);
         } catch (e) {
-          console.log(e.message);
-
-          phantom.exit(1);
+          phantom_exit(1, e.message);
         }
 
-        phantom.exit();
+        phantom_exit()
       }, render_timeout);
     },
 
@@ -118,21 +121,19 @@ var // PhantomJS CAN NOT handle images in custom header/footer,
     timeout = system.args[11] || 90000;
 
 window.setTimeout(function(){
-  console.log("Shit's being weird no result within " + timeout + "ms");
-
-  phantom.exit(1);
+  phantom_exit(1, "Shit's being weird no result within " + timeout + "ms");
 }, timeout);
 
 page.viewportSize = { width:600, height:600 };
 if (output.substr(-4) === '.pdf') {
   var size, header, footer,
       paper_size_options = {};
-  if (system_args_length > 3) {
+  if (system_args_len > 3) {
     size = system.args[3].split('*');
     paper_size_options = size.length === 2 ? {width:size[0], height:size[1], margin:'0px'} : {format:system.args[3], orientation:orientation, margin:margin};
   }
 
-  if (system_args_length > 4) {
+  if (system_args_len > 4) {
     header = system.args[4].split('*');
     if (header.length >= 2) {
       extract_images(header.join('*'));
@@ -146,7 +147,7 @@ if (output.substr(-4) === '.pdf') {
     }
   }
 
-  if (system_args_length > 5) {
+  if (system_args_len > 5) {
     footer = system.args[5].split('*');
     if (footer.length >= 2) {
       extract_images(footer.join('*'));
@@ -182,18 +183,17 @@ if (cookie_file) {
 if (is_html(input)) {  // for html string
   render_pdf(input);
 } else {  // for url resource
-  var statusCode = null;
-
-  // determine the statusCode
+  // determine the resourceStatusCode
+  var resourceStatusCode = null;
   page.onResourceReceived = function(resource){
     if (new RegExp('^'+input).test(resource.url)) {
-      statusCode = resource.status;
+      resourceStatusCode = resource.status;
     }
   };
 
   page.open(input, function(status){
-    if (status !== 'success' || (statusCode !== null && statusCode != 200)) {
-      console.log(statusCode, 'Failed to load the input!');
+    if (status !== 'success' || (resourceStatusCode !== null && resourceStatusCode != 200)) {
+      console.log(resourceStatusCode, 'Failed to load the input!');
 
       if (fs.exists(output)) {
         fs.remove(output);
@@ -202,14 +202,12 @@ if (is_html(input)) {  // for html string
       try {
         fs.touch(output);
       } catch (e) {
-        console.log(e.message);
-
-        phantom.exit(1);
+        phantom_exit(1, e.message);
       }
 
-      phantom.exit(1);
+      phantom_exit(1);
     } else {
-      render_pdf(page.content);
+      render_pdf(is_http(input) ? null : page.content);
     }
   });
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phantompdf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Spring MC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phantomjs
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -117,6 +131,7 @@ files:
 - lib/phantompdf/source.rb
 - lib/phantompdf/version.rb
 - phantompdf.gemspec
+- spec/fixtures/google.png
 - spec/fixtures/phantompdf.html
 - spec/phantompdf/assets_spec.rb
 - spec/phantompdf/config_spec.rb
@@ -150,6 +165,7 @@ signing_key:
 specification_version: 4
 summary: A PhantomJS based PDF generator
 test_files:
+- spec/fixtures/google.png
 - spec/fixtures/phantompdf.html
 - spec/phantompdf/assets_spec.rb
 - spec/phantompdf/config_spec.rb
@@ -157,3 +173,4 @@ test_files:
 - spec/phantompdf/middleware_spec.rb
 - spec/phantompdf/source_spec.rb
 - spec/spec_helper.rb
+has_rdoc: