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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d3c10fd8d62669f5590934ad3bc7dc6d94d3d652fda6f833dbd3c9ab2b4e01
-  data.tar.gz: 324be137b13530152aca2b61185b3d36eb66183d9db3eefe3b86437788604932
+  metadata.gz: 7c6f125193d622db11ffd2b5afa55db2181c7364271d38cd65a878fe52ba0b5c
+  data.tar.gz: 47159d0b495951a4ca170a5b86ee5721c5a34818e409ca4a43a1521029b64949
 SHA512:
-  metadata.gz: a1c0047a975986839561a2450139abca77ec2f8a13983f23d59144579bf2cdab1aed8a3cf7fe942399b3f63ddd1e4b51c7729f2dca2857b4594a3c2cc40a847e
-  data.tar.gz: 2ef4673878fcb593b077644cd10461ec0698b6a659eb8ebd2fa56ad95063d4b8cf812a58730abbc53b1a6c4f5526e33dad479bd64c81d0f5cb5d738a091b4d5b
+  metadata.gz: 7ba1aa7384cdb90427ed42b0e2b888da11d57dba4f7622e65882bf5038e4dd2434a51822ae811a592a6975e84f0345857a31ed3d0aa9a840a28fdf5d93daa10d
+  data.tar.gz: e56f5eae3e4fe55f2095233d4383ef29d7d4dc87bedf81a6197f47925a45d0210efb747543f8ddff17f503b164476dff5f929d85a18effcae291b26cc4678b78

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

@@ -39,7 +39,8 @@ module JekyllBookshop
 
       # 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"
+      version = "3.0.0-beta.5"
+      meta_comment = context["__bookshop__nested"] ? "" : "<!--bookshop-live meta(version=\"#{version}\" baseurl=\"#{site.baseurl}\" title=\"#{site.config["title"]&.gsub('"', '\"') || ""}\") -->\n"
 
       context.stack do
         context["include"] = parse_params(context) if @params

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

@@ -7,37 +7,11 @@ module JekyllBookshop
       @host = markup.strip
     end
 
-    def self.transformHostString(host)
-      case
-        when host =~ %r!^:\d+$!
-          "http://localhost#{host}/bookshop.js"
-        when host =~ %r!^\d+$!
-          "http://localhost:#{host}/bookshop.js"
-        when host =~ %r!^localhost:\d+$!
-          "http://#{host}/bookshop.js"
-        when host =~ %r!^/|https?://!
-          host
-        else
-          "//#{host}"
-      end
-    end
-
     def render(context)
-      return unless @host
-
-      host = BrowserTag.transformHostString(@host)
-
-      site = context.registers[:site]
-      page = context.registers[:page]
-
-      "<div data-bookshop-browser></div>
-<script src=\"#{host}\"></script>
-<script>
-  window.bookshopBrowser = new window.BookshopBrowser({
-    globals: []
-  }); 
-  window.bookshopBrowser.render();
-</script>"
+      STDERR.puts "The {% bookshop_browser #{@host} %} tag has been replaced in Bookshop 3.0"
+      STDERR.puts "Replace this tag with {% bookshop_component_browser %}"
+      STDERR.puts "Note: The port argument is no longer needed, nor are any environment checks"
+      exit 1
     end
   end
 end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module JekyllBookshop
+  class ComponentBrowserTag < Liquid::Tag
+    def initialize(tag_name, markup, tokens)
+      super
+      @port = markup.strip
+    end
+
+    def render(context)
+      local_port = 30775;
+
+      if @port.length > 0
+        is_int = Integer(@port) rescue false
+        unless is_int
+          STDERR.puts "bookshop_component_browser expected either no argument, or an integer for the local port number used when running @bookshop/browser."
+          exit 1
+        end
+        local_port = @port
+      end
+
+      "<div data-bookshop-browser=\"\"></div>
+<script src=\"http://localhost:#{ local_port }/bookshop.js\"></script>
+<script>
+  window.bookshopBrowser = new window.BookshopBrowser({globals: []});
+  window.bookshopBrowser.render();
+</script>"
+    end
+  end
+end

data/lib/jekyll-bookshop/version.rb

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

data/lib/jekyll-bookshop.rb

@@ -8,6 +8,7 @@ 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/component-browser-tag"
 require_relative "jekyll-bookshop/tags/style-tag"
 require_relative "jekyll-bookshop/opener"
 
@@ -15,6 +16,7 @@ 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)
+Liquid::Template.register_tag("bookshop_component_browser", JekyllBookshop::ComponentBrowserTag)
 
 Jekyll::Hooks.register :site, :after_init do |site|
   JekyllBookshop::Opener.open_bookshop(site)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-bookshop
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta.2
+  version: 3.0.0.pre.beta.5
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -91,6 +91,7 @@ files:
 - 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/component-browser-tag.rb
 - lib/jekyll-bookshop/tags/style-tag.rb
 - lib/jekyll-bookshop/version.rb
 homepage: https://github.com/cloudcannon/bookshop