jekyll-bookshop 1.4.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e313ba5779530305aa65dcf712685b2b3e8584024dab3a56feeda1d7c641e4a5
-  data.tar.gz: fd2a7c028ee738263c88bf8613606a032c77a1a41ad10b93824e2a7577216d6b
+  metadata.gz: 06aef8587a63ae477f2cbdca62841ca136714f1208336fc0d3b4f201eee52053
+  data.tar.gz: ede4a69fe2b96f8a5417490556dc95c9880251809abe5bb81c68adfb750d2363
 SHA512:
-  metadata.gz: 41585c83a653c024ce3370362e83c2bebf82a9e3d4d6022dc51ee383de656ab185679b590af6c0bdc3fcd18e3bb4077298d36ff94d95b05f2c3a3cd9c36726e3
-  data.tar.gz: 0d40c7a79045a87511754aec81abba7f9b53321767eba7975d5696dc2198d99923985e2d6fa061e456aaaff0a5f690ec1bed3296a0692c549fd52b22572bfbac
+  metadata.gz: 338ba1b82ae814a268fb7e8cb437a2df507debfa479b2efb8ae1a76e013ca5cba035c53c9246b84505f4b534cd7b7e35e10c71e478a0757310dc848b3e6a232f
+  data.tar.gz: 0c2b53f7d5e2127531926da39bf611f74b6a5004ee2b8200466c2f16407a191762172b2d5e880d235b96dee784b791bba18a03cf3b658c7d320e5bfa4a5696b1

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
+      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
 
@@ -26,17 +24,53 @@ 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 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.4.1"
+  VERSION = "1.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Liam Bigelow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-03 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: []