obf 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5632f5b2f1f0a39e5959b450b224ceaf0156e70b
-  data.tar.gz: 51e0052c09a107e280d3309d38e54e7ca1f88f11
+  metadata.gz: ab2c55d56ca5f570a188f3936a58324965cfb5f9
+  data.tar.gz: b0dc51874a5a7a7b3f010d6f243cd109909ab506
 SHA512:
-  metadata.gz: dbeb5f66b6ba30025ca2212f90cac5fd46510a4875a93b511aeca856fc5329b1cb04a471add5ffafcd8984327e3fb7103d9aff0addb7ff86de72d58872df6acc
-  data.tar.gz: 13f8c5a2705a34e2ecf61327ff96c8c619e297cd38fcf3fb45b2f3b733a563950df29f31982e438b286c344be00c3ade07f887e9baf37f813b1c93c2e5d7201e
+  metadata.gz: 4b90045b54cdb8f01cef1ef31e2c003a4f7ff908d8337f4cab8bb1d06553ecfed2eaeb490de01b3952874501093b1474733bc0a78f112e489d6d6ac53b66c7a4
+  data.tar.gz: 2353646c0179cebd7832a883c5f2242a22e0047119eeb4f8be4ba1aa5b258877ed111cacd466db1abb51b42f3f0fc4fab26dc36c26fd81a3c0b7e306a82e4a6d

data/lib/obf/pdf.rb

@@ -32,8 +32,6 @@ module OBF::PDF
   end
   
   def self.build_pdf(obj, dest_path, zipper, opts={})
-    character_classes = RTL_SCRIPTS.map{ |script| "\\p{#{script}}" }.join
-    rtl_regex = /[#{character_classes}]/
     OBF::Utils.as_progress_percent(0, 1.0) do
       # parse obf, draw as pdf
       pdf = Prawn::Document.new(
@@ -76,6 +74,10 @@ module OBF::PDF
     end
   end
   
+  def self.rtl_regex
+    @res ||= /[#{RTL_SCRIPTS.map{ |script| "\\p{#{script}}" }.join}]/
+  end
+  
   def self.build_page(pdf, obj, options)
     OBF::Utils.as_progress_percent(0, 1.0) do
       doc_width = 11*72 - 72
@@ -152,19 +154,19 @@ module OBF::PDF
 
               text = (button['label'] || button['vocalization']).to_s
               direction = text.match(rtl_regex) ? :rtl : :ltr
-              if opts['text_case'] == 'upper'
+              if options['text_case'] == 'upper'
                 text = text.upcase
-              elsif opts['text_case'] == 'lower'
+              elsif options['text_case'] == 'lower'
                 text = text.downcase
               end
               pdf.text_box text, :at => [0, vertical], :width => button_width, :height => text_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit, :direction => direction
-              if opts['text_only']
+              if options['text_only']
                 # render text
                 pdf.fill_color "000000"
                 text = (button['label'] || button['vocalization']).to_s
-                if opts['text_case'] == 'upper'
+                if options['text_case'] == 'upper'
                   text = text.upcase
-                elsif opts['text_case'] == 'lower'
+                elsif options['text_case'] == 'lower'
                   text = text.downcase
                 end
                 pdf.text_box text, :at => [0, 0], :width => button_width, :height => button_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit, :direction => direction
@@ -187,12 +189,12 @@ module OBF::PDF
                 if options['pages'] && button['load_board']
                   page = options['pages'][button['load_board']['id']]
                   if page
-                    page_vertical = options['text_on_top'] ? 5 + text_height : button_height - 5
+                    page_vertical = options['text_on_top'] ? -2 + text_height : button_height + 2
                     pdf.fill_color "ffffff"            
                     pdf.stroke_color "eeeeee"            
-                    pdf.fill_and_stroke_rounded_rectangle [button_width - 25, page_vertical], 20, text_height, 5
+                    pdf.fill_and_stroke_rounded_rectangle [button_width - 18, page_vertical], 20, text_height, 5
                     pdf.fill_color "000000"
-                    pdf.formatted_text_box [{:text => page, :anchor => "page#{page}"}], :at => [button_width - 25, page_vertical], :width => 20, :height => text_height, :align => :center, :valign => :center
+                    pdf.formatted_text_box [{:text => page, :anchor => "page#{page}"}], :at => [button_width - 18, page_vertical], :width => 20, :height => text_height, :align => :center, :valign => :center
                   end
                 end
               
@@ -200,9 +202,9 @@ module OBF::PDF
                 pdf.fill_color "000000"
                 vertical = options['text_on_top'] ? button_height : text_height
                 text = (button['label'] || button['vocalization']).to_s
-                if opts['text_case'] == 'upper'
+                if options['text_case'] == 'upper'
                   text = text.upcase
-                elsif opts['text_case'] == 'lower'
+                elsif options['text_case'] == 'lower'
                   text = text.downcase
                 end
                 pdf.text_box text, :at => [0, vertical], :width => button_width, :height => text_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Brian Whitmer