jekyll-optional-front-matter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 699f529d1c74aab068a8409d8f627972850284fa
-  data.tar.gz: 3eeeb01349fa637d6f4adbd008f628527f8af533
+  metadata.gz: eeb9bc52d01fe3ddf00623f3e8c7f2b9affcf7af
+  data.tar.gz: d806a601091253ec1c4dcb241fdc89ec03607882
 SHA512:
-  metadata.gz: 7da45704d66838382189ed0ab1c194fb032082e35a9896eae4d647bc36a7161f739d93621458cd2d42be61dcebc98dd20035988ef0f69c5c22b8fca01a113f5e
-  data.tar.gz: eb428b2029c7b3f0692a714847aa3a7a9384ef3680a4059bc664d25c39f04e07ea50bd9ee204cca3bdef7947d7adedc482ea8e78dcf810d67c5df1420bf81b8e
+  metadata.gz: 7ad53b232c4fa3fc252c4e8eb6af311bbc05e4b3beb7d0b1b09249f4496f91ef16c7de9cadbbbb41d58bc3658ec07048dd66cd8852e49d3c8bc06b5b517ac518
+  data.tar.gz: 4dad5d5f286cd47df84a81b875997b07a4e1d234b278db478dce3ba703d76302b4242539f73d705b47096a8dd2d2929a8191132aafa93caf75c966553caf48d2

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

@@ -5,14 +5,19 @@ module JekyllOptionalFrontMatter
     safe true
     priority :normal
 
+    CONFIG_KEY = "optional_front_matter".freeze
+    ENABLED_KEY = "enabled".freeze
+    CLEANUP_KEY = "remove_originals".freeze
+
     def initialize(site)
       @site = site
     end
 
     def generate(site)
       @site = site
-      return if site.config["require_front_matter"]
+      return if disabled?
       site.pages.concat(pages_to_add)
+      site.static_files -= static_files_to_remove if cleanup?
     end
 
     private
@@ -22,6 +27,11 @@ module JekyllOptionalFrontMatter
       pages.reject { |page| blacklisted?(page) }
     end
 
+    # An array of Jekyll::StaticFile's, *excluding* blacklisted files
+    def static_files_to_remove
+      markdown_files.reject { |page| blacklisted?(page) }
+    end
+
     # An array of potential Jekyll::Pages to add, *including* blacklisted files
     def pages
       markdown_files.map { |static_file| page_from_static_file(static_file) }
@@ -48,7 +58,7 @@ module JekyllOptionalFrontMatter
 
     def whitelisted?(page)
       return false unless site.config["include"].is_a? Array
-      entry_filter.included?(page.path)
+      entry_filter.included?(page.relative_path)
     end
 
     def markdown_converter
@@ -58,5 +68,17 @@ module JekyllOptionalFrontMatter
     def entry_filter
       @entry_filter ||= Jekyll::EntryFilter.new(site)
     end
+
+    def option(key)
+      site.config[CONFIG_KEY] && site.config[CONFIG_KEY][key]
+    end
+
+    def disabled?
+      option(ENABLED_KEY) == false || site.config["require_front_matter"]
+    end
+
+    def cleanup?
+      option(CLEANUP_KEY) == true || site.config["require_front_matter"]
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 module JekyllOptionalFrontMatter
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-optional-front-matter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll