izi_lightup 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 360a92b36f70a51ce881b38790774ecfddd8173598a369e484a21cd8a3c208e8
-  data.tar.gz: f8886f87bf6929f4cd625313834eca2eb11967847e31914a0308ce8e4cddc1f5
+  metadata.gz: f573f7d4f976500f7b282e1ffd0f4451d5f21819fd00db8eb194f94ac04fce96
+  data.tar.gz: c22e4553b330af4fa7552bd8824abf415a8716379d40fd27401b479b900d7b96
 SHA512:
-  metadata.gz: ad180f8fed8d29551ce495e9f5ed26a023b9186c17d14a1a5d70aecfa41aa9c4e501d3b1b107001660d505954528a80b0d1904a6954fc369663dc02a040da678
-  data.tar.gz: e98e0b5da1406df44e1ed716f7f84f3094aba31941fc1ca7a5977a3332a5ea844c6b0949891a6124ddaccde85874a2c35999be88b58aa62ea071bc3717dbf51e
+  metadata.gz: a937fbf2e756c1f4266921c6e47f3700bcd586c628e0137010e7f5baebe13e7c7b2a0bc2b528c37f21d87b5972f3a55fa828e37b05554d81669e1acd8f554dc6
+  data.tar.gz: 02a4203383a8f675719a4593c419019e8323de9840eda5bff1640f41cc75dd4e9c03f03a9a71c4d2e8bf239443d0a882afb76c5ba154a24af6998ab0fac3ba3b

data/app/helpers/critical_helper.rb

@@ -52,16 +52,27 @@ module CriticalHelper
     IziLightup::SmartPicture.render(object, *args, **xargs, &block)
   end
 
+  def debug_critical_css(scope_name = 'critical')
+    {
+      lookup: scoped_css_files(scope_name),
+      found: find_scoped_css(scope_name)
+    }.to_json.html_safe
+  end
+
   private
 
-  def find_scoped_css(scope_name)
+  def scoped_css_files(scope_name)
     [
       File.join(scope_name, "#{controller_path}_#{action_name}.css"),
       File.join(scope_name, "#{controller_path}.css"),
       File.join(scope_name, "#{controller_name}_#{action_name}.css"),
       File.join(scope_name, "#{controller_name}.css"),
       "#{scope_name}.css"
-    ].detect { |n| asset_exist?(n) }
+    ].uniq
+  end
+
+  def find_scoped_css(scope_name)
+    scoped_css_files(scope_name).detect { |n| asset_exist?(n) }
   end
 
   def fetch_items(object, fields)
@@ -71,6 +82,26 @@ module CriticalHelper
   end
 
   def asset_exist?(name)
-    Rails.application.assets_manifest.find_sources(name)&.first&.present?
+    return find_asset_source(name)&.present? if Rails.env.development?
+
+    manifest.assets.key?(name)
+  end
+
+  def find_asset_source(name)
+    return find_sources_fallback(name) if old_manifest?
+
+    manifest.find_sources(name)&.first
+  end
+
+  def find_sources_fallback(asset_path)
+    Rails.application.assets.find_asset(asset_path)
+  end
+
+  def old_manifest?
+    !manifest.respond_to?(:find_sources)
+  end
+
+  def manifest
+    @manifest ||= Rails.application.assets_manifest
   end
 end

data/lib/izi_lightup/smart_picture.rb

@@ -19,10 +19,12 @@ module IziLightup
             next unless version_name == :default || item.data.respond_to?(version_name)
 
             version = version_name == :default ? item.data : item.data.public_send(version_name)
-            next unless version&.file&.exists? && version&.url&.present?
+            next unless version_exists?(version)
 
             url = version.url
-            params.merge!(%i[width height].zip(version.dimensions).to_h)
+            dimensions = safe_dimentions(item, version)
+            params.merge!(dimensions) if dimensions.present?
+
             return image_tag(url, params) unless block_given?
 
             yield(url, params)
@@ -35,6 +37,33 @@ module IziLightup
 
       private
 
+      def version_exists?(version)
+        return true if version&.url&.present? && version.url =~ /https?:/
+
+        version&.file&.exists? && version&.url&.present?
+      end
+
+      def fallback_dimentions(item)
+        [item&.width, item&.height].compact
+      end
+
+      def safe_dimentions_extract(item, version)
+        begin
+          version.dimensions
+        rescue MiniMagick::Error => _e
+          fallback_dimentions(item)
+        end
+      end
+
+      def safe_dimentions(item, version)
+        dimensions = fallback_dimentions(item) if version.url =~ /https?:/
+        dimensions ||= safe_dimentions_extract(item, version)
+
+        return {} if dimensions.blank? || (dimensions.size != 2)
+
+        %i[width height].zip(dimensions).to_h
+      end
+
       def fetch_items(object, fields)
         Array.wrap(fields).map do |name|
           object.respond_to?(name) ? object.public_send(name) : nil

data/lib/izi_lightup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IziLightup
-  VERSION = '1.0.11'
+  VERSION = '1.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izi_lightup
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.16
 platform: ruby
 authors:
 - IzikAJ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Utils to speed up page load by using critical css &