obf 0.8.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1915660dacca273497702204f9950fbb1b233e88
-  data.tar.gz: 4cf715b2d432814c876e5e764f3cc413efdb33c9
+  metadata.gz: 928a651051ba2b19566f6aacb7f878c201406818
+  data.tar.gz: 74dfc75968fc195799cbc503f8faadd8cca402bf
 SHA512:
-  metadata.gz: 3c6013923795b65000fa54d4f1ffe05a7e1091d3dff4d77c8aa6bc4fbaca5fa785a0f7c184cee3fc5b70931f289ae644945a5c0abe3ff8822dabfd6b8ce264af
-  data.tar.gz: b6a0b843f551e19abc5ff5f4df5dccb2e493687cb1382f6506120138e204a7b6a98c5a5d1d78f82872a760b24187a95613eaecc17a8ff8ab5ae9e006f1e897b8
+  metadata.gz: 9f505c1aba547fbeb2cddc2c424832bb3d530043d8c1c5945295cea8a5fa69910341a4e39b7a688f7014a59db8c8a4db4fd7ee89197d9167ef6b5db580b7be2c
+  data.tar.gz: bd5d3f9a87f70db44147df8a38569cca921e9d10aa0c1bb717669ca452b045cca1f0e0e6b533aa70a53eda650359b8903f4458c50a33dd2c1e4a445f037d322c

data/lib/obf/pdf.rb

@@ -34,33 +34,55 @@ module OBF::PDF
   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(
+      doc_opts = {
         :page_layout => :landscape, 
         :page_size => [8.5*72, 11*72],
         :info => {
           :Title => obj['name']
         }
-      )
+      }
+      pdf = Prawn::Document.new(doc_opts)
       font = opts['font'] if opts['font'] && File.exists?(opts['font'])
       font ||= File.expand_path('../../TimesNewRoman.ttf', __FILE__)
       pdf.font(font) if File.exists?(font)
     
-    
+      multi_render_paths = []
       if obj['boards']
+        multi_render = obj['boards'].length > 20
         obj['boards'].each_with_index do |board, idx|
           pre = idx.to_f / obj['boards'].length.to_f
           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'], 
-              'font' => font,
-              'text_on_top' => !!opts['text_on_top'], 
-              'transparent_background' => !!opts['transparent_background'],
-              'text_case' => opts['text_case']
-            })
+            # if more than 10 pages, build each page individually 
+            # and combine them afterwards
+            if multi_render
+              path = OBF::Utils.temp_path("stash-#{idx}.pdf")
+              pdf = Prawn::Document.new(doc_opts)
+              build_page(pdf, board, {
+                'zipper' => zipper, 
+                'pages' => obj['pages'], 
+                'headerless' => !!opts['headerless'], 
+                'font' => font,
+                'links' => false,
+                'text_on_top' => !!opts['text_on_top'], 
+                'transparent_background' => !!opts['transparent_background'],
+                'text_case' => opts['text_case']
+              })
+              pdf.render_file(path)
+              multi_render_paths << path
+            else
+              pdf.start_new_page unless idx == 0
+              build_page(pdf, board, {
+                'zipper' => zipper, 
+                'pages' => obj['pages'], 
+                'headerless' => !!opts['headerless'], 
+                'font' => font,
+                'links' => true,
+                'text_on_top' => !!opts['text_on_top'], 
+                'transparent_background' => !!opts['transparent_background'],
+                'text_case' => opts['text_case']
+              })
+            end
           end
         end
       else
@@ -72,8 +94,12 @@ module OBF::PDF
           'text_case' => opts['text_case']
         })
       end
+      if multi_render_paths.length > 0
+        `gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -sOutputFile=#{dest_path} #{multi_render_paths.join(' ')}`
+      else
+        pdf.render_file(dest_path)
+      end
     
-      pdf.render_file(dest_path)
     end
   end
   
@@ -92,7 +118,7 @@ module OBF::PDF
     
       if options['pages']
         page_num = options['pages'][obj['id']]
-        pdf.add_dest("page#{page_num}", pdf.dest_fit)
+        pdf.add_dest("page#{page_num}", pdf.dest_fit) if options['links']
       end
       # header
       if !options['headerless']
@@ -107,7 +133,9 @@ module OBF::PDF
           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
+          text_options = {:text => "Go Back"}
+          text_options[:anchor] = "page1" if options['links']
+          pdf.formatted_text_box [text_options], :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"
@@ -197,7 +225,9 @@ module OBF::PDF
                     pdf.stroke_color "eeeeee"            
                     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 - 18, page_vertical], :width => 20, :height => text_height, :align => :center, :valign => :center
+                    text_options = {:text => page}
+                    text_options[:anchor] = "page#{page}" if options['links']
+                    pdf.formatted_text_box [text_options], :at => [button_width - 18, page_vertical], :width => 20, :height => text_height, :align => :center, :valign => :center
                   end
                 end
               
@@ -222,7 +252,9 @@ module OBF::PDF
       end
       pdf.fill_color "000000"
       if options['pages']
-        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
+        text_options = {:text => options['pages'][obj['id']]}
+        text_options[:anchor] = "page1" if options['links']
+        pdf.formatted_text_box [text_options], :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

@@ -9,6 +9,7 @@ module OBF::Utils
       data = Base64.strict_decode64(url.split(/\,/, 2)[1])
     else
       uri = url.match(/\%/) ? url : URI.escape(url)
+      uri = self.sanitize_url(uri)
       res = Typhoeus.get(uri)
       content_type = res.headers['Content-Type']
       data = res.body
@@ -28,6 +29,15 @@ module OBF::Utils
     }
     res
   end
+
+  def self.sanitize_url(url)
+    uri = URI.parse(url) rescue nil
+    return nil unless uri
+    return nil if (!defined?(Rails) || !Rails.env.development?) && (uri.host.match(/^127/) || uri.host.match(/localhost/) || uri.host.match(/^0/) || uri.host.to_s == uri.host.to_i.to_s)
+    port_suffix = ""
+    port_suffix = ":#{uri.port}" if (uri.scheme == 'http' && uri.port != 80)
+    "#{uri.scheme}://#{uri.host}#{port_suffix}#{uri.path}#{uri.query && "?#{uri.query}"}"
+  end
   
   def self.identify_file(path)
     name = File.basename(path) rescue nil
@@ -166,13 +176,15 @@ module OBF::Utils
     else
       background ||= 'white'
       size = 400
-      if image['content_type'] && image['content_type'].match(/svg/) && background != 'white'
+      path = file.path
+      if image['content_type'] && image['content_type'].match(/svg/)
         `convert -background none -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} #{file.path}.png`
-        `convert #{file.path}.png -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} #{file.path}.jpg`
-      else
-        `convert #{file.path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} #{file.path}.jpg`
+#        `rsvg-convert -w #{size} -h #{size} -a #{file.path} > #{file.path}.png`
+        path = "#{file.path}.png"
       end
-      "#{file.path}.jpg"
+      `convert #{path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} #{path}.jpg`
+
+      "#{path}.jpg"
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.1
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json