obf 0.6.21 → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b9f2c5c9bf032340aaef0f589345218ff1935e
-  data.tar.gz: 0ded6c478c227820dfb01e8e517f365dc2f8bce2
+  metadata.gz: 71e30f866a01995e08ca6c519b7a80799ef40d02
+  data.tar.gz: 6625177ac355eec234625152fac7abbacaff4515
 SHA512:
-  metadata.gz: 4b2c2d8fcc92ef4411bf0f3606d011683a55cecbd1ee195d2a244b8349aac3bb62ea3a2436b0e20a65804f430dd2d78c41205d1d268302821bdc2801b5542a87
-  data.tar.gz: e0bcfef45b79fc50b214ccb3113e85392509e804e5878208d1873d6fc3eaf69183000881c5b881e8509869a4c2419e59a21e536def093459a1f4729fb90e8ea0
+  metadata.gz: 8dc5b6b126eac50c4dc1051760b00519b7868a68b04dc165ad8eb1a3f29e02a326165de638891c1ae2049d5b467f389e81d6fc1b56c4bdbdd7beb67c79aa53fb
+  data.tar.gz: 7260b87077c93b60ecc73ecf918dbab60ca09ea385c8df55ed6b3ff41e6228a2149fca2ae474ac2f492773247ce1d9cfb4ffdb71632bc6780c6bcb52bac306f8

data/lib/obf/utils.rb

@@ -26,7 +26,10 @@ module OBF::Utils
       'extension' => extension
     }
     if content_type && content_type.match(/^image/)
-      res = image_attrs(data).merge(res)
+      attrs = image_attrs(data)
+      res['content_type'] ||= attrs['content_type']
+      res['width'] ||= attrs['width']
+      res['height'] ||= attrs['height']
     end
     res
   end
@@ -107,7 +110,10 @@ module OBF::Utils
         'data' => File.read(url),
         'content_type' => types[0] && types[0].to_s
       }
-      image = image_attrs(url).merge(image)
+      attrs = image_attrs(url)
+      image['content_type'] ||= attrs['content_type']
+      image['width'] ||= attrs['width']
+      image['height'] ||= attrs['height']
     end
     return nil unless image
     str = "data:" + image['content_type']
@@ -335,7 +341,10 @@ module OBF::Utils
         file.binmode
         file.write raw
         file.close
-        attrs = (OBF::Utils.image_attrs(file.path) || {}).merge(attrs)
+        more_attrs = OBF::Utils.image_attrs(file.path)
+        attrs['content_type'] ||= more_attrs['content_type']
+        attrs['width'] ||= more_attrs['width']
+        attrs['height'] ||= more_attrs['height']
       end
       attrs
     end

metadata

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