dynamic_image 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3ee783faea1d0604cc082cfe2122d3b0ffc6afb06521a9ed6f69bbf151450e7
-  data.tar.gz: 2d50c97f0994a8c0a9ae85bdd25178f22873872d6a0972967b68989b707a1400
+  metadata.gz: 63df20c9bb3d9e6ec0c62667a3d885086f2f17e2e5d3cf7181dcdef9d6c52057
+  data.tar.gz: f94ae92030634af73011e745b96f445091c5140824b309a23ff653bc75f2d831
 SHA512:
-  metadata.gz: 882830b119db3024e8c54a8c6485f853f455a87ee428932da8e7bdd53531514fb296a71d7209223e524c806e27ad70757bcf9744e7db890d212b8b4c3b0a7f1d
-  data.tar.gz: e6a5d45af7f3696ce1cea31558a3a1ecae7481740301cff5dbc51c4b9ac44dadb7b9b735e35543754eefd07f891b80f7c5d38b7e13b800971278535dd182a881
+  metadata.gz: 10cda7189c6319e1e6e73c07856cf5d302d870485f5139e7389efa2c9f12fb2302e242f3fa7924d7ba4732c6525ad55e5b4e54d8e6430d88211dcb1dc0f1ce14
+  data.tar.gz: 8077111478b4900b85086bd85849c94eb6fd372533ea3529a89c035d267e4c1b97e302f9a87b6621d40f6db9d9cc17bdf9e4f39696034f7ec7e9c111c885ab94

data/README.md

@@ -1,7 +1,5 @@
 [![Version](https://img.shields.io/gem/v/dynamic_image.svg?style=flat)](https://rubygems.org/gems/dynamic_image)
 ![Build](https://github.com/elektronaut/dynamic_image/workflows/Build/badge.svg)
-[![Code Climate](https://codeclimate.com/github/elektronaut/dynamic_image/badges/gpa.svg)](https://codeclimate.com/github/elektronaut/dynamic_image)
-[![Code Climate](https://codeclimate.com/github/elektronaut/dynamic_image/badges/coverage.svg)](https://codeclimate.com/github/elektronaut/dynamic_image)
 
 # DynamicImage
 

data/lib/dynamic_image/controller.rb

@@ -64,11 +64,16 @@ module DynamicImage
     end
 
     def process_and_send(image, options)
-      processed_image = DynamicImage::ProcessedImage.new(image, options)
-      send_data(processed_image.cropped_and_resized(requested_size),
-                filename: filename(processed_image.format),
-                content_type: processed_image.format.content_type,
-                disposition: "inline")
+      processed = DynamicImage::ProcessedImage.new(image, options)
+      variant = processed.variant_for(requested_size)
+      send_opts = { filename: filename(processed.format),
+                    content_type: processed.format.content_type,
+                    disposition: "inline" }
+      if variant
+        send_file(variant.data_file_path, **send_opts)
+      else
+        send_data(processed.cropped_and_resized(requested_size), **send_opts)
+      end
     end
 
     def render_image(options)
@@ -90,7 +95,7 @@ module DynamicImage
 
       respond_to do |format|
         format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
-          send_data(@record.data,
+          send_file(@record.data_file_path,
                     filename:,
                     content_type: @record.content_type,
                     disposition:)

data/lib/dynamic_image/image_processor.rb

@@ -49,14 +49,8 @@ module DynamicImage
 
     # Returns the image data as a binary string.
     def read
-      tempfile = Tempfile.new(["dynamic_image", target_format.extension],
-                              binmode: true)
-      tempfile.close
-      write(tempfile.path)
-      tempfile.open
-      tempfile.read
-    ensure
-      tempfile.close
+      image.write_to_buffer(target_format.extension,
+                            **target_format.save_options)
     end
 
     # Returns the image size as a Vector2d.

data/lib/dynamic_image/image_reader.rb

@@ -16,7 +16,8 @@ module DynamicImage
       if @data.is_a?(String)
         Vips::Image.new_from_buffer(@data, option_string)
       else
-        Vips::Image.new_from_file(@data.path + option_string, access: :random)
+        path = @data.is_a?(Pathname) ? @data.to_s : @data.path
+        Vips::Image.new_from_file(path + option_string, access: :random)
       end
     end
 
@@ -35,10 +36,14 @@ module DynamicImage
     end
 
     def read_file_header
-      data_stream = stream
-      header = data_stream.read(8)
-      data_stream.seek(0 - header.length, IO::SEEK_CUR) if header
-      header
+      if @data.is_a?(Pathname)
+        File.binread(@data.to_s, 8)
+      else
+        data_stream = stream
+        header = data_stream.read(8)
+        data_stream.seek(0 - header.length, IO::SEEK_CUR) if header
+        header
+      end
     end
 
     def stream

data/lib/dynamic_image/metadata.rb

@@ -3,8 +3,7 @@
 module DynamicImage
   # = DynamicImage Metadata
   #
-  # Parses metadata from an image. Expects to receive image data as a
-  # binary string.
+  # Parses metadata from an image. Accepts a Pathname, IO, or binary string.
   class Metadata
     def initialize(data)
       @data = data
@@ -60,26 +59,35 @@ module DynamicImage
       @metadata ||= read_metadata
     end
 
-    def read_image
-      yield reader.read.autorot
-    end
-
     def reader
       @reader ||= DynamicImage::ImageReader.new(@data)
     end
 
     def read_metadata
-      read_image do |image|
-        height = if image.get_fields.include?("page-height")
-                   image.get("page-height")
-                 else
-                   image.get("height")
-                 end
-
-        { width: image.get("width"),
-          height:,
-          colorspace: image.get("interpretation") }
-      end
+      image = reader.read
+
+      width = image.get("width")
+      height = if image.get_fields.include?("page-height")
+                 image.get("page-height")
+               else
+                 image.get("height")
+               end
+
+      width, height = height, width if rotated?(image)
+
+      { width:, height:, colorspace: image.get("interpretation") }
+    end
+
+    def orientation(image)
+      return 1 unless image.get_fields.include?("orientation")
+
+      image.get("orientation")
+    rescue Vips::Error
+      1
+    end
+
+    def rotated?(image)
+      orientation(image).between?(5, 8)
     end
   end
 end

data/lib/dynamic_image/model/transformations.rb

@@ -76,7 +76,7 @@ module DynamicImage
 
       def transform_image(&block)
         read_image_metadata if data_changed?
-        self.data = block.call(DynamicImage::ImageProcessor.new(data)).read
+        self.data = block.call(DynamicImage::ImageProcessor.new(Pathname(data_file_path))).read
         read_image_metadata
         self
       end

data/lib/dynamic_image/model.rb

@@ -106,7 +106,7 @@ module DynamicImage
     private
 
     def read_image_metadata
-      metadata = DynamicImage::Metadata.new(data)
+      metadata = DynamicImage::Metadata.new(Pathname(data_file_path))
       @valid_image = false
       return unless metadata.valid?
 

data/lib/dynamic_image/processed_image.rb

@@ -41,10 +41,24 @@ module DynamicImage
       return nil unless record.persisted?
 
       variant = record.variants.find_by(variant_params(size))
-      variant&.tap(&:data)
-    rescue Dis::Errors::NotFoundError
-      variant.destroy
-      nil
+      return nil unless variant
+
+      if Dis::Storage.exists?(variant.class.dis_type, variant.content_hash)
+        variant
+      else
+        variant.destroy
+        nil
+      end
+    end
+
+    # Find or create a variant for the given size, returning the variant
+    # record (not data). Returns nil if the record is not persisted.
+    def variant_for(size)
+      return nil unless record.persisted?
+
+      find_or_create_variant(size)
+    rescue ActiveRecord::RecordNotUnique
+      find_variant(size)
     end
 
     def format
@@ -68,7 +82,7 @@ module DynamicImage
     def normalized
       require_valid_image!
 
-      image = DynamicImage::ImageProcessor.new(record.data)
+      image = DynamicImage::ImageProcessor.new(Pathname(record.data_file_path))
       image = yield(image) if block_given?
       image.convert(format).read
     end

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicImage
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -15,20 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -47,16 +41,22 @@ dependencies:
   name: ruby-vips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: vector2d
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing
 test_files: []