critical-path-css-rails 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a5eefb2a42d4644343a59f2ee368e226c3b8dd
-  data.tar.gz: 2bff7d859b2f724812835870aa6a6cc5eb3e3135
+  metadata.gz: 3e92d5a4e4eb1085188e1dca05213f8504ce59f0
+  data.tar.gz: 0f1062681151f332c692501e502de54132639706
 SHA512:
-  metadata.gz: bf88d891b4fa2f7ffb6cef4d68aa412a1d31b0cd258030deff4f2be39a97255ff96fa3f3b1015ef398c7add71c98405b8a1eb9bd621a11cad83effcf7845b792
-  data.tar.gz: 1f34e4d3f2f70e2114b433a574b095b1b6727777eff49cdbf4e1b2b75a974fb738ef64c8f7957f477f29ecc084e6047a470677dd59a40fb7de64d34af827fc29
+  metadata.gz: 3fad3f39638e25d2877acc81e8ebf9e6a486d80314426c7dc1a7020a4d12a23b1fc5461d83a4faa7bbf406e7804d06dbd28f1830a60e6c756d6e7088f0c4bf39
+  data.tar.gz: 37d31f7976f968c21eb433aaada848e2d64f35fa48d9ea27caa0b1e368922a7dd994966a4e0361a30d0f723fe8f1dda3006cc73e49d459bc969c36649f8dfbe7

data/critical-path-css-rails.gemspec

@@ -9,12 +9,13 @@ Gem::Specification.new do |gem|
   gem.summary     = 'Critical Path CSS for Rails!'
   gem.description = 'Only load the CSS you need for the initial viewport in Rails!'
   gem.license     = 'MIT'
+  gem.homepage    = 'https://rubygems.org/gems/critical-path-css-rails'
 
   gem.files        = `git ls-files`.split("\n")
   gem.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.require_path = 'lib'
 
-  gem.add_development_dependency 'combustion', '~> 1.1.0'
+  gem.add_development_dependency 'combustion', '~> 1.1', '>= 1.1.0'
 
   gem.extensions = ['ext/npm/extconf.rb']
 end

data/lib/critical_path_css/configuration.rb

@@ -9,10 +9,6 @@ module CriticalPathCss
       @config['base_url']
     end
 
-    def css_path
-      @config['css_path']
-    end
-
     def css_paths
       @config['css_paths']
     end
@@ -28,5 +24,9 @@ module CriticalPathCss
     def penthouse_options
       @config['penthouse_options'] || {}
     end
+
+    def path_for_route(route)
+      css_paths[routes.index(route)] || css_paths.first
+    end
   end
 end

data/lib/critical_path_css/css_fetcher.rb

