obf 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c73acb37386325b5db5fd87c3797a56337d3e64
-  data.tar.gz: c633ace8ad21a52f7653c963c7867a5c0a0b2102
+  metadata.gz: 03b9f2c5c9bf032340aaef0f589345218ff1935e
+  data.tar.gz: 0ded6c478c227820dfb01e8e517f365dc2f8bce2
 SHA512:
-  metadata.gz: 1098bc2ffa35b73e3831cfbb89d299d16d63090830a8fc7b67487a856aa06964d7edc5c804f6c23bca60ce08ce9a878117ac2296eaf6dd7b7d59f84263a38ee6
-  data.tar.gz: dbd87beb4db1f3361dea2d6d3d5d3365943138e55678975478691454cf010e2e3d412f9acff3df29d4ff3ae1b655aac96426e744e7e0e6f1fee42338588f6cda
+  metadata.gz: 4b2c2d8fcc92ef4411bf0f3606d011683a55cecbd1ee195d2a244b8349aac3bb62ea3a2436b0e20a65804f430dd2d78c41205d1d268302821bdc2801b5542a87
+  data.tar.gz: e0bcfef45b79fc50b214ccb3113e85392509e804e5878208d1873d6fc3eaf69183000881c5b881e8509869a4c2419e59a21e536def093459a1f4729fb90e8ea0

data/lib/obf/utils.rb

@@ -20,11 +20,15 @@ module OBF::Utils
     elsif type.respond_to?(:extensions)
       extension = ("." + type.extensions[0]) if type && type.extensions && type.extensions.length > 0
     end
-    {
+    res = {
       'content_type' => content_type,
       'data' => data,
       'extension' => extension
     }
+    if content_type && content_type.match(/^image/)
+      res = image_attrs(data).merge(res)
+    end
+    res
   end
   
   def self.identify_file(path)
@@ -103,6 +107,7 @@ module OBF::Utils
         'data' => File.read(url),
         'content_type' => types[0] && types[0].to_s
       }
+      image = image_attrs(url).merge(image)
     end
     return nil unless image
     str = "data:" + image['content_type']
@@ -147,6 +152,9 @@ module OBF::Utils
       return nil
     end
     file.close
+    # 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 300x300 -background none -gravity center -extent 300x300 #{file.path}.png`
     "#{file.path}.png"
   end
@@ -255,6 +263,41 @@ module OBF::Utils
     res
   end
   
+  def self.image_attrs(path)
+    if path.match(/^data:/)
+      raw = Base64.strict_decode64(url.split(/\,/, 2)[1])
+      file = Tempfile.new('file')
+      path = file.path
+      file.binmode
+      file.write raw
+      file.close
+    else
+      is_file = File.exist?(path) rescue false
+      if !is_file
+        file = Tempfile.new('file')
+        file.binmode
+        file.write path
+        path = file.path
+        file.close
+      end
+    end
+    data = `identify -verbose #{path}`
+    res = {}
+    data.split(/\n/).each do |line|
+      pre, post = line.sub(/^\s+/, '').split(/:\s/, 2)
+      if pre == 'Geometry'
+        match = post.match(/(\d+)x(\d+)/)
+        if match && match[1] && match[2]
+          res['width'] = match[1].to_i
+          res['height'] = match[2].to_i
+        end
+      elsif pre == 'Mime type'
+        res['content_type'] = post
+      end
+    end
+    res
+  end
+  
   class Zipper
     def initialize(zipfile)
       @zipfile = zipfile
@@ -288,22 +331,11 @@ module OBF::Utils
       attrs['data'] = str
     
       if attrs['content_type'].match(/^image/)
-        fn = OBF::Utils.temp_path('file')
         file = Tempfile.new('file')
         file.binmode
         file.write raw
         file.close
-        data = `identify -verbose #{file.path}`
-        data.split(/\n/).each do |line|
-          pre, post = line.sub(/^\s+/, '').split(/:\s/, 2)
-          if pre == 'Geometry'
-            match = post.match(/(\d+)x(\d+)/)
-            if match && match[1] && match[2]
-              attrs['width'] = match[1].to_i
-              attrs['height'] = match[2].to_i
-            end
-          end
-        end
+        attrs = (OBF::Utils.image_attrs(file.path) || {}).merge(attrs)
       end
       attrs
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json