wicked_pdf 0.9.10 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22315d98409c9bf1d341ea93f9bd5df1b61b32c1
-  data.tar.gz: 4731a2ac716c06da0eb5581d5b1a270444faa70a
+  metadata.gz: 3e2ffc50ae502ee314327f4c1374d78823e24295
+  data.tar.gz: f6e10aec82199686cdda8d7520592399d397d514
 SHA512:
-  metadata.gz: 154441b8225aae01f614e149e85563b9881647cd1ee34b2ce5c5f3faf3ddc2ea9c6a3944260f4ec7d8ea32de26967ef3f948c6c4cbf20f736e42b709c3dc97ff
-  data.tar.gz: 0ded8cccea4e1c24c8eec968ee15922d03891cad7fa81156335002f063d1f1ed3ff8ad9baf717768655caed1cc8dd1328d34d4eeba65dc4d52e41287784ba5a1
+  metadata.gz: 58eb4cbd575c2bad0fad91e7a024f5fa25ce8701d4cb025837aa4296a68bacc8298baa8363a73b87809eeaa14ca9fcaff7d0400b2e4dfea183f2425461c59db3
+  data.tar.gz: 67927c005ad9f26ebff235a56ae35c8af72517a23481c108538d65067348b96d2ceb734194dd9b1c4b7af48a8d4574afb48a45b8e9d41e5c2666ffccb584c676

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 *.swp
 test/dummy/log/*.log
 gemfiles/*.lock
+.DS_Store

data/README.md

@@ -125,7 +125,7 @@ class ThingsController < ApplicationController
                :basic_auth                     => false                         # when true username & password are automatically sent from session
                :username                       => 'TEXT',
                :password                       => 'TEXT',
-               :cover                          => 'URL',
+               :cover                          => 'URL, Pathname, or raw HTML string',
                :dpi                            => 'dpi',
                :encoding                       => 'TEXT',
                :user_style_sheet               => 'URL',
@@ -133,8 +133,10 @@ class ThingsController < ApplicationController
                :post                           => ['query QUERY_PARAM'],      # could be an array or a single string in a 'name value' format
                :redirect_delay                 => NUMBER,
                :javascript_delay               => NUMBER,
+               :image_quality                  => NUMBER,
                :zoom                           => FLOAT,
                :page_offset                    => NUMBER,
+               :javascript_delay               => NUMBER,
                :book                           => true,
                :default_header                 => true,
                :disable_javascript             => false,

data/lib/wicked_pdf.rb

@@ -116,6 +116,7 @@ class WickedPdf
         parse_header_footer(:header => options.delete(:header),
                             :footer => options.delete(:footer),
                             :layout => options[:layout]),
+        parse_cover(options.delete(:cover)),
         parse_toc(options.delete(:toc)),
         parse_outline(options.delete(:outline)),
         parse_margins(options.delete(:margin)),
@@ -178,6 +179,22 @@ class WickedPdf
       r
     end
 
+    def parse_cover(argument)
+      arg = argument.to_s
+      return '' if arg.blank?
+      r = '--cover '
+      # Filesystem path or URL - hand off to wkhtmltopdf
+      if arg.include?(Rails.root.to_s) || (arg[0,4] == 'http')
+        r + arg
+      else # HTML content
+        @hf_tempfiles ||= []
+        @hf_tempfiles << tf=WickedPdfTempfile.new("wicked_cover_pdf.html")
+        tf.write arg
+        tf.flush
+        r + tf.path
+      end
+    end
+
     def parse_toc(options)
       r = '--toc ' unless options.nil?
       unless options.blank?
@@ -225,7 +242,6 @@ class WickedPdf
                                     :proxy,
                                     :username,
                                     :password,
-                                    :cover,
                                     :dpi,
                                     :encoding,
                                     :user_style_sheet])
@@ -234,7 +250,8 @@ class WickedPdf
         r +=make_options(options, [ :redirect_delay,
                                     :zoom,
                                     :page_offset,
-                                    :javascript_delay], "", :numeric)
+                                    :javascript_delay,
+                                    :image_quality], "", :numeric)
         r +=make_options(options, [ :book,
                                     :default_header,
                                     :disable_javascript,
@@ -247,6 +264,7 @@ class WickedPdf
                                     :disable_smart_shrinking,
                                     :use_xserver,
                                     :no_background], "", :boolean)
+        r +=make_options(options, [ :no_stop_slow_scripts ], "", nil)
       end
     end
 

data/lib/wicked_pdf/version.rb

@@ -1,3 +1,3 @@
 class WickedPdf
-  VERSION = '0.9.10'
+  VERSION = '0.10.0'
 end

data/lib/wicked_pdf/wicked_pdf_helper.rb

@@ -58,7 +58,11 @@ module WickedPdfHelper
     end
 
     def wicked_pdf_asset_path(asset)
-      "file:///#{asset_pathname(asset).to_s}"
+      if (pathname = asset_pathname(asset).to_s) =~ URI_REGEXP
+        pathname
+      else
+        "file:///#{pathname}"
+      end
     end
 
     private
@@ -67,10 +71,10 @@ module WickedPdfHelper
     URI_REGEXP = %r{^[-a-z]+://|^(?:cid|data):|^//}
 
     def asset_pathname(source)
-      if Rails.configuration.assets.compile == false || source.to_s[0] == '/'
-        if asset_path(source) =~ URI_REGEXP
+      if precompiled_asset?(source)
+        if (pathname = set_protocol(asset_path(source))) =~ URI_REGEXP
           # asset_path returns an absolute URL using asset_host if asset_host is set
-          asset_path(source)
+          pathname
         else
           File.join(Rails.public_path, asset_path(source).sub(/\A#{Rails.application.config.action_controller.relative_url_root}/, ''))
         end
@@ -79,9 +83,20 @@ module WickedPdfHelper
       end
     end
 
+    #will prepend a http or default_protocol to a protocol realtive URL
+    def set_protocol(source)
+      protocol = WickedPdf.config[:default_protocol] || "http"
+      source = [protocol, ":", source].join if source[0,2] == "//"
+      return source
+    end
+
+    def precompiled_asset?(source)
+      Rails.configuration.assets.compile == false || source.to_s[0] == '/'
+    end
+
     def read_asset(source)
-      if Rails.configuration.assets.compile == false || source.to_s[0] == '/'
-        if asset_path(source) =~ URI_REGEXP
+      if precompiled_asset?(source) 
+        if set_protocol(asset_path(source)) =~ URI_REGEXP
           read_from_uri(source)
         else
           IO.read(asset_pathname(source))

data/test/functional/wicked_pdf_helper_assets_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+require 'action_view/test_case'
+
+class WickedPdfHelperAssetsTest < ActionView::TestCase
+
+  include WickedPdfHelper::Assets
+
+  if Rails::VERSION::MAJOR == 4
+    test 'wicked_pdf_asset_path should return an url when assets are served by an asset server' do
+      expects(:asset_pathname => 'http://assets.domain.com/dummy.png')
+      assert_equal 'http://assets.domain.com/dummy.png', wicked_pdf_asset_path('dummy.png')
+    end
+
+    test 'wicked_pdf_asset_path should return an url with a protocol when assets are served by an asset server with relative urls' do
+      expects(:asset_path => '//assets.domain.com/dummy.png')
+      expects("precompiled_asset?" => true)
+      assert_equal 'http://assets.domain.com/dummy.png', wicked_pdf_asset_path('dummy.png')
+    end
+
+    test 'wicked_pdf_asset_path should return a path when assets are precompiled' do
+      expects("precompiled_asset?" => false)
+      path = wicked_pdf_asset_path('application.css')
+
+      assert path.include?("/assets/stylesheets/application.css")
+      assert path.include?("file://")
+    end
+  end
+
+end

data/test/unit/wicked_pdf_test.rb

@@ -129,10 +129,18 @@ class WickedPdfTest < ActiveSupport::TestCase
     end
   end
 
+  test "should parse cover" do
+    wp = WickedPdf.new
+    pathname = Rails.root.join('app','views','pdf','file.html')
+    assert_equal '--cover http://example.org', wp.get_parsed_options(:cover => 'http://example.org').strip, 'URL'
+    assert_equal "--cover #{pathname.to_s}", wp.get_parsed_options(:cover => pathname).strip, 'Pathname in Rails.root'
+    assert_match /--cover .+wicked_cover_pdf.+\.html/, wp.get_parsed_options(:cover => '<html><body>HELLO</body></html>').strip, 'HTML'
+  end
+
   test "should parse other options" do
     wp = WickedPdf.new
 
-    [ :orientation, :page_size, :proxy, :username, :password, :cover, :dpi,
+    [ :orientation, :page_size, :proxy, :username, :password, :dpi,
       :encoding, :user_style_sheet
     ].each do |o|
       assert_equal "--#{o.to_s.gsub('_', '-')} \"opts\"", wp.get_parsed_options(o => "opts").strip

data/wicked_pdf.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'mocha'
 
   spec.description       = <<desc
 Wicked PDF uses the shell utility wkhtmltopdf to serve a PDF file to a user from HTML.

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: wicked_pdf
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.10.0
 platform: ruby
 authors:
 - Miles Z. Sterrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -75,8 +89,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -135,6 +149,7 @@ files:
 - test/fixtures/document_with_long_line.html
 - test/fixtures/wicked.css
 - test/functional/pdf_helper_test.rb
+- test/functional/wicked_pdf_helper_assets_test.rb
 - test/functional/wicked_pdf_helper_test.rb
 - test/test_helper.rb
 - test/unit/wicked_pdf_test.rb
@@ -149,17 +164,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PDF generator (from HTML) gem for Ruby on Rails
@@ -201,6 +216,7 @@ test_files:
 - test/fixtures/document_with_long_line.html
 - test/fixtures/wicked.css
 - test/functional/pdf_helper_test.rb
+- test/functional/wicked_pdf_helper_assets_test.rb
 - test/functional/wicked_pdf_helper_test.rb
 - test/test_helper.rb
 - test/unit/wicked_pdf_test.rb