izi_lightup 0.0.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 130b95a322e27bff9b2b60080ca086f90d9a1a391d7cace27e479f78b9291585
-  data.tar.gz: b090a0d62203d7f4338c53eda32db9c64191686e0871d2bd59b14d075681d167
+  metadata.gz: f8f79dcdf158759fc11c0b29c8b8a97b54c250c42ba80df355a82a605df2740a
+  data.tar.gz: 523adf5e981759cef50da8418dcc167c8cf6cee7beb11f62cf1c3eab82a05468
 SHA512:
-  metadata.gz: 46424c06388df9af3110d69e781e4453713bb6d85dc3326e80fe8cab868152da360a0cd75c44088a12163040a7400677b96190f0f5879b8ce2797439bbd77f04
-  data.tar.gz: bc4da804bc238a6a158003362814c4aff7e2249b8c9ba2e0dfbcb967d5d6b064c63aa0cf8c8153873ff3d59aab955c5ea33d533e282d2dc57b1e389cd3969129
+  metadata.gz: 5e1d85ee87b1af74d7e8d580950271585126bcfde37f381a912d220130fa9f0ae7d98ac1b41e102115f0674b0672dede6d88db363c83d574766a0f8787cbea35
+  data.tar.gz: e6cd686fc83af4063aed999def9fcddcab442f0954f784f03ad3ec26c88b7b9f5cf0a52297c66c32e7c17a1900b141323ff2b2b6cf7fe0df1dab56284171388b

data/app/assets/javascripts/crit-utils/async-css.js

@@ -0,0 +1,2 @@
+//= require cssrelpreload.js
+//= require loadCSS.js

data/app/helpers/critical_helper.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 module CriticalHelper
-  def css_preload(name)
-    link = content_tag :link, '', rel: 'preload', href: stylesheet_path(name), as: 'style', onload: 'this.rel="stylesheet"'
+  def css_preload(names)
+    return '' if names.blank?
+    names = Array.wrap(names)
+
+    link = stylesheet_link_tag(*names, rel: 'preload', as: 'style', onload: 'this.rel="stylesheet"')
     noscript = content_tag :noscript do
-      content_tag :link, '', rel: 'stylesheet', href: stylesheet_path(name)
+      stylesheet_link_tag(*names)
     end
 
     link + noscript
@@ -24,20 +27,28 @@ module CriticalHelper
     inline_js('crit-utils/bundle.js').presence || '<!-- CRIT JS NOT FOUND! -->'.html_safe
   end
 
-  def critical_css
+  def critical_css(params = {})
     name = find_scoped_css('critical')
-    return '<!-- CRIT CSS NOT FOUND! -->'.html_safe if name.blank?
+    stylesheets = Array.wrap(params.fetch(:stylesheets, []))
+    data = StringIO.new
 
-    return inline_css(name) if Rails.env.production?
+    if name.blank?
+      # insert stylesheets directly if not crit css
+      data << '<!-- CRIT CSS NOT FOUND! -->'
+      data << stylesheet_link_tag(*stylesheets) if stylesheets.present?
+    else
+      data << inline_css(name)
+      data << css_preload(stylesheets) if stylesheets.present?
+      data << inline_js('crit-utils/measure.js') if Rails.env.development?
+    end
 
-    # inject measure js for development
-    inline_css(name) + inline_js('utils/measure.js')
+    data.string.html_safe
   end
 
-  def smart_picture(object, fields = %i[picture], versions = [], params = {})
+  def smart_picture(object, *args, **xargs, &block)
     return '' if object.blank?
 
-    IziLightup::SmartPicture.render(object, fields, versions, params)
+    IziLightup::SmartPicture.render(object, *args, **xargs, &block)
   end
 
   private

data/lib/izi_lightup/engine.rb

@@ -12,6 +12,7 @@ module IziLightup
 
       loadCSS.js
       cssrelpreload.js
+      crit-utils/async-css.js
     ]
   end
 end

data/lib/izi_lightup/inline_asset.rb

@@ -33,12 +33,22 @@ module IziLightup
       end
 
       def raw_source(asset_path)
+        return find_sources_fallback(asset_path) if old_manifest?
+
         manifest.find_sources(asset_path).first&.html_safe
       end
 
+      def old_manifest?
+        !manifest.respond_to?(:find_sources)
+      end
+
       def manifest
         @manifest ||= Rails.application.assets_manifest
       end
+
+      def find_sources_fallback(asset_path)
+        Rails.application.assets.find_asset(asset_path)&.source&.html_safe
+      end
     end
   end
 end

data/lib/izi_lightup/smart_picture.rb

@@ -2,9 +2,9 @@
 
 module IziLightup
   module SmartPicture
-    include ActionView::Helpers::AssetTagHelper
-
     class << self
+      include ActionView::Helpers::AssetTagHelper
+
       def render(object, fields = %i[picture], versions = [], params = {})
         return '' if object.blank?
 
@@ -19,7 +19,7 @@ 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 if version&.url&.blank?
+            next unless version&.file&.exists? && version&.url&.present?
 
             url = version.url
             params.merge!(%i[width height].zip(version.dimensions).to_h)
@@ -32,6 +32,14 @@ module IziLightup
 
         ''
       end
+
+      private
+
+      def fetch_items(object, fields)
+        Array.wrap(fields).map do |name|
+          object.respond_to?(name) ? object.public_send(name) : nil
+        end.compact
+      end
     end
   end
 end

data/lib/izi_lightup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: izi_lightup
 version: !ruby/object:Gem::Version
-  version: 0.0.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - IzikAJ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Utils to speed up page load by using critical css &
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - README.rdoc
 - app/assets/javascripts/crit-utils/active_emit.js.coffee
+- app/assets/javascripts/crit-utils/async-css.js
 - app/assets/javascripts/crit-utils/bundle.js
 - app/assets/javascripts/crit-utils/measure.js
 - app/assets/javascripts/crit-utils/measure/cls.js.coffee
@@ -35,7 +36,8 @@ files:
 - vendor/assets/javascripts/cssrelpreload.js
 - vendor/assets/javascripts/loadCSS.js
 homepage: https://bitbucket.org/netfixllc/izi_lightup
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []