jekyll-bookshop 2.0.0.pre.alpha.16 → 2.0.0.pre.alpha.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ca731f6c601f6a8a9dcf77961545abc9f2f685bcd35f711ee42417d43e6343
-  data.tar.gz: b1745066742f5ae58c723c9c080a1872da41218ff64bb8ead5f0ce5bbd070d78
+  metadata.gz: c1aa3dc1f5e98a00c8be26493e526cd58c30aebf01299de1f2118bcb2aa4a54f
+  data.tar.gz: 3cb7751c63ba626c021007f5555a47938516d8bea754bb7ceb99cd7e358ac0e2
 SHA512:
-  metadata.gz: dfb44b01c31a8bc33b3206fd6382e6ca42a90c7295de629d9852f2714275713618d19b4b80928a509a05bd5dcaabb4e016dbf52e362dd86bb6b17f09c4c7a9d7
-  data.tar.gz: b915ab8df7097692e3891c0c95f8c22b74803c55a24b5b3e2d62028683df159863556bb19f6540cc4a19ec2a146278179c823ca524de76996900af8e6df88e1d
+  metadata.gz: eba66e7c82fbd32c83f21c11ad3f3d3a9cad6765722e83650ad32e42dd3ddfbb7855207748b2220c01e293d5e329571e8dbb2e590888918da624789488423a59
+  data.tar.gz: 14343996021296ee14d2f4ba112fdbe5accec1def17c8a7b6d0f7446037abed9a0b492f8857818327c47ceb80cc67aac27c97f7e0ab498fd688feeb4f45bdcef

data/lib/jekyll-bookshop.rb

@@ -1,208 +1,21 @@
+# frozen_string_literal: true
+
 require "jekyll"
 require "pathname"
 require "dry/inflector"
 
-module JekyllBookshop
-  class Tag < Jekyll::Tags::IncludeTag
-
-    # Look for includes in the built bookshop directory
-    def tag_includes_dirs(context)
-      context['site']['bookshop_component_locations'].freeze
-    end
-
-    def expand_param_templates(params, context, parent_param)
-      param_hash = {}
-      new_params = {}
-      
-      is_template = params.key?("__template") || params.key?("__template_code")
-      template = params["__template"] || params["__template_code"] || ""
-      return Liquid::Template.parse(template).render(context) if is_template
-
-      array_template = params["__array_template"] || ""
-      if params.key? "__array_template"
-          # We're adding a new root scope here and then removing it.
-          # Who knows why, but assign and capture always add to the root scope.
-          # Which is why this is hacked in, instead of using context.stack 🤷‍♂️
-          context.scopes.push({})
-          Liquid::Template.parse(array_template).render(context)
-          template_scope = context.scopes.pop()
-          template_array = template_scope[parent_param] || "";
-          unless template_array.is_a? Array
-            Jekyll.logger.warn "Bookshop:",
-                                  "#{array_template} did not evaluate to an array
-                                   as required for key #{parent_param}.__array_template"
-            template_array = []
-          end
-
-          params.delete("__array_template")
-          output_array = []
-          template_array.each do |item|
-            inflector = Dry::Inflector.new
-            singular_parent = inflector.singularize(parent_param)
-            next_scope = {}
-            next_scope[singular_parent] = item
-
-            context.push(next_scope)
-            output_array.push(expand_param_templates(params, context, ""))
-            context.pop()
-          end
-          return output_array
-      end
-
-      params.each_pair do |param, value|
-        is_template = param.end_with?("_template") || param.end_with?("_template_code")
-        if is_template
-          param_root, param_remainder = param.split('.', 2)
-          param_hash[param_root] ||= {}
-          param_hash[param_root][param_remainder] = value
-        else
-          new_params[param] = value
-        end
-      end
-      param_hash.each_pair do |param, values|
-        new_params[param] = expand_param_templates(values, context, param)
-      end
-      new_params
-    end
-
-    # Support the bind syntax, spreading an object into params
-    def parse_params(context)
-      params = super
-
-      params.each do |key, value|
-        if key == 'bind' && value.is_a?(Hash)
-          valueHash = {}.merge(value)
-          params = valueHash.merge(params)
-          next
-        end
-      end
-
-      params.delete('bind')
-      context.scopes.push({}) # Do all expansion in an ephemeral root scope
-      params = expand_param_templates(params, context, "")
-      context.scopes.pop()
-
-      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
-      is_template = file.end_with? "__template"
-
-      file = file.gsub(".__template", "")
-      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 StyleTag < Liquid::Tag
-    def render(context)
-      site = context.registers[:site]
-      
-      bookshop_scss_files = []
-      site.config['bookshop_base_locations']&.each do |location|
-        components_loc = Pathname.new(location + "/").cleanpath.to_s
-        scss_files = Dir.glob(components_loc + "/**/*.scss")&.collect do |scss_file|
-          scss_file.sub!(components_loc+"/", '').sub!(".scss", '')
-        end
-        bookshop_scss_files.push(*scss_files)
-      end
-
-      bookshop_scss_files = bookshop_scss_files&.collect do |file|
-        "@import \"#{file}\";"
-      end
-
-      output_css = if Jekyll.env == "production"
-        bookshop_scss_files.join("\n")
-      else
-"@media all, bookshop {
-#{bookshop_scss_files.join("\n")}
-}"
-      end
-
-      output_css
-    end
-  end
-
-  class Styles
-
-    # Add the paths to find bookshop's styles
-    def self.open_bookshop(site)
-      bookshop_base_locations = site.config['bookshop_locations']&.collect do |location|
-        Pathname.new("#{site.source}/#{location}/").cleanpath.to_s
-      end
-      bookshop_base_locations = bookshop_base_locations.select do |location|
-        Dir.exist?(location)
-      end
-      bookshop_component_locations = bookshop_base_locations&.collect do |location|
-        Pathname.new("#{location}/components/").cleanpath.to_s
-      end
-
-      site.config['watch_dirs'] ||= [] # Paired with CloudCannon/jekyll-watch
-      site.config['watch_dirs'].push(*bookshop_base_locations);
-
-      site.config['sass'] ||= {}
-      site.config['sass']['load_paths'] ||= []
-      site.config['sass']['load_paths'].push(*bookshop_base_locations)
-
-      site.config['bookshop_base_locations'] ||= []
-      site.config['bookshop_base_locations'].push(*bookshop_base_locations)
-
-      site.config['bookshop_component_locations'] ||= []
-      site.config['bookshop_component_locations'].push(*bookshop_component_locations)
-    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
+require_relative "jekyll-bookshop/tags/bookshop-tag"
+require_relative "jekyll-bookshop/tags/style-tag"
+require_relative "jekyll-bookshop/init-styles"
+require_relative "jekyll-bookshop/site-data"
 
 Liquid::Template.register_tag("bookshop", JekyllBookshop::Tag)
 Liquid::Template.register_tag("bookshop_scss", JekyllBookshop::StyleTag)
 
-Liquid::Template.register_filter(JekyllBookshop::Filters)
-
 Jekyll::Hooks.register :site, :after_init do |site|
   JekyllBookshop::Styles.open_bookshop(site)
-end
+end
+
+Jekyll::Hooks.register :site, :post_render do |site|
+  JekyllBookshop::SiteData.extract(site)
+end

data/lib/jekyll-bookshop/init-styles.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module JekyllBookshop
+  class Styles
+    # Add the paths to find bookshop's styles
+    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)
+
+      site.config["sass"] ||= {}
+
+      apply_array(site.config["sass"], "load_paths", bookshop_base_locations)
+      # Paired with CloudCannon/jekyll-watch
+      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)
+    end
+
+    def self.filter_bookshops(src, locations)
+      mapped_locations = locations&.collect do |location|
+        Pathname.new("#{src}/#{location}/").cleanpath.to_s
+      end
+      mapped_locations.select do |location|
+        Dir.exist?(location)
+      end
+    end
+
+    def self.bookshop_component_locations(locations)
+      locations&.collect do |location|
+        Pathname.new("#{location}/components/").cleanpath.to_s
+      end
+    end
+
+    def self.apply_array(hash, key, arr)
+      hash[key] ||= []
+      hash[key].push(*arr)
+    end
+  end
+end

data/lib/jekyll-bookshop/site-data.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module JekyllBookshop
+  class SiteData
+    def self.extract(site)
+      @site = site
+
+      payload_collections = {}
+      @site.collections.each_pair do |collection, items|
+        payload_collections[collection] = items.docs.map do |doc|
+          doc.data.merge(hydrate_document_fields(doc))
+        end
+      end
+
+      payload_collections["data"] = {}
+      @site.data.each_pair do |key, value|
+        next if key.to_s.start_with?("_bookshop")
+
+        payload_collections["data"][key] = value
+      end
+
+      @site.data["_bookshop_site_data"] = { "site" => payload_collections }
+      Jekyll.logger.info "Bookshop:",
+                         "Bookshop site data generated"
+    end
+
+    def self.hydrate_document_fields(document)
+      keys = %w(content url date relative_path permalink)
+      hydrated_doc = {}
+      keys.each { |key| hydrated_doc[key] = document.send(key) }
+      hydrate_document_excerpt(document, hydrated_doc)
+    end
+
+    def self.hydrate_document_excerpt(document, hydrated_doc)
+      hydrated_doc.merge!({
+        "excerpt" => document.data["excerpt"].output,
+      })
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module JekyllBookshop
+  class Tag < Jekyll::Tags::IncludeTag
+    # 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
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module JekyllBookshop
+  class StyleTag < Liquid::Tag
+    def render(context)
+      site = context.registers[:site]
+
+      bookshop_scss_files = []
+      site.config["bookshop_base_locations"]&.each do |location|
+        components_loc = Pathname.new(location + "/").cleanpath.to_s
+        scss_files = Dir.glob(components_loc + "/**/*.scss")&.collect do |scss_file|
+          scss_file.sub!(components_loc + "/", "").sub!(".scss", "")
+        end
+        bookshop_scss_files.push(*scss_files)
+      end
+
+      bookshop_scss_files = bookshop_scss_files&.collect do |file|
+        "@import \"#{file}\";"
+      end
+
+      output_css = if site.config["safe_scss"] == true
+                     bookshop_scss_files.join("\n")
+                   else
+                     "@media all, bookshop {
+                        #{bookshop_scss_files.join("\n")}
+                      }"
+                   end
+
+      output_css
+    end
+  end
+end

data/lib/jekyll-bookshop/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllBookshop
-  VERSION = "2.0.0.pre.alpha.16"
-end
+  VERSION = "2.0.0.pre.alpha.45"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.16
+  version: 2.0.0.pre.alpha.45
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -50,6 +50,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.80'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.80'
+- !ruby/object:Gem::Dependency
+  name: rubocop-jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description:
 email:
 - support@cloudcannon.com
@@ -58,6 +86,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-bookshop.rb
+- lib/jekyll-bookshop/init-styles.rb
+- lib/jekyll-bookshop/site-data.rb
+- lib/jekyll-bookshop/tags/bookshop-tag.rb
+- lib/jekyll-bookshop/tags/style-tag.rb
 - lib/jekyll-bookshop/version.rb
 homepage: https://github.com/cloudcannon/bookshop
 licenses: