obf 0.6.34 → 0.6.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 416bb3ff468164c0a7e151c67c9710fcabc99d5a
-  data.tar.gz: 440441ddd3f9c072c2cfbfa8620d1cea6ca6f2c7
+  metadata.gz: 228e90f86ce6db43787977a6bb7cd1f6f4d39900
+  data.tar.gz: 203727214e253dd6a74d5a75447ae573e53b3aa7
 SHA512:
-  metadata.gz: 3e0b2d4bff94a850f85b4205e7a6013f8ce04adbab30e0d14a040f32ba21795fe88485dcfde5f1a2549eb479ee427bb3d847304512451305a37ff60570f5eef1
-  data.tar.gz: c09b2c367f3642fb8866a12581837b5d100f88a5774d19d8cc32dec130491a37d766c45583940501a45c3720ffd441de891c3b9ca6253f295c0f95a6b1c68e73
+  metadata.gz: 37fd4c26cef380a016a823e1aad43afa27a6a276b19e4bc84b411aac4cf05f1b9348780ede7ea9832582db17cd1987aa318bfd358a5ce496753724b084e6f0fe
+  data.tar.gz: f2724e1433bdf347639f95502df4e56162bdff565f932c75ee6562a5aa9f8b1769afb736df20c0e456591db4171f723c323f9477725d7d61565959014546aedc

data/lib/obf/external.rb

@@ -326,14 +326,14 @@ module OBF::External
         OBF::External.to_obz(board, tmp_path, opts)  
       end
       OBF::Utils.as_progress_percent(0.3, 1.0) do
-        OBF::OBZ.to_pdf(tmp_path, dest_path)
+        OBF::OBZ.to_pdf(tmp_path, dest_path, opts)
       end
     else
       OBF::Utils.as_progress_percent(0, 0.5) do
         self.to_obf(board, tmp_path)  
       end
       OBF::Utils.as_progress_percent(0.5, 1.0) do
-        OBF::OBF.to_pdf(tmp_path, dest_path)
+        OBF::OBF.to_pdf(tmp_path, dest_path, opts)
       end
     end
     File.unlink(tmp_path) if File.exist?(tmp_path)

data/lib/obf/obf.rb

@@ -9,8 +9,8 @@ module OBF::OBF
     OBF::External.to_obf(board, dest_path)
   end
   
-  def self.to_pdf(obf, dest_path)
-    OBF::PDF.from_obf(obf, dest_path)
+  def self.to_pdf(obf, dest_path, opts={})
+    OBF::PDF.from_obf(obf, dest_path, nil, opts)
   end
   
   def self.to_png(obf, dest_path)

data/lib/obf/obz.rb

@@ -7,7 +7,7 @@ module OBF::OBZ
     OBF::External.to_obz(content, dest_path, opts)
   end
   
-  def self.to_pdf(obz, dest_path)
-    OBF::PDF.from_obz(obz, dest_path)
+  def self.to_pdf(obz, dest_path, opts={})
+    OBF::PDF.from_obz(obz, dest_path, opts)
   end
 end

data/lib/obf/pdf.rb

@@ -18,18 +18,18 @@ module OBF::PDF
     @@footer_url = url
   end
   
-  def self.from_obf(obf_json_or_path, dest_path, zipper=nil)
+  def self.from_obf(obf_json_or_path, dest_path, zipper=nil, opts={})
     obj = obf_json_or_path
     if obj.is_a?(String)
       obj = OBF::Utils.parse_obf(File.read(obf_json_or_path))
     else
       obj = OBF::Utils.parse_obf(obf_json_or_path)
     end
-    build_pdf(obj, dest_path, zipper)
+    build_pdf(obj, dest_path, zipper, opts)
     return dest_path
   end
   
-  def self.build_pdf(obj, dest_path, zipper)
+  def self.build_pdf(obj, dest_path, zipper, opts={})
     OBF::Utils.as_progress_percent(0, 1.0) do
       # parse obf, draw as pdf
       pdf = Prawn::Document.new(
@@ -47,7 +47,7 @@ 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']})
+            build_page(pdf, board, {'zipper' => zipper, 'pages' => obj['pages'], 'headerless' => !!opts['headerless']})
           end
         end
       else
@@ -64,46 +64,50 @@ module OBF::PDF
       doc_height = 8.5*72 - 72
       default_radius = 3
       text_height = 20
+      header_height = 0
     
       # header
-      pdf.bounding_box([0, doc_height], :width => doc_width, :height => 100) do
-        if options['pages']
-          page_num = options['pages'][obj['id']]
-          pdf.add_dest("page#{page_num}", pdf.dest_fit)
-        end
-        pdf.line_width = 2
-        pdf.font_size 16
+      if !options['headerless']
+        header_height = 100
+        pdf.bounding_box([0, doc_height], :width => doc_width, :height => 100) do
+          if options['pages']
+            page_num = options['pages'][obj['id']]
+            pdf.add_dest("page#{page_num}", pdf.dest_fit)
+          end
+          pdf.line_width = 2
+          pdf.font_size 16
         
-        pdf.fill_color "eeeeee"
-        pdf.stroke_color "888888"
-        pdf.fill_and_stroke_rounded_rectangle [0, 100], 100, 100, default_radius
-        pdf.fill_color "6D81D1"
-        pdf.fill_and_stroke_polygon([5, 50], [35, 85], [35, 70], [95, 70], [95, 30], [35, 30], [35, 15])
-        pdf.fill_color "ffffff"
-        pdf.formatted_text_box [{:text => "Go Back", :anchor => "page1"}], :at => [10, 90], :width => 80, :height => 80, :align => :center, :valign => :center, :overflow => :shrink_to_fit
-        pdf.fill_color "ffffff"
-        pdf.fill_and_stroke_rounded_rectangle [110, 100], (doc_width - 200 - 20), 100, default_radius
-        pdf.fill_color "DDDB54"
-        pdf.fill_and_stroke do
-          pdf.move_to 160, 50
-          pdf.line_to 190, 70
-          pdf.curve_to [190, 30], :bounds => [[100, 130], [100, -30]]
-          pdf.line_to 160, 50
+          pdf.fill_color "eeeeee"
+          pdf.stroke_color "888888"
+          pdf.fill_and_stroke_rounded_rectangle [0, 100], 100, 100, default_radius
+          pdf.fill_color "6D81D1"
+          pdf.fill_and_stroke_polygon([5, 50], [35, 85], [35, 70], [95, 70], [95, 30], [35, 30], [35, 15])
+          pdf.fill_color "ffffff"
+          pdf.formatted_text_box [{:text => "Go Back", :anchor => "page1"}], :at => [10, 90], :width => 80, :height => 80, :align => :center, :valign => :center, :overflow => :shrink_to_fit
+          pdf.fill_color "ffffff"
+          pdf.fill_and_stroke_rounded_rectangle [110, 100], (doc_width - 200 - 20), 100, default_radius
+          pdf.fill_color "DDDB54"
+          pdf.fill_and_stroke do
+            pdf.move_to 160, 50
+            pdf.line_to 190, 70
+            pdf.curve_to [190, 30], :bounds => [[100, 130], [100, -30]]
+            pdf.line_to 160, 50
+          end
+          pdf.fill_color "444444"
+          pdf.text_box "Say that sentence out loud for me", :at => [210, 90], :width => (doc_width - 200 - 120), :height => 80, :align => :left, :valign => :center, :overflow => :shrink_to_fit
+          pdf.fill_color "eeeeee"
+          pdf.fill_and_stroke_rounded_rectangle [(doc_width - 100), 100], 100, 100, default_radius
+          pdf.fill_color "aaaaaa"
+          pdf.fill_and_stroke_polygon([doc_width - 100 + 5, 50], [doc_width - 100 + 35, 85], [doc_width - 100 + 95, 85], [doc_width - 100 + 95, 15], [doc_width - 100 + 35, 15])
+          pdf.fill_color "ffffff"
+          pdf.text_box "Erase", :at => [(doc_width - 100 + 10), 90], :width => 80, :height => 80, :align => :center, :valign => :center, :overflow => :shrink_to_fit
         end
-        pdf.fill_color "444444"
-        pdf.text_box "Say that sentence out loud for me", :at => [210, 90], :width => (doc_width - 200 - 120), :height => 80, :align => :left, :valign => :center, :overflow => :shrink_to_fit
-        pdf.fill_color "eeeeee"
-        pdf.fill_and_stroke_rounded_rectangle [(doc_width - 100), 100], 100, 100, default_radius
-        pdf.fill_color "aaaaaa"
-        pdf.fill_and_stroke_polygon([doc_width - 100 + 5, 50], [doc_width - 100 + 35, 85], [doc_width - 100 + 95, 85], [doc_width - 100 + 95, 15], [doc_width - 100 + 35, 15])
-        pdf.fill_color "ffffff"
-        pdf.text_box "Erase", :at => [(doc_width - 100 + 10), 90], :width => 80, :height => 80, :align => :center, :valign => :center, :overflow => :shrink_to_fit
       end
     
       # board
       pdf.font_size 12
       padding = 10
-      grid_height = doc_height - 100 - text_height - (padding * 2)
+      grid_height = doc_height - header_height - text_height - (padding * 2)
       grid_width = doc_width
       if obj['grid'] && obj['grid']['rows'] > 0 && obj['grid']['columns'] > 0
         button_height = (grid_height - (padding * (obj['grid']['rows'] - 1))) / obj['grid']['rows'].to_f
@@ -169,7 +173,7 @@ module OBF::PDF
     end
   end
   
-  def self.from_obz(obz_path, dest_path)
+  def self.from_obz(obz_path, dest_path, opts={})
     OBF::Utils.load_zip(obz_path) do |zipper|
       manifest = JSON.parse(zipper.read('manifest.json'))
       root = manifest['root']
@@ -207,7 +211,7 @@ module OBF::PDF
         'name' => 'Communication Board Set',
         'boards' => visited_boards,
         'pages' => pages
-      }, dest_path, zipper)
+      }, dest_path, zipper, opts)
     end
     # parse obz, draw as pdf
 

metadata

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