jekyll-js-converter 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a1eeed7b7f346b0419859c5c4f59cd735c311f4f80ab1571147abf0d82cf66
-  data.tar.gz: 004070e0d99a326d423b20bf8bb3691c98e05d7e1089f7262304c3740317e297
+  metadata.gz: 3266db8f045c5dfc168d25c41ae37cf094c3d6dbe8ffaa4b2ddf90547f486919
+  data.tar.gz: 7630aac486970cfea70a9b3f3b721973113ada5c4a2c8ad5c6e3e6c38c050977
 SHA512:
-  metadata.gz: 27142c7333b1ba84a3dea919ff2f3614e23b8d4f783f8c7280b97e55e6d9266924e0af3ddc1be79ba0ee6f9368013a2e70918ce18c03a9204d4dc25ca6cd86cb
-  data.tar.gz: a91ec043fbcc3c279616f47e462f8574dbbcc355962c4534605749653e9f77983bdcd79455424c9a6d8c77a602afa3527eb3b50413510cbf6958b42c620e779a
+  metadata.gz: b23f80a19d6ab045ca681cd9ac9037dcab4fae1df175fc2f53e02a24c7be3e0d32a5e770d42cd0955c02f667d7d9254c13ff971a19f970e07471c2f245bf89cf
+  data.tar.gz: 1f7897defebc0406b5af04d17c63dd02a2e9535e5195575c9897862bc69004ccc20c908e72b7e4c5fb78418d28fc5ccadce686ecba6150d64afb02a9d6cf87f8

data/lib/jekyll/converters/js.rb

@@ -1,5 +1,6 @@
 require 'uglifier'
 require 'jekyll/js_source_map_page'
+require 'jekyll/core_ext/hash'
 
 module Jekyll
   module Converters
@@ -21,17 +22,17 @@ module Jekyll
       end
 
       def javascript_config
-        @javascript_config ||= @config['javascript'] || {}
+        @javascript_config ||= @config['javascript'].deep_symbolize_keys || {}
       end
 
       def javascript_dir
-        javascript_config['javascript_dir'].to_s.empty? ? '_javascript' : javascript_config['javascript_dir']
+        javascript_config[:javascript_dir].to_s.empty? ? '_javascript' : javascript_config[:javascript_dir]
       end
 
       def load_paths
         @load_paths ||= begin
           paths = [Jekyll.sanitized_path(site.source, javascript_dir)]
-          paths += javascript_config['load_paths'].map { |load_path| File.expand_path(load_path, site.source) } rescue []
+          paths += javascript_config[:load_paths].map { |load_path| File.expand_path(load_path, site.source) } rescue []
 
           if safe?
             paths.map! { |path| Jekyll.sanitized_path(site.source, path) }
@@ -69,35 +70,31 @@ module Jekyll
 
       def convert(content)
         if generate_source_map?
-          config = Jekyll::Utils.symbolize_hash_keys(
-            Jekyll::Utils.deep_merge_hashes(
-              { :uglifer => {
-                  :source_map => {
-                    :map_url => @source_map_page.name,
-                    :sources_content => true,
-                    :filename => @page.name
-                  }
+          config = Jekyll::Utils.deep_merge_hashes(
+            { :uglifier => {
+                :source_map => {
+                  :map_url => @source_map_page.name,
+                  :sources_content => true,
+                  :filename => @page.name
                 }
-              },
-              javascript_config
-            )
+              }
+            },
+            javascript_config
           )
 
-          uglified, source_map = Uglifier.new(config[:uglifer]).compile_with_map(insert_imports(content))
+          uglified, source_map = Uglifier.new(config[:uglifier]).compile_with_map(insert_imports(content))
 
           @source_map_page.source_map(source_map)
           site.pages << @source_map_page
 
           uglified
         else
-          config = Jekyll::Utils.symbolize_hash_keys(
-            Jekyll::Utils.deep_merge_hashes(
-              { :uglifer => {} },
-              javascript_config
-            )
+          config = Jekyll::Utils.deep_merge_hashes(
+            { :uglifier => {} },
+            javascript_config
           )
 
-          Uglifier.new(config[:uglifer]).compile(insert_imports(content))
+          Uglifier.new(config[:uglifier]).compile(insert_imports(content))
         end
       end
 
@@ -155,7 +152,7 @@ module Jekyll
       end
 
       def source_map_option
-        javascript_config.fetch('source_map', :always).to_sym
+        javascript_config.fetch(:source_map, :always).to_sym
       end
     end
   end

data/lib/jekyll/core_ext/hash.rb

@@ -0,0 +1,12 @@
+class Hash
+  def deep_symbolize_keys(object = self)
+    case object
+      when Hash
+        object.each_with_object(Hash.new) do |(key, value), result|
+          result[key.to_sym] = deep_symbolize_keys(value)
+        end
+      else
+        object
+    end
+  end
+end

data/lib/jekyll-js-converter/version.rb

@@ -1,3 +1,3 @@
 module JekyllJsConverter
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-js-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - David Susco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
@@ -89,6 +89,7 @@ files:
 - lib/jekyll-js-converter.rb
 - lib/jekyll-js-converter/version.rb
 - lib/jekyll/converters/js.rb
+- lib/jekyll/core_ext/hash.rb
 - lib/jekyll/js_source_map_page.rb
 homepage: https://github.com/dsusco/jekyll-js-converter
 licenses:
@@ -102,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="