combine_pdf 0.2.31 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63b0c324e1bf003b0c0fc963eb2071b6c4672c18
-  data.tar.gz: 34c200edda06074773888c098b9d4f9a6479d752
+  metadata.gz: 965be3f2286760e04ed715a9514a1205b27aaf3e
+  data.tar.gz: ee3098114904a30410990bd6bd0b715aae32f81d
 SHA512:
-  metadata.gz: ebf1cd2a7c1077f71d6f41037f0ad341c06e6bbb305bfa030833956feb0bb80576e2eaa5fd7324000ff95834f8c125cafc40a782ac97c16c7e3c7e7c02166794
-  data.tar.gz: a4cc257441939fbc0dd59dffe2d3faf11ade63b89fa2637bee8b54df7ea9e31a2ec5612d366ec9208856d750deac8fe10f1ddcaab6f9bf21996e6aa52c775e90
+  metadata.gz: c55779f6471f54dfd815b61dc77f62d92774f7d5dd29877af2806c7c6de5ef9eb224f8ec6b97f1f535d020227fc4026ce058098e634f974bf631ea244a622af8
+  data.tar.gz: 9c352999dc4fa5c694e6a14f1a6ab9b02b9615af55c8991915d89283ddfad416ff0c8b5f6efe4b19df165718b37b01a138aeac21f0d693dc491426af0e4f59cf

data/.gitignore

@@ -12,3 +12,5 @@
 *.o
 *.a
 mkmf.log
+
+.DS_Store

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ***
 
+Change log v.0.2.32 (un-released)
+
+**Update**: Better errors when encryption related exceptions occur. Credit to Paul Shumeika ( @pshumeika ).
+
+**Fix**: Fixed an issue where empty pages with NULL contents value would cause CombinePDF to raise an exception when rendering. Credit to @holtmaat and Jason DeLeon (@progmem) (both in submitted different PRs regarding the issue).
+
+***
+
 Change log v.0.2.31
 
 **Broke**: Broke the fix for issue #65 so that Radio buttons data might be lost... working on a fix.

data/README.md

@@ -103,7 +103,7 @@ pdf.save "file_with_numbering.pdf"
 
 Numbering can be done with many different options, with different formating, with or without a box object, and even with opacity values - see documentation.
 
-## Loading and Rendering PDF data
+## Loading and Parsing PDF data
 
 Loading PDF data can be done from file system or directly from the memory.
 
@@ -120,14 +120,28 @@ pdf_data = prawn_pdf_document.render # Import PDF data from Prawn
 pdf = CombinePDF.parse(pdf_data)
 ```
 
-Similarly, you can output a string of PDF data using `.to_pdf`. For example, to let a user download the PDF from a [Rails](http://rubyonrails.org) or [Plezi](https://github.com/boazsegev/plezi) app:
+Using `parse` is also effective when loading data from a remote location, circumventing the need for unnecessary temporary files. For example:
+
+```ruby
+require 'combine_pdf'
+require 'net/http'
+
+url = "https://example.com/my.pdf"
+pdf = CombinePDF.parse Net::HTTP.get_response(URI.parse(url)).body
+```
+
+## Rendering PDF data
+
+Similarly, to loading and parsing, rendering can also be performed either to the memory or to a file.
+
+You can output a string of PDF data using `.to_pdf`. For example, to let a user download the PDF from either a [Rails application](http://rubyonrails.org) or a [Plezi application](http://www.plezi.io):
 
 ```ruby
 # in a controller action
 send_data combined_file.to_pdf, filename: "combined.pdf", type: "application/pdf"
 ```
 
-Or in [Sinatra](http://www.sinatrarb.com):
+In [Sinatra](http://www.sinatrarb.com):
 
 ```ruby
 # in your path's block
@@ -136,6 +150,7 @@ body combined_file.to_pdf
 headers 'content-type' => "application/pdf"
 ```
 
+
 If you prefer to save the PDF data to a file, you can always use the `save` method as we did in our earlier examples.
 
 Some PDF files contain optional content sections which cannot always be merged reliably. By default, an exception is

data/lib/combine_pdf.rb

@@ -19,6 +19,7 @@ load 'combine_pdf/filter.rb'
 load 'combine_pdf/parser.rb'
 load 'combine_pdf/pdf_public.rb'
 load 'combine_pdf/pdf_protected.rb'
+load 'combine_pdf/exceptions.rb'
 
 # load "combine_pdf/operations.rb"
 

data/lib/combine_pdf/decrypt.rb

@@ -25,7 +25,7 @@ module CombinePDF
     def initialize(objects = [], root_dictionary = {})
       @objects = objects
       @encryption_dictionary = actual_object(root_dictionary[:Encrypt])
-      raise 'Cannot decrypt an encrypted file without an encryption dictionary!' unless @encryption_dictionary
+      raise EncryptionError, 'Cannot decrypt an encrypted file without an encryption dictionary!' unless @encryption_dictionary
       @root_dictionary = actual_object(root_dictionary)
       @padding_key = [0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
                       0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
@@ -181,7 +181,7 @@ module CombinePDF
     def raise_encrypted_error(object = nil)
       object ||= @encryption_dictionary.to_s.split(',').join("\n")
       warn "Data raising exception:\n #{object.to_s.split(',').join("\n")}"
-      raise 'File is encrypted - not supported.'
+      raise EncryptionError, 'File is encrypted - not supported.'
     end
 
     def change_references_to_actual_values(hash_with_references = {})

data/lib/combine_pdf/exceptions.rb

@@ -0,0 +1,4 @@
+module CombinePDF
+  class EncryptionError < StandardError
+  end
+end

data/lib/combine_pdf/parser.rb

@@ -77,13 +77,14 @@ module CombinePDF
 
       raise 'Unknown PDF parsing error - maleformed PDF file?' unless (@parsed.select { |i| !i.is_a?(Hash) }).empty?
 
-      if @root_object == {}
+      if @root_object == {}.freeze
         xref_streams = @parsed.select { |obj| obj.is_a?(Hash) && obj[:Type] == :XRef }
         xref_streams.each do |xref_dictionary|
           @root_object.merge! xref_dictionary
         end
       end
-      raise 'root is unknown - cannot determine if file is Encrypted' if @root_object == {}
+
+      raise 'root is unknown - cannot determine if file is Encrypted' if @root_object == {}.freeze
 
       if @root_object[:Encrypt]
         # change_references_to_actual_values @root_object

data/lib/combine_pdf/renderer.rb

@@ -80,6 +80,8 @@ module CombinePDF
       ('[' + (object.collect { |item| object_to_pdf(item) }).join(' ') + ']').force_encoding(Encoding::ASCII_8BIT)
     end
 
+    EMPTY_PAGE_CONTENT_STREAM = {is_reference_only: true, referenced_object: { indirect_reference_id: 0, raw_stream_content: '' }}
+
     def format_hash_to_pdf(object)
       # if the object is only a reference:
       # special conditions apply, and there is only the setting of the reference (if needed) and output
@@ -107,7 +109,7 @@ module CombinePDF
         end
       end
       # remove extra page references.
-      object[:Contents].delete(is_reference_only: true, referenced_object: { indirect_reference_id: 0, raw_stream_content: '' }) if object[:Type] == :Page
+      object[:Contents].delete(EMPTY_PAGE_CONTENT_STREAM) if object[:Type] == :Page && object[:Contents].is_a?(Array)
       # correct stream length, if the object is a stream.
       object[:Length] = object[:raw_stream_content].bytesize if object[:raw_stream_content]
 

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '0.2.31'.freeze
+  VERSION = '0.2.32'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.32
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4
@@ -72,6 +72,7 @@ files:
 - lib/combine_pdf/api.rb
 - lib/combine_pdf/basic_writer.rb
 - lib/combine_pdf/decrypt.rb
+- lib/combine_pdf/exceptions.rb
 - lib/combine_pdf/filter.rb
 - lib/combine_pdf/fonts.rb
 - lib/combine_pdf/page_methods.rb
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Combine, stamp and watermark PDF files in pure Ruby.