active_analysis 0.1.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 682b39ef90eab2d2f825bb31f75b2345e32a4df0858d063f1f13314fd1aa25e6
-  data.tar.gz: c5cb58d2b1ac0304fc220953b4cf7250e4568642b1be30017bf56caf71b2fea1
+  metadata.gz: 77a4b728e66fe4c463fabcdc68c89ab4d6b73971aec95f96ea0bf29fc944c866
+  data.tar.gz: cc74b804d1c0ca9c803027fe2427ad99cbcc1cf1764c691865f4f092acc682d1
 SHA512:
-  metadata.gz: '0860684f890ee8b3c1818ef547126de464c1b3a2434e70850dbcd3d57fddb087c478412753936a58608700564197bdaff7ed0951fceba4b6a4bb6b2eb0ad0135'
-  data.tar.gz: f1eba05f7f54af13851000862d7c45d99e04a44ce511dfe2e815b2a1539df5f64a10df1d812a98fbbeb6f10c350dd3354f1c870c993e92754ed6326b415d6830
+  metadata.gz: d6e6fe01cf6c05e6fbe3fa36fa7f1df96dfeb395566b1612b01da8105abe9546d5f994064cc7924c6cc8d076084f5d7bd2750f4662f670070214faf9781441f9
+  data.tar.gz: 3106253d44f736d2640c63bcb4bea1a04d4654d39d3e88f6ac3ebebf12c6848238f65f481e94511a69af74eed506a9b8a69c9c9e7a44963cdb775418ebb66830

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## [Unreleased]
 
-## [0.1.0] - 2021-05-01
+- 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.0] - 2021-06-01
+
+- Added `opaque` metadata value to images
+
+## [0.1.3] - 2021-05-01
 
 - Initial release

data/README.md

@@ -18,11 +18,61 @@ And then execute:
 
 ## Usage
 
