jekyll_plugin_template 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b8804da5578887e2b1dd581de8ad30d4e7e4f4ed4a9a4d6c517e710f52a94c3
-  data.tar.gz: 9237ebfda58f9da784c9c19c13f60ca9f4b7fcaa62a818b9b383c58b66a931ae
+  metadata.gz: a4c4b04f631f93d694b6ac414c7c13e9ee040bdb054adad7d8fcacf74c86d26d
+  data.tar.gz: 83990ea5e791dc5fddf63e9493ca50af1ecacbd35021481f1400b09df70b0cc1
 SHA512:
-  metadata.gz: 8a034a2186a0cd8835a96de90c959da5969b8703d8321c86cd3ed5a34fc8473d8ef6363c67aa6ce51a5214b97e97d19be8d790f8d22667ff9eb460f6279e27be
-  data.tar.gz: 2286531c8782695985b19746a019f1215c257ea2c4ffee55bf2fdacf38d3555c85f8a15cd3145f30d466a67c6d31d7ba522b86b4baae1d6779bafeecb9bba86b
+  metadata.gz: f37621435bcb0c4d22a3765deee2e2a8942a3c6e1198ad2f737076c8aa8898937bc32d1ce2b2573fdfc16390cf05be92de5701226355764ab086553c21b03024
+  data.tar.gz: 3968dcc9173c86d0466cd00fb5d67e5236e716136a237b6e03b9a3509a319a948f8c804e22b1d46d5021d8f43d82911c6f1c75e22008bbb883b16234acb834ad

data/.rubocop.yml

@@ -1,37 +1,80 @@
-# require: rubocop-jekyll
-# inherit_gem:
-#  rubocop-jekyll: .rubocop.yml
+require:
+  # - rubocop-jekyll
+  - rubocop-md
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
   Exclude:
-      - vendor/**/*
-      - Gemfile*
-      - '*.gemspec' # This does nothing. Why?
+    - demo/_site/**/*
+    - exe/**/*
+    - vendor/**/*
+    - Gemfile*
+    - Rakefile
+    - jekyll_plugin_template.gemspec
   NewCops: enable
   TargetRubyVersion: 2.6
 
-# Gemspec/RequireMFA:
-#   Enabled: false
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
 
-# Jekyll/NoPutsAllowed:
-#   Enabled: false
+Layout/InitialIndentation:
+  Exclude:
+    - README.md
 
 Layout/HashAlignment:
+  EnforcedColonStyle: table
   EnforcedHashRocketStyle: table
 
 Layout/LineLength:
   Max: 150
 
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - jekyll_plugin_template.gemspec
+
 Metrics/AbcSize:
-  Max: 20
+  Max: 35
 
 Metrics/BlockLength:
-  Max: 50
+  Exclude:
+    - jekyll_plugin_template.gemspec
+    - spec/**/*
+
+Metrics/ClassLength:
+  Exclude:
+    - spec/**/*
 
 Metrics/MethodLength:
   Max: 40
 
-Metrics/ModuleLength:
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/PerceivedComplexity:
+  Max: 10
+
+Naming/FileName:
+  Exclude:
+    - Rakefile
+
+RSpec/ExampleLength:
+  Max: 20
+
+RSpec/MultipleExpectations:
+  Max: 15
+
+Style/CommandLiteral:
+  Enabled: false
+
+Style/CommentedKeyword:
   Enabled: false
 
 Style/Documentation:
@@ -40,5 +83,21 @@ Style/Documentation:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Style/StringConcatenation:
+  Exclude:
+    - spec/**/*
+
 Style/StringLiterals:
   Enabled: false
+
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0 / 2023-04-05
+  * Updated to `jekyll_plugin_support` v0.6.0 for attribution support.
+  * Fixed `jeky_block_tag_plugin.rb` so it works properly with `jekyll_plugin_support`.
+
 ## 0.2.0 / 2023-02-16
   * Updated to `jekyll_plugin_support` v0.5.0.
 

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec

data/jekyll_plugin_template.gemspec

@@ -1,6 +1,6 @@
 require_relative 'lib/jekyll_plugin_template/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   github = 'https://github.com/mslinn/jekyll_plugin_template'
 
   spec.authors = ['Firstname Lastname']
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   spec.files = Dir['.rubocop.yml', 'LICENSE.*', 'Rakefile', '{lib,spec}/**/*', '*.gemspec', '*.md']
 
-  spec.homepage = 'https://www.mslinn.com/blog/2020/12/30/jekyll-plugin-template-collection.html'
+  spec.homepage = 'https://www.mslinn.com/jekyll/10400-jekyll-plugin-template-collection.html'
   spec.license = 'CC0-1.0'
   spec.metadata = {
     'allowed_push_host' => 'https://rubygems.org',
@@ -30,13 +30,10 @@ Gem::Specification.new do |spec|
   spec.version = JekyllPluginTemplateVersion::VERSION
 
   spec.add_dependency 'jekyll', '>= 3.5.0'
-  spec.add_dependency 'jekyll_plugin_support', '~> 0.5.0'
+  spec.add_dependency 'jekyll_plugin_support', '>= 0.7.0'
   spec.add_dependency 'git'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'os'
   spec.add_dependency 'talk_like_a_pirate', '~> 0.2.2'
   spec.add_dependency 'tty-prompt'
-
-  # spec.add_development_dependency 'debase'
-  # spec.add_development_dependency 'ruby-debug-ide'
 end

data/lib/jekyll_block_tag_plugin.rb

@@ -1,7 +1,7 @@
 require 'jekyll_plugin_support'
 
 module JekyllPluginBlockTagTemplate
-  PLUGIN_NAME = 'block_tag_template'
+  PLUGIN_NAME = 'block_tag_template'.freeze
 end
 
 # This is the module-level description.
@@ -23,34 +23,24 @@ module JekyllBlockTagPlugin
   class MyBlock < JekyllSupport::JekyllBlock
     include JekyllPluginTemplateVersion
 
-    # See https://github.com/Shopify/liquid/wiki/Liquid-for-Programmers#create-your-own-tags
-    # @param tag_name [String] the name of the tag, which we already know.
-    # @param argument_string [String] the arguments from the tag, as a single string.
-    # @param _parse_context [Liquid::ParseContext] hash that stores Liquid options.
-    #        By default it has two keys: :locale and :line_numbers, the first is a Liquid::I18n object, and the second,
-    #        a boolean parameter that determines if error messages should display the line number the error occurred.
-    #        This argument is used mostly to display localized error messages on Liquid built-in Tags and Filters.
-    #        See https://github.com/Shopify/liquid/wiki/Liquid-for-Programmers#create-your-own-tags
-    # @return [void]
-    def initialize(tag_name, argument_string, parse_context) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      super
-      @logger = PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config)
+    REJECTED_ATTRIBUTES = %w[content excerpt next previous].freeze
 
-      @argument_string = argument_string
+    # Method prescribed by the Jekyll support plugin.
+    # @return [String]
+    def render_impl(content)
+      @helper.gem_file __FILE__ # This enables attribution
 
-      argv = Shellwords.split(argument_string) # Scans name/value arguments
-      params = KeyValueParser.new.parse(argv) # Extracts key/value pairs, default value for non-existant keys is nil
-      @param1 = params[:param1] # Obtain the value of parameter param1
-      @param2 = params[:param2]
-      @param3 = params[:param3]
-      @param4 = params[:param4]
-      @param5 = params[:param5]
-      @param_x = params[:not_present] # The value of parameters that are present is nil, but displays as the empty string
+      @param1  = @helper.keys_values['param1'] # Obtain the value of parameter param1
+      @param2  = @helper.keys_values['param2']
+      @param3  = @helper.keys_values['param3']
+      @param4  = @helper.keys_values['param4']
+      @param5  = @helper.keys_values['param5']
+      @param_x = @helper.keys_values['not_present'] # The value of parameters that are present is nil, but displays as the empty string
 
       @logger.debug do
         <<~HEREDOC
-          tag_name = '#{tag_name}'
-          argument_string = '#{argument_string}'
+          tag_name = '#{@helper.tag_name}'
+          argument_string = '#{@helper.argument_string}'
           @param1 = '#{@param1}'
           @param2 = '#{@param2}'
           @param3 = '#{@param3}'
@@ -58,36 +48,14 @@ module JekyllBlockTagPlugin
           @param5 = '#{@param5}'
           @param_x = '#{@param_x}'
           params =
-            #{params.map { |k, v| "#{k} = #{v}" }.join("\n  ")}
+            #{@helper.keys_values.map { |k, v| "#{k} = #{v}" }.join("\n  ")}
         HEREDOC
       end
-    end
-
-    REJECTED_ATTRIBUTES = %w[content excerpt next previous].freeze
-
-    # Method prescribed by the Jekyll plugin lifecycle.
-    # @param liquid_context [Liquid::Context]
-    # @return [String]
-    def render(liquid_context) # rubocop:disable Metrics/AbcSize
-      content = super # This underdocumented assignment returns the text within the block.
-
-      @site = liquid_context.registers[:site]
-      @config = @site.config
-      @mode = @config.dig('env', 'JEKYLL_ENV') || 'development'
-
-      # variables defined in pages are stored as hash values in liquid_context
-      _assigned_page_variable = liquid_context['assigned_page_variable']
-
-      # The names of front matter variables are hash keys for @page
-      @page = liquid_context.registers[:page] # @page is a Jekyll::Drops::DocumentDrop
-      # layout = @page['layout']
 
-      @envs = liquid_context.environments.first
       @layout_hash = @envs['layout']
 
       @logger.debug do
         <<~HEREDOC
-          liquid_context.scopes=#{liquid_context.scopes}
           mode="#{@mode}"
           page attributes:
             #{@page.sort
@@ -101,8 +69,12 @@ module JekyllBlockTagPlugin
       <<~HEREDOC
         <p style='color: green; background-color: yellow; padding: 1em; border: solid thin grey;'>
           #{content} #{@param1}
+          #{@helper.attribute if @helper.attribution}
         </p>
       HEREDOC
+    rescue StandardError => e
+      @logger.error { "#{self.class} died with a #{e.full_message}" }
+      exit 3
     end
 
     JekyllPluginHelper.register(self, JekyllPluginBlockTagTemplate::PLUGIN_NAME)

data/lib/jekyll_plugin_template/version.rb

@@ -1,3 +1,3 @@
 module JekyllPluginTemplateVersion
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/jekyll_tag_plugin.rb

@@ -41,7 +41,7 @@ module JekyllTagPlugin
       'smiley'     => '😁', # default emoji
       'smirk'      => '😏',
       'two_hearts' => '💕',
-    }.sort_by { |k, v| [k] }.to_h
+    }.sort_by { |k, _v| [k] }.to_h
 
     # @param tag_name [String] is the name of the tag, which we already know.
     # @param argument_string [String] the arguments from the web page.
@@ -101,11 +101,14 @@ module JekyllTagPlugin
     end
 
     def list
-      "<ul class='emoji_list'>\n" +
-      (@@emojis.map do |ename, hex_code|
-        "  <li>#{ assemble_emoji(ename, hex_code) }</li>\n"
-      end).join +
-      "</ul>\n"
+      items = @@emojis.map do |ename, hex_code|
+        "  <li>#{assemble_emoji(ename, hex_code)}</li>"
+      end
+      <<~END_RESULT
+        <ul class='emoji_list'>
+          #{items.join("\n  ")}
+        </ul>
+      END_RESULT
     end
 
     JekyllPluginHelper.register(self, JekyllPluginTagTemplate::PLUGIN_NAME)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_plugin_template
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Firstname Lastname
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -28,16 +28,16 @@ dependencies:
   name: jekyll_plugin_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +143,14 @@ files:
 - spec/run_this_first_helper.rb
 - spec/run_this_first_spec.rb
 - spec/spec_helper.rb
-homepage: https://www.mslinn.com/blog/2020/12/30/jekyll-plugin-template-collection.html
+homepage: https://www.mslinn.com/jekyll/10400-jekyll-plugin-template-collection.html
 licenses:
 - CC0-1.0
 metadata:
   allowed_push_host: https://rubygems.org
   bug_tracker_uri: https://github.com/mslinn/jekyll_plugin_template/issues
   changelog_uri: https://github.com/mslinn/jekyll_plugin_template/CHANGELOG.md
-  homepage_uri: https://www.mslinn.com/blog/2020/12/30/jekyll-plugin-template-collection.html
+  homepage_uri: https://www.mslinn.com/jekyll/10400-jekyll-plugin-template-collection.html
   source_code_uri: https://github.com/mslinn/jekyll_plugin_template
 post_install_message:
 rdoc_options: []