wicked_pdf 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ab8593ac44c5682cf136c152de88154d721bb05
-  data.tar.gz: a999e4080b0f2a76c4488058e4ccf24e69cb9d1d
+  metadata.gz: 7ecacd0a1f535b9b873927974eb6d03f4faaa1e9
+  data.tar.gz: 637c15c9aff67ac734148b74a27edff75219f6a8
 SHA512:
-  metadata.gz: 1dc2bb0b82be7d2071dd92648cee85e6ab8f539cce32b3eb92d78ab4758926e156aead56847d6a2663ea9909f79d3f53c37f6b63bf3b01d0d2343efd37b3d3c6
-  data.tar.gz: 1595873318fa389a248d5d85203a9fc397a3670d36c3ac73032362bb06f5c38f5c9dbbe78bd5e3c11c233fcfb1ad06b530dbc8ef2bdbe29582b20308605e8158
+  metadata.gz: d7e4d7a62b6134e46dad45c5dee5284030cf9fc69ba115d8200602b591dbf4b69d8d37bde7b79719a973c76e5a5b2c3ddd02eb74fd13fd8a302bb3e8d234871f
+  data.tar.gz: 8fb6793c9939c2d217f4dde048d648d95dfab7f83b2f15ea589e43c94d802ecd98b32da4f57bed1d954183397ff8adc553800a337c7a405c54fd55e68419a3be

data/.travis.yml

@@ -1,12 +1,14 @@
 language:
   - ruby
 bundler_args: --verbose
+sudo: required
 rvm:
   - 1.9.2
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - ruby-head
 gemfile:
   - gemfiles/3.0.gemfile
   - gemfiles/3.1.gemfile
@@ -52,3 +54,4 @@ matrix:
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.2.0
       gemfile: gemfiles/rails_edge.gemfile
+    - rvm: ruby-head

data/CHANGLOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [master] - Unpublished
+### Changed
+- The default dpi is now 72. Previously the default would be whatever your `wkhtmltopdf` version specified as the default. This change [speeds up generation of documents that contain `border-radius` dramatically](https://github.com/wkhtmltopdf/wkhtmltopdf/issues/1510)
+
 ## [1.0.0] - 2015-11-03
 ### Changed
 - Accepted that `WickedPDF` cannot guarantee backwards compatibility with older versions of `wkthmltopdf`, and decided to publish a new version with the MAJOR number incremented, signaling that this may have breaking changes for some people, but providing a path forward for progress. This release number also signals that this is a mature (and relatively stable) project, and should be deemed ready for production (since it has been used in production since ~2009, and downloaded over a *million* times on [RubyGems.org](https://rubygems.org/gems/wicked_pdf)).

data/README.md

@@ -35,6 +35,8 @@ gem 'wkhtmltopdf-binary'
 
 To your Gemfile and run `bundle install`.
 
+This wrapper may trail in versions, at the moment it wraps the 0.9 version of `wkhtmltopdf` while there is 0.12 version available. Some of the advanced options listed below is not available with 0.9.
+
 If your wkhtmltopdf executable is not on your webserver's path, you can configure it in an initializer:
 
 ```ruby
@@ -145,6 +147,7 @@ class ThingsController < ApplicationController
                print_media_type:               true,
                disable_smart_shrinking:        true,
                use_xserver:                    true,
+               background:                     false,                     # backround needs to be true to enable background colors to render
                no_background:                  true,
                viewport_size:                  'TEXT',                    # available only with use_xserver or patched QT
                extra:                          '',                        # directly inserted into the command to wkhtmltopdf

data/lib/wicked_pdf.rb

@@ -164,11 +164,11 @@ class WickedPdf
     end
     if type == :name_value
       parts = value.to_s.split(' ')
-      ["--#{name.gsub('_', '-')}", *parts]
+      ["--#{name.tr('_', '-')}", *parts]
     elsif type == :boolean
-      ["--#{name.gsub('_', '-')}"]
+      ["--#{name.tr('_', '-')}"]
     else
-      ["--#{name.gsub('_', '-')}", value.to_s]
+      ["--#{name.tr('_', '-')}", value.to_s]
     end
   end
 

data/lib/wicked_pdf/middleware.rb

@@ -1,13 +1,13 @@
 class WickedPdf
   class Middleware
     def initialize(app, options = {}, conditions = {})
-      @app        = app
-      @options    = (WickedPdf.config || {}).merge(options)
+      @app = app
+      @options = (WickedPdf.config || {}).merge(options)
       @conditions = conditions
     end
 
     def call(env)
-      @request    = Rack::Request.new(env)
+      @request = Rack::Request.new(env)
       @render_pdf = false
 
       set_request_to_render_as_pdf(env) if render_as_pdf?
@@ -25,10 +25,10 @@ class WickedPdf
         headers.delete('ETag')
         headers.delete('Cache-Control')
 
-        headers['Content-Length']         = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
-        headers['Content-Type']           = 'application/pdf'
+        headers['Content-Length'] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
+        headers['Content-Type'] = 'application/pdf'
         if @options.fetch(:disposition, '') == 'attachment'
-          headers['Content-Disposition']       = 'attachment'
+          headers['Content-Disposition'] = 'attachment'
           headers['Content-Transfer-Encoding'] = 'binary'
         end
       end

data/lib/wicked_pdf/pdf_helper.rb

@@ -53,7 +53,12 @@ module PdfHelper
   end
 
   def make_pdf(options = {})
-    render_opts = { :template => options[:template], :layout => options[:layout], :formats => options[:formats], :handlers => options[:handlers] }
+    render_opts = {
+      :template => options[:template],
+      :layout => options[:layout],
+      :formats => options[:formats],
+      :handlers => options[:handlers]
+    }
     render_opts.merge!(:locals => options[:locals]) if options[:locals]
     render_opts.merge!(:file => options[:file]) if options[:file]
     html_string = render_to_string(render_opts)
@@ -67,8 +72,15 @@ module PdfHelper
     options[:layout] ||= false
     options[:template] ||= File.join(controller_path, action_name)
     options[:disposition] ||= 'inline'
+    options[:dpi] ||= '72'
     if options[:show_as_html]
-      render_opts = { :template => options[:template], :layout => options[:layout], :formats => options[:formats], :handlers => options[:handlers], :content_type => 'text/html' }
+      render_opts = {
+        :template => options[:template],
+        :layout => options[:layout],
+        :formats => options[:formats],
+        :handlers => options[:handlers],
+        :content_type => 'text/html'
+      }
       render_opts.merge!(:locals => options[:locals]) if options[:locals]
       render_opts.merge!(:file => options[:file]) if options[:file]
       render(render_opts)
@@ -87,7 +99,12 @@ module PdfHelper
       @hf_tempfiles = [] unless defined?(@hf_tempfiles)
       @hf_tempfiles.push(tf = WickedPdfTempfile.new("wicked_#{hf}_pdf.html"))
       options[hf][:html][:layout] ||= options[:layout]
-      render_opts = { :template => options[hf][:html][:template], :layout => options[hf][:html][:layout], :formats => options[hf][:html][:formats], :handlers => options[hf][:html][:handlers] }
+      render_opts = {
+        :template => options[hf][:html][:template],
+        :layout => options[hf][:html][:layout],
+        :formats => options[hf][:html][:formats],
+        :handlers => options[hf][:html][:handlers]
+      }
       render_opts.merge!(:locals => options[hf][:html][:locals]) if options[hf][:html][:locals]
       render_opts.merge!(:file => options[hf][:html][:file]) if options[:file]
       tf.write render_to_string(render_opts)

data/lib/wicked_pdf/version.rb

@@ -1,3 +1,3 @@
 class WickedPdf
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/wicked_pdf/wicked_pdf_helper/assets.rb

@@ -22,9 +22,7 @@ module WickedPdfHelper
           "url(#{Regexp.last_match[1]})"
         else
           asset = Regexp.last_match[1]
-          if asset_exists?(asset)
-            "url(#{wicked_pdf_asset_path(asset)})"
-          end
+          "url(#{wicked_pdf_asset_path(asset)})" if asset_exists?(asset)
         end
       end.html_safe
     end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
 
 require 'test/unit'
 require 'mocha'

data/test/unit/wicked_pdf_test.rb

@@ -95,12 +95,12 @@ class WickedPdfTest < ActiveSupport::TestCase
 
     [:header, :footer].each do |hf|
       [:center, :font_name, :left, :right].each do |o|
-        assert_equal "--#{hf}-#{o.to_s.gsub('_', '-')} header_footer",
+        assert_equal "--#{hf}-#{o.to_s.tr('_', '-')} header_footer",
                      wp.get_parsed_options(hf => { o => 'header_footer' }).strip
       end
 
       [:font_size, :spacing].each do |o|
-        assert_equal "--#{hf}-#{o.to_s.gsub('_', '-')} 12",
+        assert_equal "--#{hf}-#{o.to_s.tr('_', '-')} 12",
                      wp.get_parsed_options(hf => { o => '12' }).strip
       end
 
@@ -116,7 +116,7 @@ class WickedPdfTest < ActiveSupport::TestCase
     toc_option = wp.get_valid_option('toc')
 
     [:font_name, :header_text].each do |o|
-      assert_equal "#{toc_option} --toc-#{o.to_s.gsub('_', '-')} toc",
+      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')} toc",
                    wp.get_parsed_options(:toc => { o => 'toc' }).strip
     end
 
@@ -125,12 +125,12 @@ class WickedPdfTest < ActiveSupport::TestCase
       :l5_font_size, :l6_font_size, :l7_font_size, :l1_indentation, :l2_indentation,
       :l3_indentation, :l4_indentation, :l5_indentation, :l6_indentation, :l7_indentation
     ].each do |o|
-      assert_equal "#{toc_option} --toc-#{o.to_s.gsub('_', '-')} 5",
+      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')} 5",
                    wp.get_parsed_options(:toc => { o => 5 }).strip
     end
 
     [:no_dots, :disable_links, :disable_back_links].each do |o|
-      assert_equal "#{toc_option} --toc-#{o.to_s.gsub('_', '-')}",
+      assert_equal "#{toc_option} --toc-#{o.to_s.tr('_', '-')}",
                    wp.get_parsed_options(:toc => { o => true }).strip
     end
   end
@@ -167,18 +167,18 @@ class WickedPdfTest < ActiveSupport::TestCase
       :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
+      assert_equal "--#{o.to_s.tr('_', '-')} opts", wp.get_parsed_options(o => 'opts').strip
     end
 
     [:cookie, :post].each do |o|
-      assert_equal "--#{o.to_s.gsub('_', '-')} name value", wp.get_parsed_options(o => 'name value').strip
+      assert_equal "--#{o.to_s.tr('_', '-')} name value", wp.get_parsed_options(o => 'name value').strip
 
-      nv_formatter = proc { |number| "--#{o.to_s.gsub('_', '-')} par#{number} val#{number}" }
+      nv_formatter = proc { |number| "--#{o.to_s.tr('_', '-')} par#{number} val#{number}" }
       assert_equal "#{nv_formatter.call(1)} #{nv_formatter.call(2)}", wp.get_parsed_options(o => ['par1 val1', 'par2 val2']).strip
     end
 
     [:redirect_delay, :zoom, :page_offset].each do |o|
-      assert_equal "--#{o.to_s.gsub('_', '-')} 5", wp.get_parsed_options(o => 5).strip
+      assert_equal "--#{o.to_s.tr('_', '-')} 5", wp.get_parsed_options(o => 5).strip
     end
 
     [
@@ -186,7 +186,7 @@ class WickedPdfTest < ActiveSupport::TestCase
       :enable_plugins, :disable_internal_links, :disable_external_links,
       :print_media_type, :disable_smart_shrinking, :use_xserver, :no_background
     ].each do |o|
-      assert_equal "--#{o.to_s.gsub('_', '-')}", wp.get_parsed_options(o => true).strip
+      assert_equal "--#{o.to_s.tr('_', '-')}", wp.get_parsed_options(o => true).strip
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wicked_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Miles Z. Sterrett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -186,3 +186,4 @@ test_files:
 - test/functional/wicked_pdf_helper_test.rb
 - test/test_helper.rb
 - test/unit/wicked_pdf_test.rb
+has_rdoc: