jekyll-bookshop 1.7.1 → 2.0.0.pre.alpha.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06aef8587a63ae477f2cbdca62841ca136714f1208336fc0d3b4f201eee52053
-  data.tar.gz: ede4a69fe2b96f8a5417490556dc95c9880251809abe5bb81c68adfb750d2363
+  metadata.gz: 5dcfebd607dda67280a95931eadee542b2a0018df3f5562b3439ec3f3ab2c4c4
+  data.tar.gz: 3614e23aa9fdf1d9fa31157e0612157f55d30c716ed46b1c40fbe001f7c521fa
 SHA512:
-  metadata.gz: 338ba1b82ae814a268fb7e8cb437a2df507debfa479b2efb8ae1a76e013ca5cba035c53c9246b84505f4b534cd7b7e35e10c71e478a0757310dc848b3e6a232f
-  data.tar.gz: 0c2b53f7d5e2127531926da39bf611f74b6a5004ee2b8200466c2f16407a191762172b2d5e880d235b96dee784b791bba18a03cf3b658c7d320e5bfa4a5696b1
+  metadata.gz: 2b7b413b32a1f126733a8f37a0860e4321b5933fb8844775aad40e7d840fbf8f2c4a85cb06169e972ae95c5e9ca039c6549587ac5c29f703bed7add368550752
+  data.tar.gz: '01970a6a13c8571afeec9a9075250a5fed66eaee7229226ef56431cddaad0d50b1953ec0e6a7683cdfb05d66d84bdd99276e6bc8b22fdd95daa4a05c2ec652c8'

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,47 @@ 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("")
+      else
+        "html:not([data-bookshop-hmr]) {#{bookshop_scss_files.join("")}}"
+      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
+
+      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 +124,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.1"
+  VERSION = "2.0.0-alpha.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0.pre.alpha.0
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-05-23 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: