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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa1795f0a5014047a0b8cfb8609c7823b7d2c7bbf77fe8407eb9bd1253fb2bb
-  data.tar.gz: 83960fdbd3ffa085318d97dc88585fe834e4a6ad2fb9d8df37cc9e857f14cd36
+  metadata.gz: b78bc626f29948998b03084444ff8b55cee28959b1193c39ca7c9ef761e037a2
+  data.tar.gz: 4ddb4263efdec585fea7664ff95fcd039010a2fe81f8a3eea3b857a423f3d9eb
 SHA512:
-  metadata.gz: 50bd3c38d1908c97a4383528b41cd50058734ba6122b45ee06009700f49b07d56bccdd4b15beb2f60a88f536d73335519d5ae294511ec05d572b3f5fab7df68c
-  data.tar.gz: ae5991b08a43512539b82306083253a869c8984be25a4b7e16cc700119ece2142b3f1b189047e4161c7108fbdbdbd039899d6fcf844cf3df3fb15c4a4bac6a69
+  metadata.gz: ee66af958a4268bd5896974c4e7063e41ca41f3e9b40f84664759fcca8605d233ec7733de00ee3a813ba1135e6d7a9a224c8f5603aca33e56fd05cba6c0e9827
+  data.tar.gz: 00f8d7660e47594a2bbe0fd3bf2593864f34d4d69408de18c636f7f042bc798722b74a07365c58ceedb3536151bbb57e4fecf71e78dafe9f49f3738a9f4d8777

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
@@ -24,6 +24,8 @@ module JekyllBookshop
         end
       end
 
+      params.delete('bind')
+
       params
     end
 
@@ -56,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.root + '/_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
 
@@ -94,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.5.0"
+  VERSION = "2.0.0-alpha.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-30 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: