prawn_hebrew 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c85ea02d489bf50f5f0c8facaab7928485a9042f324a54bfb06cd974708e5324
-  data.tar.gz: 21a63093c22ffe1baf7c9b646a000138ef05694448315f077642a0e7f72acf43
+  metadata.gz: 62db7c69cd7c2e1252b867a77a7149cb529c804a58e1487bf70baf2d4b069ec6
+  data.tar.gz: b330b9b04cbec401d31fda50971e26b5eda97c213fd62db46a6f47b3fd4027cf
 SHA512:
-  metadata.gz: c4ab1e0ce09de9756667400c9b77b43d2f859734056adce3252ffd327af19c1fc97d79ec8c4832c794ef1020a971980e32b9dbd4adf3d4b1960772e06e2edcc7
-  data.tar.gz: dc6e7cd6daae94a23eb250652dd9d1ec754439e921cd3d0707d2b3060cf6515d1e8859e5e32502e46ba0fdbfc8a55fdf62665a0b9089e4c92871a542ea75c66c
+  metadata.gz: a7e3d327abda1b5a64e81d95cbbded4c5592ac9401a66630073dbc1a2dd2f2e940a868f2924f609ddbf43157fb55f5cc2c3c3f52d48d640b65ef4fcfa1a527b2
+  data.tar.gz: 1734fa4415c8b42148ea2a939b3066a8c0f3662fd07bed346da3ae2df147151282fc3a9b7ff673dc7fdb61d259f7b02b467ae22951092c9429478d21e17e1d3e

data/lib/prawn_hebrew.rb

@@ -160,64 +160,56 @@ module PrawnHebrew
                                    char_spacing, leading, min_font_size, rotation, box_opts)
       min_size = min_font_size || 5
       current_size = initial_size
+      fitting_size = nil
       
-      # Try rendering with progressively smaller font sizes until it fits
+      # Find the largest font size that fits by testing with dry_run
       while current_size >= min_size
-        # Create a copy of box_opts to test rendering
-        test_opts = box_opts.dup
-        
-        # Try rendering at current size
         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
         
-        # Test if it fits by attempting to render
-        success = character_spacing(char_spacing) do
+        # 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
-              result = formatted_text_box(fragments, test_opts.merge(dry_run: true))
-              result.empty? || result == ""
+              formatted_text_box(fragments, test_opts.merge(dry_run: true))
             end
           else
-            result = formatted_text_box(fragments, test_opts.merge(dry_run: true))
-            result.empty? || result == ""
+            formatted_text_box(fragments, test_opts.merge(dry_run: true))
           end
         end
         
-        # If it fits, render it for real and return
-        if success
-          character_spacing(char_spacing) do
-            if rotation != 0
-              rotate(rotation, origin: box_opts[:at] || [0, 0]) do
-                formatted_text_box(fragments, box_opts.merge(leading: leading > 0 ? leading : nil).compact)
-              end
-            else
-              formatted_text_box(fragments, box_opts.merge(leading: leading > 0 ? leading : nil).compact)
-            end
-          end
-          return
+        # If overflow_text is empty or nil, the text fits
+        if overflow_text.nil? || overflow_text.empty? || overflow_text == ""
+          fitting_size = current_size
+          break
         end
         
         # Reduce font size and try again
         current_size -= 0.5
       end
       
-      # If we've reached min size, render at min size anyway
-      fragments = hebrew_formatted_text(text, size: min_size, style: style,
+      # Use the fitting size, or min_size if nothing fit
+      final_size = fitting_size || min_size
+      
+      # Now render once with the final size
+      fragments = hebrew_formatted_text(text, size: final_size, style: style,
                                         hebrew_font: hebrew_font,
                                         english_font: english_font)
       
-      box_opts[:leading] = leading if leading > 0
+      render_opts = box_opts.dup
+      render_opts[:leading] = leading if leading > 0
       
       character_spacing(char_spacing) do
         if rotation != 0
-          rotate(rotation, origin: box_opts[:at] || [0, 0]) do
-            formatted_text_box(fragments, box_opts)
+          rotate(rotation, origin: render_opts[:at] || [0, 0]) do
+            formatted_text_box(fragments, render_opts)
           end
         else
-          formatted_text_box(fragments, box_opts)
+          formatted_text_box(fragments, render_opts)
         end
       end
     end

data/lib/version.rb

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

metadata

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