jekyll-glossary_tooltip 1.0.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27106561fba42677dd2324409e4cf8ad78dfdf8e0bfa598e2c8a4a5aff25583e
-  data.tar.gz: 9aef06b73017f60dc04bebc53b38e1a06cd46d24572440a7b5b5d3a52f987aba
+  metadata.gz: '09c7f3e8d1674d97b97e0b2f61a9aec54c9f63887ef44e186bb98cb17f1e316e'
+  data.tar.gz: a04e4f54354a67f7133f9bbb49fa6a141464fdb1796caffe81d1e5253e781619
 SHA512:
-  metadata.gz: a70b8ea06d041483fea246db14b00dabe1a54cdcad869982f5edb4428fa3f1b70d263df0cd8a474194bddf3e249875bc3bfb4aa518f02da36fe8e2a412cdf79e
-  data.tar.gz: 7e41762075d3b7e346da21e54d3707b0f2e090554175a6f4a439cc7818ae8c217d73da921651f37760030b790d65c158fe0a73b9da0bf0db0bf938141caf2a4a
+  metadata.gz: 6c4fa0607b999dc875677218c0c12392fd699d5f647b37dfc0802ff1b0612bf06e9ccf564a9c562e5d5b5a4ece98b010864b1933693e3cf173446feef17ba9bb
+  data.tar.gz: 10a488c7d5dce9facceac915de46887d76142b0a59686c21c5a484bc116555dee5fe8cc90bd1fecea2cbeb29399f356bfc48e78d84faf42f91dfa8ed5e18454d

data/.github/dependabot.yml

@@ -1,4 +1,5 @@
 # Reference: https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# Validation: https://dependabot.com/docs/config-file/validator/
 version: 2
 updates:
   - package-ecosystem: "bundler"

data/.rubocop.yml

@@ -5,6 +5,10 @@ require:
   - rubocop-rake
   - rubocop-rspec
 
+inherit_mode:
+  merge:
+    - Exclude  # Merge my AllCops.Excllude with default exludes from https://github.com/rubocop/rubocop/blob/master/config/default.yml
+
 AllCops:
   TargetRubyVersion: 3.0
   Include:
@@ -68,12 +72,14 @@ Lint/UnreachableCode:
 Lint/UselessAccessModifier:
   Enabled: false
 
+Metrics/AbcSize:
+  Enabled: true
 Metrics/BlockLength:
   Enabled: true
   Max: 100
 Metrics/MethodLength:
   Enabled: true
-  Max: 15
+  Max: 25
 
 Naming/FileName:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.3.1] - 2021-08-18
+- Fix gemspec dependency range stynax.
+
+## [1.3.0] - 2021-08-07
+- Open the souce link from a tooltip in a new tab.
+
+## [1.2.0] - 2021-08-06
+- Add bottom arrow to the tooltip.
+- Restyle the glossary term bottom border style and color.
+- Add tooltip hover animation from invisible to visible.
+
+## [1.1.0] - 2021-08-06
+- Add optional `display:` argument to set a different term display name, rather than using the term name as defined in the glossary file. Usage: `{% glossary term_name, display: Different Name To Display %}`.
+
 ## [1.0.0] - 2021-08-05
 - No changes from `v0.1.0` but just bumping to final first major release version!
 

data/Gemfile

@@ -12,10 +12,11 @@ gemspec
 # Reference: https://github.com/rubygems/bundler/pull/7222
 # However there's an argument for using gemspec too: https://bundler.io/guides/creating_gem.html#testing-our-gem
 group :development, :test do
-  gem "rake", "~> 13.0", require: false
-  gem "travis", "~> 1.0", require: false
   gem "appraisal", "~> 2.4", require: false
   gem "gem-release", "~> 2.0", require: false
+  gem "rake", "~> 13.0", require: false
+  gem "solargraph", require: false
+  gem "travis", "~> 1.0", require: false
 end
 
 group :test do

data/README.md

@@ -62,13 +62,22 @@ This could look something like:
 On any page where you've made sure include the needed CSS styling, you can use the glossary tag simply like
 
 ```markdown
-Here I'm taling about {% glossary term_name %} in a blog post.
+Here I'm talking about {% glossary term_name %} in a blog post.
 
-The term name can contain spaces like {% glossary operating system }.
+The term name can contain spaces like {% glossary operating system %}.
 
 Even if the term is defined in _data/glossary.yml as 'term_name', the matching is case-insensitive meaning that I can look it up using {% glossary TeRM_NaME %}. Note that the term is displayed as defined in the tag rather than the definition, here meaing 'TeRM_NaME'.
+
+The case-styling above works as there's still a case-insensitive match. But what about when you actually want to dispaly the term differently? Maybe the term is defined as "cat" but you want to use the plural "cats"? Then you can supply an optional `display` argument. The syntax is:
+{% glossary <term>, display: <diplay name> %}
+
+This could be e.g.
+{% glossary cat, display: cats %}
+{% glossary some term, display: some other display text %}
 ```
 
+**Note** that a term name can not contain a `,`, as this is the argument separator character.
+
 
 ## CSS Style Override
 Simply modify the rules [jekyll-glossary_tooltip.css](lib/jekyll-glossary_tooltip/jekyll-glossary_tooltip.css) that you copied to your project. The tooltip is based on this [tutorial](https://www.w3schools.com/css/css_tooltip.asp). View the generated HTML output to see the HTML tags that are styled, or check the [tag.rb](lib/jekyll-glossary_tooltip/tag.rb) implementation in the method `render()`.
@@ -171,3 +180,9 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/erikw/
 
 # License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+# Acknowledgement
+Thanks to [ayastreb/jekyll-maps](https://github.com/ayastreb/jekyll-maps) for inspiration on project structure and options parsing!
+
+# More Jekyll
+Check out my other Jekyll repositories [here](https://github.com/erikw?tab=repositories&q=jekyll-&type=&language=&sort=).

data/jekyll-glossary_tooltip.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "This plugin simplifies for your readers and you by making it easy to define terms or abbreviations that needs an explanation. Define a common dictionary of terms and their definition in a YAML file. Then inside markdown files you can use the provided glossary liquid tag to insert a tooltip for a defined word from the dictionary. The tooltip will show the term definition on mouse hover."
   spec.homepage      = "https://github.com/erikw/jekyll-glossary_tooltip/"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.7", "< 4"
+  spec.required_ruby_version = [">= 2.7", "< 4"]
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/erikw/jekyll-glossary_tooltip/"
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jekyll", ">= 3.7", "< 5.0"
+  spec.add_dependency "jekyll", [">= 3.7", "< 5.0"]
 end

data/lib/jekyll-glossary_tooltip.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "jekyll-glossary_tooltip/version"
+require_relative "jekyll-glossary_tooltip/options_parser"
 require_relative "jekyll-glossary_tooltip/tag"
+require_relative "jekyll-glossary_tooltip/version"
 
 module Jekyll
   # Module for the plugin.

data/lib/jekyll-glossary_tooltip/errors.rb

@@ -13,6 +13,15 @@ module Jekyll
         def initialize(term_name); super("The term '#{term_name}' was defined multiple times in the glossary") end
       end
       class NoGlossaryFile < StandardError; def initialize; super("No data.glossary found") end end
+      class OptionsNoTermNameInTag < StandardError
+        def initialize; super("No term name argument for the glossary tag supplied") end
+      end
+      class OptionsBadTagArgumentFormat < StandardError
+        def initialize(term_name); super("The glossary tag for term '#{term_name}' has a bad argument format") end
+      end
+      class OptionsUnknownTagArgument < StandardError
+        def initialize(arg); super("An unknown tag argument #{arg} was encountered") end
+      end
     end
   end
 end

data/lib/jekyll-glossary_tooltip/jekyll-glossary_tooltip.css

@@ -2,7 +2,7 @@
 .jekyll-glossary {
   position: relative;
   display: inline-block;
-  border-bottom: 3px dotted blue;
+  border-bottom: 2px dotted #0074bd;
   cursor: help;
 }
 
@@ -36,3 +36,24 @@
 .jekyll-glossary-source-link:before {
   content: "[source]";  // "(reference)", "<link>" or whatever you want.
 }
+
+/* Arrow created with borders. */
+.jekyll-glossary .jekyll-glossary-tooltip::after {
+  content: " ";
+  position: absolute;
+  top: 100%;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 5px;
+  border-style: solid;
+  border-color: black transparent transparent transparent;
+}
+
+/* Animation from invisible to visible on hover. */
+.jekyll-glossary .jekyll-glossary-tooltip {
+  opacity: 0;
+  transition: opacity 1s;
+}
+.jekyll-glossary:hover .jekyll-glossary-tooltip {
+  opacity: 1;
+}

data/lib/jekyll-glossary_tooltip/options_parser.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "jekyll-glossary_tooltip/errors"
+
+module Jekyll
+  module GlossaryTooltip
+    # Stripped down & modified version of
+    # https://github.com/ayastreb/jekyll-maps/blob/master/lib/jekyll-maps/options_parser.rb
+    class OptionsParser
+      ARGS_PATTERN = %r{\s*(\w[-_\w]*):\s*(\w[^,\n\r]*)}
+      ARGS_ALLOWED = %w[
+        display
+      ].freeze
+
+      class << self
+        def parse(raw_options)
+          options = {
+            term_query: nil,
+            display: nil
+          }
+          opt_segments = raw_options.strip.split(",")
+          raise Errors::OptionsNoTermNameInTag unless opt_segments.length.positive?
+
+          options[:term_query] = opt_segments[0]
+          opt_segments.shift
+          parse_segments(options, opt_segments)
+          options
+        end
+
+        def parse_segments(options, opt_segments)
+          opt_segments.each do |opt_segment|
+            raise Errors::OptionsBadTagArgumentFormat, options[:term_name] unless opt_segment =~ ARGS_PATTERN
+
+            arg_name = Regexp.last_match(1)
+            arg_value = Regexp.last_match(2)
+            raise Errors::OptionsUnknownTagArgument, arg_name unless ARGS_ALLOWED.include?(arg_name)
+
+            options[arg_name.to_sym] = arg_value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-glossary_tooltip/tag.rb

@@ -7,16 +7,17 @@ module Jekyll
   module GlossaryTooltip
     # Custom liquid tag implementation.
     class Tag < Liquid::Tag
-      def initialize(tag_name, text, tokens)
+      def initialize(tag_name, args, tokens)
         super
-        @term_query = text.strip
+        @opts = OptionsParser.parse(args)
       end
 
       def render(context)
-        entry = lookup_entry(context.registers[:site], @term_query)
+        entry = lookup_entry(context.registers[:site], @opts[:term_query])
+        @opts[:display] ||= @opts[:term_query]
         <<~HTML
           <span class="jekyll-glossary">
-             #{@term_query}
+             #{@opts[:display]}
              <span class="jekyll-glossary-tooltip">#{entry["definition"]}#{render_tooltip_url(entry)}</span>
           </span>
         HTML
@@ -29,7 +30,8 @@ module Jekyll
       def render_tooltip_url(entry)
         # The content of the anchor is set from the CSS class jekyll-glossary-source-link,
         # so that the plugin user can customize the text without touching ruby source.
-        entry["url"] ? "<br><a class=\"jekyll-glossary-source-link\" href=\"#{entry["url"]}\"></a>" : ""
+        anchor = "<br><a class=\"jekyll-glossary-source-link\" href=\"#{entry["url"]}\" target=\"_blank\"></a>"
+        entry["url"] ? anchor : ""
       end
 
       def lookup_entry(site, term_name)

data/lib/jekyll-glossary_tooltip/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module GlossaryTooltip
-    VERSION = "1.0.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-glossary_tooltip
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Erik Westrup
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -68,6 +68,7 @@ files:
 - lib/jekyll-glossary_tooltip.rb
 - lib/jekyll-glossary_tooltip/errors.rb
 - lib/jekyll-glossary_tooltip/jekyll-glossary_tooltip.css
+- lib/jekyll-glossary_tooltip/options_parser.rb
 - lib/jekyll-glossary_tooltip/tag.rb
 - lib/jekyll-glossary_tooltip/version.rb
 - script/build