combine_pdf 0.2.32 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965be3f2286760e04ed715a9514a1205b27aaf3e
-  data.tar.gz: ee3098114904a30410990bd6bd0b715aae32f81d
+  metadata.gz: fc3b58971778d716ab9693eb7198523eff597e6a
+  data.tar.gz: 33bfb23329e6f0ba2917bd1eb5c120c401fe91a6
 SHA512:
-  metadata.gz: c55779f6471f54dfd815b61dc77f62d92774f7d5dd29877af2806c7c6de5ef9eb224f8ec6b97f1f535d020227fc4026ce058098e634f974bf631ea244a622af8
-  data.tar.gz: 9c352999dc4fa5c694e6a14f1a6ab9b02b9615af55c8991915d89283ddfad416ff0c8b5f6efe4b19df165718b37b01a138aeac21f0d693dc491426af0e4f59cf
+  metadata.gz: f314e20def37c16e4cdf35375cf214a5785ca3ab5b8a3ca07a8096f12d7601f1d0e5a4319ca7b4c0649dc488c668361a92058d4866aab54170d12b9ba4b8cd2b
+  data.tar.gz: b688dc96f6de9d79028170efdb26341bd45d2a947389b250b3795513946756267b00b4bcbbe0e41fa002881f0605f228a5d5048cf928c2655c7dca16d051ce65

data/CHANGELOG.md

@@ -2,7 +2,17 @@
 
 ***
 
-Change log v.0.2.32 (un-released)
+Change log v.0.2.33
+
+**Update**: Fix #97 to allow javascript support for interactive objects. Credit to @joshirashmics for exposing the issue.
+
+**Update**: Extended "named tree" support now preserves some advanced PDF feature that weren't supported before.
+
+**Deprecation**: Ruby is deprecating `Fixnum`, as so is CombinePDF... replaced all `Fixnum` occurrences with `Integer`.
+
+***
+
+Change log v.0.2.32
 
 **Update**: Better errors when encryption related exceptions occur. Credit to Paul Shumeika ( @pshumeika ).
 

data/lib/combine_pdf/page_methods.rb

@@ -172,7 +172,7 @@ module CombinePDF
     # - :"Courier-BoldOblique"
     # - :Symbol
     # - :ZapfDingbats
-    # font_size:: a Fixnum for the font size, or :fit_text to fit the text in the box. defaults to ":fit_text"
+    # font_size:: an Integer for the font size, or :fit_text to fit the text in the box. defaults to ":fit_text"
     # max_font_size:: if font_size is set to :fit_text, this will be the maximum font size. defaults to nil (no maximum)
     # font_color:: text color in [R, G, B], an array with three floats, each in a value between 0 to 1 (gray will be "[0.5, 0.5, 0.5]"). defaults to black.
     # stroke_color:: text stroke color in [R, G, B], an array with three floats, each in a value between 0 to 1 (gray will be "[0.5, 0.5, 0.5]"). defounlts to nil (no stroke).

data/lib/combine_pdf/parser.rb

@@ -29,7 +29,7 @@ module CombinePDF
     # the info and root objects, as found (if found) in the PDF file.
     #
     # they are mainly to used to know if the file is (was) encrypted and to get more details.
-    attr_reader :info_object, :root_object, :names_object, :forms_object, :outlines_object
+    attr_reader :info_object, :root_object, :names_object, :forms_object, :outlines_object, :metadata
 
     attr_reader :allow_optional_content
     # when creating a parser, it is important to set the data (String) we wish to parse.
@@ -50,6 +50,7 @@ module CombinePDF
       @names_object = {}.dup
       @outlines_object = {}.dup
       @forms_object = {}.dup
+      @metadata = nil
       @strings_dictionary = {}.dup # all strings are one string
       @version = nil
       @scanner = nil
@@ -106,7 +107,7 @@ module CombinePDF
           @scanner = StringScanner.new o[:raw_stream_content]
           stream_data = _parse_
           id_array = []
-          while stream_data[0].is_a? Fixnum
+          while stream_data[0].is_a? (Integer)
             id_array << stream_data.shift
             stream_data.shift
           end
@@ -221,7 +222,7 @@ module CombinePDF
             out << { indirect_without_dictionary: out.pop, indirect_generation_number: out.pop, indirect_reference_id: out.pop }
           end
           fresh = true
