rails_critical_css 0.2.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb62b27929733fec99af5554d08ae804025ed6375daed30d29f1dd5eafc6780
-  data.tar.gz: 7e8d54687c2580ded02b522c91fd6112706cfeefc01e0ed9a025ab39971e4fdf
+  metadata.gz: 1e7e0ec19475e3c63ca1b45cd4aafb8a044ab6a0ad67b4fd70dc409f85d01f98
+  data.tar.gz: ab4d681805cb069fb8e0e0fff552b0f24a8dfcee747ccb1814767960bf4b0fe8
 SHA512:
-  metadata.gz: 21e5e2ea8b9b820aa9866825fdbf48b2c6e0418ac2fd2451b58848f9912d24b9c549280b78b490b92a32e270bf7070bc23f2ad628c57aa6efa3e93625ab350ff
-  data.tar.gz: 2dd47899c8f7a8ea462cde17b0537355f168f096cf2673dfa0a2532e539b26bae0e9f96148e5fafa29874af0f74f7d6062ff1c00627a58e1d0e4984a80aa3c73
+  metadata.gz: 2e2afc24d78261da1b0a307dac89e8a0571a2db5b6ae0195ac6e26c15f0ec5e77da8b70ee2d471f85a2f3e8111b67683aeaf9013fe41707af0fa305b760672d6
+  data.tar.gz: b9e006821e34c9156d368a876785fafe21fa66ded5974ad25f52b2be63e09b73360a5de35d15cb01d694733d5cafd34d1ae63dfa17ad177af09433be1aedd493

data/Gemfile

@@ -1 +1,5 @@
 source 'https://rubygems.org'
+
+gemspec
+
+gem 'open3'

data/Gemfile.lock

@@ -1,11 +1,19 @@
+PATH
+  remote: .
+  specs:
+    rails_critical_css (0.3.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
+    open3 (0.1.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  open3
+  rails_critical_css!
 
 BUNDLED WITH
    2.2.21

data/README.md

@@ -20,7 +20,7 @@ Install `penthouse` NPM package in your project. Be sure that node_modules/ dire
 In initializer:
 
 ```ruby
-CriticalCssGenerator.config do |c|
+RailsCriticalCss.config do |c|
   c.keep_larger_media_queries = true
   c.height = 19999 # prevent CLS on for example footer
 end

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/actions/after_render.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator::Actions
+module RailsCriticalCss::Actions
   class AfterRender
-    include CriticalCssGenerator::Actions::Helpers
+    include RailsCriticalCss::Actions::Helpers
 
     def initialize(filter_options)
       @packed_options = filter_options.slice(
@@ -19,7 +19,7 @@ module CriticalCssGenerator::Actions
 
       return if cache_path == false
 
-      CriticalCssGenerator::Jobs::Extractor.perform_if_semaphore_is_released(
+      RailsCriticalCss::Jobs::Extractor.perform_if_semaphore_is_released(
         html: controller.full_html_response,
         cache: {
           path: cache_path,

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/actions/before_render.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator::Actions
+module RailsCriticalCss::Actions
   class BeforeRender
-    include CriticalCssGenerator::Actions::Helpers
+    include RailsCriticalCss::Actions::Helpers
 
     def initialize(filter_options)
       @packed_options = filter_options.slice(:css, :cache_key, :cache_prefix)

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/actions/helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator::Actions::Helpers
+module RailsCriticalCss::Actions::Helpers
   def group_assets_by_type(assets)
     return [] unless assets.present?
 

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/actions.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator::Actions
+module RailsCriticalCss::Actions
   extend ActiveSupport::Concern
 
   included do
-    include CriticalCssGenerator::Helpers
+    include RailsCriticalCss::Helpers
 
     attr_accessor :lazy_css_blocks,
                   :critical_css_assets,
@@ -50,8 +50,8 @@ module CriticalCssGenerator::Actions
       options[:cache_prefix] ||= 'critical-css'
 
       filter_options = options.extract!(:if, :unless).merge(only: actions)
-      around_action CriticalCssGenerator::Actions::BeforeRender.new(options), filter_options
-      after_action CriticalCssGenerator::Actions::AfterRender.new(options), filter_options
+      around_action RailsCriticalCss::Actions::BeforeRender.new(options), filter_options
+      after_action RailsCriticalCss::Actions::AfterRender.new(options), filter_options
     end
   end
 end

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator
+module RailsCriticalCss
   class Config
     class << self
       attr_writer :width, :height, :keep_larger_media_queries,

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/extractor.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator
+require 'open3'
+require 'json'
+
+module RailsCriticalCss
+  LIB_ROOT = File.expand_path(File.join('..'), File.dirname(__FILE__))
+
   class Extractor
-    include CriticalCssGenerator::Actions::Helpers
+    include RailsCriticalCss::Actions::Helpers
 
     def initialize(options)
       @html, @css = options.values_at(:html, :css)
@@ -13,13 +18,15 @@ module CriticalCssGenerator
       tmp_css_file = tmp_concat_assets_array(@css[:assets], extension: 'css')
       return nil unless tmp_html_file.present? && tmp_css_file.present?
 
-      stdout, stderr = Open3.capture2e(
-        'node lib/critical_css_generator/js/css-extractor.js',
-        stdin_data: Extractor.extractor_process_input(
-          html_path: tmp_html_file.path,
-          css_path: tmp_css_file.path,
+      stdout, stderr = Dir.chdir(LIB_ROOT) do
+        Open3.capture2e(
+          'node js/css-extractor.js',
+          stdin_data: Extractor.extractor_process_input(
+            html_path: tmp_html_file.path,
+            css_path: tmp_css_file.path,
+          )
         )
-      )
+      end
 
       if stderr.try(:success?) && !stdout.try(:include?, 'UnhandledPromiseRejectionWarning')
         [
@@ -37,7 +44,7 @@ module CriticalCssGenerator
     end
 
     def self.extractor_process_input(html_path:, css_path:)
-      config = ::CriticalCssGenerator::Config.as_json_config({
+      config = ::RailsCriticalCss::Config.as_json_config({
         url: "file://#{html_path}",
         css: css_path,
       })

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator::Helpers
+module RailsCriticalCss::Helpers
   def critical_css
     @critical_css_cache.try(:[], :css)
   end

data/lib/{critical_css_generator/critical_css_generator → rails_critical_css}/jobs/extractor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module CriticalCssGenerator::Jobs
+module RailsCriticalCss::Jobs
   class Extractor < ActiveJob::Base
     class << self
       def semaphore_key(cache_path)
@@ -18,7 +18,7 @@ module CriticalCssGenerator::Jobs
 
     def perform(cache:, css:, html:)
       semaphore = self.class.semaphore_key(cache[:path])
-      critical_css = ::CriticalCssGenerator::Extractor.new(css: css, html: html).try_extract
+      critical_css = ::RailsCriticalCss::Extractor.new(css: css, html: html).try_extract
 
       # store it as wrapped css, do not regenerate for
       # each request critical_css if something go wrong

data/lib/rails_critical_css/railtie.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+require 'rails/railtie'
+
+module RailsCriticalCss
+  class Railtie < Rails::Railtie
+    config.eager_load_namespaces << RailsCriticalCss
+  end
+end

data/lib/rails_critical_css/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RailsCriticalCss
+  VERSION = '0.3.4'
+end

data/lib/rails_critical_css.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'open3'
+require 'rails_critical_css/version'
+require 'rails_critical_css/config'
+require 'rails_critical_css/actions'
+require 'rails_critical_css/actions/helpers'
+require 'rails_critical_css/extractor'
+require 'rails_critical_css/jobs/extractor'
+require 'rails_critical_css/actions/after_render'
+require 'rails_critical_css/actions/before_render'
+require 'rails_critical_css/helpers'
+
+module RailsCriticalCss
+  def self.config
+    yield RailsCriticalCss::Config
+  end
+end
+
+ActionController::Base.send(:include, RailsCriticalCss::Actions)
+ActionView::Base.send(:include, RailsCriticalCss::Helpers)

data/rails_critical_css.gemspec

@@ -1,6 +1,11 @@
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'rails_critical_css/version'
+
 Gem::Specification.new do |s|
   s.name = 'rails_critical_css'
-  s.version = '0.2.0'
+  s.version = RailsCriticalCss::VERSION
   s.summary = 'Critical CSS rails generator'
   s.authors = ['Mateusz Bagiński']
 
@@ -9,6 +14,6 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/Mati365/rails-critical-css'
   s.files = `git ls-files`.split($/)
 
-  s.require_paths << 'lib'
+  s.require_paths = ['lib']
   s.required_ruby_version = '>= 2.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_critical_css
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Mateusz Bagiński
@@ -22,16 +22,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/critical_css_generator/critical_css_generator.rb
-- lib/critical_css_generator/critical_css_generator/actions.rb
-- lib/critical_css_generator/critical_css_generator/actions/after_render.rb
-- lib/critical_css_generator/critical_css_generator/actions/before_render.rb
-- lib/critical_css_generator/critical_css_generator/actions/helpers.rb
-- lib/critical_css_generator/critical_css_generator/config.rb
-- lib/critical_css_generator/critical_css_generator/extractor.rb
-- lib/critical_css_generator/critical_css_generator/helpers.rb
-- lib/critical_css_generator/critical_css_generator/jobs/extractor.rb
-- lib/critical_css_generator/js/css-extractor.js
+- lib/js/css-extractor.js
+- lib/rails_critical_css.rb
+- lib/rails_critical_css/actions.rb
+- lib/rails_critical_css/actions/after_render.rb
+- lib/rails_critical_css/actions/before_render.rb
+- lib/rails_critical_css/actions/helpers.rb
+- lib/rails_critical_css/config.rb
+- lib/rails_critical_css/extractor.rb
+- lib/rails_critical_css/helpers.rb
+- lib/rails_critical_css/jobs/extractor.rb
+- lib/rails_critical_css/railtie.rb
+- lib/rails_critical_css/version.rb
 - rails_critical_css.gemspec
 homepage: https://github.com/Mati365/rails-critical-css
 licenses:
@@ -41,7 +43,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/critical_css_generator/critical_css_generator.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'open3'
-require 'critical_css_generator/config'
-require 'critical_css_generator/actions'
-require 'critical_css_generator/actions/helpers'
-require 'critical_css_generator/extractor'
-require 'critical_css_generator/jobs/extractor'
-require 'critical_css_generator/actions/after_render'
-require 'critical_css_generator/actions/before_render'
-require 'critical_css_generator/helpers'
-
-module CriticalCssGenerator
-  def self.config
-    yield CriticalCssGenerator::Config
-  end
-end
-
-ActionController::Base.send(:include, CriticalCssGenerator::Actions)
-ActionView::Base.send(:include, CriticalCssGenerator::Helpers)