jekyll-bookshop 3.5.1 → 3.6.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad1d54d24f7e00199277a0c0f106541f4e7be31cdea448c2d9037b49b0724cd4
-  data.tar.gz: ce53e30896feb8391bbe3052f1ebb4217e204fcf8362aee13fc96da0ef52c71a
+  metadata.gz: b753de8f4f5417a0735f4037b6c4dacba2252daaa9067c8e796f984d3f1b96da
+  data.tar.gz: d68b9d4f74d519d0893875b1f4633aa1d3ca5d4534285b238bb07cc2cc1a34b1
 SHA512:
-  metadata.gz: 46a0ccaf016b81799aea95951e436f0ddbc4f2ae160fb116b5ecdcbb42226b0dfc82b1d8760dd29b4baa760b8ff7a654c97ae73f5aad7a5e432087474545565e
-  data.tar.gz: 9a712b5626dfe4e4ddc423c62c1683d193cde09f159356ec85f2aedbbbf73e45f12b6ebcfe9ce9c68490aae6da694e5178b929d5619b3b33aef52409c962a1e8
+  metadata.gz: eb1b7df451a338274cc018c1c71d142b9a8f54a7014168bb485c19db01a0c878fc0c962ed8a145bba6a53ff6575c6d6563d286625ddede360422f4f629f3eaed
+  data.tar.gz: 98d7ba967bcb513852dcf17d862f5d9631c9b8b09236e4f109c97ed821739c6e1f05d40ed10fcf3537c4f1fcb888c2e9b81f3dc866f2dafed8e1d41f3ef4047e

data/lib/jekyll-bookshop/tags/bookshop-common-tag.rb

@@ -23,8 +23,12 @@ module JekyllBookshop
       site = context.registers[:site]
       validate_file_name(file)
 
-      path = locate_include_file(context, file, site.safe)
-      return unless path
+      begin
+        path = locate_include_file(context, file, site.safe)
+      rescue IOError
+        return false
+      end
+      return false unless path
 
       add_include_to_dependency(site, path, context)
 
@@ -39,7 +43,7 @@ module JekyllBookshop
 
       # If this component is not a subcomponent,
       # we also drop in some site metadata here so that it can be used in the render.
-      version = "3.5.1"
+      version = "3.6.0-beta.1"
       meta_comment = context["__bookshop__nested"] ? "" : "<!--bookshop-live meta(version=\"#{version}\" baseurl=\"#{site.baseurl}\" title=\"#{site.config["title"]&.gsub('"', '\"') || ""}\") -->\n"
 
       context.stack do

data/lib/jekyll-bookshop/tags/bookshop-tag.rb

@@ -10,10 +10,21 @@ module JekyllBookshop
     # Map component names to the .jekyll.html files found in bookshop
     def render(context)
       file = render_variable(context) || @file
-
       cname = file.strip.split("/").last
-      file = "#{file}/#{cname}.jekyll.html"
-      render_once_found(context, file)
+      
+      standard_file = "#{file}/#{cname}.jekyll.html";
+      flat_file = "#{file}.jekyll.html";
+
+      file = standard_file
+      out = render_once_found(context, file)
+      unless out
+        file = flat_file
+        out = render_once_found(context, file)
+        unless out
+          raise IOError, "Component #{cname} does not exist. Create this component by placing a file in your bookshop at #{standard_file} or #{flat_file} in your components directory"
+        end
+      end
+      out
     end
   end
 end

data/lib/jekyll-bookshop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllBookshop
-  VERSION = "3.5.1"
+  VERSION = "3.6.0.pre.beta.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0.pre.beta.1
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -109,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: