acro_that 0.1.1 → 0.1.3

data/lib/acro_that/actions/add_field.rb

@@ -153,61 +153,8 @@ module AcroThat
       end
 
       def find_page_ref(page_num)
-        page_objects = []
-        resolver.each_object do |ref, body|
-          next unless body
-
-          # Check for /Type /Page with or without space, or /Type/Page
-          is_page = body.include?("/Type /Page") ||
-                    body.include?("/Type/Page") ||
-                    (body.include?("/Type") && body.include?("/Page") && body =~ %r{/Type\s*/Page})
-          next unless is_page
-
-          page_objects << ref
-        end
-
-        # If still no pages found, try to find them via the page tree
-        if page_objects.empty?
-          # Find the document catalog's /Pages entry
-          root_ref = resolver.root_ref
-          if root_ref
-            catalog_body = resolver.object_body(root_ref)
-            if catalog_body && catalog_body =~ %r{/Pages\s+(\d+)\s+(\d+)\s+R}
-              pages_ref = [Integer(::Regexp.last_match(1)), Integer(::Regexp.last_match(2))]
-              pages_body = resolver.object_body(pages_ref)
-
-              # Extract /Kids array from Pages object
-              if pages_body && pages_body =~ %r{/Kids\s*\[(.*?)\]}m
-                kids_array = ::Regexp.last_match(1)
-                # Extract all object references from Kids array
-                kids_array.scan(/(\d+)\s+(\d+)\s+R/) do |num_str, gen_str|
-                  kid_ref = [num_str.to_i, gen_str.to_i]
-                  kid_body = resolver.object_body(kid_ref)
-                  # Check if this kid is a page or another Pages node
-                  if kid_body && (kid_body.include?("/Type /Page") || kid_body.include?("/Type/Page") || (kid_body.include?("/Type") && kid_body.include?("/Page")))
-                    page_objects << kid_ref
-                  elsif kid_body && kid_body.include?("/Type /Pages")
-                    # Recursively find pages in this Pages node
-                    if kid_body =~ %r{/Kids\s*\[(.*?)\]}m
-                      kid_body[::Regexp.last_match(0)..].scan(/(\d+)\s+(\d+)\s+R/) do |n, g|
-                        grandkid_ref = [n.to_i, g.to_i]
-                        grandkid_body = resolver.object_body(grandkid_ref)
-                        if grandkid_body && (grandkid_body.include?("/Type /Page") || grandkid_body.include?("/Type/Page"))
-                          page_objects << grandkid_ref
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-
-        return page_objects[0] if page_objects.empty?
-        return page_objects[page_num - 1] if page_num.positive? && page_num <= page_objects.length
-
-        page_objects[0]
+        # Use Document's unified page-finding method
+        find_page_by_number(page_num)
       end
 
       def add_widget_to_page(widget_obj_num, page_num)

data/lib/acro_that/actions/add_signature_appearance.rb

@@ -336,10 +336,10 @@ module AcroThat
       end
 
       def create_form_xobject(_obj_num, image_obj_num, field_width, field_height, _scale_factor, scaled_width,
-                               scaled_height)
+                              scaled_height)
         # Calculate offset to left-align the image horizontally and center vertically
-        offset_x = 0.0  # Left-aligned (no horizontal offset)
-        offset_y = (field_height - scaled_height) / 2.0  # Center vertically
+        offset_x = 0.0 # Left-aligned (no horizontal offset)
+        offset_y = (field_height - scaled_height) / 2.0 # Center vertically
 
         # PDF content stream that draws the image
         # q = save graphics state

data/lib/acro_that/actions/base.rb

@@ -39,6 +39,10 @@ module AcroThat
       def acroform_ref
         @document.send(:acroform_ref)
       end
+
+      def find_page_by_number(page_num)
+        @document.send(:find_page_by_number, page_num)
+      end
     end
   end
 end

data/lib/acro_that/actions/remove_field.rb

@@ -107,11 +107,7 @@ module AcroThat
         page_objects = []
         resolver.each_object do |ref, body|
           next unless body
-
-          is_page = body.include?("/Type /Page") ||
-                    body.include?("/Type/Page") ||
-                    (body.include?("/Type") && body.include?("/Page") && body =~ %r{/Type\s*/Page})
-          next unless is_page
+          next unless DictScan.is_page?(body)
 
           page_objects << ref
         end

data/lib/acro_that/dict_scan.rb

@@ -316,6 +316,13 @@ module AcroThat
       body.include?("/Subtype") && body.include?("/Widget") && body =~ %r{/Subtype\s*/Widget}
     end
 
+    # Check if a body represents a page object (not /Type/Pages)
+    def is_page?(body)
+      return false unless body
+
+      body.include?("/Type /Page") || body =~ %r{/Type\s*/Page(?!s)\b}
+    end
+
     # Check if a field is multiline by checking /Ff flag bit 12 (0x1000)
     def is_multiline_field?(dict_body)
       return false unless dict_body