jekyll_plugin_support 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53975ba14d38fdc37e99ed9363b3d30885a301541c254584ae70d18157fc0e3f
-  data.tar.gz: ccd9fc245d26fce6fa24bbc8edcda670faa017df3e08c75ec08effa760fa44ae
+  metadata.gz: ad3dd2c6f00993d77f9db69e844a1f70e52c21ac1ef66c47294cc7683dee5743
+  data.tar.gz: 121436f415bbcb0cddffa4f9b9c26f735e899aa733df38749e5be2856d56d238
 SHA512:
-  metadata.gz: f78badf8195aebeb9401a974aebd589b1f9af69e9d6c83a3dd7d7340f2edc93ad418ef6806915dc130cb4deab5c0beb80eca15cd27189cdca999bd15d1434081
-  data.tar.gz: dde45223b684b140e3c5e7d2633d96f39e974c148094243a979cebe60c33af5383e761c3e9aa6a60d34cdd71b90a550c39964f7e6e63c692660d536990074b39
+  metadata.gz: b6d186e5d5347b7857cef3318a152a4a9db75e57ebe7dc244dd0574542b47b2c97c4ba55af03065099cca94c3ca3fb3e666268fb4e2427683b94a0c058388a7b
+  data.tar.gz: 1529488c906cc7c687356f22b65223f347d75eb35f1747742466166921b266c4f172233eaf638bb06af7fdf6fcd93e67d0f6ca25cbde0f98139edb05fb07d64a

data/.rubocop.yml

@@ -1,10 +1,17 @@
 AllCops:
   Exclude:
-      - vendor/**/*
-      - Gemfile*
+    - exe/**/*
+    - vendor/**/*
+    - Gemfile*
   NewCops: enable
   TargetRubyVersion: 2.6
 
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
+
 Layout/HashAlignment:
   Enabled: false
 
@@ -14,5 +21,21 @@ Layout/LineLength:
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/BlockLength:
+  Exclude:
+    - jekyll_plugin_support.gemspec
+
+Metrics/MethodLength:
+  Max: 25
+
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.0 / 2023-02-15
+  * Plugins now register themselves
+  * Plugins now report their name and version
+  * `@layout`, `@paginator`, and `@theme` have values if supported by the version of Jekyll, and they are active. (See [Jekyll docs](https://jekyllrb.com/docs/variables/).)
+
 ## 0.4.1 / 2023-02-14
   * Fixed several problems
   * Added demo site

data/README.md

@@ -50,11 +50,11 @@ and can parse parameters passed to the tag / block tag, [as described here](http
 ```ruby
 # For a tag:
 module Jekyll
-  class Quote < JekyllSupport::JekyllTag
+  class MyTag < JekyllSupport::JekyllTag
+    VERSION = '0.1.0'.freeze
+
     def render_impl
-      site_data = @site.data
-      @break  = @helper.parameter_specified? 'break'
-      # ...
+      # Your code here
     end
   end
 end
@@ -63,11 +63,34 @@ end
 ```ruby
 # For a tag block:
 module Jekyll
-  class Quote < JekyllSupport::JekyllBlock
+  class MyBlock < JekyllSupport::JekyllBlock
+    VERSION = '0.1.0'.freeze
+
+    def render_impl(text)
+      # Your code here
+    end
+  end
+end
+```
+
+Note that each tag or tag block must define a constant called `VERSION`.
+If your plugin is packaged as a gem, then you might need to include `version.rb` into the plugin class.
+For example, if `lib/my_plugin/version.rb` looks like this:
+
+```ruby
+module MyPluginVersion
+  VERSION = '0.5.0'.freeze
+end
+```
+
+Then your plugin can incorporate the `VERSION` constant into your plugin like this:
+```ruby
+module Jekyll
+  class MyBlock < JekyllSupport::JekyllBlock
+    include MyPluginVersion
+
     def render_impl(text)
-      site_url = @site.url
-      @break  = @helper.parameter_specified? 'break'
-      # ...
+      # Your code here
     end
   end
 end

data/Rakefile

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

data/jekyll_plugin_support.gemspec

@@ -21,26 +21,14 @@ Gem::Specification.new do |spec|
 
     Thanks for installing #{spec.name}!
 
-  END_MESSAGE
-  spec.post_install_message = <<~END_MESSAGE
-
-    Thanks for installing #{spec.name}!
-
   END_MESSAGE
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.6.0'
   spec.summary = 'Provides support for writing Jekyll plugins.'
   spec.test_files = spec.files.grep %r{^(test|spec|features)/}
-  spec.version = JekyllQuoteVersion::VERSION
+  spec.version = JekyllPluginSupportVersion::VERSION
 
   spec.add_dependency 'jekyll', '>= 3.5.0'
   spec.add_dependency 'jekyll_plugin_logger'
   spec.add_dependency 'key-value-parser'
-
-  spec.add_development_dependency 'debase'
-  spec.add_development_dependency 'rspec-match_ignoring_whitespace'
-  # spec.add_development_dependency 'rubocop-jekyll'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'ruby-debug-ide'
 end

data/lib/jekyll_plugin_support/version.rb

@@ -1,3 +1,3 @@
-module JekyllQuoteVersion
-  VERSION = '0.4.1'.freeze
+module JekyllPluginSupportVersion
+  VERSION = '0.5.0'.freeze
 end

data/lib/jekyll_plugin_support.rb

@@ -75,11 +75,19 @@ module JekyllSupport
     # Method prescribed by the Jekyll plugin lifecycle.
     def render(liquid_context)
       @helper.liquid_context = liquid_context
-      @page = liquid_context.registers[:page]
-      @site = liquid_context.registers[:site]
+
+      @envs      = liquid_context.environments.first
+
+      @layout    = @envs[:layout]
+      @paginator = @envs[:paginator]
+      @theme     = @envs[:theme]
+
+      @page      = liquid_context.registers[:page]
+      @site      = liquid_context.registers[:site]
+
       @config = @site.config
-      @envs = liquid_context.environments.first
       @mode = @config['env']['JEKYLL_ENV'] || 'development'
+
       render_impl
     end
 

data/lib/jekyll_plugin_support_helper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'shellwords'
 require 'key_value_parser'
 
@@ -7,7 +5,7 @@ require 'key_value_parser'
 class JekyllPluginHelper
   attr_reader :argv, :keys_values, :liquid_context, :logger, :markup, :params, :tag_name
 
-  # Expand a environment variable reference
+  # Expand an environment variable reference
   def self.expand_env(str, die_if_undefined: false)
     str.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do
       envar = Regexp.last_match(1)
@@ -18,6 +16,21 @@ class JekyllPluginHelper
     end
   end
 
+  def self.register(klass, name)
+    abort("Error: The #{name} plugin does not define VERSION") \
+      unless klass.const_defined?(:VERSION)
+
+    version = klass.const_get(:VERSION)
+
+    abort("Error: The #{name} plugin is not an instance of JekyllSupport::JekyllBlock or JekyllSupport::JekyllTag") \
+      unless klass.instance_of?(Class) &&
+             (klass.ancestors.include?(JekyllSupport::JekyllBlock) || \
+              klass.ancestors.include?(JekyllSupport::JekyllTag))
+
+    Liquid::Template.register_tag(name, klass)
+    PluginMetaLogger.instance.info { "Loaded #{name} v#{version} plugin." }
+  end
+
   # strip leading and trailing quotes if present
   def self.remove_quotes(string)
     string.strip.gsub(/\A'|\A"|'\Z|"\Z/, '').strip if string
@@ -35,14 +48,14 @@ class JekyllPluginHelper
   def initialize(tag_name, markup, logger)
     @tag_name = tag_name
     @logger = logger
-    @logger.debug { "@keys_values='#{@keys_values}'" }
     reinitialize(markup.strip)
+    @logger.debug { "@keys_values='#{@keys_values}'" }
   end
 
   def reinitialize(markup)
     # @keys_values was a Hash[Symbol, String|Boolean] but now it is Hash[String, String|Boolean]
-    @markup = markup # Useful for debugging
-    @argv = Shellwords.split(JekyllPluginHelper.expand_env(markup))
+    @markup = markup
+    @argv = Shellwords.split(self.class.expand_env(markup))
     @keys_values = KeyValueParser \
       .new({}, { array_values: false, normalize_keys: false, separator: /=/ }) \
       .parse(@argv)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_plugin_support
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -52,76 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-match_ignoring_whitespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 - mslinn@mslinn.com
@@ -142,6 +72,7 @@ files:
 - spec/jekyll_block_plugin_support_spec.rb
 - spec/jekyll_tag_plugin_support_spec.rb
 - spec/spec_helper.rb
+- spec/status_persistence.txt
 homepage: https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html#quote
 licenses:
 - MIT
@@ -177,4 +108,5 @@ test_files:
 - spec/jekyll_block_plugin_support_spec.rb
 - spec/jekyll_tag_plugin_support_spec.rb
 - spec/spec_helper.rb
+- spec/status_persistence.txt
 ...