adzap-wicked_pdf 2.0.0.beta2 → 2.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ea1861662d27d078f0687835542b048648b15237258699e266f0ab018fd608
-  data.tar.gz: 47dc57c0ed8a638a3ab3921ad746248c6c2a72f2ab355b2448f2188ac2718388
+  metadata.gz: 00a2f0d862aef8fdabd275049bdeb153fde574191baf868e38331e024f9c9a20
+  data.tar.gz: 9a3a4eab190d8e2eeffb72c3d7ef8dc9e682c08298c3865a500827fbb90f2418
 SHA512:
-  metadata.gz: 2a41b903e2d397afcf0f20fc0b72f5a9fbecf97f3e6f75f974fe0a827fa8f961dd09d9d0a29828c3b5cb3fd30f2c9066016eb9f88c3eb64892c4fa5a4a8606d7
-  data.tar.gz: 4730471489cd16958963fabacdf9bb25c4509539491c20ec9706ffecb0a678f8b5e8cf34e9aacfafc04ceb2b17ab670039e4558cc3b2639bcca35e2a4f11bbbe
+  metadata.gz: 35308c7be05d32e170d2de22e215a5c3c491cf111864c61ba9120e15fd635d7c0f41f6441df54d4605f39b3d8f690a8fbde26f1ee0b2cedc1ab22cc18064deab
+  data.tar.gz: 65925e576958b7bc555168c0c90f8d6040d0f4435dd6c8e55eff629b5d034ab30bb9d54a0d6fbf0095a5b2c9f7a0a0e47d94baf36980c6f83372471a80df36a3

data/.gitignore

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

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'byebug'
-
 gemspec

data/lib/wicked_pdf/asset_helper.rb

@@ -1,4 +1,4 @@
-require 'open-uri'
+require 'net/http'
 
 module WickedPdf
   module AssetHelper
@@ -124,8 +124,7 @@ module WickedPdf
     end
 
     def read_from_uri(uri)
-      encoding = ':UTF-8'
-      asset = open(uri, "r#{encoding}", &:read)
+      asset = Net::HTTP.get(URI(uri))
       asset = gzip(asset) if WickedPdf.config[:expect_gzipped_remote_assets]
       asset
     end

data/lib/wicked_pdf/command.rb

@@ -9,6 +9,7 @@ module WickedPdf
 
     def execute(options, *args)
       command = [binary.path]
+      command << '--enable-local-file-access' # FIXME should be set as config
       command += option_parser.parse(options)
       command += args
 

data/lib/wicked_pdf/document.rb

@@ -12,11 +12,12 @@ module WickedPdf
       options = options.dup
       options.merge!(WickedPdf.config) { |_key, option, _config| option }
       string_file = WickedPdf::Tempfile.new('wicked_pdf.html', options[:temp_path])
-      string_file.binmode
-      string_file.write(string)
-      string_file.close
+      string_file.write_in_chunks(string)
 
       pdf_from_html_file(string_file.path, options)
+    rescue Errno::EINVAL => e
+      Rails.logger.error '[wicked_pdf] The HTML file is too large! Try reducing the size or using the return_file option instead.'
+      raise e
     ensure
       string_file.close! if string_file
     end
@@ -25,21 +26,22 @@ module WickedPdf
       # merge in global config options
       options.merge!(WickedPdf.config) { |_key, option, _config| option }
       generated_pdf_file = WickedPdf::Tempfile.new('wicked_pdf_generated_file.pdf', options[:temp_path])
+      return_file = options.delete(:return_file)
 
-      result = @command.execute(options, url, generated_pdf_file.path.to_s)
+      err = @command.execute(options, url, generated_pdf_file.path.to_s)
 
-      if options[:return_file]
-        return_file = options.delete(:return_file)
+      if return_file
         return generated_pdf_file
       end
 
-      generated_pdf_file.rewind
-      generated_pdf_file.binmode
-      pdf = generated_pdf_file.read
+      pdf = generated_pdf_file.read_in_chunks
 
-      raise "PDF could not be generated!\n Command Error: #{result}" if pdf && pdf.rstrip.empty?
+      raise "PDF could not be generated!\n Command Error: #{err}" if pdf && pdf.rstrip.empty?
 
       pdf
