vitals_image 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5399352c9f774e90f9a671459d582672c69c19b5640675e47a5c77536cb36826
-  data.tar.gz: a05b961a9730225fd60f81c8d5467ab44a542abd8fa96d659891f805ee5a21b7
+  metadata.gz: 070dabcbfcfe58cf4ad78ed7509cf16963484fa160db4358ed2f400a1a7d7925
+  data.tar.gz: cecf4c19afeed8df374686752e3ee7300ecbe6ced03c15781a9f0caa6134418b
 SHA512:
-  metadata.gz: 41a2aca3f4efb2178525af7566d24fe9825f858860a0b482c48ada2f49bc62edadb085986f165dc7d1d2875c5faf2e60114040c6318c6f52e469db620b32fb4d
-  data.tar.gz: 1fe231165885de9b8c0876abfc466583f9fcb0da7c5ea2da73104e0d93348064c55e41fe9471decc0c077ac8392efcfe3f5c49b75db305c743752c7d78eeaa9a
+  metadata.gz: 424b3c5908a10ee87df1e8174b786f30166af7b8fc28c4473ca77775dafb77fb1cce5780568a1098efac6898eb4b97584857ea122555d68f81ead1f6b1cfbb5c
+  data.tar.gz: 9510a8c14a5363997d6729933b3356f0bf7145410498e850ccd27d346fbde54e6bdf013e4b6b97afd557279f26dae4e082c07ad188ecdbcdb3e1e3b984c1655e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.5]
+
+- Add `domains` config to allow limiting from which domains images will be analyzed
+- User `after_commit` to enqueued analyze job
+
 ## [0.4.1] - 2021-07-22
 
 - Do not discard the specified `style` attribute

data/README.md

@@ -134,6 +134,7 @@ The following configuration options are available. The defaults were chosen for
 | jpeg_optimization               | see below      | see below               | Hash of options to pass to active storage when optimizing a JPEG. |
 | png_optimization                | see below      | see below               | Hash of options to pass to active storage when optimizing a PNG. |
 | active_storage_route            | `:inherited`   | `:inherited`            | Defines how urls of active storage images will be generated. If `inherited` it will use the same as active storage. Other valid options are `redirect`, `proxy` and `public`. Whatever is set here can be overriden in the helper. |
+| domains                         | empty          | -                       | Limits the domains that vitals image source can be created from |
 
 Minimagick
 ```ruby
@@ -164,8 +165,6 @@ These can be configured in your environment files, just like any other rails set
 ```
 Rails.application.configure do |config|
   config.vitals_image.image_library = :vips
-  config.vitals_image.mobile_width = 410
-  config.vitals_image.desktop_width = 1264
   config.vitals_image.lazy_loading = :lozad
   config.vitals_image.require_alt_attribute = true
   config.vitals_image.check_for_white_background = true

data/app/models/vitals_image/source.rb

@@ -2,8 +2,8 @@
 
 module VitalsImage
   class Source < ActiveRecord::Base
-    store :metadata, accessors: [ :analyzed, :width, :height ], coder: ActiveRecord::Coders::JSON, default: "{ analyzed: false }"
+    store :metadata, accessors: [ :identified, :analyzed, :width, :height ], coder: ActiveRecord::Coders::JSON
 
-    after_create -> { AnalyzeJob.perform_later(self) }
+    after_create_commit -> { AnalyzeJob.perform_later(self) }
   end
 end

data/db/migrate/20210809171706_add_fingerprint_to_vitals_image_sources.rb

@@ -0,0 +1,6 @@
+class AddFingerprintToVitalsImageSources < ActiveRecord::Migration[6.1]
+  def change
+    add_column :vitals_image_sources, :fingerprint, :string
+    add_index :vitals_image_sources, :fingerprint, unique: true
+  end
+end

data/lib/vitals_image.rb

@@ -14,8 +14,6 @@ module VitalsImage
   mattr_accessor :analyzers
   mattr_accessor :image_library
 
-  mattr_accessor :mobile_width
-  mattr_accessor :desktop_width
   mattr_accessor :resolution
   mattr_accessor :lazy_loading
   mattr_accessor :lazy_loading_placeholder
@@ -28,6 +26,7 @@ module VitalsImage
   mattr_accessor :jpeg_optimization
   mattr_accessor :png_optimization
   mattr_accessor :active_storage_route
+  mattr_accessor :domains
 
   mattr_accessor :skip_ssl_verification
 end

data/lib/vitals_image/cache.rb

@@ -15,7 +15,7 @@ module VitalsImage
         source = @store.read(key)
 
         if source.blank?
-          source = Source.find_or_create_by(key: key)
+          source = find_or_create_by(key)
           expires_in = source.analyzed ? nil : 1.minute
           @store.write(key, source, expires_in: expires_in)
         end
@@ -25,6 +25,16 @@ module VitalsImage
     end
 
     private
+      def find_or_create_by(key)
+        uri = URI.parse(key)
+
+        if VitalsImage.domains.present? && !VitalsImage.domains.include?(uri.host)
+          Source.new(key: key, metadata: { identified: false })
+        else
+          Source.find_or_create_by(key: key) { |source| source.identified = true }
+        end
+      end
+
       def with_retry
         yield
       rescue ActiveRecord::RecordNotUnique

data/lib/vitals_image/engine.rb

@@ -29,6 +29,7 @@ module VitalsImage
     config.vitals_image                                 = ActiveSupport::OrderedOptions.new
     config.vitals_image.optimizers                      = [VitalsImage::Optimizer::Blank, VitalsImage::Optimizer::Variable, VitalsImage::Optimizer::Invariable, VitalsImage::Optimizer::Url]
     config.vitals_image.analyzers                       = [VitalsImage::Analyzer::UrlAnalyzer]
+    config.vitals_image.domains                         = []
 
     config.eager_load_namespaces << VitalsImage
 
@@ -40,8 +41,6 @@ module VitalsImage
         VitalsImage.optimizers                 = app.config.vitals_image.optimizers                 || []
         VitalsImage.analyzers                  = app.config.vitals_image.analyzers                  || []
 
-        VitalsImage.mobile_width               = app.config.vitals_image.mobile_width               || :original
-        VitalsImage.desktop_width              = app.config.vitals_image.desktop_width              || :original
         VitalsImage.resolution                 = app.config.vitals_image.resolution                 || 2
         VitalsImage.lazy_loading               = app.config.vitals_image.lazy_loading               || :native
         VitalsImage.lazy_loading_placeholder   = app.config.vitals_image.lazy_loading_placeholder   || VitalsImage::Base::TINY_GIF
@@ -54,6 +53,7 @@ module VitalsImage
         VitalsImage.jpeg_conversion            = app.config.vitals_image.jpeg_conversion
         VitalsImage.jpeg_optimization          = app.config.vitals_image.jpeg_optimization
         VitalsImage.png_optimization           = app.config.vitals_image.png_optimization
+        VitalsImage.domains                    = app.config.vitals_image.domains                    || []
 
         VitalsImage.skip_ssl_verification      = app.config.vitals_image.skip_ssl_verification      || false
       end

data/lib/vitals_image/gem_version.rb

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

data/lib/vitals_image/optimizer/url.rb

@@ -17,7 +17,7 @@ module VitalsImage
       end
 
       def style
-        if !analyzed?
+        if !identified? || !analyzed?
           # Do nothing
         elsif !requested_height
           "height:auto;"
@@ -26,6 +26,10 @@ module VitalsImage
         end
       end
 
+      def identified?
+        metadata.identified
+      end
+
       def analyzed?
         metadata.analyzed
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vitals_image
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Breno Gazzola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -243,6 +243,7 @@ files:
 - app/views/layouts/vitals_image/application.html.erb
 - config/routes.rb
 - db/migrate/20210502132155_create_vitals_image_sources.rb
+- db/migrate/20210809171706_add_fingerprint_to_vitals_image_sources.rb
 - lib/tasks/vitals_image_tasks.rake
 - lib/vitals_image.rb
 - lib/vitals_image/analyzer.rb