prawn_hebrew 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5df90e0dbfa49359bec17f0242bd74575961defdbcd08fa0a9e349e16b741cb
-  data.tar.gz: 0d6d7e0e2894a4aed5174ca6a16fe7d2e53f44546974feb741d417f5c46c67a4
+  metadata.gz: 5bce759324c9ddd6c50281d64a986b18df0390951268ec3b1d73070ab49f9484
+  data.tar.gz: 1213589f341946c555682929bd737ffe8d715ee9400f174e01377751c9c7c64c
 SHA512:
-  metadata.gz: ddaaa14bc478082942318462c87f774ad2ed195bd1fe8d3595179a7b61ec3c0d295fb97829f0a88ce575fd496b5c0bffb49d2e67a1a09316e3ebbc0228d0bc5d
-  data.tar.gz: 524de0466b4737077454a0e42148c3ec96ab8e4d6e8883d32440f7bd0cfe9edcb9f147b8a9ad837795d98fdc3f6ec75d24720ca19c4a529fa7467e00955e33a9
+  metadata.gz: e9b463d274d655efcade8b1c3acab361e9f4776c9fce6c6aedc09dee0f6c8b9d7c3cd6cd2c8ae2a2f5f7e6888155477d550708e654b41561dddb765a113d4c01
+  data.tar.gz: 787b80276ff7af3e9da4c3067192562a4b8ba0f5af9cd0cd52e75e7ffd5431e32cbfba215d671728407c5dcdd8cbd052bc19baaae65f61312db8c503faab4146

data/lib/prawn_hebrew.rb

@@ -4,16 +4,29 @@ require_relative 'version'
 module PrawnHebrew
   module Text
     DEFAULT_HEBREW_FONT = 'GveretLevinHebrew'.freeze
-    DEFAULT_ENGLISH_FONT = 'Arial'.freeze
+    DEFAULT_ENGLISH_FONT = 'Helvetica'.freeze
+    
+    # Set to true for debugging which text rendering path is used
+    DEBUG_MODE = false
+    INVISIBLE_CHARS = /[\u200B\u200C\u200D\u200E\u200F\uFEFF\u00AD\u202A\u202B\u202C\u202D\u202E]/.freeze
+    NBSP_CHARS = /[\u00A0\u202F]/.freeze
+
+    def sanitize_text(text)
+      return text if text.nil?
+      text.to_s.gsub(INVISIBLE_CHARS, '').gsub(NBSP_CHARS, ' ')
+    end
 
     def hebrew_formatted_text(text, size: 12, style: :normal, hebrew_font: DEFAULT_HEBREW_FONT, english_font: DEFAULT_ENGLISH_FONT)
+      text = sanitize_text(text)
       words = text.to_s.split(/(\s+|\n)/)
       hebrew_run = []
       fragments = []
+      
+      styles = style.is_a?(Array) ? style : [style].compact
 
       words.each do |word|
         if word.strip.empty?
-          fragments << { text: word, font: english_font, size: size, styles: [style] } if word != ' '
+          fragments << { text: word, font: english_font, size: size, styles: styles } if word != ' '
           next
         end
 
@@ -22,20 +35,20 @@ module PrawnHebrew
         else
           unless hebrew_run.empty?
             hebrew_run.reverse.each_with_index do |hw, idx|
-              fragments << { text: hw, font: hebrew_font, size: size, direction: :rtl, styles: [style] }
-              fragments << { text: ' ', font: hebrew_font, size: size, direction: :rtl, styles: [style] } if idx < hebrew_run.length - 1
+              fragments << { text: hw, font: hebrew_font, size: size, direction: :rtl, styles: styles }
+              fragments << { text: ' ', font: hebrew_font, size: size, direction: :rtl, styles: styles } if idx < hebrew_run.length - 1
             end
             fragments << { text: ' ' }
             hebrew_run.clear
           end
-          fragments << { text: "#{word} ", font: english_font, size: size, styles: [style] }
+          fragments << { text: "#{word} ", font: english_font, size: size, styles: styles }
         end
       end
 
       unless hebrew_run.empty?
         hebrew_run.reverse.each_with_index do |hw, idx|
-          fragments << { text: hw, font: hebrew_font, size: size, direction: :rtl, styles: [style] }
-          fragments << { text: ' ', font: hebrew_font, size: size, direction: :rtl, styles: [style] } if idx < hebrew_run.length - 1
+          fragments << { text: hw, font: hebrew_font, size: size, direction: :rtl, styles: styles }
+          fragments << { text: ' ', font: hebrew_font, size: size, direction: :rtl, styles: styles } if idx < hebrew_run.length - 1
         end
       end
       fragments
@@ -43,11 +56,68 @@ module PrawnHebrew
 
     def hebrew_text_box(text, size: 12, style: :normal,
                         hebrew_font: DEFAULT_HEBREW_FONT,
-                        english_font: DEFAULT_ENGLISH_FONT, **box_opts)
-      fragments = hebrew_formatted_text(text, size: size, style: style,
-                                        hebrew_font: hebrew_font,
-                                        english_font: english_font)
-      formatted_text_box(fragments, box_opts)
+                        english_font: DEFAULT_ENGLISH_FONT,
+                        direction: :auto, **box_opts)
+      
+      # Handle font specification in box_opts or use defaults
+      final_hebrew_font = box_opts.delete(:hebrew_font) || hebrew_font
+      final_english_font = box_opts.delete(:english_font) || english_font
+      final_size = box_opts.delete(:size) || size
+      rotation = box_opts.delete(:rotate) || 0
+      char_spacing = box_opts.delete(:character_spacing) || 0
+      leading = box_opts.delete(:leading) || 0
+      
+      # Check if text contains Hebrew characters
+      contains_hebrew = text.to_s =~ /\p{Hebrew}/
+      
+      # If direction is auto, determine based on content
+      if direction == :auto
+        direction = contains_hebrew ? :rtl : :ltr
+      end
+      
+      # For completely English text (no Hebrew characters and LTR direction), 
+      # use standard Prawn text_box for better performance and compatibility
+      if !contains_hebrew && direction == :ltr
+        render_english_only_text(text, final_size, style, final_english_font, 
+                                 rotation, char_spacing, leading, box_opts)
+      else
+        # For Hebrew text or RTL direction, use formatted text approach
+        if rotation != 0
+          rotate(rotation, origin: box_opts[:at] || [0, 0]) do
+            render_hebrew_text_content(text, contains_hebrew, direction, final_size, style, 
+                               final_hebrew_font, final_english_font, char_spacing, leading, box_opts)
+          end
+        else
+          render_hebrew_text_content(text, contains_hebrew, direction, final_size, style, 
+                             final_hebrew_font, final_english_font, char_spacing, leading, box_opts)
+        end
+      end
+    end
+    
+    private
+    
+    # Render pure English text using standard Prawn text_box for optimal performance
+    def render_english_only_text(text, final_size, style, final_english_font, 
+                                 rotation, char_spacing, leading, box_opts)
+          font(final_english_font) do
+            text_box(text.to_s, { size: final_size, style: style }.merge(box_opts))
+          end
+    end
+    
+    # Render Hebrew text or mixed text using formatted text approach
+    def render_hebrew_text_content(text, contains_hebrew, direction, final_size, style, 
+                           final_hebrew_font, final_english_font, char_spacing, leading, box_opts)
+      # Apply character spacing and leading if specified
+      character_spacing(char_spacing) do
+        fragments = hebrew_formatted_text(text, size: final_size, style: style,
+                                          hebrew_font: final_hebrew_font,
+                                          english_font: final_english_font)
+        
+        # Add leading to box_opts if specified
+        box_opts[:leading] = leading if leading > 0
+        
+        formatted_text_box(fragments, box_opts)
+      end
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
-module PrawnHebrew
-  VERSION = "0.0.1"
+module PrawnHebrew
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn_hebrew
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Ben Lite
@@ -10,7 +10,8 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Working with hebrew words in prawn
-email: benlite96@gmail.com
+email:
+- benlite96@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []