jekyll-bookshop 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b78bc626f29948998b03084444ff8b55cee28959b1193c39ca7c9ef761e037a2
-  data.tar.gz: 4ddb4263efdec585fea7664ff95fcd039010a2fe81f8a3eea3b857a423f3d9eb
+  metadata.gz: 7cac00131ec04e5582dc6c8f89e177a3aa306abbc5c51522f0a9175af5016249
+  data.tar.gz: b3b97e8005d57aaef0c5b12c813c4671e07e9336b83a17ece8888ef8347e2a59
 SHA512:
-  metadata.gz: ee66af958a4268bd5896974c4e7063e41ca41f3e9b40f84664759fcca8605d233ec7733de00ee3a813ba1135e6d7a9a224c8f5603aca33e56fd05cba6c0e9827
-  data.tar.gz: 00f8d7660e47594a2bbe0fd3bf2593864f34d4d69408de18c636f7f042bc798722b74a07365c58ceedb3536151bbb57e4fecf71e78dafe9f49f3738a9f4d8777
+  metadata.gz: 7e9706e863b2d8b1f5b5edbe00afd8f011270faae31f4b8d0db3ab8863414e66f3c30c80a7ffcc5c1de69172846f50d5ca5c6066659050acd005e8b7babb8a14
+  data.tar.gz: db11956432b5a16c4b27e464c2c3de3d20f1d06128e2ce15f959c056846573e2e75e4d213bd3d822eb8b5fbecc3570a1668b4bcebe39ba5f9a3b6b6d1ab1b602

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
@@ -63,7 +60,7 @@ module JekyllBookshop
       site = context.registers[:site]
       
       bookshop_scss_files = []
-      site.config['bookshop_locations']&.each do |location|
+      site.config['bookshop_base_locations']&.each do |location|
         components_loc = Pathname.new(location + "/").cleanpath.to_s
         scss_files = Dir.glob(components_loc + "/**/*.scss")&.collect do |scss_file|
           scss_file.sub!(components_loc+"/", '').sub!(".scss", '')
@@ -91,19 +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
+      bookshop_base_locations = site.config['bookshop_locations']&.collect do |location|
+        Pathname.new("#{site.source}/#{location}/").cleanpath.to_s
       end
-      bookshop_locations = bookshop_locations.select do |location|
+      bookshop_base_locations = bookshop_base_locations.select do |location|
         Dir.exist?(location)
       end
+      bookshop_component_locations = bookshop_base_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(*bookshop_base_locations);
 
       site.config['sass'] ||= {}
       site.config['sass']['load_paths'] ||= []
-      site.config['sass']['load_paths'].push(*bookshop_locations)
+      site.config['sass']['load_paths'].push(*bookshop_base_locations)
+
+      site.config['bookshop_base_locations'] ||= []
+      site.config['bookshop_base_locations'].push(*bookshop_base_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.2"
+  VERSION = "2.0.0.pre.alpha.7"
 end

metadata

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