dynamic_image 2.0.0.beta4 → 2.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13ff169ce75c97a2fd1c4f6e5ed7f4236ca7c427
-  data.tar.gz: 289506e149b4e4b8a1141e31767f885174a765d6
+  metadata.gz: cd6783a5824c2de5a61c549f88613c5461779e9b
+  data.tar.gz: f1f6a7b013b1ec0a0bdac1dd1dcd48fc72305112
 SHA512:
-  metadata.gz: a05f6fb62543baa9d489ccf47aebb308513db35aaf374eedbfeb91252b844ace7cc00bd289be5c2ff13b893ea481b73103ded631837f9582a00fe61714f3a5f0
-  data.tar.gz: 4acdbae86426d975ceed4ca44369303bbec92a6c5c757d4a3960f035ff19bd5313626783a01c3fd00b257c3a82a4659c4729a90d79c3d318bc1b94881622f6b0
+  metadata.gz: 0f1a9443802ed6be61bd135800c748a85da7b2c72cc3bf3a832a21ac91f3c02bce47aec16e0a259b5fbd3ba7bccef78e5ba4c7b3063dfc752dbf08d09384ed7b
+  data.tar.gz: eb357b816a71f5b6e3d58a851bbdfd9795d75ba91a5f8629c7922fcc929e203bcc3c8970d1f9c04b23fff0a5ac40db37883fb8b17f4d63fdf0b8e93a172d84c7

data/README.md

@@ -48,33 +48,33 @@ that the generated URLs are properly signed and timestamped.
 To display the image at it's original size, use `dynamic_image_tag` without
 any options.
 
-```html
+```erb
 <%= dynamic_image_tag image %>
 ```
 
 To resize it, specify a max size. This will scale the image down to fit, but
 no cropping will occur.
 
-```html
+```erb
 <%= dynamic_image_tag image, size: '400x400' %>
 ```
 
 Setting `crop: true` will crop the image to the exact size.
 
-```html
+```erb
 <%= dynamic_image_tag image, size: '400x400', crop: true %>
 ```
 
 Omitting either dimension will render the image at an exact width or height.
 
-```html
+```erb
 <%= dynamic_image_tag image, size: '400x' %>
 ```
 
 `dynamic_image_path` and `dynamic_image_url` act pretty much like regular URL
 helpers.
 
-```html
+```erb
 <%= link_to "See image", dynamic_image_path(image) %>
 ```
 
@@ -83,4 +83,4 @@ helpers.
 Copyright 2006-2014 Inge Jørgensen
 
 DynamicImage is released under the
-[MIT License](http://www.opensource.org/licenses/MIT).
+[MIT License](http://www.opensource.org/licenses/MIT).

data/lib/dynamic_image/controller.rb

@@ -43,6 +43,7 @@ module DynamicImage
       end
     end
 
+    # Returns the requested size as a vector.
     def requested_size
       Vector2d.parse(params[:size])
     end

data/lib/dynamic_image/processed_image.rb

@@ -38,9 +38,6 @@ module DynamicImage
       normalized do |image|
         image.crop image_sizing.crop_geometry_string(size)
         image.resize size
-        if content_type == 'image/gif'
-          image.coalesce
-        end
       end
     end
 
@@ -49,6 +46,7 @@ module DynamicImage
     # * Applies EXIF rotation
     # * CMYK images are converted to sRGB
     # * Strips metadata
+    # * Optimizes GIFs
     # * Performs format conversion if the requested format is different
     #
     # ==== Example
@@ -61,10 +59,10 @@ module DynamicImage
       require_valid_image!
       process_data do |image|
         image.combine_options do |combined|
-          image.auto_orient
-          image.colorspace('sRGB') if needs_colorspace_conversion?
+          combined.auto_orient
+          combined.colorspace('sRGB') if needs_colorspace_conversion?
           yield(combined) if block_given?
-          image.strip
+          optimize(combined)
         end
         image.format(format) if needs_format_conversion?
       end
@@ -72,10 +70,22 @@ module DynamicImage
 
     private
 
+    def coalesced(image)
+      if gif?
+        image.coalesce
+        image = MiniMagick::Image.read(image.to_blob)
+      end
+      image
+    end
+
     def format
       @format || record_format
     end
 
+    def gif?
+      content_type == 'image/gif'
+    end
+
     def image_sizing
       @image_sizing ||= DynamicImage::ImageSizing.new(record, uncropped: @uncropped)
     end
@@ -88,8 +98,15 @@ module DynamicImage
       format != record_format
     end
 
+    def optimize(image)
+      if gif?
+        image.layers 'optimize'
+      end
+      image.strip
+    end
+
     def process_data(&block)
-      image = MiniMagick::Image.read(record.data)
+      image = coalesced(MiniMagick::Image.read(record.data))
       yield(image)
       result = image.to_blob
       image.destroy!

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DynamicImage
-  VERSION = "2.0.0.beta4"
+  VERSION = "2.0.0.beta5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails