hexapdf 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d95e6e2abba7581aab78e449bf860c3955170d4c266850373296300495236c44
-  data.tar.gz: '0950af72d8864e98a70367ee28bdf09bc09aa83cace38933aa613bc8d476263d'
+  metadata.gz: 889b4bf1bc77da0a3fdfc62d2b5b09042aa1b5a567d5ed80ae382e6cdeb193f9
+  data.tar.gz: 67f217de3dbd01653e9df4e8f8af7e8dba3745cd772e6d6ab930411ff3d1cfb3
 SHA512:
-  metadata.gz: c3c4ad1073d3ea9b820dc129348cf2d571159ea129aa65a10546552ae52e19cf29d74a4716e3fcefac10b34f9d2ad7e833bb90355c81564a152c853e0a406ea4
-  data.tar.gz: 637e17817d1aa8eb3b75035aa5d654f5bdbd7b531fb16776da49945c5100ab0705ab7d59b300f192b865d75ded43edae48d2f15541c2a93edbdedba9318f896a
+  metadata.gz: 71affdceb736e0645c45b181a585b3a425135c0b22fba1daf28d89aaa6e73e5226f18a1e420fb75325653c87274f66664526d8ca55baaaa5251b4f822617b986
+  data.tar.gz: 63aceaac41dd2ea797f92e7335a381bea5d1bdd2f7388c583431323e7ac9fae0855a404a84fbed70222130bd5eded126dae5385be2291d76c91021633d03a3bb

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.12.3 - 2020-08-22
+
+### Changed
+
+* Allow any object responding to `#to_sym` when setting a radio button value
+
+### Fixed
+
+* Error in the AcroForm appearance generator for text fields when the font is
+  not found in the default resources
+* Parsing of long numbers when reading a file from IO
+* Usage of unsupported method for Ruby 2.4 so that all tests pass again
+
+
 ## 0.12.2 - 2020-08-17
 
 ### Fixed

data/lib/hexapdf/content/parser.rb

@@ -177,7 +177,7 @@ module HexaPDF
       def parse(contents, processor = nil, &block) #:yields: object, params
         raise ArgumentError, "Argument processor or block is needed" if processor.nil? && block.nil?
         if processor.nil?
-          block.singleton_class.alias_method(:process, :call)
+          block.singleton_class.send(:alias_method, :process, :call)
           processor = block
         end
 

data/lib/hexapdf/tokenizer.rb

@@ -249,17 +249,18 @@ module HexaPDF
     #
     # See: PDF1.7 s7.3.3
     def parse_number
-      if (val = @ss.scan(/[+-]?\d++(?!\.)/))
+      val = scan_until(WHITESPACE_OR_DELIMITER_RE) || @ss.scan(/.*/)
+      if val.match?(/\A[+-]?\d++(?!\.)\z/)
         tmp = val.to_i
         # Handle object references, see PDF1.7 s7.3.10
         prepare_string_scanner(10)
         tmp = Reference.new(tmp, @ss[1].to_i) if @ss.scan(REFERENCE_RE)
         tmp
-      elsif (val = @ss.scan(/[+-]?(?:\d+\.\d*|\.\d+)/))
+      elsif val.match?(/\A[+-]?(?:\d+\.\d*|\.\d+)\z/)
         val << '0' if val.getbyte(-1) == 46 # dot '.'
         Float(val)
       else
-        parse_keyword
+        TOKEN_CACHE[val] # val is keyword
       end
     end
 

data/lib/hexapdf/type/acro_form/appearance_generator.rb

@@ -206,6 +206,10 @@ module HexaPDF
         # * The font, font size and font color are taken from the associated field's default
         #   appearance string. See VariableTextField.
         #
+        #   If the font is not usable by HexaPDF (which may be due to a variety of reasons, e.g. no
+        #   associated information in the form's default resources), the font specified by the
+        #   configuration option +acro_form.fallback_font+ will be used.
+        #
         # * The widget's rectangle /Rect must be defined. If the height is zero, it is auto-sized
         #   based on the font size. If additionally the font size is zero, a font size of
         #   +acro_form.default_font_size+ is used. If the width is zero, the
