combine_pdf 0.2.20 → 0.2.21

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7cc0e0274387687766335c52fd25e98da231ded0
4
- data.tar.gz: 809c6a2af4d5eb56857845560205ad222d2cfc88
3
+ metadata.gz: 4705fea5bde857e260f98fa8610c8947895a8771
4
+ data.tar.gz: f48137c987828a2ff637006360a9085bec11d6d4
5
5
  SHA512:
6
- metadata.gz: 072bec00cf0b1837017145b528c9e3b290f3dcb958385d1e7efd9d8b879c78724b775e568cbdc5bee93ca72c2f955ff0dd343e290530db9e689123f1e2b260a4
7
- data.tar.gz: 21a123a20265221396df344ade4587b80ecba769b770ec5015e1960f2f899abbf3fac2d7df4c9fed59a2bbc7fa4a7bc8d8aa439559e4ff96562f983929f43151
6
+ metadata.gz: d8aa105aa32d36a45c030a774029635f32e7d042e9afc3db86664eb99f6cc872a262b1d46613dc6e6884fbee53aa0cda02f32528a93a2e220621a592e7e39f6c
7
+ data.tar.gz: cced4adc08cb505eac7fffc39262f3ce0abe9d1d64853bab3c2eb8d52d7a0c04f35f24c240b80cab2ea34e1b46a88ab28c8654cf152adcede37ec01c59f02ba6
@@ -2,6 +2,12 @@
2
2
 
3
3
  ***
4
4
 
5
+ Change log v.0.2.21
6
+
7
+ **Fix**: fix for issue #54 and #59 (duplicate), discovered by @iggant (Anton Kolodii), related to name conflict resolution and page resources. The issue would cause and error (exception) to occur when attempting to merge pages with specific resource structures. Credit to @cw6365 (Chris Ward) and @DenKey (Den) as well.
8
+
9
+ ***
10
+
5
11
  Change log v.0.2.20
6
12
 
7
13
  **Fix**: fix for issue #56, discovered by @LeptonHeavy, regarding errors caused by the new PDF form support feature.
@@ -869,11 +869,12 @@ module CombinePDF
869
869
  # @return [true, false] returns true if there are two different resources sharing the same named reference.
870
870
  def should_secure?(page)
871
871
  # travel every dictionary to pick up names (keys), change them and add them to the dictionary
872
- res = self.resources
873
- foreign_res = page.resources
872
+ res = actual_value(self.resources)
873
+ foreign_res = actual_value(page.resources)
874
+ tmp = nil
874
875
  res.each do |k,v|
875
- if actual_value(v).is_a?(Hash) && actual_value(foreign_res[k]).is_a?(Hash)
876
- v.keys.each do |name| return true if actual_value(foreign_res[k]) && actual_value(foreign_res[k])[name] && actual_value(foreign_res[k])[name] != actual_value(v[k])[name]
876
+ if ((v = actual_value(v)).is_a?(Hash) && (tmp = actual_value(foreign_res[k])).is_a?(Hash) )
877
+ v.keys.each do |name| return true if tmp[name] && tmp[name] != v[name]
877
878
  end # else # Do nothing, this is taken care of elseware
878
879
  end
879
880
  end
@@ -1,3 +1,3 @@
1
1
  module CombinePDF
2
- VERSION = "0.2.20"
2
+ VERSION = "0.2.21"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: combine_pdf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.20
4
+ version: 0.2.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Boaz Segev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-28 00:00:00.000000000 Z
11
+ date: 2016-05-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ruby-rc4