+    rescue Errno::EINVAL => e
+      Rails.logger.error '[wicked_pdf] The PDF file is too large! Try reducing the size or using the return_file option instead.'
+      raise e
     ensure
       generated_pdf_file.close! if generated_pdf_file && !return_file
     end

data/lib/wicked_pdf/railtie.rb

@@ -5,11 +5,13 @@ require 'wicked_pdf/asset_helper'
 module WickedPdf
   class Railtie < Rails::Railtie
     initializer 'wicked_pdf.register' do |_app|
-      ActionController::Base.send :prepend, PdfHelper
-      ActionController::Renderers.add :pdf do |template, options|
-        WickedPdf::Renderer.new(self).render(options.merge(:pdf => template))
-      end
-      ActionView::Base.send :include, WickedPdf::AssetHelper
+      ActiveSupport.on_load(:action_controller) {
+        ActionController::Base.send :prepend, PdfHelper
+        ActionController::Renderers.add :pdf do |template, options|
+          WickedPdf::Renderer.new(self).render(options.merge(pdf: template))
+        end
+      }
+      ActiveSupport.on_load(:action_view) { include WickedPdf::AssetHelper }
     end
   end
 end

data/lib/wicked_pdf/renderer.rb

@@ -2,8 +2,6 @@ module WickedPdf
   class Renderer
     attr_reader :controller
 
-    delegate :request, :send_data, :controller_path, :action_name, :to => :controller
-
     def initialize(controller)
       @controller = controller
       @hf_tempfiles = []
@@ -23,25 +21,13 @@ module WickedPdf
     private
 
     def set_basic_auth(options = {})
-      options[:basic_auth] ||= WickedPdf.config.fetch(:basic_auth) { false }
-      return unless options[:basic_auth] && request.env['HTTP_AUTHORIZATION']
-      request.env['HTTP_AUTHORIZATION'].split(' ').last
+      options[:basic_auth] ||= WickedPdf.config.fetch(:basic_auth, false)
+      return unless options[:basic_auth] && controller.request.env['HTTP_AUTHORIZATION']
+      controller.request.env['HTTP_AUTHORIZATION'].split(' ').last
     end
 
     def make_pdf(options = {})
-      render_opts = {
-        :template => options[:template],
-        :prefixes => options[:prefixes],
-        :layout => options[:layout],
-        :formats => options[:formats],
-        :handlers => options[:handlers],
-        :assigns => options[:assigns]
-      }
-      render_opts[:inline] = options[:inline] if options[:inline]
-      render_opts[:locals] = options[:locals] if options[:locals]
-      render_opts[:file]   = options[:file] if options[:file]
-
-      html_string = controller.render_to_string(render_opts)
+      html_string = controller.render_to_string(render_options(options))
       options = prerender_header_and_footer(options)
 
       document = WickedPdf::Document.new(command(options[:wkhtmltopdf]))
@@ -52,26 +38,14 @@ module WickedPdf
 
     def make_and_send_pdf(pdf_name, options = {})
       options[:layout] ||= false
-      options[:template] ||= File.join(controller_path, action_name)
+      options[:template] ||= File.join(controller.controller_path, controller.action_name)
       options[:disposition] ||= 'inline'
       if options[:show_as_html]
-        render_opts = {
-          :template => options[:template],
-          :prefixes => options[:prefixes],
-          :layout => options[:layout],
-          :formats => options[:formats],
-          :handlers => options[:handlers],
-          :assigns => options[:assigns],
-          :content_type => 'text/html'
-        }
-        render_opts[:inline] = options[:inline] if options[:inline]
-        render_opts[:locals] = options[:locals] if options[:locals]
-        render_opts[:file] = options[:file] if options[:file]
-        render(render_opts)
+        controller.render(render_options(options).merge(:content_type => 'text/html'))
       else
         pdf_content = make_pdf(options)
         File.open(options[:save_to_file], 'wb') { |file| file << pdf_content } if options[:save_to_file]
-        send_data(pdf_content, :filename => pdf_name + '.pdf', :type => 'application/pdf', :disposition => options[:disposition]) unless options[:save_only]
+        controller.send_data(pdf_content, :filename => pdf_name + '.pdf', :type => 'application/pdf', :disposition => options[:disposition]) unless options[:save_only]
       end
     end
 
