jekyll-bookshop 1.2.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b79933762b0dc9e409b4ba34dfbb0cd43d53f58a60ddf954b6f08a0867d7d630
-  data.tar.gz: fc068a554d4a52bb0c5dd5a9d86b6920e185c106f27d44166895ca35dc3e4ea6
+  metadata.gz: 7438b5eaba1bd9137c295b41adf21153a13240b692bc8403cf1748b58e8eb906
+  data.tar.gz: 7a1de85a107b7b52471423b3a52a4bfaa1a3a8bc73f243613c22a0ebe6c87e20
 SHA512:
-  metadata.gz: 2e6f74cf9de65d5386898bba5a9ba0cd8df2526bb0e5a28cd070aac788d08c51a23c09aca7c1e4aa12e18c58c217bb3cb2fd9382f8867f249cd2d27b94d0dec0
-  data.tar.gz: b3410a5149720f5265284c40f10671e27842e845ddef8c4d6c055595530bdcccd7124859c4a1b8c562f71b14238cada9bce1afda2e820142c21844b781f35e55
+  metadata.gz: 777613006a9cc08d0d0ac04f6a4de05f04ebe9a923ee088b39bbef7b2e05fe1d603152140dd4b1efe5f46f651116118b2425794bd223422e83ce428b1e9a1b89
+  data.tar.gz: 2f55439d5dd80b57be876bb30b44e6a4d03d4f9f37d3333930f9776857e0087a736c9e18adf51787533e141b90732098a5bc02b0a50a3e536bf3a6db1f0556fe

data/lib/jekyll-bookshop.rb

@@ -3,26 +3,74 @@ 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
+      Array([
+        Pathname.new(context['site']['bookshop_theme_path'] + '/components').cleanpath.to_s, 
+        Pathname.new(context['site']['bookshop_site_path'] + '/components').cleanpath.to_s
+      ]).freeze
+    end
+
+    # Support the bind syntax, spreading an object into params
+    def parse_params(context)
+      params = super
+
+      params.each do |key, value|
+        if key == 'bind'
+          valueHash = {}.merge(value)
+          params = valueHash.merge(params)
+          next
+        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 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_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
+
       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(Pathname.new(bookshop_theme_path + '/sass').cleanpath.to_s)
+      site.config['sass']['load_paths'].push(Pathname.new(bookshop_site_path + '/sass').cleanpath.to_s)
     end
   end
 

data/lib/jekyll-bookshop/version.rb

@@ -1,3 +1,3 @@
 module JekyllBookshop
-  VERSION = "1.2.1"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Liam Bigelow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2021-02-17 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
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Jekyll plugin to load components from bookshop
 test_files: []