prawn_hebrew 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62db7c69cd7c2e1252b867a77a7149cb529c804a58e1487bf70baf2d4b069ec6
-  data.tar.gz: b330b9b04cbec401d31fda50971e26b5eda97c213fd62db46a6f47b3fd4027cf
+  metadata.gz: 1c923e10c8587bf590c02c70f3ef62dd6d2e95c6fb5c338c453e41db11fce73a
+  data.tar.gz: 15fee6431648b088fd6b6e824db4a00f43880eb7a30cc208a0ecbc0b59ffeaf6
 SHA512:
-  metadata.gz: a7e3d327abda1b5a64e81d95cbbded4c5592ac9401a66630073dbc1a2dd2f2e940a868f2924f609ddbf43157fb55f5cc2c3c3f52d48d640b65ef4fcfa1a527b2
-  data.tar.gz: 1734fa4415c8b42148ea2a939b3066a8c0f3662fd07bed346da3ae2df147151282fc3a9b7ff673dc7fdb61d259f7b02b467ae22951092c9429478d21e17e1d3e
+  metadata.gz: b6ed446d3c436f65630bfb528b79735e6c2d9cc4120b68e70c7c173047868081068a3eb22689d79ac472d2db7306cf3373feb8998b520b613f9fa466f69a27f3
+  data.tar.gz: a4ae2aaa3b7b7e8990df02a953345010e66aaa41b167ba3dea0e44011d1719081397fcc2fea5a2c5e12e2ae0c04eb2ca94e84d464e4b23fcc4045e87e7673370

data/lib/prawn_hebrew.rb

@@ -159,43 +159,53 @@ module PrawnHebrew
     def shrink_hebrew_text_to_fit(text, initial_size, style, hebrew_font, english_font, 
                                    char_spacing, leading, min_font_size, rotation, box_opts)
       min_size = min_font_size || 5
+      
+      # Get box dimensions
+      box_width = box_opts[:width]
+      box_height = box_opts[:height]
+      
+      return render_hebrew_text_content(text, true, :rtl, initial_size, style, 
+                                       hebrew_font, english_font, char_spacing, leading, box_opts) unless box_width && box_height
+      
       current_size = initial_size
       fitting_size = nil
       
-      # Find the largest font size that fits by testing with dry_run
+      # Try progressively smaller sizes
       while current_size >= min_size
-        fragments = hebrew_formatted_text(text, size: current_size, style: style,
-                                          hebrew_font: hebrew_font,
-                                          english_font: english_font)
+        # Calculate approximate text dimensions at this size
+        test_fragments = hebrew_formatted_text(text, size: current_size, style: style,
+                                               hebrew_font: hebrew_font,
+                                               english_font: english_font)
         
-        test_opts = box_opts.dup
-        test_opts[:leading] = leading if leading > 0
+        # Calculate total text width by measuring each fragment
+        total_width = 0
+        total_height = current_size * 1.2 # Approximate line height
         
-        # Test if it fits without actually rendering
-        overflow_text = character_spacing(char_spacing) do
-          if rotation != 0
-            rotate(rotation, origin: test_opts[:at] || [0, 0]) do
-              formatted_text_box(fragments, test_opts.merge(dry_run: true))
-            end
-          else
-            formatted_text_box(fragments, test_opts.merge(dry_run: true))
+        test_fragments.each do |fragment|
+          next if fragment[:text] == "\n"
+          fragment_font = fragment[:font] || hebrew_font
+          font(fragment_font) do
+            total_width += width_of(fragment[:text], size: current_size)
           end
         end
         
-        # If overflow_text is empty or nil, the text fits
-        if overflow_text.nil? || overflow_text.empty? || overflow_text == ""
+        # Count newlines to estimate height
+        line_count = text.count("\n") + 1
+        total_height = (current_size * 1.2 * line_count) + (leading * (line_count - 1))
+        
+        # Check if it would fit (with some padding)
+        if total_width <= (box_width * 0.95) && total_height <= (box_height * 0.95)
           fitting_size = current_size
           break
         end
         
-        # Reduce font size and try again
         current_size -= 0.5
       end
       
       # Use the fitting size, or min_size if nothing fit
       final_size = fitting_size || min_size
       
-      # Now render once with the final size
+      # Render with the final size
       fragments = hebrew_formatted_text(text, size: final_size, style: style,
                                         hebrew_font: hebrew_font,
                                         english_font: english_font)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module PrawnHebrew
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn_hebrew
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Ben Lite