adzap-wicked_pdf 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ea1861662d27d078f0687835542b048648b15237258699e266f0ab018fd608
-  data.tar.gz: 47dc57c0ed8a638a3ab3921ad746248c6c2a72f2ab355b2448f2188ac2718388
+  metadata.gz: a9e90952154e4de99f48f07c05cc15650674e368f77471d6f6211952a73e3731
+  data.tar.gz: 6e9d65e47ae12a3dd7eed5daa3feca137579c2821d647ee18695fcb021ebf0f4
 SHA512:
-  metadata.gz: 2a41b903e2d397afcf0f20fc0b72f5a9fbecf97f3e6f75f974fe0a827fa8f961dd09d9d0a29828c3b5cb3fd30f2c9066016eb9f88c3eb64892c4fa5a4a8606d7
-  data.tar.gz: 4730471489cd16958963fabacdf9bb25c4509539491c20ec9706ffecb0a678f8b5e8cf34e9aacfafc04ceb2b17ab670039e4558cc3b2639bcca35e2a4f11bbbe
+  metadata.gz: 455ec689af1b87ac63c04625684a508f998c73e0814127849723f5d0e51e357f88194ecdf12e979ec1aa86deeb115857ec8eadcf0d3cf8d9d12a0f838e6cc21d
+  data.tar.gz: cbf22b211f946ff1b46d25230ec6601a229ddd8985aff353fb9195db72e6acf33a52db0345c1745d92288ee7f371630a14fc1189f72ea40c25fe734508b7297a

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/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/version.rb

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

data/test/test_helper.rb

@@ -2,7 +2,6 @@
 ENV['RAILS_ENV'] = 'test'
 
 require 'combustion'
-require 'byebug'
 
 Combustion.path = 'test/dummy'
 Combustion.initialize!(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adzap-wicked_pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Miles Z. Sterrett
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport