cloudcannon-jekyll-bookshop 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4e52fe7b3ba536952967db73d6c044bcfbc7b085f2d08a4c68b6596e2bd569
-  data.tar.gz: c984f34175e0233c5c023d0ff3732fd017a146623b1e4cc2cea86c8197611f18
+  metadata.gz: e9e4ca9c7dd82b20b523ffc540493a2cb6baffdfdc3aa1e55923aaf2764724c5
+  data.tar.gz: 90f434c71ea590ceaa9ad24864f7290bd156b582f8879f09285c0421b02848d1
 SHA512:
-  metadata.gz: a463bd057baba2cf95a15bb0e1b81ffb7803bbe7df82bfb4a99a83c3c8e265c3e2fba72dc2f0328b39910dbeb6bcbf602580d93a4ae55c0987a5f11366622427
-  data.tar.gz: 8e9709477eb2d65df9965453f6e2381ce59764acb656ab9bf6b50029bd6c8bd352671a964b8a9f6958d5f6f8588c035bb06d2d97400eb1ab21fba1a0b79f4104
+  metadata.gz: 2f8555fe8d35188431f06a5ad5ba43e9caccf5590aeab79bb8f34d5f38ddf904bf6b5cd81add18c097faf2dcb4eb271dc6d7bad42566e25508464b9675ff1135
+  data.tar.gz: 03f2449f7bcd85610274c39acfd6b398b45bb24b8c5ccc3d95a5405e8961e92fda67e10a4ef1fb183dce379b0dddd6484b94413a78f68a85967c403cb46434d5

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cloudcannon-jekyll-bookshop (2.0.2)
+    cloudcannon-jekyll-bookshop (2.0.6)
       dry-inflector (>= 0.1, < 1.0)
       jekyll (>= 3.7, < 5.0)
-      node-runner (>= 1.0, < 2.0)
+      node-runner-temp-fix-windows (>= 1.0, < 2.0)
       toml-rb (>= 2.0, < 3.0)
 
 GEM
@@ -16,7 +16,7 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     citrus (3.0.2)
-    cloudcannon-jekyll (2.0.1)
+    cloudcannon-jekyll (2.2.0)
       jekyll (>= 2.4.0, < 5)
     colorator (1.1.0)
     concurrent-ruby (1.1.9)
@@ -25,14 +25,14 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.15.3)
+    ffi (1.15.4)
     forwardable-extended (2.6.0)
     hashdiff (1.0.1)
     http_parser.rb (0.6.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    jekyll (4.2.0)
+    jekyll (4.2.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -56,7 +56,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.6.0)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
@@ -66,7 +66,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    node-runner (1.0.1)
+    node-runner-temp-fix-windows (1.0.1)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
@@ -79,7 +79,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (3.26.1)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

data/cloudcannon-jekyll-bookshop.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", ">= 3.7", "< 5.0"
   spec.add_dependency "toml-rb", ">= 2.0", "< 3.0"
-  spec.add_dependency "node-runner", ">= 1.0", "< 2.0"
+  spec.add_dependency "node-runner-temp-fix-windows", ">= 1.0", "< 2.0"
   spec.add_dependency "dry-inflector", ">= 0.1", "< 1.0"
   spec.add_development_dependency "cloudcannon-jekyll", ">= 2.0", "< 3.0"
   spec.add_development_dependency "rubocop", "~> 0.80"

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.2"
+  VERSION = "2.0.6"
 end

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

@@ -1,6 +1,6 @@
 {
   "name": "@bookshop/cloudcannon-structures",
-  "version": "2.0.2",
+  "version": "2.0.6",
   "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.2",
+    "@bookshop/toml-narrator": "2.0.6",
     "@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.2",
+  "version": "2.0.6",
   "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.2
+  version: 2.0.6
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -51,7 +51,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: node-runner
+  name: node-runner-temp-fix-windows
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="