obf 0.9.8.6 → 0.9.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2c866158d28930becd902f17ed56e40e9fe7c42427a669e3059cc6e5c5e94e0
-  data.tar.gz: 335218803680fd6cf87cd36b862811c1af6e57e29972d129a491de926aa837c8
+  metadata.gz: 3e9744e7a34a7cf34c098f19e1fbc6ef9eb6ceb3e1c7eebfc3fb7d80779b502c
+  data.tar.gz: 3a707ec782d9a9df24409a9e2ef4c3c96b8b59de9693a587c044826c6fe72cbd
 SHA512:
-  metadata.gz: 5cefe31a7fea80ef4e80f5a1e605a169f31db0e7bf684e9aba0a93ebb06913508cef8374aa994fe77965c34dbdda364c65f6815cb4b4cad0afc990b26636fdf4
-  data.tar.gz: 2d6ef0cc281351d3217864f3f07b55fc72adef71d5ced8653de7201bfac061c463a0e8f5224be366872c8ddc533f2c6d5ceba7b58fd54989725a94eb13ff7dc3
+  metadata.gz: efcf27be7401b4d904608f968e174b44b79c85b9346cbd174a1da9917e0e58faa4197338f5ba9cfaabd15c3e409bb603083f119e3a8ac73c10869a285d919a41
+  data.tar.gz: fe94deb30f15448d792b4abcc7695c7e049f821d7a89250518410c320e6e82aaffca13bc1dcef256fc3eb390d473f37fa079f475cf85e83845c50af156de67b1

data/lib/obf/pdf.rb

@@ -64,7 +64,7 @@ module OBF::PDF
         multi_render = obj['boards'].length > 20
         obj['boards'].each_with_index do |board, idx|
           started = Time.now.to_i
-          puts "starting pdf of board #{idx} #{board['name'] || board['id']} at #{started}"
+          OBF::Utils.log "starting pdf of board #{idx} #{board['name'] || board['id']} at #{started}"
           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
@@ -101,7 +101,7 @@ module OBF::PDF
               })
             end
           end
-          puts "  finished pdf of board #{idx}/#{obj['boards'].length} #{Time.now.to_i - started}s"
+          OBF::Utils.log "  finished pdf of board #{idx}/#{obj['boards'].length} #{Time.now.to_i - started}s"
         end
       else
         build_page(pdf, obj, {
@@ -185,7 +185,7 @@ module OBF::PDF
         button_width = (grid_width - (padding * (obj['grid']['columns'] - 1))) / obj['grid']['columns'].to_f
 
         # Grab all the images per board in parallel
-        puts "  batch-retrieving remote images"
+        OBF::Utils.log "  batch-retrieving remote images"
         hydra = Typhoeus::Hydra.hydra
         grabs = []
         obj['buttons'].each do |btn|
@@ -204,7 +204,7 @@ module OBF::PDF
           grab[:image]['raw_data'] = grab[:req].response.body
           grab[:image]['content_type'] = grab[:req].response.headers['Content-Type'] if grab[:req].response.headers['Content-Type']
         end
-        puts "  done with #{grabs.length} remote images!"
+        OBF::Utils.log "  done with #{grabs.length} remote images!"
 
         obj['grid']['order'].each_with_index do |buttons, row|
           buttons.each_with_index do |button_id, col|

data/lib/obf/utils.rb

@@ -132,6 +132,7 @@ module OBF::Utils
     str
   end
   
+
   def self.save_image(image, zipper=nil, background=nil)
     if image['data']
       if !image['content_type']
@@ -146,9 +147,9 @@ module OBF::Utils
         image['content_type'] = types[0] && types[0].to_s
       end
     elsif image['url']
-      puts "  retrieving #{image['url']}"
+      OBF::Utils.log "  retrieving #{image['url']}"
       url_data = get_url(image['url'])
-      puts "  done!"
+      OBF::Utils.log "  done!"
       image['raw_data'] = url_data['data']
       image['content_type'] = url_data['content_type']
     elsif image['symbol']
@@ -184,17 +185,17 @@ module OBF::Utils
       size = 400
       path = file.path
       if image['content_type'] && image['content_type'].match(/svg/)
-        puts "    convert -background \"#{background}\" -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} -flatten #{file.path}.jpg"
+        OBF::Utils.log "    convert -background \"#{background}\" -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} -flatten #{file.path}.jpg"
         `convert -background "#{background}" -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} -flatten #{file.path}.jpg`
 #        `rsvg-convert -w #{size} -h #{size} -a #{file.path} > #{file.path}.png`
         path = "#{file.path}.jpg"
       else
-        puts "    convert #{path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} -flatten #{path}.jpg"
+        OBF::Utils.log "    convert #{path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} -flatten #{path}.jpg"
         `convert #{path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} -flatten #{path}.jpg`
         path = "#{path}.jpg"
       end
 
-      puts "    finished image"
+      OBF::Utils.log "    finished image"
       path
     end
   end
@@ -344,7 +345,7 @@ module OBF::Utils
         file.close
       end
     end
-    puts "file not found, #{path}" if !File.exist?(path)
+    OBF::Utils.log "file not found, #{path}" if !File.exist?(path)
     data = `identify -verbose #{path}`
     data.split(/\n/).each do |line|
       pre, post = line.sub(/^\s+/, '').split(/:\s/, 2)
@@ -410,6 +411,14 @@ module OBF::Utils
       attrs
     end
   end
+
+  def self.log(str)
+    if defined?(Rails)
+      Rails.logger.info(str)
+    else
+      puts str
+    end
+  end
   
   def self.load_zip(path, &block)
     require 'zip'

metadata

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