@@ -16,7 +16,7 @@ module CriticalPathCss
     def fetch_route(route)
       options = {
         'url' => @config.base_url + route,
-        'css' => fetch_css_path_for_route(route),
+        'css' => @config.path_for_route(route),
         'width' => 1300,
         'height' => 900,
         'timeout' => 30_000,
@@ -51,17 +51,5 @@ module CriticalPathCss
       end
       out
     end
-
-    private
-
-    def fetch_css_path_for_route(route)
-      index_for_route = @config.routes.index(route)
-
-      if index_for_route && @config.css_paths[index_for_route]
-        @config.css_paths[index_for_route]
-      else
-        @config.css_path
-      end
-    end
   end
 end

data/lib/critical_path_css/rails/config_loader.rb

@@ -19,15 +19,12 @@ module CriticalPathCss
       end
 
       def format_css_paths
-        if config['css_path']
-          config['css_path']  = format_path(config['css_path'])
-          config['css_paths'] = []
-        elsif config['css_paths']
-          config['css_path']  = ''
-          config['css_paths'] = config['css_paths'].collect { |path| format_path(path) }
+        config['css_paths'] = [config['css_path']] if config['css_path']
+
+        if config['css_paths']
+          config['css_paths'].map! { |path| format_path(path) }
         else
-          config['css_path']  = ActionController::Base.helpers.stylesheet_path(config['manifest_name'], host: '')
-          config['css_paths'] = []
+          config['css_paths'] = [ActionController::Base.helpers.stylesheet_path(config['manifest_name'], host: '')]
         end
       end
 

data/lib/critical_path_css/rails/version.rb

@@ -1,5 +1,5 @@
 module CriticalPathCSS
   module Rails
-    VERSION = '3.0.2'.freeze
+    VERSION = '3.0.3'.freeze
   end
 end

data/spec/fixtures/files/config/mutliple-css-paths.yml

@@ -0,0 +1,14 @@
+defaults: &defaults
+  base_url: http://0.0.0.0:9292
+  css_paths:
+    - /test.css
+    - /test2.css
+  routes:
+    - /
+    - /new_route
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults

data/spec/fixtures/files/config/no-paths-specified.yml

@@ -0,0 +1,11 @@
+defaults: &defaults
+  base_url: http://0.0.0.0:9292
+  manifest_name: application
+  routes:
+    - /
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults

data/spec/fixtures/files/config/paths-and-routes-not-same-length.yml

@@ -0,0 +1,15 @@
+defaults: &defaults
+  base_url: http://0.0.0.0:9292
+  css_paths:
+    - /test.css
+    - /test2.css
+  routes:
+    - /
+    - /new_route
+    - /newer_route
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults

data/spec/fixtures/files/config/paths-both-specified.yml

@@ -0,0 +1,15 @@
+defaults: &defaults
+  base_url: http://0.0.0.0:9292
+  css_path: /test.css
+  css_paths:
+    - /test.css
+    - /test2.css
+  routes:
+    - /
+    - /new_route
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults

data/spec/fixtures/files/config/single-css-path.yml

@@ -0,0 +1,11 @@
+defaults: &defaults
+  base_url: http://0.0.0.0:9292
+  css_path: /test.css
+  routes:
+    - /
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults

data/spec/lib/critical_path_css/css_fetcher_spec.rb

@@ -1,27 +1,30 @@
 require 'spec_helper'
 
 RSpec.describe 'CssFetcher' do
-  let(:subject) { CriticalPathCss::CssFetcher.new(config) }
+  subject { CriticalPathCss::CssFetcher.new(config) }
+
+  let(:base_url) { 'http://0.0.0.0:9292' }
   let(:response) { ['foo','', OpenStruct.new(exitstatus: 0)] }
-  let(:routes) { ['/', '/new_route'] }
+  let(:routes)   { ['/', '/new_route'] }
   let(:config) do
-    OpenStruct.new(
-      base_url: 'http://0.0.0.0:9292',
-      css_path: css_path,
-      css_paths: css_paths,
-      penthouse_options: {},
-      routes: routes
+    CriticalPathCss::Configuration.new(
+      OpenStruct.new(
+        base_url: base_url,
+        css_paths: css_paths,
+        penthouse_options: {},
+        routes: routes
+      )
     )
   end
 
   describe '#fetch_route' do
     context 'when a single css_path is configured' do
-      let(:css_path) { '/test.css' }
-      let(:css_paths) { [] }
+      let(:css_paths) { ['/test.css'] }
 
       it 'generates css for the single route' do
         expect(Open3).to receive(:capture3) do |arg1, arg2, arg3|
           options = JSON.parse(arg3)
+
           expect(options['css']).to eq '/test.css'
         end.once.and_return(response)
 
@@ -32,44 +35,48 @@ RSpec.describe 'CssFetcher' do
 
   describe '#fetch' do
     context 'when a single css_path is configured' do
-      let(:css_path) { '/test.css' }
-      let(:css_paths) { [] }
+      let(:css_paths) { ['/test.css'] }
 
       it 'generates css for each route from the same file' do
         expect(Open3).to receive(:capture3) do |arg1, arg2, arg3|
           options = JSON.parse(arg3)
+
           expect(options['css']).to eq '/test.css'
         end.twice.and_return(response)
+
         subject.fetch
       end
     end
 
     context 'when multiple css_paths are configured' do
-      let(:css_path) { '' }
       let(:css_paths) { ['/test.css', '/test2.css'] }
 
       it 'generates css for each route from the respective file' do
         expect(Open3).to receive(:capture3) do |arg1, arg2, arg3|
           options = JSON.parse(arg3)
-          expect(options['css']).to eq '/test.css' if options['url'] == 'http://0.0.0.0:9292/'
-          expect(options['css']).to eq '/test2.css' if options['url'] == 'http://0.0.0.0:9292/new_route'
+
+          css_paths.each_with_index do |path, index|
+            expect(options['css']).to eq path if options['url'] == "#{base_url}/#{routes[index]}"
+          end
         end.twice.and_return(response)
+
         subject.fetch
       end
     end
 
     context 'when same css file applies to multiple routes' do
-      let(:css_path) { '' }
       let(:css_paths) { ['/test.css', '/test2.css', '/test.css'] }
       let(:routes) { ['/', '/new_route', '/newer_route'] }
 
       it 'generates css for each route from the respective file' do
         expect(Open3).to receive(:capture3) do |arg1, arg2, arg3|
           options = JSON.parse(arg3)
-          expect(options['css']).to eq '/test.css' if options['url'] == 'http://0.0.0.0:9292/'
-          expect(options['css']).to eq '/test2.css' if options['url'] == 'http://0.0.0.0:9292/new_route'
-          expect(options['css']).to eq '/test.css' if options['url'] == 'http://0.0.0.0:9292/newer_route'
+
+          css_paths.each_with_index do |path, index|
+            expect(options['css']).to eq path if options['url'] == "#{base_url}/#{routes[index]}"
+          end
         end.thrice.and_return(response)
+
         subject.fetch
       end
     end

data/spec/lib/critical_path_css/rails/config_loader_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe 'ConfigLoader' do
-  let(:subject) { CriticalPathCss::Rails::ConfigLoader.new }
+  subject { CriticalPathCss::Rails::ConfigLoader.new }
 
   describe '#load' do
     before do
@@ -9,54 +9,15 @@ RSpec.describe 'ConfigLoader' do
     end
 
     context 'when single css_path is specified' do
-      let(:config_file) {
-        <<~CONFIG
-          defaults: &defaults
-            base_url: http://0.0.0.0:9292
-            css_path: /test.css
-            routes:
-              - /
+      let(:config_file) { file_fixture('config/single-css-path.yml').read }
 
-          development:
-            <<: *defaults
-
-          test:
-            <<: *defaults
-        CONFIG
-      }
-
-      it 'sets css_path with the path' do
-        expect(subject.config['css_path']).to eq '/app/spec/internal/public/test.css'
-      end
-
-      it 'leaves css_paths empty' do
-        expect(subject.config['css_paths']).to eq []
+      it 'sets css_paths with the lone path' do
+        expect(subject.config['css_paths']).to eq ['/app/spec/internal/public/test.css']
       end
     end
 
     context 'when multiple css_paths are specified' do
-      let(:config_file) {
-        <<~CONFIG
-          defaults: &defaults
-            base_url: http://0.0.0.0:9292
-            css_paths:
-              - /test.css
-              - /test2.css
-            routes:
-              - /
-              - /new_route
-
-          development:
-            <<: *defaults
-
-          test:
-            <<: *defaults
-        CONFIG
-      }
-
-      it 'sets css_path to empty string' do
-        expect(subject.config['css_path']).to eq ''
-      end
+      let(:config_file) { file_fixture('config/mutliple-css-paths.yml').read }
 
       it 'leaves css_paths to an array of paths' do
         expect(subject.config['css_paths']).to eq ['/app/spec/internal/public/test.css','/app/spec/internal/public/test2.css']
@@ -64,51 +25,15 @@ RSpec.describe 'ConfigLoader' do
     end
 
     context 'when no paths are specified' do
-      let(:config_file) {
-        <<~CONFIG
-          defaults: &defaults
-            base_url: http://0.0.0.0:9292
-            manifest_name: application
-            routes:
-              - /
+      let(:config_file) { file_fixture('config/no-paths-specified.yml').read }
 
-          development:
-            <<: *defaults
-
-          test:
-            <<: *defaults
-        CONFIG
-      }
-
-      it 'sets css_path with the path' do
-        expect(subject.config['css_path']).to eq '/stylesheets/application.css'
-      end
-
-      it 'leaves css_paths empty' do
-        expect(subject.config['css_paths']).to eq []
+      it 'sets css_paths with the lone manifest path' do
+        expect(subject.config['css_paths']).to eq ['/stylesheets/application.css']
       end
     end
 
     context 'when single css_path and multiple css_paths are both specified' do
-      let(:config_file) {
-        <<~CONFIG
-          defaults: &defaults
-            base_url: http://0.0.0.0:9292
-            css_path: /test.css
-            css_paths:
-              - /test.css
-              - /test2.css
-            routes:
-              - /
-              - /new_route
-
-          development:
-            <<: *defaults
-
-          test:
-            <<: *defaults
-        CONFIG
-      }
+      let(:config_file) { file_fixture('config/paths-both-specified.yml').read }
 
       it 'raises an error' do
         expect { subject }.to raise_error LoadError, 'Cannot specify both css_path and css_paths'
@@ -116,25 +41,7 @@ RSpec.describe 'ConfigLoader' do
     end
 
     context 'when css_paths and routes are not the same length' do
-      let(:config_file) {
-        <<~CONFIG
-          defaults: &defaults
-            base_url: http://0.0.0.0:9292
-            css_paths:
-              - /test.css
-              - /test2.css
-            routes:
-              - /
-              - /new_route
-              - /newer_route
-
-          development:
-            <<: *defaults
-
-          test:
-            <<: *defaults
-        CONFIG
-      }
+      let(:config_file) { file_fixture('config/paths-and-routes-not-same-length.yml').read }
 
       it 'raises an error' do
         expect { subject }.to raise_error LoadError, 'Must specify css_paths for each route'

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: critical-path-css-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Michael Misshore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 description: Only load the CSS you need for the initial viewport in Rails!
@@ -62,6 +68,11 @@ files:
 - package-lock.json
 - package.json
 - spec/features/generate_and_fetch_critical_css_spec.rb
+- spec/fixtures/files/config/mutliple-css-paths.yml
+- spec/fixtures/files/config/no-paths-specified.yml
+- spec/fixtures/files/config/paths-and-routes-not-same-length.yml
+- spec/fixtures/files/config/paths-both-specified.yml
+- spec/fixtures/files/config/single-css-path.yml
 - spec/internal/app/controllers/root_controller.rb
 - spec/internal/app/views/layouts/application.html.erb
 - spec/internal/app/views/root/index.html.erb
@@ -75,7 +86,7 @@ files:
 - spec/lib/critical_path_css/css_fetcher_spec.rb
 - spec/lib/critical_path_css/rails/config_loader_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage: https://rubygems.org/gems/critical-path-css-rails
 licenses:
 - MIT
 metadata: {}