carrierwave-vips 0.9.9 → 1.0.0

data/lib/carrierwave/vips.rb

@@ -36,6 +36,10 @@ module CarrierWave
       def convert(extension)
         process :convert => extension
       end
+
+      def strip
+        process :strip
+      end
     end
 
     ##
@@ -51,18 +55,30 @@ module CarrierWave
         image
       end
     end
-    
+
+    ##
+    # Remove all exif and icc data when writing to a file. This method does
+    # not actually remove any metadata but rather marks it to be removed when
+    # writing the file.
+    #
+    def strip
+      manipulate! do |image|
+        @_strip = true
+        image
+      end
+    end
+
     ##
     # Convert the file to a different format
     #
     #
     # === Parameters
-    # [f (String)] the format for the file format (jpeg, png, gif)
+    # [f (String)] the format for the file format (jpeg, png)
     # [opts (Hash)] options to be passed to converting function (ie, :interlace => true for png)
     #
     def convert(f, opts = {})
       f = f.to_s.downcase
-      allowed = %w(jpeg png gif)
+      allowed = %w(jpeg png)
       raise ArgumentError, "Format must be one of: #{allowed.join(',')}" unless allowed.include?(f)
       @_format = f
       @_format_opts = opts
@@ -159,27 +175,35 @@ module CarrierWave
       @_vimage ||= VIPS::Image.new(current_path)
       @_vimage = yield @_vimage
     rescue => e
-      raise CarrierWave::ProcessingError.new("Failed to manipulate file, maybe it is not an image? Original Error: #{e}")
+      raise CarrierWave::ProcessingError.new("Failed to manipulate file, maybe it is not a supported image? Original Error: #{e}")
     end
-    
+
     def process!(*)
       ret = super
       if @_vimage
         tmp_name = current_path.sub(/(\.[a-z]+)$/i, '_tmp\1')
-        if @_format
-          @vimage.send(format, tmp_name, @_format_opts)
-        else
-          @_vimage.write(tmp_name)
+        writer = writer_class.send(:new, @_vimage, @_format_opts)
+        if @_strip
+          writer.remove_exif
+          writer.remove_icc
         end
+        writer.write(tmp_name)
         FileUtils.mv(tmp_name, current_path)
         @_vimage = nil
-        @_format = nil
       end
       ret
     end
-    
+
   private
-    
+
+    def writer_class
+      case @_format
+        when 'jpeg' then VIPS::JPEGWriter
+        when 'png' then VIPS::PNGWriter
+        else VIPS::Writer
+      end
+    end
+
     def resize_image(image, width, height, min_or_max = :min)
       ratio = get_ratio image, width, height, min_or_max
       if jpeg? # find the shrink ratio for loading

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-vips
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies: []
 description: Adds VIPS support to CarrierWave
 email: eltiare@github.com