Reduce overall class size (#132)

Merge pull request 132
jekyll · Feb 24, 2022 · 6b88b54 · 6b88b54
1 parent 5d130e8
commit 6b88b54
Showing 1 changed file with 11 additions and 28 deletions.
diff --git a/lib/jekyll/converters/scss.rb b/lib/jekyll/converters/scss.rb
@@ -92,16 +92,11 @@ def jekyll_sass_configuration
       end
 
       def sass_build_configuration_options(overrides)
-        if safe?
-          overrides
-        else
-          Jekyll::Utils.symbolize_hash_keys(
-            Jekyll::Utils.deep_merge_hashes(
-              jekyll_sass_configuration,
-              overrides
-            )
-          )
-        end
+        return overrides if safe?
+
+        Jekyll::Utils.symbolize_hash_keys(
+          Jekyll::Utils.deep_merge_hashes(jekyll_sass_configuration, overrides)
+        )
       end
 
       def syntax
@@ -141,22 +136,16 @@ def sass_dir_relative_to_site_source
       def sass_load_paths
         paths = user_sass_load_paths + [sass_dir_relative_to_site_source]
 
-        if safe?
-          # Sanitize paths to prevent any attack vectors (.e.g. `/**/*`)
-          paths.map! { |path| Jekyll.sanitized_path(site_source, path) }
-        end
+        # Sanitize paths to prevent any attack vectors (.e.g. `/**/*`)
+        paths.map! { |path| Jekyll.sanitized_path(site_source, path) } if safe?
 
         # Expand file globs (e.g. `node_modules/*/node_modules` )
         Dir.chdir(site_source) do
           paths = paths.flat_map { |path| Dir.glob(path) }
 
           paths.map! do |path|
-            if safe?
-              # Sanitize again in case globbing was able to do something crazy.
-              Jekyll.sanitized_path(site_source, path)
-            else
-              File.expand_path(path)
-            end
+            # Sanitize again in case globbing was able to do something crazy.
+            safe? ? Jekyll.sanitized_path(site_source, path) : File.expand_path(path)
           end
         end
 
@@ -337,11 +326,7 @@ def sass_embedded_generate_source_map(source_map)
       end
 
       def site
-        if associate_page_failed?
-          Jekyll.sites.last
-        else
-          sass_page.site
-        end
+        associate_page_failed? ? Jekyll.sites.last : sass_page.site
       end
 
       def site_source
@@ -350,9 +335,7 @@ def site_source
 
       def site_source_relative_from_pwd
         @site_source_relative_from_pwd ||=
-          Pathname.new(site_source)
-            .relative_path_from(Pathname.new(Dir.pwd))
-            .to_s
+          Pathname.new(site_source).relative_path_from(Pathname.new(Dir.pwd)).to_s
       end
     end
   end