jekyll-dice-tray 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d407c51d39049511c08f665a5b70a71d0eff1a0ec1522472948ce6350fd670
-  data.tar.gz: d2ae3f53ca8018c55bfff796cba3781684076bdeb8ba5bfdc9307c5f3e30c127
+  metadata.gz: 3f1058c6701f813bd5bef233707af9e65bc2b1876de92db04675158a71a0adab
+  data.tar.gz: 6550e68c8ef38aaefebffb822c85c4090402fbfda41585f3ece54f36a1bddf7b
 SHA512:
-  metadata.gz: e30263b41fc804cb82a2f6ba76a0697bd31e0e6d5ace3550a94fb6d41d20a25eec1c2db6e65048ea94b549b3137de4a079dc57c7c9f6209b6b841d5b20723ac4
-  data.tar.gz: 843991fe95b1a12b60550fc6bc462ea547b46e23b740eda47fe3a454dda4d0e34c4757d7ba8f2f3ae68989814c551b3011fbb571b7f022ab1dd404a4f28942fe
+  metadata.gz: 9b5f1d58cfcced42951de3dc03660c4c1d683a7a8523af220d1817c0cf610935383a48f4e20b58409920cce03b2654040ce8a6e7ae753eb2971f5972576ad2fe
+  data.tar.gz: ecf24959ae7c875c23923be6b231ea494fc4d7fa9d0837f8567a1b161e9120f9a48de4fb76e58522a3751697213469a6bf92f6abdaf25491792ebdd99a7b4627

data/README.md

@@ -31,7 +31,7 @@ Optional `_config.yml` settings:
 ```yml
 dice_tray:
   enabled: true
-  assets_path: /assets/jekyll-dice-tray
+  assets_path: /assets/jekyll-dice-tray  # prefixed with site baseurl automatically
   inject_tray: true
   link_dice_in_markdown: true
 ```

data/lib/jekyll/dice_tray/config.rb

@@ -0,0 +1,26 @@
+module Jekyll
+  module DiceTray
+    module Config
+      DEFAULT_ASSETS_PATH = "/assets/jekyll-dice-tray"
+
+      # Site-relative directory for writing static assets (no baseurl).
+      def self.assets_dir(site)
+        path = configured_path(site)
+        path.sub(%r{\A/}, "")
+      end
+
+      # URL path for linking assets in HTML (includes baseurl).
+      def self.assets_url(site)
+        baseurl = site.config["baseurl"].to_s.chomp("/")
+        "#{baseurl}#{configured_path(site)}"
+      end
+
+      def self.configured_path(site)
+        cfg = site.config["dice_tray"] || {}
+        path = (cfg["assets_path"] || DEFAULT_ASSETS_PATH).to_s
+        path.start_with?("/") ? path : "/#{path}"
+      end
+      private_class_method :configured_path
+    end
+  end
+end

data/lib/jekyll/dice_tray/generator.rb

@@ -8,10 +8,8 @@ module Jekyll
         cfg = (site.config["dice_tray"] || {})
         return if cfg["enabled"] == false
 
-        assets_path = cfg["assets_path"] || "/assets/jekyll-dice-tray"
-        assets_path = "/#{assets_path}" unless assets_path.start_with?("/")
-
         asset_dir = File.expand_path("../../../assets/jekyll-dice-tray", __dir__)
+        dest_dir = Config.assets_dir(site)
 
         files = {
           "dice_tray.js" => File.join(asset_dir, "dice_tray.js"),
@@ -23,7 +21,7 @@ module Jekyll
           site.static_files << AssetFile.new(
             site,
             site.source,
-            assets_path.sub(%r{\A/}, ""),
+            dest_dir,
             name,
             source_path: source_path
           )

data/lib/jekyll/dice_tray/hooks.rb

@@ -8,13 +8,10 @@ module Jekyll
           next if cfg["enabled"] == false
           next unless doc.respond_to?(:output_ext) && doc.output_ext == ".html"
 
-          assets_path = cfg["assets_path"] || "/assets/jekyll-dice-tray"
-          assets_path = "/#{assets_path}" unless assets_path.start_with?("/")
-
           begin
             out = doc.output.to_s
             out = HtmlRewriter.rewrite(out) if cfg.fetch("link_dice_in_markdown", true)
-            out = HtmlRewriter.inject_tray(out, assets_path: assets_path) if cfg.fetch("inject_tray", true)
+            out = HtmlRewriter.inject_tray(out, assets_path: Config.assets_url(site)) if cfg.fetch("inject_tray", true)
             doc.output = out
           rescue StandardError => e
             Jekyll.logger.warn("jekyll-dice-tray:", "Failed to process #{doc.relative_path}: #{e.class}: #{e.message}")

data/lib/jekyll/dice_tray/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module DiceTray
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end
 

data/lib/jekyll-dice-tray.rb

@@ -2,6 +2,7 @@ require "jekyll"
 require "nokogiri"
 
 require_relative "jekyll/dice_tray/version"
+require_relative "jekyll/dice_tray/config"
 require_relative "jekyll/dice_tray/asset_file"
 require_relative "jekyll/dice_tray/generator"
 require_relative "jekyll/dice_tray/html_rewriter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-dice-tray
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - directsun
@@ -54,6 +54,7 @@ files:
 - assets/jekyll-dice-tray/dice_tray.js
 - lib/jekyll-dice-tray.rb
 - lib/jekyll/dice_tray/asset_file.rb
+- lib/jekyll/dice_tray/config.rb
 - lib/jekyll/dice_tray/generator.rb
 - lib/jekyll/dice_tray/hooks.rb
 - lib/jekyll/dice_tray/html_rewriter.rb