@@ -82,22 +56,17 @@ module WickedPdf
         next unless options[hf] && options[hf][:html] && options[hf][:html][:template]
 
         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],
-          :assigns => options[hf][:html][:assigns]
-        }
-        render_opts[:locals] = options[hf][:html][:locals] if options[hf][:html][:locals]
-        render_opts[:file] = options[hf][:html][:file] if options[:file]
-
+        render_opts = render_options(options[hf][:html])
         path = render_to_tempfile("wicked_#{hf}_pdf.html", render_opts)
         options[hf][:html][:url] = "file:///#{path}"
       end
       options
     end
 
+    def render_options(options)
+      options.slice(:template, :prefixes, :layout, :formats, :handlers, :assigns, :inline, :locals, :file)
+    end
+
     def render_to_tempfile(filename, options)
       tf = WickedPdf::Tempfile.new(filename)
       @hf_tempfiles.push(tf)

data/lib/wicked_pdf/tempfile.rb

@@ -1,13 +1,43 @@
 require 'tempfile'
+require 'stringio'
 
-module WickedPdf
-  class Tempfile < Tempfile
-    # ensures the Tempfile's filename always keeps its extension
+class WickedPdf
+  class Tempfile < ::Tempfile
     def initialize(filename, temp_dir = nil)
       temp_dir ||= Dir.tmpdir
       extension = File.extname(filename)
-      basename  = File.basename(filename, extension)
+      basename = File.basename(filename, extension)
       super([basename, extension], temp_dir)
     end
+
+    def write_in_chunks(input_string)
+      binmode
+      string_io = StringIO.new(input_string)
+      write(string_io.read(chunk_size)) until string_io.eof?
+      close
+      self
+    rescue Errno::EINVAL => e
+      raise e, file_too_large_message
+    end
+
+    def read_in_chunks
+      rewind
+      binmode
+      output_string = ''
+      output_string << read(chunk_size) until eof?
+      output_string
+    rescue Errno::EINVAL => e
+      raise e, file_too_large_message
+    end
+
+    private
+
+    def chunk_size
+      1024 * 1024
+    end
+
+    def file_too_large_message
+      'The HTML file is too large! Try reducing the size or using the return_file option instead.'
+    end
   end
 end

data/lib/wicked_pdf/version.rb

@@ -1,3 +1,3 @@
 module WickedPdf
-  VERSION = '2.0.0.beta2'.freeze
+  VERSION = '2.0.0.beta4'.freeze
 end

data/test/test_helper.rb

@@ -2,11 +2,10 @@
 ENV['RAILS_ENV'] = 'test'
 
 require 'combustion'
-require 'byebug'
 
 Combustion.path = 'test/dummy'
 Combustion.initialize!(:all) do
-  if config.active_record.sqlite3.respond_to?(:represent_boolean_as_integer) # Rails 5.2
+  if Rails::VERSION::MAJOR < 6.0 && config.active_record.sqlite3.respond_to?(:represent_boolean_as_integer) # Rails 5.2
     config.active_record.sqlite3.represent_boolean_as_integer = true
   end
 end

data/wicked_pdf.gemspec

@@ -28,11 +28,12 @@ DESC
 
   spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rails', '< 6.0'
   spec.add_development_dependency 'combustion'
   spec.add_development_dependency 'bundler', '>= 1.3.0', '< 3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop', '~> 0.50.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3', '<= 1.4'
   spec.add_development_dependency 'mocha', '= 1.3'
+  spec.add_development_dependency 'sprockets', '~> 3.0'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: adzap-wicked_pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta4
 platform: ruby
 authors:
 - Miles Z. Sterrett
 - David Jones
 - Adam Meehan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,16 +30,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -106,16 +106,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: |
   Wicked PDF uses the shell utility wkhtmltopdf to serve a PDF file to a user from HTML.
   In other words, rather than dealing with a PDF generation DSL of some sort,
@@ -201,7 +215,7 @@ homepage: https://github.com/adzap/wicked_pdf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,9 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - wkhtmltopdf
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: PDF generator (from HTML) gem for Ruby on Rails
 test_files: