jekyll-bookshop 2.0.0.pre.alpha.18 → 2.0.0.pre.alpha.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c3d3183ce166b15c38e0d9e1793e88599dc902fc99258280204b5a6c0c1b18d
-  data.tar.gz: 02d080f0a87d077dee57680aac65c1b376f58bff5303f4d21bbc6023290c8bd7
+  metadata.gz: 986c96d3e958c3967551379041a88a4e8934dbc0ad6025900436e042094ea602
+  data.tar.gz: c9393a58731595e9cac2dbf86ec85c805347a320faf25d24a909059546a92b73
 SHA512:
-  metadata.gz: aeb9360603c8868495fafe4565f735998d8fbcaf49f0e9fd3e88371eada64b5d95028337fda8fe4a1732a6dd4db735be1258d69f47d1a5311712f44c7e9fb74c
-  data.tar.gz: 81ba28a2dd8f280cec34fbb8b1077616da99b457fac696f314016db13caceb100b4fa17297deb354fd8e01bb86730b1d18c4585cde14273ff09f4277e36460d5
+  metadata.gz: ce11ff41268cde9ac8e726770d6d6fa187d1333f0f71296cdf1a4bc44a42f7fb32147d3a60a93e46d0dbe6117b13e30f8887b04d7c9c96fed77675917b7840e9
+  data.tar.gz: 5b5e99a60c73885749a90a108edb81eb6ca52b237cd67e6ab8cb3c1ce902db2b7db8213ba2daeff2751b66202f3b3d1ac38839f1125f465376c3e8f46c79f350

data/lib/jekyll-bookshop.rb

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 require "jekyll"
 require "pathname"
 require "dry/inflector"
 
 require_relative "jekyll-bookshop/tags/bookshop-tag"
 require_relative "jekyll-bookshop/tags/style-tag"
-require_relative "jekyll-bookshop/tags/site-data-tag"
 require_relative "jekyll-bookshop/init-styles"
-require_relative "jekyll-bookshop/filters"
-
+require_relative "jekyll-bookshop/site-data"
 
 Liquid::Template.register_tag("bookshop", JekyllBookshop::Tag)
 Liquid::Template.register_tag("bookshop_scss", JekyllBookshop::StyleTag)
-Liquid::Template.register_tag("bookshop_site_data", JekyllBookshop::SiteDataTag)
-
-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

@@ -1,30 +1,41 @@
+# frozen_string_literal: true
+
 module JekyllBookshop
   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
+      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
-      bookshop_base_locations = bookshop_base_locations.select do |location|
+      mapped_locations.select do |location|
         Dir.exist?(location)
       end
-      bookshop_component_locations = bookshop_base_locations&.collect do |location|
+    end
+
+    def self.bookshop_component_locations(locations)
+      locations&.collect do |location|
         Pathname.new("#{location}/components/").cleanpath.to_s
       end
+    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)
+    def self.apply_array(hash, key, arr)
+      hash[key] ||= []
+      hash[key].push(*arr)
     end
   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

@@ -1,64 +1,10 @@
+# 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
-
-    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
+      context["site"]["bookshop_component_locations"].freeze
     end
 
     # Support the bind syntax, spreading an object into params
@@ -66,17 +12,14 @@ module JekyllBookshop
       params = super
 
       params.each do |key, value|
-        if key == 'bind' && value.is_a?(Hash)
-          valueHash = {}.merge(value)
-          params = valueHash.merge(params)
-          next
-        end
+        next unless key == "bind" && value.is_a?(Hash)
+
+        value_hash = {}.merge(value)
+        params = value_hash.merge(params)
+        next
       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.delete("bind")
 
       params
     end
@@ -86,9 +29,7 @@ module JekyllBookshop
       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)
@@ -110,7 +51,6 @@ module JekyllBookshop
           raise e
         end
       end
-
     end
   end
-end
+end

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

@@ -1,30 +1,24 @@
+# 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|
+      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", '')
+        scss_files = Dir.glob(components_loc + "/**/*.scss")&.sort&.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
+
+      "@media all, bookshop {#{bookshop_scss_files.join("\n")}}"
     end
   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.18"
-end
+  VERSION = "2.0.0.pre.alpha.50"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.18
+  version: 2.0.0.pre.alpha.50
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 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,11 +86,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-bookshop.rb
-- lib/jekyll-bookshop/filters.rb
 - lib/jekyll-bookshop/init-styles.rb
-- lib/jekyll-bookshop/page-without-a-file.rb
+- lib/jekyll-bookshop/site-data.rb
 - lib/jekyll-bookshop/tags/bookshop-tag.rb
-- lib/jekyll-bookshop/tags/site-data-tag.rb
 - lib/jekyll-bookshop/tags/style-tag.rb
 - lib/jekyll-bookshop/version.rb
 homepage: https://github.com/cloudcannon/bookshop

data/lib/jekyll-bookshop/filters.rb

@@ -1,22 +0,0 @@
-module JekyllBookshop
-  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

data/lib/jekyll-bookshop/page-without-a-file.rb

@@ -1,8 +0,0 @@
-module JekyllBookshop
-    # Utility class to help generate files with no source file
-    class PageWithoutAFile < Jekyll::Page
-      def read_yaml(*)
-        @data ||= {}
-      end
-    end
-  end

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

@@ -1,53 +0,0 @@
-require 'json/ext'
-require_relative '../page-without-a-file'
-
-module JekyllBookshop
-  class SiteDataTag < Liquid::Tag
-    def render(context)
-      @site = context.registers[: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
-      output_payload = {"site" => payload_collections}.to_json
-
-      filename = "site-data"
-      generate_file(filename, output_payload)
-      "<script>window.bookshopSiteData = #{output_payload};</script>"
-    end
-
-    def hydrate_document_fields(document)
-      keys = ["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 hydrate_document_excerpt(document, hydrated_doc)
-      hydrated_doc.merge!({
-        "excerpt" => document.data["excerpt"].output
-      })
-    end
-
-    def generate_file(filename, content)
-      dest = destination_json_path(filename)
-      FileUtils.mkdir_p(File.dirname(dest))
-      File.open(dest, "w") { |file| file.write(content) }
-      @site.keep_files ||= []
-      @site.keep_files << json_path(filename)
-    end
-
-    def destination_json_path(filename)
-      Jekyll.sanitized_path(@site.dest, json_path(filename))
-    end
-
-    def json_path(filename)
-      "_bookshop/#{filename}.json"
-    end
-  end
-end