obf 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdbd542af4a663ec4b85d8588bea053ea946e461
-  data.tar.gz: 4d0a586090fca67b1db3436280f65d79a63331fa
+  metadata.gz: dd00c599d531f48b18aebf3bb2bed662be381436
+  data.tar.gz: dbe1f4910cfdc5441f46137a348eec3fd5120254
 SHA512:
-  metadata.gz: ab5713ddf7e40ab053d7585cf970220aff4414f06cff95f37689d556743982509687ac20fe13014a48a411b98eae1ca8d531f739625909ea3e67ddaf84ec5178
-  data.tar.gz: 57bff52590b718bcd5da270c3e52aa373aa7472469c0443114dfef70b496d990af1c82428059523e7d4c82dab30917311fe97c559fc9726a369ee25451282cc7
+  metadata.gz: c5cf06356cd608a7602ae2043cdd27d8eaa8f3d4f9323f90afc99e795f4c29ff89930c08a1b736accc4ff816384c758f26735040bdd074ad5eac48512a9de04c
+  data.tar.gz: a6257eb285b1bd76b93fcb2eedfac5a4201b191115996cd65ee2daf11df361bdb85ace887cabf5e24368331b09254a9b4cd3d51f1cbf7a425c3160347cd52cec

data/lib/obf/pdf.rb

@@ -47,11 +47,11 @@ module OBF::PDF
           post = (idx + 1).to_f / obj['boards'].length.to_f
           OBF::Utils.as_progress_percent(pre, post) do
             pdf.start_new_page unless idx == 0
-            build_page(pdf, board, {'zipper' => zipper, 'pages' => obj['pages'], 'headerless' => !!opts['headerless'], 'text_on_top' => !!opts['text_on_top']})
+            build_page(pdf, board, {'zipper' => zipper, 'pages' => obj['pages'], 'headerless' => !!opts['headerless'], 'text_on_top' => !!opts['text_on_top'], 'transparent_background' => !!opts['transparent_background']})
           end
         end
       else
-        build_page(pdf, obj, {'headerless' => !!opts['headerless'], 'text_on_top' => !!opts['text_on_top']})
+        build_page(pdf, obj, {'headerless' => !!opts['headerless'], 'text_on_top' => !!opts['text_on_top'], 'transparent_background' => !!opts['transparent_background']})
       end
     
       pdf.render_file(dest_path)
@@ -134,7 +134,11 @@ module OBF::PDF
               pdf.bounding_box([5, vertical], :width => button_width - 10, :height => button_height - text_height - 5) do
                 image = (obj['images_hash'] || {})[button['image_id']]
                 if image
-                  image_local_path = image && OBF::Utils.save_image(image, options['zipper'])
+                  bg = 'white'
+                  if options['transparent_background']
+                    bg = "\##{fill}"
+                  end
+                  image_local_path = image && OBF::Utils.save_image(image, options['zipper'], bg)
                   if image_local_path && File.exist?(image_local_path)
                     pdf.image image_local_path, :fit => [button_width - 10, button_height - text_height - 5], :position => :center, :vposition => :center
                     File.unlink image_local_path
@@ -171,7 +175,7 @@ module OBF::PDF
       end
       pdf.fill_color "000000"
       if options['pages']
-        pdf.text_box options['pages'][obj['id']], :at => [doc_width - 100, text_height], :width => 100, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
+        pdf.formatted_text_box [{:text => options['pages'][obj['id']], :anchor => "page1"}], :at => [doc_width - 100, text_height], :width => 100, :height => text_height, :align => :right, :valign => :center, :overflow => :shrink_to_fit
       end
     end
   end

data/lib/obf/utils.rb

@@ -115,7 +115,7 @@ module OBF::Utils
     str
   end
   
-  def self.save_image(image, zipper=nil)
+  def self.save_image(image, zipper=nil, background=nil)
     if image['data']
       if !image['content_type']
         image['content_type'] = image['data'].split(/;/)[0].split(/:/)[1]
@@ -162,7 +162,8 @@ module OBF::Utils
       # TODO: maybe convert to jpg instead of png?
       # see https://github.com/prawnpdf/prawn/issues/324
       # in that case, fill the image with a white background, perhaps?
-      `convert #{file.path} -density 1200 -resize 200x200 -background white -gravity center -extent 200x200 #{file.path}.jpg`
+      background ||= 'white'
+      `convert #{file.path} -density 1200 -resize 200x200 -background "#{background}" -gravity center -extent 200x200 #{file.path}.jpg`
       "#{file.path}.jpg"
     end
   end

metadata

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