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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7dd4ef9bde09e47ceb17a1513634053ecec2559487cdf7d70c4979da29cb54d
-  data.tar.gz: 3249af02f3aa9014c62101f8c82cdde9f533a9ef5c5bc29262e6cafed69f0241
+  metadata.gz: e50503a293fa35c489d60225d2a9839c8ad1d09020acf839f04aaadd73a857be
+  data.tar.gz: 54a21e0e7649fe504193193a2558e3e276ca9539e54c2b4cc115558f0ad6b7c7
 SHA512:
-  metadata.gz: e57ad713b8e3c127bf7c6f011b1d549e673c466df55b6f6545411af6b907555f980ed55272edff89581477bb117abc88d001627d790934a6684b26612624307f
-  data.tar.gz: ea2368741bd50509f51777c67144c808bc5dbc36fb937baaa010bf9666fe6f95756b81aa803628ba28152bc32a8cf8180e41ae358119076c1e5d7d3a131653db
+  metadata.gz: 441897214a67dfdcf1db45c06391484ccb9f59946094799dcaca8aa72362f8783046d5ca9bb835a132e4a84bca3af663c029449af8930e4dbdc53f27920855ce
+  data.tar.gz: 8664dbc2912fd38ba23004122c0b2db83d91c5c499bf1f0d7559d0c13bfc6614a28d6d336348fedad89afa4b10483e12668d8f92127feb3f232b7fdfbc84a336

data/lib/jekyll-bookshop.rb

@@ -6,7 +6,10 @@ module JekyllBookshop
 
     # Look for includes in the built bookshop directory
     def tag_includes_dirs(context)
-      Array(Pathname.new(context['site']['bookshop_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
@@ -21,6 +24,8 @@ module JekyllBookshop
         end
       end
 
+      params.delete('bind')
+
       params
     end
 
@@ -53,15 +58,49 @@ 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_path = site.theme.root + '/_bookshop'
-      site.config['bookshop_path'] = Pathname.new(bookshop_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_path + '/sass').cleanpath.to_s)
+      site.config['sass']['load_paths'].push(*bookshop_locations)
     end
   end
 
@@ -87,7 +126,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.4.6"
+  VERSION = "2.0.0-alpha.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 2.0.0.pre.alpha.1
 platform: ruby
 authors:
 - Liam Bigelow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,7 +30,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: 
+description:
 email:
 - liam@cloudcannon.com
 executables: []
@@ -43,7 +43,7 @@ homepage: https://github.com/cloudcannon/bookshop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -54,12 +54,12 @@ 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: 
+signing_key:
 specification_version: 4
 summary: A Jekyll plugin to load components from bookshop
 test_files: []