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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b6d710345780ab2407cb8fbe813bbd529fc0dfb922ea5ecb90e2504f5170ba1
-  data.tar.gz: 29f217b6baf287f8d175efd249aa7b4f037039c51a95d8fb6963d304226ff80f
+  metadata.gz: 5dcfebd607dda67280a95931eadee542b2a0018df3f5562b3439ec3f3ab2c4c4
+  data.tar.gz: 3614e23aa9fdf1d9fa31157e0612157f55d30c716ed46b1c40fbe001f7c521fa
 SHA512:
-  metadata.gz: f6164fdb7c8777322fb29252c8808af41721146ec4490dd4d3c0a7a513c9079571aa6547debd728ae9a5d114d9aca16feb70253e720c20bf88a9b5c26ef3d4ae
-  data.tar.gz: 49b341a6ba264558aa44a8bee9aafd6827d10f2fc18d577b5949b27bea13e43841fb2d68a9555cdc3b210e9ccb61c288724d615996bb1eba9522c7530e381585
+  metadata.gz: 2b7b413b32a1f126733a8f37a0860e4321b5933fb8844775aad40e7d840fbf8f2c4a85cb06169e972ae95c5e9ca039c6549587ac5c29f703bed7add368550752
+  data.tar.gz: '01970a6a13c8571afeec9a9075250a5fed66eaee7229226ef56431cddaad0d50b1953ec0e6a7683cdfb05d66d84bdd99276e6bc8b22fdd95daa4a05c2ec652c8'

data/lib/jekyll-bookshop.rb

@@ -3,18 +3,16 @@ require 'pathname'
 
 module JekyllBookshop
   class Tag < Jekyll::Tags::IncludeTag
-    def initialize(tag_name, markup, tokens)
-      cpath = markup.strip.partition(" ").first
-      cname = cpath.strip.split("/").last
-      tag = markup.strip.partition(" ").last
-      markup = "#{cpath}/#{cname}.jekyll.html #{tag}"
-      super
-    end
 
+    # 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
     def parse_params(context)
       params = super
 
@@ -26,17 +24,81 @@ module JekyllBookshop
         end
       end
 
+      params.delete('bind')
+
       params
     end
+
+    # Map component names to the .jekyll.html files found in bookshop
+    def render(context)
+      site = context.registers[:site]
+
+      file = render_variable(context) || @file
+      cname = file.strip.split("/").last
+      file = "#{file}/#{cname}.jekyll.html"
+      validate_file_name(file)
+
+      path = locate_include_file(context, file, site.safe)
+      return unless path
+
+      add_include_to_dependency(site, path, context)
+
+      partial = load_cached_partial(path, context)
+
+      context.stack do
+        context["include"] = parse_params(context) if @params
+        begin
+          partial.render!(context)
+        rescue Liquid::Error => e
+          e.template_name = path
+          e.markup_context = "included " if e.markup_context.nil?
+          raise e
+        end
+      end
+    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_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
 
@@ -62,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.4.4"
+  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.4.4
+  version: 2.0.0.pre.alpha.0
 platform: ruby
 authors:
 - Liam Bigelow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-12 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: []