combine_pdf 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c5d23db9fbb596774c8de4c114e8b498666a3becc8494dd5bad9b83df7697d
-  data.tar.gz: 76cdf0ac5c7348e4ea0f7b6229821ae22e8cde8280b3f54e33a78f943f1631f4
+  metadata.gz: 23a07449258879f448dc9296b367ff0c9413a1ea2d40da8cbd0e2e9ba3830c61
+  data.tar.gz: 9624aab26ab067ba3e49ea0ec71f2f7ba22f0555e5e4e9784d787371364d4d04
 SHA512:
-  metadata.gz: 797b955bacadf38f8fa2122b0a2f57f0e24aa7295cd22799cf857453be498f77a9e968ae429f4f69ea9f937dcc5d52ab699cbcf8d4272f42a46dbcd7ae5f77ff
-  data.tar.gz: 1b83908d5d2e1a6a18f33a9b6920937cb5a23d8d8f55807291a56398d9487f41eafd94d81c82767abbf841168e040c26fb6cac275552b2076208d9dc5eb0dc15
+  metadata.gz: aedfb6afebad0c9d7ff4f47141ab0f7f1352829358ee4b888815e525212ba7f853b73e353fb073df03a705ae7c131d8300c4acd5c1c30287e8f90cd68e07e920
+  data.tar.gz: e24bc6be0be1974711dd586d4a30cf94617e0c37a483613104558800ab5e8d04f32073bd09a0813cb386bb7c297164bfdb73a3fc0904b811c86b3afc7670b6b7

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ***
 
+#### Change log v.1.0.15
+
+**Fix**: An attempt to fix JRuby compatibility concerns (issue #127).
+
 #### Change log v.1.0.14
 
 **Fix**: Fixed an issue related to PDF XRef table data, where a malformed EOL marker would cause the parser to fail. Credit to @dangerous (David Rainsford) for exposing this issue in a comment to issue #140.

data/lib/combine_pdf/pdf_protected.rb

@@ -232,15 +232,42 @@ module CombinePDF
     # @private
     # this method reviews a Hash and updates it by merging Hash data,
     # preffering the new over the old.
-    def self.hash_merge_new_no_page(_key, old_data, new_data)
-      return old_data unless new_data
-      return new_data unless old_data
-      if old_data.is_a?(Hash) && new_data.is_a?(Hash)
-        return old_data if (old_data[:Type] == :Page)
-        old_data.merge(new_data, &(@hash_merge_new_no_page_proc ||= method(:hash_merge_new_no_page)))
+    # def self.hash_merge_new_no_page(_key = nil, old_data = nil, new_data = nil)
+    #   return old_data unless new_data
+    #   return new_data unless old_data
+    #   if old_data.is_a?(Hash) && new_data.is_a?(Hash)
+    #     return old_data if (old_data[:Type] == :Page)
+    #     old_data.merge(new_data, &(@hash_merge_new_no_page_proc ||= method(:hash_merge_new_no_page)))
+    #   elsif old_data.is_a? Array
+    #     return old_data + new_data if new_data.is_a?(Array)
+    #     return old_data.dup << new_data
+    #   elsif new_data.is_a? Array
+    #     new_data + [old_data]
+    #   else
+    #     new_data
+    #   end
+    # end
+
+    # @private
+    # JRuby Alternative this method reviews a Hash and updates it by merging Hash data,
+    # preffering the new over the old.
+    HASH_MERGE_NEW_NO_PAGE = Proc.new do |_key = nil, old_data = nil, new_data = nil|
+      if !new_data
+        old_data
+      elsif !old_data
+        new_data
+      elsif old_data.is_a?(Hash) && new_data.is_a?(Hash)
+        if (old_data[:Type] == :Page)
+          old_data
+        else
+          old_data.merge(new_data, &HASH_MERGE_NEW_NO_PAGE)
+        end
       elsif old_data.is_a? Array
-        return old_data + new_data if new_data.is_a?(Array)
-        return old_data.dup << new_data
+        if new_data.is_a?(Array)
+          old_data + new_data
+        else
+          old_data.dup << new_data
+        end
       elsif new_data.is_a? Array
         new_data + [old_data]
       else

data/lib/combine_pdf/pdf_public.rb

@@ -306,10 +306,10 @@ module CombinePDF
       if data.is_a? PDF
         @version = [@version, data.version].max
         pages_to_add = data.pages
-        actual_value(@names ||= {}.dup).update data.names, &self.class.method(:hash_merge_new_no_page)
+        actual_value(@names ||= {}.dup).update data.names, &HASH_MERGE_NEW_NO_PAGE
         merge_outlines((@outlines ||= {}.dup), actual_value(data.outlines), location) unless actual_value(data.outlines).empty?
         if actual_value(@forms_data)
-          actual_value(@forms_data).update actual_value(data.forms_data), &self.class.method(:hash_merge_new_no_page) if data.forms_data
+          actual_value(@forms_data).update actual_value(data.forms_data), &HASH_MERGE_NEW_NO_PAGE if data.forms_data
         else
           @forms_data = data.forms_data
         end

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '1.0.14'.freeze
+  VERSION = '1.0.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4