jekyll-bookshop 3.0.0.pre.beta.3 → 3.0.0.pre.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc712f2000dc4931c776e6fbef168ef393b1fb2ba921b1cd64e705b595cdc52e
-  data.tar.gz: ebe71f39d3050a113cc7b2ef19d9ad609aee1a00e07dc44cfb85a0715cbbecbf
+  metadata.gz: f5f0dd99fdd2b70261dab2b6c48817cfe82220682142ae74f469a12bc2e7e25e
+  data.tar.gz: af1c898fbff0a3c4e338f870afeabaf2ab0da16ded31711dc2d2fa3fbda3f7a8
 SHA512:
-  metadata.gz: 13960804e5a7d64764cea2003ce44fcd6602bcfb83fb0e66a6e31fca89794cab59556003fed226cfff0375bc12d6584d4189a20198ba0ccc11778df1ea91743e
-  data.tar.gz: 8b2fffd0251a89b37087d6c8b6c2614beab33bb72ae540786d400c0e38d7e4009d6c7f82a9721f902b3ddcc1d61bf1640a437fc523ddf018e28ef7b1fb98c381
+  metadata.gz: efb9ca10b9053e242c290053b67e859fbbb627eb837a7bf0d86df5493b99c2fdac3c8fd8cdf54cc28e05c88e220bd33897a20d7fab33f99b7609ca9f88dcee79
+  data.tar.gz: 596d11e3931a95a68c9f618f813d76fa79becd346ed89255820d9bf8ee0a3b02d78b726442515188c71ffe029102fbb99956436bd9a5649ac5eec90f1d2481cf

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

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

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.3"
+  VERSION = "3.0.0.pre.beta.4"
 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.3
+  version: 3.0.0.pre.beta.4
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-04-01 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