jekyll-tidy-json 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6b350d84387d649ec9ca591f5c2bbc56b8c5333eb8e9ffa5a709472714496c1
-  data.tar.gz: 6e799e09705abafb510fcb01abb831c22da6355ea589b06348c4fb7e45407080
+  metadata.gz: 743cff63a7b0ed59e0696cd02bdb1b950be588188252a791cee1819800e78372
+  data.tar.gz: b9605dc665eae31688f7f42c5a6d898ab0d289b52b7ee954504d3956747fda41
 SHA512:
-  metadata.gz: d9e2b1b0637e07ac9244db9ce04b5ff0c776769e36b262b5778e4b6462d435c40b4cdf74aeab5a5085e5443e2546a740594d488de8f0eff4a92fda1960950052
-  data.tar.gz: 83d90fb02ce7e61d186731dd68dcda92d9ef63dd70731adcd4c219358f410efe3cb0d368375109261f68b7577f8ce88a4086614fc991b56b7a0b07e0ca9f4b93
+  metadata.gz: fd49755b9430689d3988c993061874b3251137a5983ac2c5a2bf868f2f32e3c646edd08a85784940e69516fefb859c45ca1cc1b802bcc6812f26cbd8134e03a9
+  data.tar.gz: 5bf48c6c393eca5a9507391f2c8d156263ef8a0776dde06cd86c0acf91b877c14820dfbd112a399a032f4844096c7c0d11210345c9572292d5f8a3bd265b062f

data/README.adoc

@@ -51,6 +51,13 @@ Available configuration options:
 | Description
 | Default setting
 
+| `continue_on_error`
+| If set to `false`, any malformed JSON encounter will raise error, preventing
+site from being built.  If set to `true`, all malformed files are exempted from
+being tidied up with a meaningful warning being printed, but site generation
+continues.
+| `false`
+
 | `enabled`
 | Can be used to disable the plugin entirely by setting it to `false`.
 | `true`

data/jekyll-tidy-json.gemspec

@@ -1,4 +1,4 @@
-require_relative 'lib/jekyll/tidy_json/version'
+require_relative "lib/jekyll/tidy_json/version"
 
 ALL_FILES_IN_GIT = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
 

data/lib/jekyll/tidy_json.rb

@@ -15,12 +15,19 @@ module Jekyll
       end
 
       def tidy_page_or_document(page_or_document)
+        if should_tidy?(page_or_document.relative_path)
+          tidy_page_or_document!(page_or_document)
+        end
+      end
+
+      def tidy_page_or_document!(page_or_document)
         path = page_or_document.relative_path
 
-        if should_tidy?(path)
-          Jekyll.logger.debug("Tidy up JSON:", path)
-          page_or_document.output = tidy_string(page_or_document.output)
-        end
+        Jekyll.logger.debug("Tidy up JSON:", path)
+        page_or_document.output = tidy_string(page_or_document.output)
+      rescue JSON::ParserError
+        print_parse_error(!continue_on_error?, $!, path)
+        raise unless continue_on_error?
       end
 
       def tidy_string(string)
@@ -30,6 +37,10 @@ module Jekyll
         JSON.public_send meth, json
       end
 
+      def continue_on_error?
+        !!@continue_on_error
+      end
+
       def pretty?
         !!@pretty
       end
@@ -41,9 +52,17 @@ module Jekyll
       private
 
       def parse_plugin_config(pc)
+        @continue_on_error = pc.fetch("continue_on_error", false)
         @enabled = pc.fetch("enabled", true)
         @pretty = pc.fetch("pretty", false)
       end
+
+      def print_parse_error(is_fatal, exception, file_path)
+        logger = Jekyll.logger.public_method(is_fatal ? :error : :warn)
+
+        logger.("Malformed JSON at path:", file_path)
+        logger.(exception)
+      end
     end
   end
 end

data/lib/jekyll/tidy_json/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module TidyJSON
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-tidy-json
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll