jekyll-bookshop 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50503a293fa35c489d60225d2a9839c8ad1d09020acf839f04aaadd73a857be
-  data.tar.gz: 54a21e0e7649fe504193193a2558e3e276ca9539e54c2b4cc115558f0ad6b7c7
+  metadata.gz: 547820823e84a8f724261d8ad21f9da6453543e62e0d352506fa178455860932
+  data.tar.gz: 76e11bf1ef21346e48c80f7bb58241e2a5dd371f93563d1eae1d156f883f6998
 SHA512:
-  metadata.gz: 441897214a67dfdcf1db45c06391484ccb9f59946094799dcaca8aa72362f8783046d5ca9bb835a132e4a84bca3af663c029449af8930e4dbdc53f27920855ce
-  data.tar.gz: 8664dbc2912fd38ba23004122c0b2db83d91c5c499bf1f0d7559d0c13bfc6614a28d6d336348fedad89afa4b10483e12668d8f92127feb3f232b7fdfbc84a336
+  metadata.gz: 78351e3aa8d0474f42c7ffb0f447c0e92b47503273b01e8e638b61e2363c52c1de707763c8738c79f7d7d5a43ca0b23cdf6df0bb576fa9d9499ec43354266992
+  data.tar.gz: 826de74c699df019fd758bfeeb13751938fd9230ad1ca3ab28a2001fa9fd2af2fb2916f606bd77f58f7bab706c6f59603a4d29db644c01f691f10074da22d36b

data/lib/jekyll-bookshop.rb

@@ -6,10 +6,7 @@ module JekyllBookshop
 
     # Look for includes in the built bookshop directory
     def tag_includes_dirs(context)
-      bookshop_locations = context['site']['bookshop_locations']&.collect do |location|
-        Pathname.new(location + "/components").cleanpath.to_s
-      end
-      bookshop_locations.freeze
+      context['site']['bookshop_component_locations'].freeze
     end
 
     # Support the bind syntax, spreading an object into params
@@ -91,16 +88,28 @@ module JekyllBookshop
 
     # Add the paths to find bookshop's styles
     def self.open_bookshop(site)
-      bookshop_locations = site.config['bookshop_locations']&.collect do |location|
-        Pathname.new(location + "/").cleanpath.to_s
+      base_bookshop_locations = site.config['bookshop_locations']&.collect do |location|
+        Pathname.new("#{site.source}/#{location}/").cleanpath.to_s
+      end
+      base_bookshop_locations = base_bookshop_locations.select do |location|
+        Dir.exist?(location)
+      end
+      bookshop_component_locations = base_bookshop_locations&.collect do |location|
+        Pathname.new("#{location}/components/").cleanpath.to_s
       end
 
       site.config['watch_dirs'] ||= [] # Paired with CloudCannon/jekyll-watch
-      site.config['watch_dirs'].push(*bookshop_locations);
+      site.config['watch_dirs'].push(*base_bookshop_locations);
 
       site.config['sass'] ||= {}
       site.config['sass']['load_paths'] ||= []
-      site.config['sass']['load_paths'].push(*bookshop_locations)
+      site.config['sass']['load_paths'].push(*base_bookshop_locations)
+
+      site.config['bookshop_locations'] = []
+      site.config['bookshop_locations'].push(*base_bookshop_locations)
+
+      site.config['bookshop_component_locations'] ||= []
+      site.config['bookshop_component_locations'].push(*bookshop_component_locations)
     end
   end
 

data/lib/jekyll-bookshop/version.rb

@@ -1,3 +1,3 @@
 module JekyllBookshop
-  VERSION = "2.0.0-alpha.1"
+  VERSION = "2.0.0.pre.alpha.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0.pre.alpha.6
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll