jekyll-bookshop 1.1.8 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74dd846a69c8b663995ddfd47424d095ba5f71016d2ee1f614782b7728ae45b8
-  data.tar.gz: 535d1e0314519f8103e488adfa3a3b98a33d9272ca23a4a97112629864f66450
+  metadata.gz: c7dd4ef9bde09e47ceb17a1513634053ecec2559487cdf7d70c4979da29cb54d
+  data.tar.gz: 3249af02f3aa9014c62101f8c82cdde9f533a9ef5c5bc29262e6cafed69f0241
 SHA512:
-  metadata.gz: 6123421fb0ba0028c5ea03a271ab4f208b8a9d9101f033440a2d312e89709950ad33b95bed195bb9fdf4adb12c3e9d87868e339495d0840bab928624ec8847a6
-  data.tar.gz: 113a04a56c3dc756b94e4b85e3ec7dae482374681ec3cadec5a8db2063244164a08e1d15e6b42d38e5133c1c006edce859f64ff0ad5b85dce339bc699db54ad4
+  metadata.gz: e57ad713b8e3c127bf7c6f011b1d549e673c466df55b6f6545411af6b907555f980ed55272edff89581477bb117abc88d001627d790934a6684b26612624307f
+  data.tar.gz: ea2368741bd50509f51777c67144c808bc5dbc36fb937baaa010bf9666fe6f95756b81aa803628ba28152bc32a8cf8180e41ae358119076c1e5d7d3a131653db

data/lib/jekyll-bookshop.rb

@@ -3,19 +3,59 @@ require 'pathname'
 
 module JekyllBookshop
   class Tag < Jekyll::Tags::IncludeTag
-    def initialize(tag_name, markup, tokens)
-      cname = markup.strip.partition(" ").first
-      tag = markup.strip.partition(" ").last
-      markup = "#{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
     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
@@ -24,10 +64,33 @@ module JekyllBookshop
       site.config['sass']['load_paths'].push(Pathname.new(bookshop_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

@@ -0,0 +1,3 @@
+module JekyllBookshop
+  VERSION = "1.4.6"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.4.6
 platform: ruby
 authors:
 - Liam Bigelow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,6 +38,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-bookshop.rb
+- lib/jekyll-bookshop/version.rb
 homepage: https://github.com/cloudcannon/bookshop
 licenses:
 - MIT