vitals_image 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c75ba4087e4d7a4028c7264bb3aa2fe3a5084eb1f627714d58e468f3a999289
-  data.tar.gz: 625fe4c2c4462b749b0c841e218461c7740e633e054a2f269b9b34f41b5fde04
+  metadata.gz: b9a6e4da54850851d9b8e5366d3e07053272e32393d821d120f223045fc298d9
+  data.tar.gz: 10353144a856a6f24cc830ea3087f24d390bbecf4c962f5600ab6592344aac84
 SHA512:
-  metadata.gz: b8042b6efa3d6c6164a62a4ccc6b576a9993525f8efbbd8e19ad0a1fa7ac6d15d28c0e68e5604ae22823c6a39266747c3180f72350bce97889c3a3a228f8c02c
-  data.tar.gz: fb2a462820d0228734fef483bee2beefefab5065556a8e916c37493c9ffe651c442b21cd193f82375b59e2c19b72bd702a9d91abc10c636fbcac90cc5f2f6904
+  metadata.gz: ba5154564de3e592ddb4cec088397e31e46418a14e2517b7da93496a70aed868c43249e78740bcddc9d73cce61f5b44a6e6bf6d74240b38bf10ebdb30522d70a
+  data.tar.gz: db3cc9c5230f55c626a92bc340eef681d7da0b7d7fc3ab47c263a805a88debca84395c7865e49a77b96bf44810000811bb204b4af8c5c02e11e1cbd2f97ea665

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [0.4.0] - 2021-07-06
+
+- Fixed resize and pad in vips
+- Fixed image quality in vips
+- Reduced JPEG quality from 85 to 80
+- Removed optimal quality
+- Updated Vitals Image to 0.5
+
+## [0.3.0] - 2021-05-22
+
+- Redo the image helper
+- Redo the active storage optimizer 
+
 ## [0.2.1] - 2021-05-22
 
 - Do not attempt to transform invariable images

data/app/helpers/vitals_image/tag_helper.rb

@@ -6,32 +6,17 @@ module VitalsImage
       source = image_url(source) if source.is_a?(String)
       optimizer = VitalsImage::Base.optimizer(source, options)
 
-      if !optimizer.variable?
-        vitals_image_invariable_tag(optimizer)
-      elsif optimizer.native_lazy_load?
-        vitals_image_variable_tag(optimizer)
-      else
-        vitals_image_lazy_tag(optimizer)
-      end
-    end
-
-    private
-      def vitals_image_invariable_tag(optimizer)
-        image_tag optimizer.src, optimizer.html_options
-      end
-
-      def vitals_image_variable_tag(optimizer)
-        url = vitals_image_url(optimizer.src, optimizer.html_options)
-        image_tag url, optimizer.html_options
-      end
-
-      def vitals_image_lazy_tag(optimizer)
+      if optimizer.non_native_lazy_load?
         url = vitals_image_url(optimizer.html_options["data"]["src"], optimizer.html_options)
         optimizer.html_options["data"]["src"] = url
-
         image_tag optimizer.src, optimizer.html_options
+      else
+        url = vitals_image_url(optimizer.src, optimizer.html_options)
+        image_tag url, optimizer.html_options
       end
+    end
 
+    private
       def vitals_image_url(source, options)
         active_storage_route = options.delete("active_storage_route") || VitalsImage.active_storage_route
 

data/lib/vitals_image/engine.rb

@@ -19,14 +19,15 @@ require "vitals_image/errors"
 require "vitals_image/optimizer"
 require "vitals_image/optimizer/blank"
 require "vitals_image/optimizer/url"
-require "vitals_image/optimizer/active_storage"
+require "vitals_image/optimizer/variable"
+require "vitals_image/optimizer/invariable"
 
 module VitalsImage
   class Engine < ::Rails::Engine
     isolate_namespace VitalsImage
 
     config.vitals_image                                 = ActiveSupport::OrderedOptions.new
-    config.vitals_image.optimizers                      = [VitalsImage::Optimizer::Blank, VitalsImage::Optimizer::ActiveStorage, VitalsImage::Optimizer::Url]
+    config.vitals_image.optimizers                      = [VitalsImage::Optimizer::Blank, VitalsImage::Optimizer::Variable, VitalsImage::Optimizer::Invariable, VitalsImage::Optimizer::Url]
     config.vitals_image.analyzers                       = [VitalsImage::Analyzer::UrlAnalyzer]
 
     config.eager_load_namespaces << VitalsImage
@@ -69,13 +70,13 @@ module VitalsImage
     initializer "vitals_image.optimizations" do
       config.after_initialize do |app|
         if VitalsImage.image_library == :vips
-          VitalsImage.jpeg_conversion   ||= { saver: { strip: true, quality: 85, interlace: true, optimize_coding: true, trellis_quant: true, quant_table: 3, background: 255 }, format: "jpg" }
-          VitalsImage.jpeg_optimization ||= { saver: { strip: true, quality: 85, interlace: true, optimize_coding: true, trellis_quant: true, quant_table: 3 } }
+          VitalsImage.jpeg_conversion   ||= { saver: { strip: true, quality: 80, interlace: true, optimize_coding: true, trellis_quant: true, quant_table: 3, background: 255 }, format: "jpg" }
+          VitalsImage.jpeg_optimization ||= { saver: { strip: true, quality: 80, interlace: true, optimize_coding: true, trellis_quant: true, quant_table: 3 } }
           VitalsImage.png_optimization  ||= { saver: { strip: true, compression: 9 } }
         else
-          VitalsImage.jpeg_conversion   ||= { saver: { strip: true, quality: 85, interlace: "JPEG", sampling_factor: "4:2:0", colorspace: "sRGB", background: :white, flatten: true, alpha: :off }, format: "jpg" }
-          VitalsImage.jpeg_optimization ||= { saver: { strip: true, quality: 85, interlace: "JPEG", sampling_factor: "4:2:0", colorspace: "sRGB" } }
-          VitalsImage.png_optimization  ||= { saver: { strip: true, quality: 00 } }
+          VitalsImage.jpeg_conversion   ||= { saver: { strip: true, quality: 80, interlace: "JPEG", sampling_factor: "4:2:0", colorspace: "sRGB", background: :white, flatten: true, alpha: :off }, format: "jpg" }
+          VitalsImage.jpeg_optimization ||= { saver: { strip: true, quality: 80, interlace: "JPEG", sampling_factor: "4:2:0", colorspace: "sRGB" } }
+          VitalsImage.png_optimization  ||= { saver: { strip: true, quality: 75 } }
         end
       end
     end

data/lib/vitals_image/gem_version.rb

@@ -8,8 +8,8 @@ module VitalsImage
 
   module VERSION
     MAJOR = 0
-    MINOR = 2
-    TINY  = 1
+    MINOR = 4
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/vitals_image/optimizer.rb

@@ -26,7 +26,7 @@ module VitalsImage
 
     def html_options
       @html_options ||= begin
-        html_options = @options.dup
+        html_options = @options.dup.except("lazy_load")
         html_options["width"]           = width
         html_options["height"]          = height
         html_options["style"]           = style
@@ -57,11 +57,6 @@ module VitalsImage
       lazy_load? && VitalsImage.lazy_loading == :native
     end
 
-    # Override this method in a concrete subclass. Have it return true the source is an active storage blob
-    def variable?
-      false
-    end
-
     private
       def style
         if analyzed? && !requested_height

data/lib/vitals_image/optimizer/invariable.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module VitalsImage
+  class Optimizer::Invariable < Optimizer
+    def self.accept?(source)
+      source.respond_to?(:variable?) && !source.variable?
+    end
+
+    private
+      def source_url
+        @source
+      end
+
+      def style
+        if !analyzed?
+          # Do nothing
+        elsif !requested_height
+          "height:auto;"
+        elsif fixed_dimensions?
+          "object-fit: contain;"
+        end
+      end
+
+      def original_width
+        metadata[:width]
+      end
+
+      def original_height
+        metadata[:height]
+      end
+
+      def metadata
+        @source.metadata
+      end
+
+      def analyzed?
+        metadata[:analyzed]
+      end
+  end
+end

data/lib/vitals_image/optimizer/{active_storage.rb → variable.rb}

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
 module VitalsImage
-  class Optimizer::ActiveStorage < Optimizer
+  class Optimizer::Variable < Optimizer
     def self.accept?(source)
-      source.is_a?(::ActiveStorage::Attached) || source.is_a?(::ActiveStorage::Attachment) || source.is_a?(::ActiveStorage::Blob)
-    end
-
-    def variable?
-      @source.variable?
+      source.respond_to?(:variable?) && source.variable?
     end
 
     private
@@ -65,31 +61,31 @@ module VitalsImage
       end
 
       def optimize_jpeg
-        @source.variant optimizations_with_optimal_quality(VitalsImage.jpeg_optimization)
+        @source.variant resize_and_flatten(VitalsImage.jpeg_optimization)
       end
 
       def optimize_png
         if alpha? || !VitalsImage.convert_to_jpeg
-          @source.variant optimizations(VitalsImage.png_optimization)
+          @source.variant resize(VitalsImage.png_optimization)
         else
-          @source.variant optimizations_with_optimal_quality(VitalsImage.jpeg_conversion)
+          @source.variant resize_and_flatten(VitalsImage.jpeg_conversion)
         end
       end
 
       def optimize_generic
         if alpha? || !VitalsImage.convert_to_jpeg
-          @source.variant optimizations
+          @source.variant resize
         else
-          @source.variant optimizations_with_optimal_quality(VitalsImage.jpeg_conversion)
+          @source.variant resize_and_flatten(VitalsImage.jpeg_conversion)
         end
       end
 
-      def optimizations_with_optimal_quality(defaults = {})
-        quality = @source.metadata[:optimal_quality] || defaults[:saver][:quality]
-        defaults.merge quality: quality, "#{resize_mode}": dimensions
+      def resize_and_flatten(defaults = {})
+        resize  = resize_mode != :resize_and_pad ? dimensions : dimensions.push(background: [255])
+        defaults.merge "#{resize_mode}": resize
       end
 
-      def optimizations(defaults = {})
+      def resize(defaults = {})
         defaults.merge "#{resize_mode}": dimensions
       end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vitals_image
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Breno Gazzola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -253,9 +253,10 @@ files:
 - lib/vitals_image/errors.rb
 - lib/vitals_image/gem_version.rb
 - lib/vitals_image/optimizer.rb
-- lib/vitals_image/optimizer/active_storage.rb
 - lib/vitals_image/optimizer/blank.rb
+- lib/vitals_image/optimizer/invariable.rb
 - lib/vitals_image/optimizer/url.rb
+- lib/vitals_image/optimizer/variable.rb
 - lib/vitals_image/test_case.rb
 - lib/vitals_image/version.rb
 homepage: https://github.com/FestaLab/vitals_image