jekyll-bookshop 2.0.0.pre.beta.8 → 2.0.0.pre.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27d3ef56987d4cb0697e1b1b76ffb7dbaf14bf1e0d664a8fd8b8e189a3ea19d
-  data.tar.gz: bf1cabac88826cd381d42ccb7d71a0621ebaeefa42b12eba67e770db1a837685
+  metadata.gz: 1c27acbf119b2591a6bf5338666e2e6d4e31c019d45e462a38fb8479b6138f45
+  data.tar.gz: ed5d3f499e7466724f504f545eef5ed513a28c2e378b512f0e860490f699ab39
 SHA512:
-  metadata.gz: db0d31e14a9d37245d1be758b477ff320433632229f5070944272e84a79646f1ee97c95a8a77fffb528bef2359c4d9c62ba695cc3e632c956b0c58b263563c56
-  data.tar.gz: 1313d6d992b35e8aaae6f94528506c91a07e04c3dd577fef626f6779156cd15f0d7e3abb51b6119cf8275847bbc9c4449b510f74085b90ea2e9f0f966b23171c
+  metadata.gz: a9c6c4c80fa1c79efe7cbea55a1b05698ed527d3a13ba4ea534df5600044e80cf589ff49e4f69810e982c14e138f47a94fdc67f832171e2f86c11d6210287f1a
+  data.tar.gz: c8aae3e4cd0739e5737976df7c18df5f13d953268ca0926cc50b49f664a4959104f798bc1eecf496ba516215a09e23dfb5b6c4c2f5bfbcf5676548fd47574f0e

data/lib/jekyll-bookshop.rb

@@ -4,18 +4,21 @@ require "jekyll"
 require "pathname"
 require "dry/inflector"
 
+require_relative "jekyll-bookshop/tags/bookshop-common-tag"
+require_relative "jekyll-bookshop/tags/bookshop-include-tag"
 require_relative "jekyll-bookshop/tags/bookshop-tag"
 require_relative "jekyll-bookshop/tags/browser-tag"
 require_relative "jekyll-bookshop/tags/style-tag"
-require_relative "jekyll-bookshop/init-styles"
+require_relative "jekyll-bookshop/opener"
 require_relative "jekyll-bookshop/site-data"
 
 Liquid::Template.register_tag("bookshop", JekyllBookshop::Tag)
+Liquid::Template.register_tag("bookshop_include", JekyllBookshop::IncludeTag)
 Liquid::Template.register_tag("bookshop_scss", JekyllBookshop::StyleTag)
 Liquid::Template.register_tag("bookshop_browser", JekyllBookshop::BrowserTag)
 
 Jekyll::Hooks.register :site, :after_init do |site|
-  JekyllBookshop::Styles.open_bookshop(site)
+  JekyllBookshop::Opener.open_bookshop(site)
 end
 
 Jekyll::Hooks.register :site, :post_render do |site|

data/lib/jekyll-bookshop/{init-styles.rb → opener.rb}

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 module JekyllBookshop
-  class Styles
-    # Add the paths to find bookshop's styles
+  class Opener
+    # Add the paths to find bookshop(s)
     def self.open_bookshop(site)
       return unless site.config["bookshop_locations"]
 
       bookshop_base_locations = filter_bookshops(site.source, site.config["bookshop_locations"])
       bookshop_component_locations = bookshop_component_locations(bookshop_base_locations)
+      bookshop_shared_locations = bookshop_shared_locations(bookshop_base_locations)
 
       site.config["sass"] ||= {}
 
@@ -16,6 +17,7 @@ module JekyllBookshop
       apply_array(site.config, "watch_dirs", bookshop_base_locations)
       apply_array(site.config, "bookshop_base_locations", bookshop_base_locations)
       apply_array(site.config, "bookshop_component_locations", bookshop_component_locations)
+      apply_array(site.config, "bookshop_shared_locations", bookshop_shared_locations)
     end
 
     def self.filter_bookshops(src, locations)
