jekyll-bookshop 2.6.1 → 3.0.0.pre.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b23100ad586a2b7a45c65893d7fb03e64a5b0cd1feac6f8239d304ed545abc2
-  data.tar.gz: 8d3aef9f4f6a9644b683955e5724378312cc3d97e0cbcbfe705760ca1eff84d9
+  metadata.gz: 10d3c10fd8d62669f5590934ad3bc7dc6d94d3d652fda6f833dbd3c9ab2b4e01
+  data.tar.gz: 324be137b13530152aca2b61185b3d36eb66183d9db3eefe3b86437788604932
 SHA512:
-  metadata.gz: 34c95ddccae16a3b03465531d62ba2215256595a17fa000e497adf091d4a00b08c2f0ba10f64bec62583859bcbfcea550dafcd4c9e22e2d3c713b93bc396bae3
-  data.tar.gz: f79e8c44537f6f7599f3f17016796980b90e866170840fbfbd0ab1178a80005b7f323ace21b6ff0a981509d2ba6241415a52eaec30035cb6f5ebf0b945b8f516
+  metadata.gz: a1c0047a975986839561a2450139abca77ec2f8a13983f23d59144579bf2cdab1aed8a3cf7fe942399b3f63ddd1e4b51c7729f2dca2857b4594a3c2cc40a847e
+  data.tar.gz: 2ef4673878fcb593b077644cd10461ec0698b6a659eb8ebd2fa56ad95063d4b8cf812a58730abbc53b1a6c4f5526e33dad479bd64c81d0f5cb5d738a091b4d5b

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

@@ -37,12 +37,17 @@ module JekyllBookshop
         loop_context = "#{name}[#{index}]"
       end
 
+      # If this component is not a subcomponent,
+      # we also drop in some site metadata here so that it can be used in the render.
+      meta_comment = context["__bookshop__nested"] ? "" : "<!--bookshop-live meta(version=\"#{JekyllBookshop::VERSION.gsub(".pre.", "-")}\" baseurl=\"#{site.baseurl}\" title=\"#{site.config["title"]&.gsub('"', '\"') || ""}\") -->\n"
+
       context.stack do
         context["include"] = parse_params(context) if @params
+        context["__bookshop__nested"] = true
         begin
-          "<!--bookshop-live name(#{file}) params(#{@params}) context(#{loop_context.gsub(/-/, '=').gsub(/=include\./, '=')}) -->
-          #{partial.render!(context)}
-          <!--bookshop-live end-->"
+          "#{meta_comment}<!--bookshop-live name(#{file}) params(#{@params}) context(#{loop_context.gsub(/-/, '=').gsub(/=include\./, '=')}) -->
+#{partial.render!(context)}
+<!--bookshop-live end-->"
         rescue Liquid::Error => e
           e.template_name = path
           e.markup_context = "included " if e.markup_context.nil?

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

@@ -30,17 +30,11 @@ module JekyllBookshop
       site = context.registers[:site]
       page = context.registers[:page]
 
-      site.data["_bookshop_data_pages"] ||= []
-      unless site.data["_bookshop_data_pages"].include?(page["url"])
-        site.data["_bookshop_data_pages"].push(page["url"])
-      end
-
       "<div data-bookshop-browser></div>
-<script>window.bookshop_browser_site_data = null;</script>
 <script src=\"#{host}\"></script>
 <script>
   window.bookshopBrowser = new window.BookshopBrowser({
-    globals: [window.bookshop_browser_site_data]
+    globals: []
   }); 
   window.bookshopBrowser.render();
 </script>"

data/lib/jekyll-bookshop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllBookshop
-  VERSION = "2.6.1"
+  VERSION = "3.0.0.pre.beta.2"
 end

data/lib/jekyll-bookshop.rb

@@ -10,7 +10,6 @@ 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/opener"
-require_relative "jekyll-bookshop/site-data"
 
 Liquid::Template.register_tag("bookshop", JekyllBookshop::Tag)
 Liquid::Template.register_tag("bookshop_include", JekyllBookshop::IncludeTag)
@@ -20,7 +19,3 @@ Liquid::Template.register_tag("bookshop_browser", JekyllBookshop::BrowserTag)
 Jekyll::Hooks.register :site, :after_init do |site|
   JekyllBookshop::Opener.open_bookshop(site)
 end
-
-Jekyll::Hooks.register :site, :post_render do |site|
-  JekyllBookshop::SiteData.extract(site)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 3.0.0.pre.beta.2
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -87,7 +87,6 @@ extra_rdoc_files: []
 files:
 - lib/jekyll-bookshop.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
@@ -109,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key:

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

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module JekyllBookshop
-  class SiteData
-    def self.extract(site)
-      @site = site
-
-      payload = {}
-      @site.collections.each_pair do |collection, items|
-        payload[collection] = items.docs.map do |doc|
-          doc.data.merge(hydrate_document_fields(doc))
-        end
-      end
-
-      payload["data"] = {}
-      @site.data.each_pair do |key, value|
-        next if key.to_s.start_with?("_bookshop")
-
-        payload["data"][key] = value
-      end
-
-      payload["baseurl"] = @site.baseurl
-      payload["title"] = @site.config["title"]
-
-      @site.data["_bookshop_site_data"] = { "site" => payload }
-
-      update_browser_pages
-
-      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
-
-    def self.update_browser_pages
-      @site.pages.each do |page|
-        next unless @site.data["_bookshop_data_pages"]&.include?(page.url)
-
-        page.output = page.output.gsub(
-          %r!bookshop_browser_site_data = null!,
-          "bookshop_browser_site_data = #{@site.data["_bookshop_site_data"].to_json.gsub(%r!</script!i, "<\\/script")}"
-        )
-      end
-      @site.data["_bookshop_data_pages"] = nil
-    end
-  end
-end