jekyll-bookshop 2.0.0.pre.alpha.3 → 2.0.0.pre.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae69ac09de4cb95b7996d88da33964171b4f369fb7488b6c1d8ffa87ad441a3f
-  data.tar.gz: 404e3e060faf574adfdb6198ec173641bfc2a9bc518329be2ac521d934402e97
+  metadata.gz: b0ef8591510abbc4fe50bd326fd6d2387da047b547e7f54582b07d1ebf3f2ace
+  data.tar.gz: 7e02ca2b237eff55023a1a12ad3b78abf71a72499c781e69761bacf3e8ab2d8b
 SHA512:
-  metadata.gz: 94e5608863fff116b9dba6dd9e02a48a807bedbce42a3bf3c2540f7b6d64a65ddfbd260fb514a61d2306db95010e27bb121146c8623300841f6d54db3abd2800
-  data.tar.gz: e5f4262f7ddff67a9bc6ffeeb0ae3a738c8ea6c62339a0b779f200d04076cc54149bd2c5729733433deec852f291e2f18b7c81f9208d8a20fad66bcebb15c331
+  metadata.gz: 1bd9f64db37ca097bb9431f1e8a4dcedac9834b6e60a689db434c52787cbf4e04d20f8a46dc2a207d8fc62368b7f6238216a793135cd59b70a14aab51e214575
+  data.tar.gz: 16f22b6f1a460f4be51803233196a0f6f096cbcc4da8b4f311cb2e6965e7abc39335b33044e4e099e60ccbf3379daa84169806bd61b575d09a12d541a0bdefa5

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.pre.alpha.3"
+  VERSION = "2.0.0.pre.alpha.8"
 end

metadata

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