@@ -33,6 +35,12 @@ module JekyllBookshop
       end
     end
 
+    def self.bookshop_shared_locations(locations)
+      locations&.collect do |location|
+        Pathname.new("#{location}/shared/jekyll/").cleanpath.to_s
+      end
+    end
+
     def self.apply_array(hash, key, arr)
       hash[key] ||= []
       hash[key].push(*arr)

data/lib/jekyll-bookshop/tags/bookshop-common-tag.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module JekyllBookshop
+  class CommonTag < Jekyll::Tags::IncludeTag
+    # Support the bind syntax, spreading an object into params
+    def parse_params(context)
+      params = super
+
+      params.each do |key, value|
+        next unless key == "bind" && value.is_a?(Hash)
+
+        value_hash = {}.merge(value)
+        params = value_hash.merge(params)
+        next
+      end
+
+      params.delete("bind")
+
+      params
+    end
+
+    def render_once_found(context, file)
+      site = context.registers[:site]
+      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
+end

data/lib/jekyll-bookshop/tags/bookshop-include-tag.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module JekyllBookshop
+  class IncludeTag < JekyllBookshop::CommonTag
+    # Look for includes in the built bookshop directory
+    def tag_includes_dirs(context)
+      context["site"]["bookshop_shared_locations"].freeze
+    end
+
+    # Map include names to the .jekyll.html files found in bookshop
+    def render(context)
+      file = render_variable(context) || @file
+
+      file = "#{file}.jekyll.html"
+      render_once_found(context, file)
+    end
+  end
+end

data/lib/jekyll-bookshop/tags/bookshop-tag.rb

@@ -1,56 +1,19 @@
 # frozen_string_literal: true
 
 module JekyllBookshop
-  class Tag < Jekyll::Tags::IncludeTag
+  class Tag < JekyllBookshop::CommonTag
     # Look for includes in the built bookshop directory
     def tag_includes_dirs(context)
       context["site"]["bookshop_component_locations"].freeze
     end
 
-    # Support the bind syntax, spreading an object into params
-    def parse_params(context)
-      params = super
-
-      params.each do |key, value|
-        next unless key == "bind" && value.is_a?(Hash)
-
-        value_hash = {}.merge(value)
-        params = value_hash.merge(params)
-        next
-      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
+      render_once_found(context, file)
     end
   end
 end

data/lib/jekyll-bookshop/tags/style-tag.rb

@@ -18,7 +18,20 @@ module JekyllBookshop
         "@import \"#{file}\";"
       end
 
-      "@media all, bookshop {#{bookshop_scss_files.join("\n")}}"
+      bookshop_scss_files.sort! do |a, b| 
+        a_shared = a.match(%r!"shared\/!)
+        b_shared = b.match(%r!"shared\/!)
+        case
+        when a_shared && !b_shared
+          -1
+        when !a_shared && b_shared
+          1
+        else
+          a <=> b
+        end
+      end
+
+      "@media all, bookshop {#{bookshop_scss_files.join("")}}"
     end
   end
 end

data/lib/jekyll-bookshop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllBookshop
-  VERSION = "2.0.0.pre.beta.8"
+  VERSION = "2.0.0.pre.beta.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.8
+  version: 2.0.0.pre.beta.12
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -86,8 +86,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-bookshop.rb
-- lib/jekyll-bookshop/init-styles.rb
+- lib/jekyll-bookshop/opener.rb
 - lib/jekyll-bookshop/site-data.rb
+- lib/jekyll-bookshop/tags/bookshop-common-tag.rb
+- lib/jekyll-bookshop/tags/bookshop-include-tag.rb
 - lib/jekyll-bookshop/tags/bookshop-tag.rb
 - lib/jekyll-bookshop/tags/browser-tag.rb
 - lib/jekyll-bookshop/tags/style-tag.rb