@@ -222,7 +226,7 @@ module HexaPDF
         def create_text_appearances
           font_name, font_size = @field.parse_default_appearance_string
           default_resources = @document.acro_form.default_resources
-          font = default_resources.font(font_name).font_wrapper
+          font = default_resources.font(font_name).font_wrapper rescue nil
           unless font
             fallback_font_name, fallback_font_options = @document.config['acro_form.fallback_font']
             if fallback_font_name

data/lib/hexapdf/type/acro_form/button_field.rb

@@ -134,8 +134,8 @@ module HexaPDF
         # Check boxes:: For check boxes that are in the on state the value +true+ is returned.
         #               Otherwise +false+ is returned.
         #
-        # Radio buttons:: If no radio button is selected, +nil+ is returned. Otherwise the name of
-        #                 the specific radio button that is selected is returned.
+        # Radio buttons:: If no radio button is selected, +nil+ is returned. Otherwise the value (a
+        #                 Symbol) of the specific radio button that is selected is returned.
         def field_value
           normalized_field_value(:V)
         end
@@ -149,7 +149,8 @@ module HexaPDF
         #               +false+ for unchecking it.
         #
         # Radio buttons:: To turn all radio buttons off, provide +nil+ as value. Otherwise provide
-        #                 the name of a radio button that should be turned on.
+        #                 the value (a Symbol or an object responding to +#to_sym+) of a radio
+        #                 button that should be turned on.
         def field_value=(value)
           normalized_field_value_set(:V, value)
         end
@@ -179,7 +180,7 @@ module HexaPDF
           end
         end
 
-        # Returns the name used for setting the check box to the on state.
+        # Returns the name (a Symbol) used for setting the check box to the on state.
         #
         # Defaults to :Yes if no other name could be determined.
         def check_box_on_name
@@ -187,7 +188,8 @@ module HexaPDF
             find {|key| key != :Off } || :Yes
         end
 
-        # Returns the array of values that can be used for the field value of the radio button.
+        # Returns the array of Symbol values that can be used for the field value of the radio
+        # button.
         def radio_button_values
           each_widget.map do |widget|
             widget.appearance&.normal_appearance&.value&.each_key&.find {|key| key != :Off }
@@ -200,8 +202,8 @@ module HexaPDF
         # default appearance.
         #
         # If the widget is created for a radio button field, the +value+ argument needs to set to
-        # the value (a symbol) this widget represents. It can be used with #field_value= to set this
-        # specific widget of the radio button set to on.
+        # the value (a Symbol or an object responding to +#to_sym+) this widget represents. It can
+        # be used with #field_value= to set this specific widget of the radio button set to on.
         #
         # See: Field#create_widget, AppearanceGenerator button field methods
         def create_widget(page, defaults: true, value: nil, **values)
@@ -209,8 +211,11 @@ module HexaPDF
             if check_box?
               widget[:AP] = {N: {Yes: nil, Off: nil}}
             elsif radio_button?
-              raise ArgumentError, "Argument value has to be provided for radio buttons" unless value
-              widget[:AP] = {N: {value => nil, Off: nil}}
+              unless value.respond_to?(:to_sym)
+                raise ArgumentError, "Argument 'value' has to be provided for radio buttons " \
+                  "and needs to respond to #to_sym"
+              end
+              widget[:AP] = {N: {value.to_sym => nil, Off: nil}}
             end
             next unless defaults
             widget.border_style(color: 0, width: 1, style: (push_button? ? :beveled : :solid))
@@ -271,8 +276,8 @@ module HexaPDF
                         value == true ? check_box_on_name : :Off
                       elsif value.nil?
                         :Off
-                      elsif radio_button_values.include?(value)
-                        value
+                      elsif radio_button_values.include?(value.to_sym)
+                        value.to_sym
                       else
                         @document.config['acro_form.on_invalid_value'].call(self, value)
                       end

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.12.2'
+  VERSION = '0.12.3'
 
 end

data/test/hexapdf/common_tokenizer_tests.rb

@@ -121,6 +121,11 @@ module CommonTokenizerTests
     assert(token.kind_of?(HexaPDF::Tokenizer::Token))
   end
 
+  it "next_token: should not fail when reading super long numbers" do
+    create_tokenizer("1" + "0" * 10_000)
+    assert_equal(10**10_000, @tokenizer.next_token)
+  end
+
   it "next_object: works for all PDF object types, including array and dictionary" do
     create_tokenizer(<<-EOF.chomp.gsub(/^ {8}/, ''))
         true false null 123 34.5 (string) <4E6F76> /Name

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.12.2)>>
+      <</Producer(HexaPDF version 0.12.3)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.12.2)>>
+      <</Producer(HexaPDF version 0.12.3)>>
       endobj
       2 0 obj
       <</Length 10>>stream

data/test/hexapdf/type/acro_form/test_appearance_generator.rb

@@ -495,18 +495,25 @@ describe HexaPDF::Type::AcroForm::AppearanceGenerator do
 
     describe "font resolution in case the referenced font is not usable" do
       before do
-        def (@form.default_resources.font(:F1)).font_wrapper; nil; end
-        @field.field_value = 'Test'
+        @doc.config['acro_form.fallback_font'] = ['Times', variant: :none]
+        @field[:V] = 'Test'
       end
 
-      it "uses the fallback font if configured" do
-        @doc.config['acro_form.fallback_font'] = ['Times', variant: :none]
+      it "uses the fallback font if the font is not usable" do
+        def (@form.default_resources.font(:F1)).font_wrapper; nil; end
         @generator.create_appearances
         assert_equal(:'Times-Roman', @widget[:AP][:N][:Resources][:Font][:F2][:BaseFont])
       end
 
+      it "uses the fallback font if the font is not found" do
+        @form.default_resources[:Font].delete(:F1)
+        @generator.create_appearances
+        assert_equal(:'Times-Roman', @widget[:AP][:N][:Resources][:Font][:F1][:BaseFont])
+      end
+
       it "fails if fallback fonts are disabled" do
         @doc.config['acro_form.fallback_font'] = nil
+        @form.default_resources[:Font].delete(:F1)
         msg = assert_raises(HexaPDF::Error) { @generator.create_appearances }
         assert_match(/Font.*not usable/, msg.message)
       end

data/test/hexapdf/type/acro_form/test_button_field.rb

@@ -140,7 +140,7 @@ describe HexaPDF::Type::AcroForm::ButtonField do
     it "sets a correct field value" do
       @field.create_widget(@doc.pages.add, value: :button1)
 
-      @field.field_value = :button1
+      @field.field_value = "button1"
       assert_equal(:button1, @field[:V])
       @field.field_value = nil
       assert_equal(:Off, @field[:V])
@@ -158,7 +158,7 @@ describe HexaPDF::Type::AcroForm::ButtonField do
     end
 
     it "returns an array of possible values" do
-      @field.create_widget(@doc.pages.add, value: :Test)
+      @field.create_widget(@doc.pages.add, value: "Test")
       @field.create_widget(@doc.pages.add, value: :x)
       @field.create_widget(@doc.pages.add, value: :y)
       assert_equal([:Test, :x, :y], @field.radio_button_values)
@@ -172,6 +172,7 @@ describe HexaPDF::Type::AcroForm::ButtonField do
       assert_equal(:solid, border_style.style)
       assert_equal([1], widget.background_color.components)
       assert_equal(:circle, widget.marker_style.style)
+      assert_equal({test: nil, Off: nil}, widget[:AP][:N].value)
     end
 
     it "always creates standalone widgets" do
@@ -181,6 +182,10 @@ describe HexaPDF::Type::AcroForm::ButtonField do
     it "fails if the value argument is not provided for create_widget" do
       assert_raises(ArgumentError) { @field.create_widget(@doc.pages.add) }
     end
+
+    it "fails if the value argument for create_widget doesn't respond to to_sym" do
+      assert_raises(ArgumentError) { @field.create_widget(@doc.pages.add, value: 5) }
+    end
   end
 
   it "returns a default field value" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse