jekyll-optional-front-matter 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f29ae8b396c629a50b14f900421747957941c972f74f849e3505df32529bc2c4
-  data.tar.gz: 7e95a9d27e9059dcb2c7ddbdaee50fc82f5d11e2ee682b8473758159c3ddfbe6
+  metadata.gz: 256286d5e37418605dcfff4045918e459575542b56e64f59d72044991d9f052c
+  data.tar.gz: 415a9ebd808dc1fa8171e4a8fcbc848d59c16f7196cc38312a65c383c3be2746
 SHA512:
-  metadata.gz: 19bfcf7ce7456e4b66891ae01160a89b18aa89b535909c5ea0abbb1401687f85a5453db51b821d4c63dfa03b5cdfb836ab5cbabd820902da36f76391f2c477b3
-  data.tar.gz: cdf191d684a0d5652c8bae17e3f14eec6dc1ad09a33a37d7a01100acb22032db6e27360f34878fbe8135cb1d60590bae030127fef7cdc67fa66abed97c04a91e
+  metadata.gz: 9f217c725fb604e2147bcb5709ee818ec908b9d940b405f2f6d6ea3eb24912bb761c5093d12a551b653fb26612722ad421edee13f936092ccb1632c3060d6510
+  data.tar.gz: 67676b4ce80ec3a5696e950f3a2d023e2d6791995300cbe4b19e1da1f2731d292f8c69f6c787227866e224d91d5eaa58c9f36eda3c9bed929d6cb522842ca6ab

data/lib/jekyll-optional-front-matter/generator.rb

@@ -26,17 +26,17 @@ module JekyllOptionalFrontMatter
 
     private
 
-    # An array of Jekyll::Pages to add, *excluding* blacklisted files
+    # An array of Jekyll::Pages to add, *excluding* denylisted files
     def pages_to_add
-      pages.reject { |page| blacklisted?(page) }
+      pages.reject { |page| denylisted?(page) }
     end
 
-    # An array of Jekyll::StaticFile's, *excluding* blacklisted files
+    # An array of Jekyll::StaticFile's, *excluding* denylisted files
     def static_files_to_remove
-      markdown_files.reject { |page| blacklisted?(page) }
+      markdown_files.reject { |page| denylisted?(page) }
     end
 
-    # An array of potential Jekyll::Pages to add, *including* blacklisted files
+    # An array of potential Jekyll::Pages to add, *including* denylisted files
     def pages
       markdown_files.map { |static_file| page_from_static_file(static_file) }
     end
@@ -54,14 +54,15 @@ module JekyllOptionalFrontMatter
       Jekyll::Page.new(site, base, dir, name)
     end
 
-    # Does the given Jekyll::Page match our filename blacklist?
-    def blacklisted?(page)
-      return false if whitelisted?(page)
+    # Does the given Jekyll::Page match our filename denylist?
+    def denylisted?(page)
+      return false if explicitly_included?(page)
 
-      FILENAME_BLACKLIST.include?(page.basename.upcase)
+      FILENAME_DENYLIST.include?(page.basename.upcase)
     end
 
-    def whitelisted?(page)
+    # Is the given Jekyll::Page explicitly listed in the site's `include` config?
+    def explicitly_included?(page)
       return false unless site.config["include"].is_a? Array
 
       entry_filter.included?(page.relative_path)
@@ -76,11 +77,14 @@ module JekyllOptionalFrontMatter
     end
 
     def option(key)
-      site.config[CONFIG_KEY] && site.config[CONFIG_KEY][key]
+      config = site.config[CONFIG_KEY]
+      config[key] if config.is_a?(Hash)
     end
 
+    # `optional_front_matter: false` is shorthand for `enabled: false`
     def disabled?
-      option(ENABLED_KEY) == false || site.config["require_front_matter"]
+      site.config[CONFIG_KEY] == false || option(ENABLED_KEY) == false ||
+        site.config["require_front_matter"]
     end
 
     def cleanup?

data/lib/jekyll-optional-front-matter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllOptionalFrontMatter
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/jekyll-optional-front-matter.rb

@@ -7,7 +7,7 @@ module JekyllOptionalFrontMatter
   # Case-insensitive array of filenames to exclude. All files must first
   # match the config-defined list of markdown extensions. If you'd like one
   # of these files included in your site, simply add YAML front matter to it.
-  FILENAME_BLACKLIST = %w(
+  FILENAME_DENYLIST = %w(
     README
     LICENSE
     LICENCE
@@ -17,4 +17,8 @@ module JekyllOptionalFrontMatter
     ISSUE_TEMPLATE
     PULL_REQUEST_TEMPLATE
   ).freeze
+
+  # Deprecated: use FILENAME_DENYLIST. Kept so existing callers don't break.
+  FILENAME_BLACKLIST = FILENAME_DENYLIST
+  deprecate_constant :FILENAME_BLACKLIST
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-optional-front-matter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ben Balter
@@ -43,6 +43,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A Jekyll plugin to make front matter optional for Markdown files
 test_files: []