mini_magick 4.2.1 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49b81b26769187774c378282a38bcdc9dfdacc8b
-  data.tar.gz: cce11e45efbe18ab9a6a2d4d70d5d6ff4f2d02b4
+  metadata.gz: 5b11755872c6d7075df247147d9e999ef3bca850
+  data.tar.gz: 622b385dab7bc2d5b87a821ececef02cb43fe8ad
 SHA512:
-  metadata.gz: 665e1299b109c62778a9d75569e1fd3db842af8d1bd6c19bdf6026a325f9c971a52d6f6700d90bf3e748278c42cb25f03e1a1339cbf61890cf67c3e1112bc170
-  data.tar.gz: 846180eb935c1209a479dcb3bfbb3960855b9fe10164ea01f747ede2f6604df01e35aad2afa29e706d1c7fa5a3c5d78ebf3fe7444cf8b8cce285e511ed79c96a
+  metadata.gz: a471047183fcc4543156d4d5bd262574335446eeb17de78083779dccc03a375f8c3b48597ffc4939cbca07934c70c510778acbe349a1e2ef7e1e9650b646086d
+  data.tar.gz: cf48a927e44d8c4978d4a2f8bc4d2e981d4ef79bc2fc9c2be484ab1a243dcd9a6c90eae98a2bd8419d93ff0c50434d562c9d926de12470ec7b41d8b1af2a0edb

data/lib/mini_magick/image.rb

@@ -489,14 +489,12 @@ module MiniMagick
       end
     end
 
-    private
-
     def mogrify(page = nil)
       @info.clear
 
       MiniMagick::Tool::Mogrify.new do |builder|
         builder.instance_eval do
-          def format(*)
+          def format(*args)
             fail NoMethodError,
               "you must call #format on a MiniMagick::Image directly"
           end
@@ -508,6 +506,8 @@ module MiniMagick
       self
     end
 
+    private
+
     def layer?
       path =~ /\[\d+\]$/
     end

data/lib/mini_magick/image/info.rb

@@ -52,6 +52,8 @@ module MiniMagick
 
           @info.fetch(value)
         end
+      rescue ArgumentError, TypeError
+        raise MiniMagick::Invalid, "image data can't be read"
       end
 
       def colorspace
@@ -103,18 +105,15 @@ module MiniMagick
           details_string.each_line.with_object([]).inject({}) do |details_hash, (line, key_stack)|
             level = line[/^\s*/].length / 2 - 1
             next details_hash if level == -1 # we ignore the root level
+            key_stack.pop if level < key_stack.size
+
+            key, _, value = line.partition(/:[\s\n]/).map(&:strip)
             hash = key_stack.inject(details_hash) { |hash, key| hash.fetch(key) }
-            key, value = line.split(":", 2).map(&:strip)
-
-            if level == key_stack.size
-              if value.empty?
-                hash[key] = {}
-                key_stack.push key
-              else
-                hash[key] = value
-              end
-            elsif level < key_stack.size
-              key_stack.pop
+            if value.empty?
+              hash[key] = {}
+              key_stack.push key
+            else
+              hash[key] = value
             end
 
             details_hash

data/lib/mini_magick/tool.rb

@@ -184,8 +184,6 @@ module MiniMagick
       self << ")"
     end
 
-    private
-
     ##
     # Dynamically generates modules with dynamically generated option methods
     # for each command-line tool. It uses the `-help` page of a command-line

data/lib/mini_magick/version.rb

@@ -9,7 +9,7 @@ module MiniMagick
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 1
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.3
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake