active_analysis 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9bd54c9d6b6579f5419244bdce0170c10889efc633d363b2a9be8129335b0bf
-  data.tar.gz: bea8aa7a1e0f5c8d716c6d9eb2c3d253f5a1be3cb461484c16b5e281f47cd6bd
+  metadata.gz: 77a4b728e66fe4c463fabcdc68c89ab4d6b73971aec95f96ea0bf29fc944c866
+  data.tar.gz: cc74b804d1c0ca9c803027fe2427ad99cbcc1cf1764c691865f4f092acc682d1
 SHA512:
-  metadata.gz: 402b15df181ac8bc2f583e70d9f856d7b7a9271493883a5ee9b7998aa890cb15c771f68e5be12028b4bfca29bf2514886fd09d841106cba88bed50975067dedb
-  data.tar.gz: f35aa5ac09d2f3294512541733f38d5fa649c82994c685d26d92f9dd94f6f6e15a83fda66affae7553b7028fb1878542586242d524124f8afa6a8d226052e52a
+  metadata.gz: d6e6fe01cf6c05e6fbe3fa36fa7f1df96dfeb395566b1612b01da8105abe9546d5f994064cc7924c6cc8d076084f5d7bd2750f4662f670070214faf9781441f9
+  data.tar.gz: 3106253d44f736d2640c63bcb4bea1a04d4654d39d3e88f6ac3ebebf12c6848238f65f481e94511a69af74eed506a9b8a69c9c9e7a44963cdb775418ebb66830

data/CHANGELOG.md

@@ -1,10 +1,23 @@
 ## [Unreleased]
 
-## [0.3] - 2021-06-17
+- Make it easier to override target dssim and minimum quality in the optimal quality addon
+
+## [0.4.0] - 2021-06-22 
+
+- Remove the new Rails analyzers
+- Do not detect optimal quality of variants
+- Start optimal quality calculation at quality = 75 to match Vitals Image quality = 80
+- Fix Rubocop offenses
+
+## [0.3.1] - 2021-06-17
+
+- Fix vips image path call
+
+## [0.3.0] - 2021-06-17
 
 - Added addons feature
 
-## [0.2] - 2021-06-01
+## [0.2.0] - 2021-06-01
 
 - Added `opaque` metadata value to images
 

data/README.md

@@ -67,12 +67,11 @@ A modification of the original video analyzer. Requires the [FFmpeg](https://www
 Active Analysis allows additional features to be added to the image analyzers through addons. To create an addon simply inherit the `Addon` class and add it to the addons array in the configuration.
 ```ruby
 Rails.application.configure do |config|
-  config.active_analysis.addons << ActiveAnalysis::Addon::ImageAddon::OptimalQuality
+  config.active_analysis.addons << ActiveAnalysis::Addon::ImageAddon::WhiteBackground
 end
 ```
 
 The following addons available:
-- ImageAddon::OptimalQuality: An EXPERIMENTAL addon that calculates the optimal image quality using a DSSIM of 0.001. This addon is SLOOOOOOW.
 - ImageAddon::WhiteBackground: An EXPERIMENTAL addon that checks if the image has a white background. Requires both vips and image magick to be installed.
 
 ## Development

data/app/controllers/active_analysis/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveAnalysis
   class ApplicationController < ActionController::Base
   end

data/app/helpers/active_analysis/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveAnalysis
   module ApplicationHelper
   end

data/app/jobs/active_analysis/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveAnalysis
   class ApplicationJob < ActiveJob::Base
   end

data/app/mailers/active_analysis/application_mailer.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module ActiveAnalysis
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 end

data/app/models/active_analysis/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveAnalysis
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true

data/config/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 ActiveAnalysis::Engine.routes.draw do
 end

data/lib/active_analysis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_analysis/version"
 require "active_analysis/engine"
 

data/lib/active_analysis/addon/image_addon.rb

@@ -3,10 +3,11 @@
 require_relative "../addon"
 
 module ActiveAnalysis
-  # This is an abstract base class for image addons
+  # This is an abstract base class for image addons. Image addons are only executed for original
+  # blobs.
   class Addon::ImageAddon < Addon
     def self.accept?(blob)
-      blob.image?
+      blob.image? && blob.attachments.none? { |attachment| attachment.record_type == ActiveStorage::VariantRecord }
     end
 
     def metadata
@@ -14,4 +15,3 @@ module ActiveAnalysis
     end
   end
 end
-

data/lib/active_analysis/addon/image_addon/white_background.rb

@@ -60,4 +60,3 @@ module ActiveAnalysis
       end
   end
 end
-

data/lib/active_analysis/analyzer/audio_analyzer.rb

@@ -63,4 +63,3 @@ module ActiveAnalysis
       end
   end
 end
-

data/lib/active_analysis/analyzer/image_analyzer.rb

@@ -44,4 +44,3 @@ module ActiveAnalysis
       end
   end
 end
-

data/lib/active_analysis/analyzer/image_analyzer/image_magick.rb

@@ -38,9 +38,8 @@ module ActiveAnalysis
       def opaque?(image)
         return true unless image.data["channelDepth"].key?("alpha")
 
-        value = image.data["version"] =~ /7.\d/ ? 255 : 0
+        value = /7.\d/.match?(image.data["version"]) ? 255 : 0
         image.data["channelStatistics"]["alpha"]["mean"] == value
       end
   end
 end
-

data/lib/active_analysis/engine.rb

@@ -17,7 +17,6 @@ require_relative "analyzer/pdf_analyzer"
 
 require_relative "addon"
 require_relative "addon/image_addon"
-require_relative "addon/image_addon/optimal_quality"
 require_relative "addon/image_addon/white_background"
 
 module ActiveAnalysis
@@ -46,6 +45,9 @@ module ActiveAnalysis
       config.after_initialize do |app|
         if ActiveAnalysis.image_analyzer
           app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::ImageAnalyzer
+          app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::ImageAnalyzer::Vips if defined?(ActiveStorage::Analyzer::ImageAnalyzer::Vips)
+          app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::ImageAnalyzer::ImageMagick if defined?(ActiveStorage::Analyzer::ImageAnalyzer::ImageMagick)
+
           app.config.active_storage.analyzers.append Analyzer::ImageAnalyzer::Vips
           app.config.active_storage.analyzers.append Analyzer::ImageAnalyzer::ImageMagick
         end
@@ -56,7 +58,7 @@ module ActiveAnalysis
         end
 
         if ActiveAnalysis.audio_analyzer
-          app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::ImageAnalyzer if defined?(ActiveStorage::Analyzer::ImageAnalyzer)
+          app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::AudioAnalyzer if defined?(ActiveStorage::Analyzer::AudioAnalyzer)
           app.config.active_storage.analyzers.append Analyzer::AudioAnalyzer
         end
 

data/lib/active_analysis/gem_version.rb

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

data/lib/tasks/active_analysis_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :active_analysis do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_analysis
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Breno Gazzola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -159,7 +159,6 @@ files:
 - lib/active_analysis.rb
 - lib/active_analysis/addon.rb
 - lib/active_analysis/addon/image_addon.rb
-- lib/active_analysis/addon/image_addon/optimal_quality.rb
 - lib/active_analysis/addon/image_addon/white_background.rb
 - lib/active_analysis/analyzer.rb
 - lib/active_analysis/analyzer/audio_analyzer.rb

data/lib/active_analysis/addon/image_addon/optimal_quality.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../image_addon"
-
-module ActiveAnalysis
-  class Addon::ImageAddon::OptimalQuality < Addon::ImageAddon
-    def metadata
-      { optimal_quality: calculate_optimal_quality }
-    end
-
-    private
-      def calculate_optimal_quality
-        quality = 85
-
-        loop do
-          new_quality = quality - 5
-          dssim = calculate_dssim(new_quality)
-          break if dssim > 0.001 || quality < 55
-          quality = new_quality
-        end
-
-        quality
-      rescue
-        nil
-      end
-
-      def calculate_dssim(quality)
-        image_with_quality(quality) do |image|
-          dssim = `dssim #{filepath} #{image.path}`
-          Float dssim.split.first
-        end
-      end
-
-      def image_with_quality(quality)
-        extname  = File.extname(filepath)
-        basename = File.basename(filepath, extname)
-
-        Tempfile.create(["#{basename}_#{quality}", extname]) do |tempfile|
-          processor.apply(saver: { format: "jpg", quality: quality }).call(filepath, destination: tempfile.path)
-          yield tempfile
-        end
-      end
-
-      def filepath
-        ActiveAnalysis.image_library == :vips ? file.filename : file.path
-      end
-
-      def processor
-        ActiveAnalysis.image_library == :vips ? ::ImageProcessing::Vips : ::ImageProcessing::MiniMagick
-      end
-  end
-end