Merge branch 'master' into refactors

Author: michael-misshore

README.md

@@ -27,7 +27,7 @@ However, more packages may need to be installed depending on your OS distributio
 After reviewing the dependency requirements, add `critical-path-css-rails` to your Gemfile:
 
 ```
-gem 'critical-path-css-rails', '~> 2.6.0'
+gem 'critical-path-css-rails', '~> 2.10.0'
 ```
 
 Download and install by running:
@@ -54,6 +54,7 @@ First, you'll need to configue a few things in the YAML file: `config/critical_p
 
 * `manifest_name`: If you're using the asset pipeline, add the manifest name.
 * `css_path`: If you're not using the asset pipeline, you'll need to define the path to the application's main CSS. The gem assumes your CSS lives in `RAILS_ROOT/public`. If your main CSS file is in `RAILS_ROOT/public/assets/main.css`, you would set the variable to `/assets/main.css`.
+* `css_paths`: If you have the need to specify multiple CSS source files, you can do so with `css_paths`. Note that `css_path` and `css_paths` are **mutually exclusive**; if using `css_path`, configuration for `css_paths` should be omitted, and vice versa. When using this option, a separate CSS path must be specified for each route, and they will be matched based on the order specified (the first CSS path will be applied to the first route, the second CSS path to the second route, etc).
 * `routes`: List the routes that you would like to generate the critical CSS for. (i.e. /resources, /resources/show/1, etc.)
 * `base_url`: Add your application's URL for the necessary environments.
 
@@ -87,7 +88,7 @@ A simple example using [loadcss-rails](https://github.com/michael-misshore/loadc
 <script>
     loadCSS("<%= stylesheet_path('application') %>");
 </script>
-<link rel="preload" href="<%= stylesheet_path('application') %>" as="style" onload="this.rel='stylesheet'">
+<link rel="preload" href="<%= stylesheet_path('application') %>" as="style" onload="this.onload=null;this.rel='stylesheet'">
 <noscript>
     <link rel="stylesheet" href="<%= stylesheet_path('application') %>">
 </noscript>
@@ -146,6 +147,12 @@ This gem is to be tested inside of docker/docker-compose. [Combustion](https://g
 
 Once shell'd in, run `bundle exec rspec spec` to run the test. The test rails app lives in `spec/internal`, and it can be viewed locally at `http://localhost:9292/`
 
+If you encounter Chromium errors trying to run the tests, installing [Puppeteer](https://github.com/GoogleChrome/puppeteer) might help.
+
+```Bash
+  npm install puppeteer
+```
+
 
 ## Versions
 

lib/config/critical_path_css.yml

@@ -3,6 +3,9 @@ defaults: &defaults
   manifest_name: application
   # Else provide the relative path of your CSS file from the /public directory
   # css_path: /path/to/css/from/public/main.css
+  # Or provide a separate path for each route
+  # css_paths:
+  #   - /path/to/css/from/public/main.css
   routes:
     - /
 

lib/critical_path_css/configuration.rb

@@ -13,6 +13,10 @@ def css_path
       @config['css_path']
     end
 
+    def css_paths
+      @config['css_paths']
+    end
+
     def manifest_name
       @config['manifest_name']
     end

lib/critical_path_css/css_fetcher.rb

@@ -10,7 +10,10 @@ def initialize(config)
     end
 
     def fetch
-      @config.routes.map { |route| [route, css_for_route(route)] }.to_h
+      @config.routes.map.with_index { |route, index|
+        css_path = @config.css_paths[index].present? ? @config.css_paths[index] : @config.css_path
+        [route, css_for_route(route, css_path)]
+      }.to_h
     end
 
     def fetch_route(route)
@@ -19,10 +22,10 @@ def fetch_route(route)
 
     protected
 
-    def css_for_route(route)
+    def css_for_route(route, css_path)
       options = {
         'url' => @config.base_url + route,
-        'css' => @config.css_path,
+        'css' => css_path,
         ## optional params
         # viewport dimensions
         'width' => 1300,

lib/critical_path_css/rails/config_loader.rb

@@ -5,12 +5,19 @@ class ConfigLoader
 
       def load
         config = YAML.safe_load(ERB.new(File.read(configuration_file_path)).result, [], [], true)[::Rails.env]
-        config['css_path'] = "#{::Rails.root}/public" + (
+        validate_css_path config
+        if config['css_path']
+          config['css_path'] = "#{::Rails.root}/public" + (
             config['css_path'] ||
               ActionController::Base.helpers.stylesheet_path(
                 config['manifest_name'], host: ''
               )
-        )
+          )
+          config['css_paths'] = []
+        else
+          config['css_path'] = ''
+          config['css_paths'] = config['css_paths'].collect { |path| "#{::Rails.root}/public#{path}" }
+        end
         config
       end
 
@@ -19,6 +26,14 @@ def load
       def configuration_file_path
         @configuration_file_path ||= ::Rails.root.join('config', CONFIGURATION_FILENAME)
       end
+
+      def validate_css_path(config)
+        if config['css_path'] && config['css_paths']
+          raise LoadError, 'Cannot specify both css_path and css_paths'
+        elsif config['css_paths'] && config['css_paths'].length != config['routes'].length
+          raise LoadError, 'Must specify css_paths for each route'
+        end
+      end
     end
   end
 end

lib/critical_path_css/rails/version.rb

@@ -1,5 +1,5 @@
 module CriticalPathCSS
   module Rails
-    VERSION = '2.6.0'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

package-lock.json

@@ -7,7 +7,7 @@
     "lib": "lib"
   },
   "dependencies": {
-    "penthouse": "=1.6.0"
+    "penthouse": "=1.10.1"
   },
   "license": "MIT"
 }

package.json

@@ -1 +1,2 @@
+<h1>Critical Path CSS Rails Test App</h1>
 <p><%= CriticalPathCss.fetch(request.path) %></p>