carrierwave-vips 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cbfca259dba6306ed6a192de3efe5efcd002c6
-  data.tar.gz: c7fa49c3e3b663778a57bd0013b603efd9a87b87
+  metadata.gz: 396ab1d1691448f43668aac98834ef7632a4ef3f
+  data.tar.gz: 675e9ed21120941cda965f68e1409377199a8147
 SHA512:
-  metadata.gz: 15d8611ba4a8463f8be66f7b896049035511bd5bdfd2517927358b111406ed2d8961003cdece16a68c379d29c54fbb9564caa917d287375f3371411da9bc38fd
-  data.tar.gz: 5e3c97f22de79c6ec428c3892edf7db9eac1d457e801bdd2c66bf1ff016a647845c47c7fdfe67b506b1c880d7bb2b38aadf3f96e2d6cb4e6f29bd9eb47863c50
+  metadata.gz: 1bbddce513e5a8e3e306fac9076faf1b9507107fc5455a4f768f774fe04bdfc53371497fe50efe528ac9b739417d26c90ea468b157c7bd5d38406993bc9c4c1b
+  data.tar.gz: 1001757f7a13538405ffad122011bdad2e58df077b22f52e096e7a80fb6c2544275a53884d0b6ec4b0ea23de777b12f96d13972160885e8f4533707c7baaf5fd

data/lib/carrierwave/vips.rb

@@ -9,7 +9,7 @@ module CarrierWave
         [ -1, 24, -1 ],
         [ -1, -1, -1 ]
       ]
-      ::VIPS::Mask.new conv_mask, 16
+      ::Vips::Image.new_from_array conv_mask, 16
     end
 
     def self.included(base)
@@ -40,6 +40,34 @@ module CarrierWave
       def strip
         process :strip
       end
+
+      def auto_orient
+        process :auto_orient
+      end
+    end
+
+    ##
+    # Read the camera EXIF data to determine orientation and adjust accordingly
+    #
+    def auto_orient
+      manipulate! do |image|
+        o = image.get('exif-Orientation').to_i rescue nil
+        o ||= image.get('exif-ifd0-Orientation').to_i rescue 1
+        case o
+          when 1
+            # Do nothing, everything is peachy
+          when 6
+            image.rot270
+          when 8
+            image.rot180
+          when 3
+            image.rot90
+          else
+            raise('Invalid value for Orientation: ' + o.to_s)
+        end
+        image.set('exif-Orientation', '')
+        image.set('exif-ifd0-Orientation', '')
+      end
     end
 
     ##
@@ -50,10 +78,8 @@ module CarrierWave
     # [percent (Integer)] quality from 0 to 100
     #
     def quality(percent)
-      manipulate! do |image|
-        @_format_opts = { :quality => percent } if jpeg? || @_format=='jpeg'
-        image
-      end
+      write_opts[:Q] = percent
+      get_image
     end
 
     ##
@@ -62,10 +88,8 @@ module CarrierWave
     # writing the file.
     #
     def strip
-      manipulate! do |image|
-        @_strip = true
-        image
-      end
+      write_opts[:strip] = true
+      get_image
     end
 
     ##
@@ -77,11 +101,14 @@ module CarrierWave
     # [opts (Hash)] options to be passed to converting function (ie, :interlace => true for png)
     #
     def convert(f, opts = {})
+      opts = opts.dup
       f = f.to_s.downcase
-      allowed = %w(jpeg png)
+      allowed = %w(jpeg jpg png)
       raise ArgumentError, "Format must be one of: #{allowed.join(',')}" unless allowed.include?(f)
-      @_format = f
-      @_format_opts = opts
+      self.format_override = f == 'jpeg' ? 'jpg' : f
+      opts[:Q] = opts.delete(:quality) if opts.has_key?(:quality)
+      write_opts.merge!(opts)
+      get_image
     end
 
     ##
@@ -118,17 +145,22 @@ module CarrierWave
 
         image = resize_image image, new_width, new_height, :max
 
-        if image.x_size > new_width
+        if image.width > new_width
           top = 0
-          left = (image.x_size - new_width) / 2
-        elsif image.y_size > new_height
+          left = (image.width - new_width) / 2
+        elsif image.height > new_height
           left = 0
-          top = (image.y_size - new_height) / 2
+          top = (image.height - new_height) / 2
         else
           left = 0
           top = 0
         end
 
+        # Floating point errors can sometimes chop off an extra pixel
+        # TODO: fix all the universe so that floating point errors never happen again
+        new_height = image.height if image.height < new_height
+        new_width = image.width if image.width < new_width
+
         image.extract_area(left, top, new_width, new_height)
 
       end
@@ -147,7 +179,7 @@ module CarrierWave
     #
     def resize_to_limit(new_width, new_height)
       manipulate! do |image|
-        image = resize_image(image,new_width,new_height) if new_width < image.x_size || new_height < image.y_size
+        image = resize_image(image,new_width,new_height) if new_width < image.width || new_height < image.height
         image
       end
     end
@@ -155,18 +187,18 @@ module CarrierWave
     ##
     # Manipulate the image with Vips. Saving of the image is delayed until after
     # all the process blocks have been called. Make sure you always return an
-    # VIPS::Image object from the block
+    # Vips::Image object from the block
     #
     # === Gotcha
     #
-    # This method assumes that the object responds to +current_path+.
-    # Any class that this module is mixed into must have a +current_path+ method.
+    # This method assumes that the object responds to +current_path+ and +file+.
+    # Any class that this module is mixed into must have a +current_path+ and a +file+ method.
     # CarrierWave::Uploader does, so you won't need to worry about this in
     # most cases.
     #
     # === Yields
     #
-    # [VIPS::Image] for further manipulation
+    # [Vips::Image] for further manipulation
     #
     # === Raises
     #
@@ -174,14 +206,7 @@ module CarrierWave
     #
 
     def manipulate!
-      cache_stored_file! unless cached?
-      @_vimage ||= if jpeg?
-          VIPS::Image.jpeg(current_path, :sequential => true)
-        elsif png?
-          VIPS::Image.png(current_path, :sequential => true)
-        else
-          VIPS::Image.new(current_path)
-        end
+      @_vimage ||= get_image
       @_vimage = yield @_vimage
     rescue => e
       raise CarrierWave::ProcessingError.new("Failed to manipulate file, maybe it is not a supported image? Original Error: #{e}")
@@ -190,59 +215,73 @@ module CarrierWave
     def process!(*)
       ret = super
       if @_vimage
-        tmp_name = current_path.sub(/(\.[[:alnum:]]+)$/i, '_tmp\1')
-        writer = writer_class.send(:new, @_vimage, @_format_opts)
-        if @_strip
-          writer.remove_exif
-          writer.remove_icc
-        end
-        writer.write(tmp_name)
+        ext_regex = /(\.[[:alnum:]]+)$/
+        ext = format_override ? "_tmp.#{format_override}" : '_tmp\1'
+        tmp_name = current_path.sub(ext_regex, ext)
+        opts = write_opts.dup
+        opts.delete(:Q) unless write_jpeg?(tmp_name)
+        @_vimage.write_to_file(tmp_name, **opts)
         FileUtils.mv(tmp_name, current_path)
         @_vimage = nil
       end
       ret
     end
 
+    def filename
+      return unless original_filename
+      format_override ? original_filename.sub(/\.[[:alnum:]]+$/, ".#{format_override}") : original_filename
+    end
+
   private
 
-    def writer_class
-      case @_format
-        when 'jpeg' then VIPS::JPEGWriter
-        when 'png' then VIPS::PNGWriter
-        else VIPS::Writer
-      end
+    attr_accessor :format_override
+
+    def get_image
+      cache_stored_file! unless cached?
+      @_vimage ||= if jpeg? || png?
+                     ::Vips::Image.new_from_file(current_path, access: :sequential)
+                   else
+                     ::Vips::Image.new_from_file(current_path)
+                   end
+    end
+
+    def write_opts
+      @_write_opts ||= {}
     end
 
     def resize_image(image, width, height, min_or_max = :min)
       ratio = get_ratio image, width, height, min_or_max
       return image if ratio == 1
       if ratio > 1
-        image = image.affinei_resize :nearest, ratio
+        image = image.resize(ratio, kernel: :nearest)
       else
-        if ratio <= 0.5
-          factor = (1.0 / ratio).floor
-          image = image.shrink(factor)
-          image = image.tile_cache(image.x_size, 1, 30)
-          ratio = get_ratio image, width, height, min_or_max
-        end
-        image = image.affinei_resize :bicubic, ratio
+        image = image.resize(ratio, kernel: :cubic)
         image = image.conv SHARPEN_MASK
       end
       image
     end
 
     def get_ratio(image, width,height, min_or_max = :min)
-      width_ratio = width.to_f / image.x_size
-      height_ratio = height.to_f / image.y_size
+      width_ratio = width.to_f / image.width
+      height_ratio = height.to_f / image.height
       [width_ratio, height_ratio].send(min_or_max)
     end
 
     def jpeg?(path = current_path)
-      path =~ /.*jpg$/i or path =~ /.*jpeg$/i
+      %w(jgp jpeg).include? ext(path)
     end
 
     def png?(path = current_path)
-      path =~ /.*png$/i
+      ext(path) == 'png'
+    end
+
+    def write_jpeg?(path)
+      format_override == 'jpg' || jpeg?(path)
+    end
+
+    def ext(path)
+      matches = /\.([[:alnum:]]+)$/.match(path)
+      matches && matches[1].downcase
     end
 
   end # Vips

metadata

@@ -1,111 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-vips
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Nicoll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-migrations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds VIPS support to CarrierWave
@@ -125,17 +69,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds VIPS support to CarrierWave