jekyll-js-converter 0.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f975186d3b4d088fb3ee18595c6b6f43b1226defb8f44d06e2683663c60a611
-  data.tar.gz: fd7abf2439a6a69133cdd2c0e55ed3f30fa8d8e2dc95698d1b1314cb934e4a60
+  metadata.gz: 46e4f09c7076cad7fb5dfc7c811e826cce1ad8358db66f3bb3e99a85577ca4ab
+  data.tar.gz: cc313145326fd00006785f91df5f3fd7277c5f97b5fba35e2fe8e66edc50ce97
 SHA512:
-  metadata.gz: '086d6cef9f35f63debb0ff5a0bfead0c11cc69e45f1e543ba3191cd6a619a7d3f7a45b8ebe465348de2ee2bec04b3d2d1155f7f52645fbca394ce589f91f1941'
-  data.tar.gz: ee944a5a249415e7308a67488a6d2e0bc44a7f2a71153301444da9dd18265c03d0529be0b2d02125acc751dd06c08b3973c1aa39a2df0ea0b1888ccd51636a82
+  metadata.gz: f3c7dfac1fd68634f4e0a6ade3a6429127e9e183a752e2f06a0cec311c989fecb82d14c6d4c0a3df5840131000e4ca68b51f672d2acbe5f082e66cc51aeb66ef
+  data.tar.gz: fe2e8bd2d8a2b7cbccfbd7d2f03d3ed38951268fafc5131d18a4688f284cdce9e87e030920660fb23ff2722788e888443a0f0aca42eb4e39ec21dccaee26f20a

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
@@ -11,7 +12,6 @@ module Jekyll
 
       def associate_page(page)
         @page = page
-        @site = @page.site
         @source_map_page = JsSourceMapPage.new(@page)
       end
 
@@ -22,28 +22,28 @@ 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) } rescue []
+          paths = [Jekyll.sanitized_path(site.source, javascript_dir)]
+          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) }
+            paths.map! { |path| Jekyll.sanitized_path(site.source, path) }
           end
 
-          Dir.chdir(@site.source) do
+          Dir.chdir(site.source) do
             paths = paths.flat_map { |path| Dir.glob(path) }
 
             paths.map! do |path|
               if safe?
-                Jekyll.sanitized_path(site_source, path)
+                Jekyll.sanitized_path(site.source, path)
               else
                 File.expand_path(path)
               end
@@ -51,7 +51,7 @@ module Jekyll
           end
 
           paths.uniq!
-          paths << @site.theme.javascript_path
+          paths << site.theme.javascript_path if site.theme&.javascript_path
           paths.select { |path| File.directory?(path) }
         end
       end
@@ -60,7 +60,7 @@ module Jekyll
         ext =~ /^\.js$/i
       end
 
-      def output_ext(ext)
+      def output_ext(ext = '')
         '.js'
       end
 
@@ -72,7 +72,7 @@ module Jekyll
         if generate_source_map?
           config = Jekyll::Utils.symbolize_hash_keys(
             Jekyll::Utils.deep_merge_hashes(
-              { :uglifer => {
+              { :uglifier => {
                   :source_map => {
                     :map_url => @source_map_page.name,
                     :sources_content => true,
@@ -84,21 +84,21 @@ module Jekyll
             )
           )
 
-          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
+          site.pages << @source_map_page
 
           uglified
         else
           config = Jekyll::Utils.symbolize_hash_keys(
             Jekyll::Utils.deep_merge_hashes(
-              { :uglifer => {} },
+              { :uglifier => {} },
               javascript_config
             )
           )
 
-          Uglifier.new(config[:uglifer]).compile(insert_imports(content))
+          Uglifier.new(config[:uglifier]).compile(insert_imports(content))
         end
       end
 
@@ -110,7 +110,7 @@ module Jekyll
         elsif source_map_option.eql?(:always)
           true
         else
-          :development == source_map_option == Jekyll.env.to_sym
+          :development == source_map_option && source_map_option == Jekyll.env.to_sym
         end
       end
 
@@ -151,8 +151,12 @@ module Jekyll
         content
       end
 
+      def site
+        @site ||= @page.nil? ? Jekyll.sites.last : @page.site
+      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 = '0.0.6'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-js-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - David Susco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-23 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:
   - - ">="