acro_that 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c25e9ad58be5a660ea6abb5a56896fef953d67578425b01a9de86f1cc1ae8a1d
-  data.tar.gz: 45133e292e45343903ee53b44f709149bea0353d9aa7e2a2a9f3c6fa676da1dd
+  metadata.gz: 35e82f82af4a5ad469ce89111633daea2b86ca0f9a965282824c03bd5f9b8af6
+  data.tar.gz: 47e8c25c2f8d1a9243ed9c6e5c85ba6f65aa1cc52b8abe62c3fdaed3a72f8361
 SHA512:
-  metadata.gz: 7762f8c137e7b29c6cdbc15c8ce3fd9387b96dfc4a22a64ee171fc0c9c8d7f67951b42fb491cb283e160aced6a37d0e6eaa30599fa63d0876a77a9be8506d493
-  data.tar.gz: 7a92be45bc9810a3e085c67fe0ee7b0a245925179ec345bbf0f3cb56cc4b2195bc6faca01f27a64c86646c7ef5c91dd1c6f732140905a6d208c4e8c476ff0458
+  metadata.gz: d20594b2b72776e4eea071d87036e2151cfcbb5a36f09d1b11ecd4d055168a613ba1d8fcd308b1748706b30c4ea6cc84742e2f895a21f594ef6c9a79351f5cc1
+  data.tar.gz: fb36a88b91eced4f62b027f920e5233e626f4d469087fe7c46419091020324b9d92d0f5a70d55479064c93bd787513950b2ce84bbcb185834a706c7f83fa9555

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acro_that (0.1.8)
+    acro_that (1.0.0)
       chunky_png (~> 1.4)
 
 GEM

data/lib/acro_that/actions/add_field.rb

@@ -54,12 +54,14 @@ module AcroThat
       def create_field_handler(type_input)
         is_radio = [:radio, "radio"].include?(type_input)
         group_id = @options[:group_id]
+        is_button = [:button, "button", "/Btn", "/btn"].include?(type_input)
 
         if is_radio && group_id
           AcroThat::Fields::Radio.new(@document, @name, @options.merge(metadata: @metadata))
         elsif [:signature, "signature", "/Sig"].include?(type_input)
           AcroThat::Fields::Signature.new(@document, @name, @options.merge(metadata: @metadata))
-        elsif [:checkbox, "checkbox"].include?(type_input)
+        elsif [:checkbox, "checkbox"].include?(type_input) || is_button
+          # :button type maps to /Btn which are checkboxes by default (unless radio flag is set)
           AcroThat::Fields::Checkbox.new(@document, @name, @options.merge(metadata: @metadata))
         else
           # Default to text field

data/lib/acro_that/actions/update_field.rb

@@ -178,8 +178,34 @@ module AcroThat
         ft_pattern = %r{/FT\s+/Btn}
         is_button_field = ft_pattern.match(dict_body)
 
-        normalized_value = if is_button_field
-                             # For checkboxes/radio buttons, normalize to "Yes" or "Off"
+        # Check if it's a radio button by checking field flags
+        # For widgets, check the parent field's flags since widgets don't have /Ff directly
+        is_radio = false
+        if is_button_field
+          field_flags_match = dict_body.match(%r{/Ff\s+(\d+)})
+          if field_flags_match
+            field_flags = field_flags_match[1].to_i
+            # Radio button flag is bit 15 = 32768
+            is_radio = field_flags.anybits?(32_768)
+          elsif dict_body.include?("/Parent")
+            # This is a widget - check parent field's flags
+            parent_tok = DictScan.value_token_after("/Parent", dict_body)
+            if parent_tok && parent_tok =~ /\A(\d+)\s+(\d+)\s+R/
+              parent_ref = [Integer(::Regexp.last_match(1)), Integer(::Regexp.last_match(2))]
+              parent_body = get_object_body_with_patch(parent_ref)
+              if parent_body
+                parent_flags_match = parent_body.match(%r{/Ff\s+(\d+)})
+                if parent_flags_match
+                  parent_flags = parent_flags_match[1].to_i
+                  is_radio = parent_flags.anybits?(32_768)
+                end
+              end
+            end
+          end
+        end
+
+        normalized_value = if is_button_field && !is_radio
+                             # For checkboxes, normalize to "Yes" or "Off"
                              # Accept "Yes", "/Yes" (PDF name format), true (boolean), or "true" (string)
                              value_str = new_value.to_s
                              is_checked = ["Yes", "/Yes", "true"].include?(value_str) || new_value == true
