izi_lightup 1.0.12 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f41382e7ef7800607c021d33859c57b10a4408580acef3e068d92a2eaf6fdb
-  data.tar.gz: 635d22e277085980967845763882aaddfb8c3f161e4b0fff3bdb09d782f2a875
+  metadata.gz: f1c5603ca13de2a4cdacbde2661a234b2bc2840658a261914f35ff47cb98d07e
+  data.tar.gz: be1513d0fa4e6cb010e80acb83babff7c4464e7d07f566aec0594d23bf37820d
 SHA512:
-  metadata.gz: 3909f266b8eaf65aae1ee745bf6079508f31008181fe24083cdfeb914177886f0b03f3752457ee72c9871a40f1a6c41ed517f43a77f2e7e3d4d9e0fb6d3a54b8
-  data.tar.gz: 99964f117e4f1725b99375185891857310be36ecdaa119858f9b683297b85fd688eab1d97f6b8bc7c95811ca1bbec1ca74f60bf4ba5ade878b9f3d8e981ea9fb
+  metadata.gz: f879475075c1d7e5915cdfd1b13b9583da64c80eeb88aacde80193c2d6e780b8ad4e1b5a7e1f7c078d415408b38023c9db6b48c8a4e63ac6a32ea5ca2d3058fe
+  data.tar.gz: b74a74d53569055e21493ca675c7bfd6a0634e8108201a891fbf0d06c427cc84e926882fa6011a346d9d211e7953968c681967450288ca6a29e57f1aab0edc7e

data/app/helpers/critical_helper.rb

@@ -52,16 +52,38 @@ 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) }
+      "#{controller_path}_#{action_name}",
+      controller_path,
+      *scoped_namespace_file(scope_name),
+      "#{controller_name}_#{action_name}",
+      controller_name,
+      scope_name
+    ].compact.uniq.map { |l| File.join(scope_name, "#{l}.css") }
+  end
+
+  def scoped_namespace_file(scope_name)
+    scopes = []
+    return scopes if controller_path == controller_name
+
+    parts = controller_path.gsub(/\/#{controller_name}$/, '').split('/').reject(&:blank?)
+    parts.each { |p| scopes.unshift(File.join([scopes.first, p].compact)) }
+
+    scopes.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,11 +93,25 @@ module CriticalHelper
   end
 
   def asset_exist?(name)
-    return manifest.find_sources(name)&.first&.present? if Rails.env.development?
+    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

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.12'
+  VERSION = '1.0.17'
 end

metadata

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