mini_magick 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8921e089d8d63d1391e76876bc63b4e3ff953706
-  data.tar.gz: 38930195578ded9545d86b4225718671a9cd8b6a
+  metadata.gz: 21f140f463e39c25ff85d153dde2633ae64253fc
+  data.tar.gz: 09fcec5741441ab2b4d7f8346ddfa2d6d5c40a51
 SHA512:
-  metadata.gz: 39cc0fccd098a964a02be8e2cde7565d492ab9a5831df89a2f1b90d751d67368c13584c05ef3253aab51f8aecf107a52ca489a6849bd32e80a334869500f4628
-  data.tar.gz: 9c620a81d8b8e601a172d3b8333f4020048e2b7d385ce40fe85caff7f6df7480f1e08c8046d8fa10d66164eb264efe06d9303f111444f55c6193546ca34ab0f2
+  metadata.gz: 6daee1a467de3117d0278a79d6006446c35bcf64afc746fa7ae04a45ee53b26334c171d7f73e58e0de97792496d82e4a00c336511e62427c55bb97e67f278f40
+  data.tar.gz: 87a1ccb4e52bbfd6fcfe4f4251f4d6711dd79aaa4d935b10d35c04db27ff11236dfca5422efb67c704c6953e54939751d4419cf1ca9d0bc63d91787b473ad3d3

data/lib/mini_magick/image/info.rb

@@ -25,6 +25,8 @@ module MiniMagick
           raw_exif(value)
         when "exif"
           exif
+        when "details"
+          details
         else
           raw(value)
         end
@@ -53,9 +55,7 @@ module MiniMagick
       end
 
       def colorspace
-        @info.fetch("colorspace") do
-          @info["colorspace"] = self["%r"]
-        end
+        @info["colorspace"] ||= self["%r"]
       end
 
       def mime_type
@@ -75,10 +75,10 @@ module MiniMagick
       end
 
       def exif
-        @info.fetch("exif") do
+        @info["exif"] ||= (
           output = self["%[EXIF:*]"]
           pairs = output.gsub(/^exif:/, "").split("\n").map { |line| line.split("=") }
-          exif = Hash[pairs].tap do |hash|
+          Hash[pairs].tap do |hash|
             ASCII_ENCODED_EXIF_KEYS.each do |key|
               next unless hash.has_key?(key)
 
@@ -86,22 +86,40 @@ module MiniMagick
               hash[key] = decode_comma_separated_ascii_characters(value)
             end
           end
-
-          @info["exif"] = exif
-        end
+        )
       end
 
       def raw(value)
-        key = "raw:#{value}"
-        @info.fetch(key) do
-          @info[key] = identify { |b| b.format(value) }
-        end
+        @info["raw:#{value}"] ||= identify { |b| b.format(value) }
       end
 
       def signature
-        @info.fetch("signature") do
-          @info["signature"] = self["%#"]
-        end
+        @info["signature"] ||= self["%#"]
+      end
+
+      def details
+        @info["details"] ||= (
+          details_string = identify(&:verbose)
+          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
+            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
+            end
+
+            details_hash
+          end
+        )
       end
 
       def identify
@@ -113,7 +131,6 @@ module MiniMagick
 
       def decode_comma_separated_ascii_characters(encoded_value)
         return encoded_value unless encoded_value.include?(',')
-
         encoded_value.scan(/\d+/).map(&:to_i).map(&:chr).join
       end
 

data/lib/mini_magick/image.rb

@@ -258,6 +258,11 @@ module MiniMagick
     # @return [String]
     #
     attribute :signature
+    ##
+    # Returns the information from `identify -verbose` in a Hash format.
+    #
+    # @return [Hash]
+    attribute :details
 
     ##
     # Use this method if you want to access raw Identify's format API.
@@ -424,7 +429,7 @@ module MiniMagick
     #
     # @see http://www.imagemagick.org/script/composite.php
     #
-    def composite(other_image, output_extension = 'jpg', mask = nil)
+    def composite(other_image, output_extension = type.downcase, mask = nil)
       output_tempfile = MiniMagick::Utilities.tempfile(".#{output_extension}")
 
       MiniMagick::Tool::Composite.new do |composite|

data/lib/mini_magick/version.rb

@@ -8,7 +8,7 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -9,10 +9,11 @@ authors:
 - Peter Kieltyka
 - James Miller
 - Thiago Fernandes Massa
+- Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,6 +64,7 @@ email:
 - peter@nulayer.com
 - bensie@gmail.com
 - thiagown@gmail.com
+- janko.marohnic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []