jekyll-bookshop 1.1.10 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 651a1f61d8d1f760073e0575aa607cf5ea14bfc2fb32adfc2a9644424dbcb704
-  data.tar.gz: 4563c66b5438da4d9d02aba4d2fd84340b54616dd1f0279e381007aabf9491fc
+  metadata.gz: 3aa1795f0a5014047a0b8cfb8609c7823b7d2c7bbf77fe8407eb9bd1253fb2bb
+  data.tar.gz: 83960fdbd3ffa085318d97dc88585fe834e4a6ad2fb9d8df37cc9e857f14cd36
 SHA512:
-  metadata.gz: a37fa18b049134dd25b41bd409890eafaa8593181bc42e942090fd8f539f8409466fabe64504b368502a4e90c94bd022396cdf2901b31dd3d92254832d6b438f
-  data.tar.gz: 0ee2cc741ec67ade5198f7dde105d25cf585615bfef53034f83a48745c3cb8492eaccbfffde18869c2b689c866ab960d9f3b68e796c4baf03131d4b0ed97c18d
+  metadata.gz: 50bd3c38d1908c97a4383528b41cd50058734ba6122b45ee06009700f49b07d56bccdd4b15beb2f60a88f536d73335519d5ae294511ec05d572b3f5fab7df68c
+  data.tar.gz: ae5991b08a43512539b82306083253a869c8984be25a4b7e16cc700119ece2142b3f1b189047e4161c7108fbdbdbd039899d6fcf844cf3df3fb15c4a4bac6a69

data/lib/jekyll-bookshop.rb

@@ -3,32 +3,101 @@ 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
+    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.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
+
       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
+
+  module Filters
+    def addmods(classname, mods = {})
+      base = classname.partition(" ").first
+      mods.each do |mod|
+        if mod[1]
+          classname = "#{classname} #{base}--#{mod[0]}"
+        end
+      end
+      return classname
+    end
+
+    def addstates(classname, states = {})
+      states.each do |state|
+        if state[1]
+          classname = "#{classname} is-#{state[0]}"
+        end
+      end
+      return classname
     end
   end
 end
 
 Liquid::Template.register_tag("component", JekyllBookshop::Tag)
 
+Liquid::Template.register_filter(JekyllBookshop::Filters)
+
 Jekyll::Hooks.register :site, :after_init do |site|
   JekyllBookshop::Styles.open_bookshop(site)
 end

data/lib/jekyll-bookshop/version.rb

@@ -1,3 +1,3 @@
 module JekyllBookshop
-  VERSION = "1.1.10"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.5.0
 platform: ruby
 authors:
 - Liam Bigelow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-11-30 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: []