-Active Analyzers will automatically add all its analyzers to Active Storage's analyzers array. Don't worry, if you added any custom analyzers they will be there. You can check the comments in the source code of each analyzer to see what information they extract from files:
-- Audio: [source](https://github.com/FestaLab/active_analysis/blob/main/lib/active_analysis/analyzer/audio_analyzer.rb)
-- Image: [source](https://github.com/FestaLab/active_analysis/blob/main/lib/active_analysis/analyzer/image_analyzer.rb)
-- PDF: [source](https://github.com/FestaLab/active_analysis/blob/main/lib/active_analysis/analyzer/pdf_analyzer.rb)
-- Video: [source](https://github.com/FestaLab/active_analysis/blob/main/lib/active_analysis/analyzer/video_analyzer.rb)
+Active Analysis automatically replaces all of Rails default analyzers with its own. It will not remove other custom analyzers if you have them. You can also configure which analyzers will be inserted.
+
+```ruby
+Rails.application.configure do |config|
+  config.active_analysis.image_library  = :vips # Defaults to the same as active storage
+  config.active_analysis.image_analyzer = true  # Defaults to true
+  config.active_analysis.audio_analyzer = true  # Defaults to true
+  config.active_analysis.pdf_analyzer   = false # Defaults to true
+  config.active_analysis.video_analyzer = false # Defaults to true
+end
+```
+
+#### Image
+A modification of the original image analyzer and a new analyzer. Requires the [ImageMagick](http://www.imagemagick.org) system library or the [libvips](https://github.com/libvips/libvips) system library.
+
+- Width (pixels)
+- Height (pixels)
+- Opaque (true if file is opaque, false if not)
+
+An image will be considered opaque if it does not have an alpha channel, or if none of its pixels have an alpha value below the minimum (as defined by the library).
+
+#### PDF
+A new analyzer. Requires the [poppler](https://poppler.freedesktop.org/) system library.
+
+- Width (pixels)
+- Height (pixels)
+- Pages
+
+#### Audio
+A new analyzer. Requires the [FFmpeg](https://www.ffmpeg.org) system library.
+
+- Duration (seconds)
+- Bit Rate (bits/second)
+
+#### Video
+A modification of the original video analyzer. Requires the [FFmpeg](https://www.ffmpeg.org) system library
+
+- Width (pixels)
+- Height (pixels)
+- Duration (seconds)
+- Angle (degrees)
+- Display aspect ratio
+- Audio (true if file has an audio channel, false if not)
+- Video (true if file has an video channel, false if not)
+
+## Addons
+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::WhiteBackground
+end
+```
+
+The following addons available:
+- 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"
 
@@ -7,6 +9,12 @@ module ActiveAnalysis
   autoload :FixtureSet
 
   mattr_accessor :logger
-  mattr_accessor :analyzers
+
   mattr_accessor :image_library
+  mattr_accessor :image_analyzer
+  mattr_accessor :audio_analyzer
+  mattr_accessor :pdf_analyzer
+  mattr_accessor :video_analyzer
+
+  mattr_accessor :addons
 end

data/lib/active_analysis/addon.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ActiveAnalysis
+  # This is an abstract base class for analyzer addons, which extract extra metadata from blobs.
+  class Addon
+    attr_reader :file
+
+    def self.accept?(blob)
+      false
+    end
+
+    def initialize(file)
+      @file = file
+    end
+
+    def metadata
+      raise NotImplementedError
+    end
+  end
+end

data/lib/active_analysis/addon/image_addon.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "../addon"
+
+module ActiveAnalysis
+  # 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.attachments.none? { |attachment| attachment.record_type == ActiveStorage::VariantRecord }
+    end
+
+    def metadata
+      raise NotImplementedError
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative "../image_addon"
+
+module ActiveAnalysis
+  class Addon::ImageAddon::WhiteBackground < Addon::ImageAddon
+    def metadata
+      { white_background: white_background? }
+    end
+
+    private
+      def white_background?
+        corners = extract_corner_areas(file)
+        colors = corners.map { |corner| primary_color_for(corner) }
+        colors.all? { |color| color.all? { |value| value > 250 } }
+      rescue
+        nil
+      end
+
+      def extract_corner_areas(image)
+        paths = []
+
+        image_path = ActiveAnalysis.image_analyzer == :vips ? image.filename : image.path
+        basename   = SecureRandom.urlsafe_base64
+        width      = image.width
+        height     = image.height
+        size       = 8
+
+        paths << Rails.root.join("tmp", "#{basename}_top_left.jpg")
+        `vips im_extract_area #{image_path} #{paths.last} 0 0 #{size} #{size}`
+
+        paths << Rails.root.join("tmp", "#{basename}_top_right.jpg")
+        `vips im_extract_area #{image_path} #{paths.last} #{width - size} 0 #{size} #{size}`
+
+        paths << Rails.root.join("tmp", "#{basename}_bottom_right.jpg")
+        `vips im_extract_area #{image_path} #{paths.last} #{width - size} #{height - size} #{size} #{size}`
+
+        paths << Rails.root.join("tmp", "#{basename}_bottom_left.jpg")
+        `vips im_extract_area #{image_path} #{paths.last} 0 #{height - size} #{size} #{size}`
+
+        paths
+      end
+
+      def primary_color_for(filepath)
+        histogram = generate_color_histogram(filepath)
+        sorted = sort_by_frequency(histogram)
+        extract_dominant_rgb(sorted)
+      end
+
+      def generate_color_histogram(path)
+        `convert #{path} +dither -colors 5 -define histogram:unique-colors=true -format "%c" histogram:info:`
+      end
+
+      def sort_by_frequency(histogram)
+        histogram.each_line.map { |line| parts = line.split(":"); [parts[0].to_i, parts[1]] }.sort_by { |line| line[0] }.reverse
+      end
+
+      def extract_dominant_rgb(array)
+        array.map { |line| line[1].match(/\(([\d.,]+)/).captures.first.split(",").take(3).map(&:to_i) }.first
+      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

@@ -9,7 +9,7 @@ module ActiveAnalysis
   #
   # Example:
   #
-  #   ActiveAnalysis::CoreExtensionsAnalyzer::ImageAnalyzer::ImageMagick.new(blob).metadata
+  #   ActiveAnalysis::Analyzer::ImageAnalyzer::ImageMagick.new(blob).metadata
   #   # => { width: 4104, height: 2736 }
   class Analyzer::ImageAnalyzer < Analyzer
     def self.accept?(blob)
@@ -19,12 +19,28 @@ module ActiveAnalysis
     def metadata
       read_image do |image|
         if rotated_image?(image)
-          { width: image.height, height: image.width }
+          { width: image.height, height: image.width, opaque: opaque?(image), **addons(image) }.compact
         else
-          { width: image.width, height: image.height }
+          { width: image.width, height: image.height, opaque: opaque?(image), **addons(image) }.compact
         end
       end
     end
+
+    private
+      def read_image
+        raise NotImplementedError
+      end
+
+      def rotated_image?(image)
+        raise NotImplementedError
+      end
+
+      def opaque?(image)
+        raise NotImplementedError
+      end
+
+      def addons(image)
+        ActiveAnalysis.addons.select { |addon| addon.accept?(blob) }.map { |addon_class| addon_class.new(image).metadata }.reduce({}, :merge).compact
+      end
   end
 end
-

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

@@ -7,7 +7,7 @@ module ActiveAnalysis
   # the {ImageMagick}[http://www.imagemagick.org] system library.
   class Analyzer::ImageAnalyzer::ImageMagick < Analyzer::ImageAnalyzer
     def self.accept?(blob)
-      super && ActiveStorage.variant_processor == :mini_magick
+      super && ActiveAnalysis.image_library == :mini_magick
     end
 
     private
@@ -34,6 +34,12 @@ module ActiveAnalysis
       def rotated_image?(image)
         %w[ RightTop LeftBottom TopRight BottomLeft ].include?(image["%[orientation]"])
       end
+
+      def opaque?(image)
+        return true unless image.data["channelDepth"].key?("alpha")
+
+        value = /7.\d/.match?(image.data["version"]) ? 255 : 0
+        image.data["channelStatistics"]["alpha"]["mean"] == value
+      end
   end
 end
-

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

@@ -7,14 +7,14 @@ module ActiveAnalysis
   # the {libvips}[https://libvips.github.io/libvips/] system library.
   class Analyzer::ImageAnalyzer::Vips < Analyzer::ImageAnalyzer
     def self.accept?(blob)
-      super && ActiveStorage.variant_processor == :vips
+      super && ActiveAnalysis.image_library == :vips
     end
 
     private
       def read_image
         download_blob_to_tempfile do |file|
           require "ruby-vips"
-          image = ::Vips::Image.new_from_file(file.path, access: :sequential)
+          image = ::Vips::Image.new_from_file(file.path)
 
           if valid_image?(image)
             yield image
@@ -39,6 +39,11 @@ module ActiveAnalysis
         false
       end
 
+      def opaque?(image)
+        return true unless image.has_alpha?
+        image[image.bands - 1].min == 255
+      end
+
       def valid_image?(image)
         image.avg
         true
@@ -47,4 +52,3 @@ module ActiveAnalysis
       end
   end
 end
-

data/lib/active_analysis/analyzer/pdf_analyzer.rb

@@ -7,7 +7,7 @@ module ActiveAnalysis
   #
   # Example:
   #
-  #   ActiveAnalysis::CoreExtensionsAnalyzer::PDFAnalyzer::Poppler.new(blob).metadata
+  #   ActiveAnalysis::Analyzer::PDFAnalyzer::Poppler.new(blob).metadata
   #   # => { width: 4104, height: 2736, pages: 10 }
   #
   # This analyzer requires the {poppler}[https://poppler.freedesktop.org/] system library, which is not provided by Rails.

data/lib/active_analysis/engine.rb

@@ -3,6 +3,7 @@
 require "active_storage"
 
 require "marcel"
+require "image_processing"
 require "ruby-vips"
 require "mini_magick"
 
@@ -14,31 +15,56 @@ require_relative "analyzer/audio_analyzer"
 require_relative "analyzer/video_analyzer"
 require_relative "analyzer/pdf_analyzer"
 
+require_relative "addon"
+require_relative "addon/image_addon"
+require_relative "addon/image_addon/white_background"
+
 module ActiveAnalysis
   class Engine < ::Rails::Engine
     isolate_namespace ActiveAnalysis
 
-    config.active_analysis                             = ActiveSupport::OrderedOptions.new
+    config.active_analysis = ActiveSupport::OrderedOptions.new
+    config.active_analysis.addons = []
+
     config.eager_load_namespaces << ActiveAnalysis
 
     initializer "active_analysis.configs" do
       config.after_initialize do |app|
-        ActiveAnalysis.logger                          = app.config.active_analysis.logger || Rails.logger
-        ActiveAnalysis.analyzers                       = app.config.active_analysis.analyzers || []
-        ActiveAnalysis.image_library                   = app.config.active_analysis.image_library || app.config.active_storage.variant_processor
+        ActiveAnalysis.logger         = app.config.active_analysis.logger         || Rails.logger
+
+        ActiveAnalysis.image_library  = app.config.active_analysis.image_library  || app.config.active_storage.variant_processor || :mini_magick
+        ActiveAnalysis.image_analyzer = app.config.active_analysis.image_analyzer || true
+        ActiveAnalysis.audio_analyzer = app.config.active_analysis.audio_analyzer || true
+        ActiveAnalysis.pdf_analyzer   = app.config.active_analysis.pdf_analyzer   || true
+        ActiveAnalysis.video_analyzer = app.config.active_analysis.video_analyzer || true
+        ActiveAnalysis.addons         = app.config.active_analysis.addons         || []
       end
     end
 
-    initializer "active_analysis.core_extensions" do
+    initializer "active_analysis.analyzers" do
       config.after_initialize do |app|
-        app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::ImageAnalyzer
-        app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::VideoAnalyzer
-
-        app.config.active_storage.analyzers.append Analyzer::ImageAnalyzer::Vips
-        app.config.active_storage.analyzers.append Analyzer::ImageAnalyzer::ImageMagick
-        app.config.active_storage.analyzers.append Analyzer::VideoAnalyzer
-        app.config.active_storage.analyzers.append Analyzer::AudioAnalyzer
-        app.config.active_storage.analyzers.append Analyzer::PDFAnalyzer
+        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
+
+        if ActiveAnalysis.video_analyzer
+          app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::VideoAnalyzer
+          app.config.active_storage.analyzers.append Analyzer::VideoAnalyzer
+        end
+
+        if ActiveAnalysis.audio_analyzer
+          app.config.active_storage.analyzers.delete ActiveStorage::Analyzer::AudioAnalyzer if defined?(ActiveStorage::Analyzer::AudioAnalyzer)
+          app.config.active_storage.analyzers.append Analyzer::AudioAnalyzer
+        end
+
+        if ActiveAnalysis.pdf_analyzer
+          app.config.active_storage.analyzers.append Analyzer::PDFAnalyzer
+        end
       end
     end
   end

data/lib/active_analysis/gem_version.rb

@@ -8,8 +8,8 @@ module ActiveAnalysis
 
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    TINY  = 3
+    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.1.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Breno Gazzola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -16,70 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: image_processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: ruby-vips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: platform_agent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +157,9 @@ files:
 - app/views/layouts/active_analysis/application.html.erb
 - config/routes.rb
 - lib/active_analysis.rb
+- lib/active_analysis/addon.rb
+- lib/active_analysis/addon/image_addon.rb
+- lib/active_analysis/addon/image_addon/white_background.rb
 - lib/active_analysis/analyzer.rb
 - lib/active_analysis/analyzer/audio_analyzer.rb
 - lib/active_analysis/analyzer/image_analyzer.rb
@@ -219,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Collection of Active Storage analyzers