@@ -189,7 +215,13 @@ module AcroThat
                            end
 
         # Encode the normalized value
-        v_token = DictScan.encode_pdf_string(normalized_value)
+        # For checkboxes, use PDF name format to match /AS appearance state format
+        # For radio buttons and other fields, use PDF string format
+        v_token = if is_button_field && !is_radio
+                    DictScan.encode_pdf_name(normalized_value)
+                  else
+                    DictScan.encode_pdf_string(normalized_value)
+                  end
 
         # Find /V using pattern matching to ensure we get the complete key
         v_key_pattern = %r{/V(?=[\s(<\[/])}
@@ -545,34 +577,57 @@ module AcroThat
       end
 
       def create_checkbox_yes_appearance(width, height)
-        # Create a form XObject that draws a checked checkbox
-        # Box outline + checkmark
-        # Scale to match width and height
-        # Simple appearance: draw a box and a checkmark
-        # For simplicity, use PDF drawing operators
-        # Box: rectangle from (0,0) to (width, height)
-        # Checkmark: simple path drawing
-
-        # PDF content stream for checked checkbox
-        # Draw just the checkmark (no box border)
+        line_width = [width * 0.05, height * 0.05].min
         border_width = [width * 0.08, height * 0.08].min
 
-        # Calculate checkmark path
-        check_x1 = width * 0.25
-        check_y1 = height * 0.45
-        check_x2 = width * 0.45
-        check_y2 = height * 0.25
-        check_x3 = width * 0.75
-        check_y3 = height * 0.75
+        # Define checkmark in normalized coordinates (0-1 range) for consistent aspect ratio
+        # Checkmark shape: three points forming a checkmark
+        norm_x1 = 0.25
+        norm_y1 = 0.55
+        norm_x2 = 0.45
+        norm_y2 = 0.35
+        norm_x3 = 0.75
+        norm_y3 = 0.85
+
+        # Calculate scale to maximize size while maintaining aspect ratio
+        # Use the smaller dimension to ensure it fits
+        scale = [width, height].min * 0.85  # Use 85% of the smaller dimension
+        
+        # Calculate checkmark dimensions
+        check_width = scale
+        check_height = scale
+        
+        # Center the checkmark in the box
+        offset_x = (width - check_width) / 2
+        offset_y = (height - check_height) / 2
+        
+        # Calculate actual coordinates
+        check_x1 = offset_x + norm_x1 * check_width
+        check_y1 = offset_y + norm_y1 * check_height
+        check_x2 = offset_x + norm_x2 * check_width
+        check_y2 = offset_y + norm_y2 * check_height
+        check_x3 = offset_x + norm_x3 * check_width
+        check_y3 = offset_y + norm_y3 * check_height
 
         content_stream = "q\n"
-        content_stream += "0 0 0 rg\n" # Black color (darker)
-        content_stream += "#{border_width} w\n" # Line width
-        # Draw checkmark only (no box border)
+        # Draw square border around field bounds
+        content_stream += "0 0 0 RG\n" # Black stroke color
+        content_stream += "#{line_width} w\n" # Line width
+        # Draw rectangle from (0,0) to (width, height)
+        content_stream += "0 0 m\n"
+        content_stream += "#{width} 0 l\n"
+        content_stream += "#{width} #{height} l\n"
+        content_stream += "0 #{height} l\n"
+        content_stream += "0 0 l\n"
+        content_stream += "S\n" # Stroke the border
+
+        # Draw checkmark
+        content_stream += "0 0 0 rg\n" # Black fill color
+        content_stream += "#{border_width} w\n" # Line width for checkmark
         content_stream += "#{check_x1} #{check_y1} m\n"
         content_stream += "#{check_x2} #{check_y2} l\n"
         content_stream += "#{check_x3} #{check_y3} l\n"
-        content_stream += "S\n" # Stroke
+        content_stream += "S\n" # Stroke the checkmark
         content_stream += "Q\n"
 
         build_form_xobject(content_stream, width, height)

data/lib/acro_that/fields/base.rb

@@ -107,6 +107,7 @@ module AcroThat
                                  end
 
         # For radio buttons, /V should only be set if explicitly selected
+        # For checkboxes, /V should be a PDF name to match /AS format
         # For other fields, encode as PDF string
         if should_set_value && normalized_field_value && !normalized_field_value.to_s.empty?
           # For radio buttons, only set /V if selected option is explicitly set to true
@@ -115,6 +116,10 @@ module AcroThat
             if [true, "true"].include?(@options[:selected]) && normalized_field_value.to_s.start_with?("/")
               dict += "  /V #{normalized_field_value}\n"
             end
+          elsif type == "/Btn"
+            # For checkboxes (button fields that aren't radio), encode value as PDF name
+            # to match the /AS appearance state format (/Yes or /Off)
+            dict += "  /V #{DictScan.encode_pdf_name(normalized_field_value)}\n"
           else
             dict += "  /V #{DictScan.encode_pdf_string(normalized_field_value)}\n"
           end
@@ -156,10 +161,11 @@ module AcroThat
                              end
 
           if type == "/Btn" && should_set_value
+            # For checkboxes, encode value as PDF name to match /AS appearance state format
             value_str = value.to_s
             is_checked = ["Yes", "/Yes", "true"].include?(value_str) || value == true
             checkbox_value = is_checked ? "Yes" : "Off"
-            widget += "  /V #{DictScan.encode_pdf_string(checkbox_value)}\n"
+            widget += "  /V #{DictScan.encode_pdf_name(checkbox_value)}\n"
           elsif should_set_value && value && !value.empty?
             widget += "  /V #{DictScan.encode_pdf_string(value)}\n"
           end
@@ -193,7 +199,7 @@ module AcroThat
 
         af_body = get_object_body_with_patch(af_ref)
         # Use +"" instead of dup to create a mutable copy without keeping reference to original
-        patched = af_body + ""
+        patched = af_body.to_s
 
         # Step 1: Add field to /Fields array
         fields_array_ref = DictScan.value_token_after("/Fields", patched)

data/lib/acro_that/fields/checkbox.rb

@@ -44,7 +44,7 @@ module AcroThat
         widget_ref = [widget_obj_num, 0]
         original_widget_body = get_object_body_with_patch(widget_ref)
         # Use +"" instead of dup to create a mutable copy without keeping reference to original
-        widget_body = original_widget_body + ""
+        widget_body = original_widget_body.to_s
 
         ap_dict = "<<\n  /N <<\n    /Yes #{yes_obj_num} 0 R\n    /Off #{off_obj_num} 0 R\n  >>\n>>"
 
@@ -58,12 +58,23 @@ module AcroThat
         is_checked = value_str == "Yes" || value_str == "/Yes" || value_str == "true" || @field_value == true
         normalized_value = is_checked ? "Yes" : "Off"
 
+        # Set /V to match /AS - both should be PDF names for checkboxes
+        v_value = DictScan.encode_pdf_name(normalized_value)
+
         as_value = if normalized_value == "Yes"
                      "/Yes"
                    else
                      "/Off"
                    end
 
+        # Update /V to ensure it matches /AS format (both PDF names)
+        widget_body = if widget_body.include?("/V")
+                        DictScan.replace_key_value(widget_body, "/V", v_value)
+                      else
+                        DictScan.upsert_key_value(widget_body, "/V", v_value)
+                      end
+
+        # Update /AS to match the normalized value
         widget_body = if widget_body.include?("/AS")
                         DictScan.replace_key_value(widget_body, "/AS", as_value)
                       else
@@ -74,15 +85,37 @@ module AcroThat
       end
 
       def create_checkbox_yes_appearance(width, height)
-        border_width = [width * 0.08, height * 0.08].min
         line_width = [width * 0.05, height * 0.05].min
+        border_width = [width * 0.08, height * 0.08].min
 
-        check_x1 = width * 0.25
-        check_y1 = height * 0.45
-        check_x2 = width * 0.45
-        check_y2 = height * 0.25
-        check_x3 = width * 0.75
-        check_y3 = height * 0.75
+        # Define checkmark in normalized coordinates (0-1 range) for consistent aspect ratio
+        # Checkmark shape: three points forming a checkmark
+        norm_x1 = 0.25
+        norm_y1 = 0.55
+        norm_x2 = 0.45
+        norm_y2 = 0.35
+        norm_x3 = 0.75
+        norm_y3 = 0.85
+
+        # Calculate scale to maximize size while maintaining aspect ratio
+        # Use the smaller dimension to ensure it fits
+        scale = [width, height].min * 0.85  # Use 85% of the smaller dimension
+        
+        # Calculate checkmark dimensions
+        check_width = scale
+        check_height = scale
+        
+        # Center the checkmark in the box
+        offset_x = (width - check_width) / 2
+        offset_y = (height - check_height) / 2
+        
+        # Calculate actual coordinates
+        check_x1 = offset_x + norm_x1 * check_width
+        check_y1 = offset_y + norm_y1 * check_height
+        check_x2 = offset_x + norm_x2 * check_width
+        check_y2 = offset_y + norm_y2 * check_height
+        check_x3 = offset_x + norm_x3 * check_width
+        check_y3 = offset_y + norm_y3 * check_height
 
         content_stream = "q\n"
         # Draw square border around field bounds

data/lib/acro_that/fields/radio.rb

@@ -74,7 +74,7 @@ module AcroThat
         return unless original_widget_body
 
         # Store original before modifying to avoid loading again
-        widget_body = original_widget_body + ""
+        widget_body = original_widget_body.to_s
 
         # Ensure we have a valid export value - if empty, generate a unique one
         # Export value must be unique for each widget in the group for mutual exclusivity
@@ -124,7 +124,7 @@ module AcroThat
           original_parent_body = get_object_body_with_patch(parent_ref)
           if original_parent_body
             # Store original before modifying
-            parent_body = original_parent_body + ""
+            parent_body = original_parent_body.to_s
             # Update parent's /V to match the selected button's export value
             parent_body = if parent_body.include?("/V")
                             DictScan.replace_key_value(parent_body, "/V", export_name)
@@ -143,7 +143,7 @@ module AcroThat
           return unless original_parent_body_for_ap
 
           # Use a working copy for modification
-          parent_body_for_ap = original_parent_body_for_ap + ""
+          parent_body_for_ap = original_parent_body_for_ap.to_s
           parent_ap_tok = DictScan.value_token_after("/AP", parent_body_for_ap)
           if parent_ap_tok && parent_ap_tok.start_with?("<<")
             n_tok = DictScan.value_token_after("/N", parent_ap_tok)
@@ -165,12 +165,34 @@ module AcroThat
         # Draw only the checkmark (no border)
         border_width = [width * 0.08, height * 0.08].min
 
-        check_x1 = width * 0.25
-        check_y1 = height * 0.45
-        check_x2 = width * 0.45
-        check_y2 = height * 0.25
-        check_x3 = width * 0.75
-        check_y3 = height * 0.75
+        # Define checkmark in normalized coordinates (0-1 range) for consistent aspect ratio
+        # Checkmark shape: three points forming a checkmark
+        norm_x1 = 0.25
+        norm_y1 = 0.55
+        norm_x2 = 0.45
+        norm_y2 = 0.35
+        norm_x3 = 0.75
+        norm_y3 = 0.85
+
+        # Calculate scale to maximize size while maintaining aspect ratio
+        # Use the smaller dimension to ensure it fits
+        scale = [width, height].min * 0.85  # Use 85% of the smaller dimension
+        
+        # Calculate checkmark dimensions
+        check_width = scale
+        check_height = scale
+        
+        # Center the checkmark in the box
+        offset_x = (width - check_width) / 2
+        offset_y = (height - check_height) / 2
+        
+        # Calculate actual coordinates
+        check_x1 = offset_x + norm_x1 * check_width
+        check_y1 = offset_y + norm_y1 * check_height
+        check_x2 = offset_x + norm_x2 * check_width
+        check_y2 = offset_y + norm_y2 * check_height
+        check_x3 = offset_x + norm_x3 * check_width
+        check_y3 = offset_y + norm_y3 * check_height
 
         content_stream = "q\n"
         # Draw checkmark only (no border)

data/lib/acro_that/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AcroThat
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acro_that
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Wynkoop