cloudcannon-jekyll-bookshop 2.0.1 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbacf5e895d06b58dd1f656bda66aaac91ac65d5b1d555b0dce1da21faf3734e
-  data.tar.gz: 98bdc82a5db6682cc69cb23e6f09d5104633f97c74ec59414a39bdc08f816c5c
+  metadata.gz: 6d904ddbae9b38e3decf17c9107d8faa47b962894b9e7472296ee4ae53c97913
+  data.tar.gz: e3344f22a4cf1e4a8e4b4227efd58ca0958bbb1a44ee2cfe25b7647ed64a8ddb
 SHA512:
-  metadata.gz: cb83619797b6903ca4d89550e680a123971f6a727c5502f66c49cc640ae2ba805179f0166d2429317a6b52893a59a88002973bfdd598c83d024c8340a72cdfd3
-  data.tar.gz: d5bbd29b9c9e1ab752475e3cea3a0c26043606450809eec19cc1c4f5efbe7fcd5d4700b7c9d9d3f765abf2758358610b00bbbcc201b7b11c276ace4a345b924e
+  metadata.gz: 20ba82495584aaa27667160d96535ab128cbc36c80cc2fd7e3208439d65ce747707b77931540410f6ad1d3270725b022c27409fd314b3db2bc93f88562b81738
+  data.tar.gz: 3ed20d1f6d2a95268b0ad016f59344f61c92e5bc8373fc51681f00558bdb6a6c47a564c84c5da7b164d9837d94ea9b6e1cc63480d56262c12f39c173b8b4f2a1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudcannon-jekyll-bookshop (2.0.1)
+    cloudcannon-jekyll-bookshop (2.0.5)
       dry-inflector (>= 0.1, < 1.0)
       jekyll (>= 3.7, < 5.0)
       node-runner (>= 1.0, < 2.0)

data/lib/cloudcannon-jekyll-bookshop/structures.rb

@@ -47,6 +47,7 @@ module CloudCannonJekyllBookshop
       array_structures = component.delete("structures")
       array_structures.each do |key|
         hash[key] ||= {}
+        hash[key]["id_key"] = "_bookshop_name"
         hash[key]["values"] ||= []
         hash[key]["values"].push(component)
       end
@@ -58,18 +59,47 @@ module CloudCannonJekyllBookshop
       Jekyll.logger.info "Bookshop:",
                          "Parsing Stories from #{base_path}"
 
-      threads = []
-      Dir.glob("**/*.{bookshop}.{toml,tml,tom,tm}", :base => base_path).each do |f|
-        threads << Thread.new do
-          raw_file = File.read(base_path + "/" + f)
-          component = load_component(raw_file)
-
-          transform_component(f, component).each do |transformed_component|
-            add_structure(site.config["_array_structures"], transformed_component)
+      files = Dir.glob("**/*.{bookshop}.{toml,tml,tom,tm}", :base => base_path);
+
+      read_attempts = 0
+      while files.size > 0 && read_attempts < 5
+        processing = files.map(&:clone)
+        files = []
+        threads = []
+        processing.each do |f|
+          threads << Thread.new do
+            begin
+              raw_file = File.read(base_path + "/" + f)
+              component = load_component(raw_file)
+    
+              transform_component(f, component).each do |transformed_component|
+                add_structure(site.config["_array_structures"], transformed_component)
+              end
+            rescue
+              Thread.current[:output] = f
+            end
           end
         end
+        threads.each do |t|
+          t.join
+          files << t[:output] if t[:output]
+        end
+        Jekyll.logger.info "Bookshop:",
+                           "Had trouble reading #{files.size} file(s), retrying" if files.size > 0
+        read_attempts += 1
+      end
+
+      if files.size > 0
+        Jekyll.logger.error "Bookshop:",
+                            "❌ Failed to read #{files.size} file(s)"
+        files.each do |f|
+          Jekyll.logger.error "Bookshop:",
+                              "❌ Failed to read #{f}"
+        end
+        Jekyll.logger.error "Bookshop:",
+                            "❌ Check your TOML files are valid."
+        exit 1
       end
-      threads.each(&:join)
     end
 
     def self.setup_helpers

data/lib/cloudcannon-jekyll-bookshop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyllBookshop
-  VERSION = "2.0.1"
+  VERSION = "2.0.5"
 end

data/node_modules/@bookshop/cloudcannon-structures/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bookshop/cloudcannon-structures",
-  "version": "2.0.1",
+  "version": "2.0.5",
   "description": "Convert a Bookshop object into a CloudCannon structure",
   "main": "main.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@bookshop/toml-narrator": "2.0.1",
+    "@bookshop/toml-narrator": "2.0.5",
     "@ltd/j-toml": "^1.17.0",
     "ava": "^3.15.0",
     "nyc": "^15.1.0",

data/node_modules/@bookshop/toml-narrator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bookshop/toml-narrator",
-  "version": "2.0.1",
+  "version": "2.0.5",
   "description": "Rewrite Bookshop TOML files to preserve comments",
   "main": "main.js",
   "scripts": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.5
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll