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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7438b5eaba1bd9137c295b41adf21153a13240b692bc8403cf1748b58e8eb906
-  data.tar.gz: 7a1de85a107b7b52471423b3a52a4bfaa1a3a8bc73f243613c22a0ebe6c87e20
+  metadata.gz: ae69ac09de4cb95b7996d88da33964171b4f369fb7488b6c1d8ffa87ad441a3f
+  data.tar.gz: 404e3e060faf574adfdb6198ec173641bfc2a9bc518329be2ac521d934402e97
 SHA512:
-  metadata.gz: 777613006a9cc08d0d0ac04f6a4de05f04ebe9a923ee088b39bbef7b2e05fe1d603152140dd4b1efe5f46f651116118b2425794bd223422e83ce428b1e9a1b89
-  data.tar.gz: 2f55439d5dd80b57be876bb30b44e6a4d03d4f9f37d3333930f9776857e0087a736c9e18adf51787533e141b90732098a5bc02b0a50a3e536bf3a6db1f0556fe
+  metadata.gz: 94e5608863fff116b9dba6dd9e02a48a807bedbce42a3bf3c2540f7b6d64a65ddfbd260fb514a61d2306db95010e27bb121146c8623300841f6d54db3abd2800
+  data.tar.gz: e5f4262f7ddff67a9bc6ffeeb0ae3a738c8ea6c62339a0b779f200d04076cc54149bd2c5729733433deec852f291e2f18b7c81f9208d8a20fad66bcebb15c331

data/lib/jekyll-bookshop.rb

@@ -6,10 +6,10 @@ module JekyllBookshop
 
     # Look for includes in the built bookshop directory
     def tag_includes_dirs(context)
-      Array([
-        Pathname.new(context['site']['bookshop_theme_path'] + '/components').cleanpath.to_s, 
-        Pathname.new(context['site']['bookshop_site_path'] + '/components').cleanpath.to_s
-      ]).freeze
+      bookshop_locations = context['site']['bookshop_locations']&.collect do |location|
+        Pathname.new(location + "/components").cleanpath.to_s
+      end
+      bookshop_locations.freeze
     end
 
     # Support the bind syntax, spreading an object into params
@@ -58,19 +58,52 @@ module JekyllBookshop
     end
   end
 
+  class StyleTag < Liquid::Tag
+    def render(context)
+      site = context.registers[:site]
+      
+      bookshop_scss_files = []
+      site.config['bookshop_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", '')
+        end
+        bookshop_scss_files.push(*scss_files)
+      end
+
+      bookshop_scss_files = bookshop_scss_files&.collect do |file|
+        "@import '#{file}';"
+      end
+
+      output_css = if Jekyll.env == "production"
+        bookshop_scss_files.join("\n")
+      else
+"html:not([data-bookshop-hmr]) {
+#{bookshop_scss_files.join("\n")}
+}"
+      end
+
+      output_css
+    end
+  end
+
   class Styles
 
     # Add the paths to find bookshop's styles
     def self.open_bookshop(site)
-      bookshop_theme_path = site.theme ? site.theme.root : site.source + '/_bookshop'
-      bookshop_site_path = site.source + '/_bookshop'
-      site.config['bookshop_theme_path'] = Pathname.new(bookshop_theme_path).cleanpath.to_s
-      site.config['bookshop_site_path'] = Pathname.new(bookshop_site_path).cleanpath.to_s
+      bookshop_locations = site.config['bookshop_locations']&.collect do |location|
+        Pathname.new(location + "/").cleanpath.to_s
+      end
+      bookshop_locations = bookshop_locations.select do |location|
+        Dir.exist?(location)
+      end
+
+      site.config['watch_dirs'] ||= [] # Paired with CloudCannon/jekyll-watch
+      site.config['watch_dirs'].push(*bookshop_locations);
 
       site.config['sass'] ||= {}
       site.config['sass']['load_paths'] ||= []
-      site.config['sass']['load_paths'].push(Pathname.new(bookshop_theme_path + '/sass').cleanpath.to_s)
-      site.config['sass']['load_paths'].push(Pathname.new(bookshop_site_path + '/sass').cleanpath.to_s)
+      site.config['sass']['load_paths'].push(*bookshop_locations)
     end
   end
 
@@ -96,7 +129,8 @@ module JekyllBookshop
   end
 end
 
-Liquid::Template.register_tag("component", JekyllBookshop::Tag)
+Liquid::Template.register_tag("bookshop", JekyllBookshop::Tag)
+Liquid::Template.register_tag("bookshop_scss", JekyllBookshop::StyleTag)
 
 Liquid::Template.register_filter(JekyllBookshop::Filters)
 

data/lib/jekyll-bookshop/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -54,9 +54,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.0.3
 signing_key: