Minor refactor to config loader

Author: michael-misshore

lib/critical-path-css-rails.rb

@@ -28,14 +28,10 @@ def self.fetch(route)
   end
 
   def self.fetcher
-    @fetcher ||= CssFetcher.new(Configuration.new(config))
+    @fetcher ||= CssFetcher.new(Configuration.new(config_loader.config))
   end
 
-  def self.config
-    @config ||= begin
-      loader = CriticalPathCss::Rails::ConfigLoader.new
-      loader.load
-      loader.config
-    end
+  def self.config_loader
+    @config_loader ||= CriticalPathCss::Rails::ConfigLoader.new
   end
 end

lib/critical_path_css/rails/config_loader.rb

@@ -3,7 +3,7 @@ module Rails
     class ConfigLoader
       CONFIGURATION_FILENAME = 'critical_path_css.yml'.freeze
 
-      def load
+      def initialize
         validate_css_paths
         format_css_paths
       end

spec/lib/critical_path_css/rails/config_loader_spec.rb

@@ -25,10 +25,6 @@
         CONFIG
       }
 
-      before do
-        subject.load
-      end
-
       it 'sets css_path with the path' do
         expect(subject.config['css_path']).to eq '/app/spec/internal/public/test.css'
       end
@@ -58,10 +54,6 @@
         CONFIG
       }
 
-      before do
-        subject.load
-      end
-
       it 'sets css_path to empty string' do
         expect(subject.config['css_path']).to eq ''
       end
@@ -93,7 +85,7 @@
       }
 
       it 'raises an error' do
-        expect { subject.load }.to raise_error LoadError, 'Cannot specify both css_path and css_paths'
+        expect { subject }.to raise_error LoadError, 'Cannot specify both css_path and css_paths'
       end
     end
 
@@ -119,7 +111,7 @@
       }
 
       it 'raises an error' do
-        expect { subject.load }.to raise_error LoadError, 'Must specify css_paths for each route'
+        expect { subject }.to raise_error LoadError, 'Must specify css_paths for each route'
       end
     end
   end