prawn-templates 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4675a2da68897899907ad2cd9ca41f965795c529
-  data.tar.gz: dad0a841287c217ba076dcdf054d8f406a5921b2
+SHA256:
+  metadata.gz: 7f3296b580f0225c618f9a1dce52ae6a5eee1b1b3f6629bb9681f2df39cb0e9b
+  data.tar.gz: 060c30df02ead5cf014dc794092ef59ae1af77d8335da3829f8047a6dce181f1
 SHA512:
-  metadata.gz: 3f26464256ebf5e75af2744dac364cc02299f81953a3f2edd8298987d9ec8e81abadc15b97bc838dad6feade30572aa9b7f9f21fa1cc7434ed86113777c38dc3
-  data.tar.gz: 52fa48e4bdc6371d89fbf2a5ddebfbad0867465f65eae7458f0021e8e140c659c47fe673454482eb25a521d8be32b9f5b169e03f91ee61cff705140bb77eaee9
+  metadata.gz: 45937095668db1620f1483fffafc0a07b0f83f2bbb31203bedda29b55b54411a8f4aedfccea4934a680ab634da73bc86df106777aa94cd4e6aa722d54272148c
+  data.tar.gz: 9a7b8c9897b741bc65560e908f63709fd40b4d0a502eed20ad7a2d0f36ccb7f5867d677daafb81be8b6335eaa5c4cd5320f9741e44070e4a2621588debc8095b

data/lib/pdf/core/page.rb

@@ -22,6 +22,24 @@ module PDF
         end
       end
 
+      # Prepend a content stream containing 'q',
+      # and append a content stream containing 'Q'.
+      # This ensures that prawn has a pristine graphics state
+      # before it starts adding content.
+      def wrap_graphics_state
+        dictionary.data[:Contents] = Array(dictionary.data[:Contents])
+
+        # Save graphics context
+        @content = document.ref({})
+        dictionary.data[:Contents].unshift(document.state.store[@content])
+        document.add_content 'q'
+
+        # Restore graphics context
+        @content = document.ref({})
+        dictionary.data[:Contents] << document.state.store[@content]
+        document.add_content 'Q'
+      end
+
       # As per the PDF spec, each page can have multiple content streams. This
       # will add a fresh, empty content stream this the page, mainly for use in
       # loading template files.
@@ -29,9 +47,7 @@ module PDF
       def new_content_stream
         return if in_stamp_stream?
 
-        unless dictionary.data[:Contents].is_a?(Array)
-          dictionary.data[:Contents] = [content]
-        end
+        dictionary.data[:Contents] = Array(dictionary.data[:Contents])
         @content = document.ref({})
         dictionary.data[:Contents] << document.state.store[@content]
         document.open_graphics_state
@@ -45,7 +61,11 @@ module PDF
 
       alias __dimensions dimensions if method_defined? :dimensions
       def dimensions
-        return inherited_dictionary_value(:MediaBox) if imported_page?
+        if imported_page?
+          media_box = inherited_dictionary_value(:MediaBox)
+          return media_box.data if media_box.is_a?(PDF::Core::Reference)
+          return media_box
+        end
 
         coords = PDF::Core::PageGeometry::SIZES[size] || size
         [0, 0] +
@@ -100,7 +120,7 @@ module PDF
           Contents: content
         )
 
-        resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI]
+        resources[:ProcSet] = %i[PDF Text ImageB ImageC ImageI]
       end
     end
   end

data/lib/prawn/document/internals.rb

@@ -3,12 +3,18 @@ module Prawn
     module Internals
       delegate [:open_graphics_state] => :renderer
 
+      # wraps existing content streams with two new streams
+      # containing just 'q' and 'Q'. This ensures that prawn
+      # has a pristine graphics context before it starts adding content.
+      #
       # adds a new, empty content stream to each page. Used in templating so
       # that imported content streams can be left pristine
       #
       def fresh_content_streams(options = {})
         (1..page_count).each do |i|
           go_to_page i
+
+          state.page.wrap_graphics_state
           state.page.new_content_stream
           apply_margin_options(options)
           generate_margin_box

data/lib/prawn/templates.rb

@@ -130,7 +130,6 @@ module Prawn
             load_object_graph(hash, ref).identifier
           )
         end
-
       rescue PDF::Reader::MalformedPDFError,
              PDF::Reader::InvalidObjectError => e
         msg = 'Error reading template file. If you are sure it\'s a valid PDF,'\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-templates
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gregory Brown
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pdf-reader
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Prawn::Templates allows using PDFs as templates in Prawn