-        # puts "!!!!!!!!! Error with :indirect_reference_id\n\nObject #{out.last}  :indirect_reference_id = #{out.last[:indirect_reference_id]}" unless out.last[:indirect_reference_id].is_a?(Fixnum)
+        # puts "!!!!!!!!! Error with :indirect_reference_id\n\nObject #{out.last}  :indirect_reference_id = #{out.last[:indirect_reference_id]}" unless out.last[:indirect_reference_id].is_a?(Integer)
         ##########################################
         ## parse a Hex String
         ##########################################

data/lib/combine_pdf/pdf_protected.rb

@@ -73,7 +73,7 @@ module CombinePDF
 
       # duplicate any non-unique pages - This is a special case to resolve Adobe Acrobat Reader issues (see issues #19 and #81)
       uniqueness = {}.dup
-      page_list.each { |page| page = page.dup if uniqueness[page.object_id]; uniqueness[page.object_id] = page }
+      page_list.each { |page| page = page[:referenced_object] || page; page = page.dup if uniqueness[page.object_id]; uniqueness[page.object_id] = page }
       page_list.clear
       page_list = uniqueness.values
       uniqueness.clear
@@ -174,7 +174,7 @@ module CombinePDF
       @objects.each { |obj| obj.delete(:indirect_reference_id); obj.delete(:indirect_generation_number) }
     end
 
-    POSSIBLE_NAME_TREES = [:Dests, :AP, :Pages, :IDS, :Templates, :URLS, :Pages].to_set.freeze
+    POSSIBLE_NAME_TREES = [:Dests, :AP, :Pages, :IDS, :Templates, :URLS, :JavaScript, :EmbeddedFiles, :AlternatePresentations, :Renditions].to_set.freeze
 
     def rebuild_names(name_tree = nil, base = 'CombinePDF_0000000')
       if name_tree

data/lib/combine_pdf/pdf_public.rb

@@ -351,7 +351,7 @@ module CombinePDF
     # options:: a Hash of options setting the behavior and format of the page numbers:
     # - :number_format a string representing the format for page number. defaults to ' - %s - ' (allows for letter numbering as well, such as "a", "b"...).
     # - :location an Array containing the location for the page numbers, can be :top, :buttom, :top_left, :top_right, :bottom_left, :bottom_right or :center (:center == full page). defaults to [:top, :buttom].
-    # - :start_at a Fixnum that sets the number for first page number. also accepts a letter ("a") for letter numbering. defaults to 1.
+    # - :start_at an Integer that sets the number for first page number. also accepts a letter ("a") for letter numbering. defaults to 1.
     # - :margin_from_height a number (PDF points) for the top and buttom margins. defaults to 45.
     # - :margin_from_side a number (PDF points) for the left and right margins. defaults to 15.
     # - :page_range a range of pages to be numbered (i.e. (2..-1) ) defaults to all the pages (nil). Remember to set the :start_at to the correct value.

data/lib/combine_pdf/renderer.rb

@@ -20,7 +20,7 @@ module CombinePDF
         return format_name_to_pdf object
       elsif object.is_a?(Array)
         return format_array_to_pdf object
-      elsif object.is_a?(Fixnum) || object.is_a?(Float) || object.is_a?(TrueClass) || object.is_a?(FalseClass)
+      elsif object.is_a?(Integer) || object.is_a?(Float) || object.is_a?(TrueClass) || object.is_a?(FalseClass)
         return object.to_s
       elsif object.is_a?(Hash)
         return format_hash_to_pdf object
@@ -154,7 +154,7 @@ module CombinePDF
       elsif object.is_a?(String)
         return object.dup
       else
-        return object # objects that aren't Strings, Arrays or Hashes (such as Symbols and Fixnums) won't be edited inplace.
+        return object # objects that aren't Strings, Arrays or Hashes (such as Symbols and Integers) won't be edited inplace.
       end
     end
   end
@@ -169,5 +169,5 @@ end
 # arrays are Array
 # strings are String
 # names are Symbols (String.to_sym)
-# numbers are Fixnum or Float
+# numbers are Integers or Float
 # boolean are TrueClass or FalseClass

data/lib/combine_pdf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.32
+  version: 0.2.33
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Combine, stamp and watermark PDF files in pure Ruby.