psychgus 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa00bfe0768a30b9679056fe748769e53827b254d8899bcaacc032fc236e5791
-  data.tar.gz: 46a834b2f517190e9c6b28e6f87964a186c69b7b2bdaf45465d59f2ac1f06603
+  metadata.gz: 01544ac84a4c500d36c933328b920f43bbe878609d10f60c615d6ccccf7ca9da
+  data.tar.gz: 2856f8d12ebe3881513acfbb4ec8da5af40fd98a35a36b9ec227260643c2193e
 SHA512:
-  metadata.gz: 3bcbf539c47cfb64273682b0d1fa76c3745e523e0a792f2a9dec92e1df80352c6c987762edcebd9fc21bccc36450619b42572f5e37fe66e5002ffad2e2e15eb6
-  data.tar.gz: 338ffe5daaafb1ddc79fac1f939058928d839f64f96bd3c8198bbda7f8426da0fea04ab6fead6b114628d64466901499c844bdc14fa55d8795f05d34b89d11ec
+  metadata.gz: d0e41a6e5b84bd23527583e6cbd46db820e8c53e67d241a85e08182770114ee1ee0e57d2b706ca87acd42367fe27001d1de61a67ae9e700211823948ff780c4f
+  data.tar.gz: 558601409148d719e718a4132f703ad46b06bbb7f19f0ce1d46befd3021051c714a4a6bc0613766ae7d05294f312764b4e1f6b82ba65c13da92a5990210ef136

data/.yardopts

@@ -1,5 +1,4 @@
 --files 'LICENSE.txt,CHANGELOG.md'
 --protected
 --readme 'README.md'
---template-path 'yard/templates'
 --title 'Psychgus'

data/CHANGELOG.md

@@ -1,11 +1,21 @@
 # Changelog | Psychgus
 
-All notable changes to this project will be documented in this file.
+- [Keep a Changelog v1.0.0](https://keepachangelog.com/en/1.0.0)
+- [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html)
 
-Format is based on [Keep a Changelog v1.0.0](https://keepachangelog.com/en/1.0.0),
-and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
+## [Unreleased]
+- https://github.com/esotericpig/psychgus/compare/v1.3.6...HEAD
 
-## [[Unreleased]](https://github.com/esotericpig/psychgus/compare/v1.3.5...HEAD)
+
+## [v1.3.6] - 2025-05-01
+### Fixed
+- Fixed deref aliases for Psych v5.2.0+.
+
+### Changed
+- Renamed `master` branch to `main`.
+- Applied RuboCop suggestions.
+- Refactored tests.
+- Removed `yard_ghurt` gem.
 
 
 ## [v1.3.5] - 2024-09-06

data/Gemfile

@@ -3,16 +3,15 @@
 
 source 'https://rubygems.org'
 
-group(:development) do
+group(:development,:test) do
   # Build.
-  gem 'bundler'   ,'~> 2.5'
+  gem 'bundler'   ,'~> 2.6'
   gem 'rake'      ,'~> 13.2'
 
   # Doc.
-  gem 'rdoc'      ,'~> 6.7'   # RDoc for YARD (*.rb).
-  gem 'redcarpet' ,'~> 3.6'   # Markdown for YARD (*.md).
+  gem 'rdoc'      ,'~> 6.13'  # RDoc (*.rb).
+  gem 'redcarpet' ,'~> 3.6'   # Markdown (*.md).
   gem 'yard'      ,'~> 0.9'   # Doc.
-  gem 'yard_ghurt','~> 1.2'   # YARD GitHub rake tasks.
 end
 
 group(:test) do

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/psychgus.svg)](https://badge.fury.io/rb/psychgus)
 [![CI Status](https://github.com/esotericpig/psychgus/actions/workflows/ci.yml/badge.svg)](https://github.com/esotericpig/psychgus/actions/workflows/ci.yml)
-[![Doc Coverage](http://inch-ci.org/github/esotericpig/psychgus.svg?branch=master)](https://inch-ci.org/github/esotericpig/psychgus)
+[![Doc Coverage](http://inch-ci.org/github/esotericpig/psychgus.svg?branch=main)](https://inch-ci.org/github/esotericpig/psychgus)
 
 [![Documentation](https://img.shields.io/badge/doc-yard-%23A0522D.svg)](https://esotericpig.github.io/docs/psychgus/yardoc/index.html)
 [![Source Code](https://img.shields.io/badge/source-github-%23211F1F.svg)](https://github.com/esotericpig/psychgus)
@@ -59,7 +59,7 @@ The Psychgus name comes from the well-styled character Gus from the TV show Psyc
     - [Generating Doc](#generating-doc)
 - [License](#license)
 
-## [//](#contents) Setup
+## Setup
 
 Pick your poison...
 
@@ -93,7 +93,7 @@ $ bundle install
 $ bundle exec rake install:local
 ```
 
-## [//](#contents) Using
+## Using
 
 Documentation (YARDoc) is available on my [GitHub Page](https://esotericpig.github.io/docs/psychgus/yardoc/index.html) and on [RubyDoc.info](https://www.rubydoc.info/gems/psychgus).
 
@@ -111,7 +111,7 @@ Instead of making your own styler, you can also use one of the [pre-defined styl
 | [Advanced Usage](#advanced-usage)
 | [Common Stylers](#common-stylers)
 
-### [//](#using) Simple Example
+### Simple Example
 
 ```Ruby
 require 'psychgus'
@@ -157,7 +157,7 @@ puts Coffee.new.to_yaml
 # style: [Cappuccino, Espresso, Latte, Mocha]
 ```
 
-### [//](#using) Hash Example
+### Hash Example
 
 ```Ruby
 require 'psychgus'
@@ -252,7 +252,7 @@ puts burgers.to_yaml({:indent => 3,:stylers => BurgerStyler.new,:deref_aliases =
 #    Bun: Kaiser
 ```
 
-### [//](#using) Class Example
+### Class Example
 
 ```Ruby
 require 'psychgus'
@@ -423,7 +423,7 @@ puts burgers.to_yaml({:indent => 3,:deref_aliases => true})
 #    Sauce: 'Honey BBQ'
 ```
 
-### [//](#using) Advanced Usage
+### Advanced Usage
 
 ```Ruby
 require 'psychgus'
@@ -514,7 +514,7 @@ puts parser.handler.root.to_ruby
 puts
 ```
 
-### [//](#using) Common Stylers
+### Common Stylers
 
 A collection of commonly-used [Stylers](https://esotericpig.github.io/docs/psychgus/yardoc/Psychgus/Stylers.html) and [Stylables](https://esotericpig.github.io/docs/psychgus/yardoc/Psychgus/Stylables.html) are included with Psychgus.
 
@@ -527,7 +527,7 @@ A collection of commonly-used [Stylers](https://esotericpig.github.io/docs/psych
 | [NoTagStyler](https://esotericpig.github.io/docs/psychgus/yardoc/Psychgus/Stylers/NoTagStyler.html) | Tag remover for classes |
 | [SeqFlowStyler](https://esotericpig.github.io/docs/psychgus/yardoc/Psychgus/Stylers/SeqFlowStyler.html) | FLOW style changer for Sequences only |
 
-#### [//](#common-stylers) Stylers Example
+#### Stylers Example
 
 ```Ruby
 require 'psychgus'
@@ -571,7 +571,7 @@ puts EggCarton.new.to_yaml
 #     - green
 ```
 
-## [//](#contents) Hacking
+## Hacking
 
 ```
 $ git clone 'https://github.com/esotericpig/psychgus.git'
@@ -580,13 +580,13 @@ $ bundle install
 $ bundle exec rake -T
 ```
 
-### [//](#hacking) Testing
+### Testing
 
 Run tests:
 
 `$ bundle exec rake test`
 
-### [//](#hacking) Generating Doc
+### Generating Doc
 
 Generate doc:
 
@@ -596,12 +596,12 @@ Clean & generate pristine doc:
 
 `$ bundle exec rake clobber doc`
 
-## [//](#contents) License
+## License
 
 [GNU LGPL v3+](LICENSE.txt)
 
 > Psychgus (<https://github.com/esotericpig/psychgus>)  
-> Copyright (c) 2017-2024 Bradley Whited  
+> Copyright (c) 2017-2025 Bradley Whited  
 > 
 > Psychgus is free software: you can redistribute it and/or modify  
 > it under the terms of the GNU Lesser General Public License as published by  

data/Rakefile

@@ -4,29 +4,26 @@
 require 'bundler/gem_tasks'
 
 require 'yard'
-require 'yard_ghurt'
 
 require 'psychgus/version'
-
 require 'rake/clean'
 require 'rake/testtask'
 
-task default: [:test]
+task default: %i[test]
 
 CLEAN.exclude('.git/','stock/')
 CLOBBER.include('doc/')
 
 # Execute "rake clobber doc" for pristine docs.
 desc 'Generate documentation (YARDoc)'
-task doc: %i[yard yard_gfm_fix]
+task doc: %i[yard]
 
 # To test using different Gem versions:
 #   GST=1 bundle update && bundle exec rake test
 Rake::TestTask.new do |task|
   task.libs = ['lib','test']
   task.pattern = File.join('test','**','*_test.rb')
-  task.description += " ('#{task.pattern}')"
-  #task.options = '--verbose' # Execute "rake test TESTOPT=-v" instead.
+  # task.options = '--verbose' # Execute "rake test TESTOPT=-v" instead.
   task.verbose = true
   task.warning = true
 end
@@ -34,20 +31,3 @@ end
 YARD::Rake::YardocTask.new do |task|
   task.files = [File.join('lib','**','*.rb')]
 end
-
-YardGhurt::GFMFixTask.new do |task|
-  task.description = 'Fix (find & replace) text in the YARD files for GitHub differences'
-
-  task.arg_names = [:dev]
-  task.dry_run = false
-  task.fix_code_langs = true
-  task.md_files = ['index.html']
-
-  task.before = proc do |t2,args|
-    # Delete this file as it's never used (index.html is an exact copy)
-    YardGhurt.rm_exist(File.join(t2.doc_dir,'file.README.html'))
-
-    t2.css_styles << '<link rel="stylesheet" type="text/css" href="/css/prism.css" />'
-    t2.js_scripts << '<script src="/js/prism.js"></script>)'
-  end
-end

data/lib/psychgus/blueberry.rb

@@ -88,7 +88,7 @@ module Psychgus
     #                               class/module/etc.
     #
     # @return [Styler,Array<Styler>,nil] {Styler}(s) for this class/module/etc.
-    def psychgus_stylers(sniffer)
+    def psychgus_stylers(_sniffer)
       return nil
     end
   end

data/lib/psychgus/ext/core_ext.rb

@@ -51,7 +51,7 @@ module Psychgus
       # @return [String] the YAML generated from this Object
       #
       # @see Psychgus.dump
-      def to_yaml(options={})
+      def to_yaml(options = {})
         # NOTE: This method signature must use old-style `options={}` instead of `**options`!
         #       Because some Gems, like `Moneta`, depend on this.
 

data/lib/psychgus/ext/yaml_tree_ext.rb

@@ -33,7 +33,6 @@ module Psychgus
         else # 5.1.2+
           return unless key?(target)
 
-          @targets.delete(target)
           @obj_to_node.delete(target)
         end
       end
@@ -81,7 +80,7 @@ module Psychgus
           @st.psychgus_unregister(target) if @emitter.deref_aliases?
         end
 
-        result = super(target)
+        result = super(target) # rubocop:disable Style/SuperArguments
 
         # Check styler_count because @emitter may not be a StyledTreeBuilder and target may not be a Blueberry
         @emitter.pop_styler(styler_count) if styler_count > 0

data/lib/psychgus/stylables.rb

@@ -38,7 +38,7 @@ module Psychgus
       # @param min_level [Integer] the minimum level (inclusive) to style
       # @param new_style [Integer] the new style to set the nodes to
       # @param kargs [Hash] capture extra keyword args, so no error for undefined args
-      def initialize(min_level=0,new_style: nil,**kargs)
+      def initialize(min_level = 0,new_style: nil,**_kargs)
         @min_level = min_level
         @new_style = new_style
       end
@@ -67,7 +67,7 @@ module Psychgus
       # @param new_delim [nil,String] the replacement for each +delim+ if not nil
       # @param delim [String,Regexp] the delimiter to split on
       # @param kargs [Hash] capture extra keyword args, so no error for undefined args
-      def initialize(each_word: true,new_delim: nil,delim: /[\s_\-]/,**kargs)
+      def initialize(each_word: true,new_delim: nil,delim: /[\s_\-]/,**_kargs)
         delim = Regexp.quote(delim.to_s) unless delim.is_a?(Regexp)
 
         @delim = Regexp.new("(#{delim})")
@@ -95,7 +95,7 @@ module Psychgus
       #
       # @see cap_word
       # @see Styler#style_scalar
-      def style_scalar(sniffer,node)
+      def style_scalar(_sniffer,node)
         if !@each_word || node.value.nil? || node.value.empty?
           node.value = cap_word(node.value)
           return
@@ -128,7 +128,7 @@ module Psychgus
       # @param io [IO] the IO to write to
       # @param verbose [true,false] whether to be more verbose (e.g., write child info)
       # @param kargs [Hash] capture extra keyword args, so no error for undefined args
-      def initialize(io: StringIO.new,verbose: false,**kargs)
+      def initialize(io: StringIO.new,verbose: false,**_kargs)
         @io = io
         @verbose = verbose
       end
@@ -199,14 +199,14 @@ module Psychgus
 
       # @param cap [true,false] whether to capitalize the symbol
       # @param kargs [Hash] capture extra keyword args, so no error for undefined args
-      def initialize(cap: true,**kargs)
+      def initialize(cap: true,**_kargs)
         @cap = cap
       end
 
       # If +node.value+ is a symbol, change it into a string and capitalize it.
       #
       # @see Styler#style_scalar
-      def style_scalar(sniffer,node)
+      def style_scalar(_sniffer,node)
         return if node.value.nil? || node.value.empty?
         return if node.value[0] != ':'
 
@@ -224,7 +224,7 @@ module Psychgus
       # If +node.tag+ is settable, set it to nil.
       #
       # @see Styler#style
-      def style(sniffer,node)
+      def style(_sniffer,node)
         node.tag = nil if node.respond_to?(:tag=)
       end
     end

data/lib/psychgus/styled_document_stream.rb

@@ -35,7 +35,7 @@ module Psychgus
     # This mimics the behavior of Psych::Handlers::DocumentStream#end_document.
     #
     # @see Psych::Handlers::DocumentStream#end_document
-    def end_document(implicit_end=!streaming?)
+    def end_document(implicit_end = !streaming?)
       @last.implicit_end = implicit_end
       @block.call(pop)
     end

data/lib/psychgus/styled_tree_builder.rb

@@ -37,7 +37,7 @@ module Psychgus
     # @param stylers [Styler] {Styler}(s) to use for styling this TreeBuilder
     # @param deref_aliases [true,false] whether to dereference aliases; output the actual value
     #                                   instead of the alias
-    def initialize(*stylers,deref_aliases: false,**options)
+    def initialize(*stylers,deref_aliases: false,**_options)
       super()
 
       @deref_aliases = deref_aliases
@@ -143,7 +143,7 @@ module Psychgus
     # @param count [Integer] the optional amount of tail elements to pop
     #
     # @return [Styler,Array<Styler>,nil] the last {Styler}(s), or if empty or count==0, nil
-    def pop_styler(count=1)
+    def pop_styler(count = 1)
       return nil if count == 0
       return @stylers.pop if count == 1
 

data/lib/psychgus/version.rb

@@ -10,5 +10,5 @@
 
 module Psychgus
   # Version of this gem in "#.#.#" format.
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

data/lib/psychgus.rb

@@ -332,7 +332,7 @@ module Psychgus
   # @return [Integer,Object] the constant value from the class (usually an int)
   #
   # @see .node_class
-  def self.node_const(class_name,const_name,lenient=true)
+  def self.node_const(class_name,const_name,lenient: true)
     node_class = node_class(class_name)
     const_name = const_name.to_sym.upcase
 
@@ -378,7 +378,7 @@ module Psychgus
   #
   # @see .dump_stream
   # @see Psych.dump_stream
-  def self.dump(object,io=nil,**options)
+  def self.dump(object,io = nil,**options)
     return dump_stream(object,io: io,**options)
   end
 
@@ -467,8 +467,10 @@ module Psychgus
       end
     end
 
-    visitor = Psych::Visitors::YAMLTree.create(options,StyledTreeBuilder.new(*stylers,
-      deref_aliases: deref_aliases))
+    visitor = Psych::Visitors::YAMLTree.create(
+      options,
+      StyledTreeBuilder.new(*stylers,deref_aliases: deref_aliases)
+    )
 
     if objects.empty?
       # Else, will throw a cryptic NoMethodError:
@@ -681,8 +683,9 @@ module Psychgus
   # @see Psych::SyntaxError
   def self.parse_stream(yaml,filename: nil,stylers: nil,deref_aliases: false,**options,&block)
     if block_given?
-      parser = Psych::Parser.new(StyledDocumentStream.new(*stylers,deref_aliases: deref_aliases,**options,
-        &block))
+      parser = Psych::Parser.new(
+        StyledDocumentStream.new(*stylers,deref_aliases: deref_aliases,**options,&block)
+      )
 
       return parser.parse(yaml,filename)
     else

data/psychgus.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |spec|
   spec.description = 'Easily style YAML files using Psych, like Sequence/Mapping Flow style.'
 
   spec.metadata = {
-    'homepage_uri'      => 'https://github.com/esotericpig/psychgus',
-    'source_code_uri'   => 'https://github.com/esotericpig/psychgus',
-    'bug_tracker_uri'   => 'https://github.com/esotericpig/psychgus/issues',
-    'changelog_uri'     => 'https://github.com/esotericpig/psychgus/blob/master/CHANGELOG.md',
-    'documentation_uri' => 'https://esotericpig.github.io/docs/psychgus/yardoc/index.html',
+    'rubygems_mfa_required' => 'true',
+    'homepage_uri'          => 'https://github.com/esotericpig/psychgus',
+    'source_code_uri'       => 'https://github.com/esotericpig/psychgus',
+    'bug_tracker_uri'       => 'https://github.com/esotericpig/psychgus/issues',
+    'changelog_uri'         => 'https://github.com/esotericpig/psychgus/blob/main/CHANGELOG.md',
+    'documentation_uri'     => 'https://esotericpig.github.io/docs/psychgus/yardoc/index.html',
   }
 
   spec.required_ruby_version = '>= 2.2'
@@ -29,8 +30,8 @@ Gem::Specification.new do |spec|
     Dir.glob(File.join("{#{spec.require_paths.join(',')}}",'**','*.{erb,rb}')),
     Dir.glob(File.join(spec.bindir,'*')),
     Dir.glob(File.join('{samples,test,yard}','**','*.{erb,rb}')),
-    %W[ Gemfile #{spec.name}.gemspec Rakefile .yardopts ],
-    %w[ LICENSE.txt CHANGELOG.md README.md ],
+    %W[Gemfile #{spec.name}.gemspec Rakefile .yardopts],
+    %w[LICENSE.txt CHANGELOG.md README.md],
   ].flatten
 
   # Test using different Gem versions:
@@ -41,6 +42,8 @@ Gem::Specification.new do |spec|
   if !gemspec_test.empty?
     case gemspec_test
     when '1' then psych_gemv = '<= 5.1.1'
+    when '2' then psych_gemv = '5.1.2'
+    when '3' then psych_gemv = '5.2.0'
     end
 
     puts 'Using Gem versions:'

data/test/blueberry_test.rb

@@ -8,29 +8,39 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-require 'psychgus_tester'
+require 'test_helper'
 
-class Burger
-  include Psychgus::Blueberry
-
-  attr_accessor :bun
-  attr_accessor :cheese
-  attr_accessor :sauce
-
-  def initialize(sauce,cheese,bun)
-    @bun = bun
-    @cheese = cheese
-    @sauce = sauce
+class BlueberryTest < Minitest::Test
+  def setup
+    @burgers = Burgers.new
   end
 
-  def encode_with(coder)
-    coder['Bun'] = @bun
-    coder['Cheese'] = @cheese
-    coder['Sauce'] = @sauce
-  end
+  def test_blueberry
+    expected = TestHelper.lstrip_pipe(<<-YAML)
+    |--- !ruby/object:Burgers
+    |Burgers:
+    |  Classic:
+    |    'Bun': 'Sesame Seed'
+    |    'Cheese': 'American'
+    |    'Sauce': ['Ketchup', 'Mustard']
+    |  BBQ: {'Bun': 'Kaiser', 'Cheese': 'Cheddar', 'Sauce': 'Honey BBQ'}
+    |  Fancy:
+    |    'Bun': 'Hawaiian'
+    |    'Cheese': 'Smoked Gouda'
+    |    'Sauce': 'Spicy Wasabi'
+    |Toppings:
+    |- Mushrooms
+    |- - Lettuce
+    |  - Onions
+    |  - Pickles
+    |  - Tomatoes
+    |- - - Ketchup
+    |    - Mustard
+    |  - - Salt
+    |    - Pepper
+    YAML
 
-  def psychgus_stylers(sniffer)
-    return BurgerStyler.new(sniffer)
+    assert_equal expected,@burgers.to_yaml
   end
 end
 
@@ -42,13 +52,13 @@ class Burgers
     @burgers = {
       'Classic' => Burger.new(['Ketchup','Mustard'],'American','Sesame Seed'),
       'BBQ'     => Burger.new('Honey BBQ','Cheddar','Kaiser'),
-      'Fancy'   => Burger.new('Spicy Wasabi','Smoked Gouda','Hawaiian')
+      'Fancy'   => Burger.new('Spicy Wasabi','Smoked Gouda','Hawaiian'),
     }
 
     @toppings = [
       'Mushrooms',
       %w[Lettuce Onions Pickles Tomatoes],
-      [%w[Ketchup Mustard],%w[Salt Pepper]]
+      [%w[Ketchup Mustard],%w[Salt Pepper]],
     ]
   end
 
@@ -66,64 +76,53 @@ class BurgerStyler
     @position = sniffer.position
   end
 
-  def style(sniffer,node)
-    # Remove ugly and unsafe "!ruby/object:Burger"
+  def style(_sniffer,node)
+    # Remove ugly and unsafe `!ruby/object:Burger`.
     node.tag = nil if node.respond_to?(:tag)
   end
 
   def style_mapping(sniffer,node)
     parent = sniffer.parent
 
-    if !parent.nil?
-      # BBQ
-      node.style = Psychgus::MAPPING_FLOW if parent.respond_to?(:value) && parent.value.casecmp('BBQ') == 0
+    if !parent.nil? && parent.respond_to?(:value) && parent.value.casecmp('BBQ') == 0
+      # BBQ.
+      node.style = Psychgus::MAPPING_FLOW
     end
   end
 
-  def style_scalar(sniffer,node)
-    # Only for Burgers
+  def style_scalar(_sniffer,node)
+    # Only for Burgers.
     node.style = Psychgus::SCALAR_SINGLE_QUOTED
   end
 
   def style_sequence(sniffer,node)
     relative_level = (sniffer.level - @level) + 1
 
-    # [Ketchup, Mustard]
+    # [Ketchup, Mustard].
     node.style = Psychgus::SEQUENCE_FLOW if relative_level == 3
   end
 end
 
-class BlueberryTest < PsychgusTester
-  def setup
-    @burgers = Burgers.new
+class Burger
+  include Psychgus::Blueberry
+
+  attr_accessor :bun
+  attr_accessor :cheese
+  attr_accessor :sauce
+
+  def initialize(sauce,cheese,bun)
+    @bun = bun
+    @cheese = cheese
+    @sauce = sauce
   end
 
-  def test_blueberry
-    expected = <<-YAML
-    |--- !ruby/object:Burgers
-    |Burgers:
-    |  Classic:
-    |    'Bun': 'Sesame Seed'
-    |    'Cheese': 'American'
-    |    'Sauce': ['Ketchup', 'Mustard']
-    |  BBQ: {'Bun': 'Kaiser', 'Cheese': 'Cheddar', 'Sauce': 'Honey BBQ'}
-    |  Fancy:
-    |    'Bun': 'Hawaiian'
-    |    'Cheese': 'Smoked Gouda'
-    |    'Sauce': 'Spicy Wasabi'
-    |Toppings:
-    |- Mushrooms
-    |- - Lettuce
-    |  - Onions
-    |  - Pickles
-    |  - Tomatoes
-    |- - - Ketchup
-    |    - Mustard
-    |  - - Salt
-    |    - Pepper
-    YAML
-    expected = self.class.lstrip_pipe(expected)
+  def encode_with(coder)
+    coder['Bun'] = @bun
+    coder['Cheese'] = @cheese
+    coder['Sauce'] = @sauce
+  end
 
-    assert_equal expected,@burgers.to_yaml
+  def psychgus_stylers(sniffer)
+    return BurgerStyler.new(sniffer)
   end
 end

data/test/psychgus_test.rb

@@ -8,23 +8,11 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-require 'psychgus_tester'
+require 'test_helper'
 
 require 'tempfile'
 
-class FlowStyler
-  include Psychgus::Styler
-
-  def style_mapping(sniffer,node)
-    node.style = Psychgus::MAPPING_FLOW if sniffer.level >= 4
-  end
-
-  def style_sequence(sniffer,node)
-    node.style = Psychgus::SEQUENCE_FLOW if sniffer.level >= 4
-  end
-end
-
-class PsychgusTest < PsychgusTester
+class PsychgusTest < Minitest::Test
   EXPECTED_BURGERS = <<-YAML
 ---
 Burgers:
@@ -42,7 +30,7 @@ Toppings:
   end
 
   def test_alias
-    expected = <<-YAML
+    expected = TestHelper.lstrip_pipe(<<-YAML)
     |---
     |Dolphins:
     |  Common: {Length: "~2.5m", Weight: "~235kg"}
@@ -53,25 +41,25 @@ Toppings:
     |- {Length: "~4m", Weight: "~300kg"}
     |- {Length: "~7m", Weight: "~3600kg"}
     YAML
-    expected = self.class.lstrip_pipe(expected)
 
-    assert_equal expected,DOLPHINS_DATA.to_yaml(deref_aliases: true,stylers: @flow_styler)
+    assert_equal expected,TestHelper::DOLPHINS_DATA.to_yaml(deref_aliases: true,stylers: @flow_styler)
   end
 
   def test_dump
-    assert_equal EXPECTED_BURGERS,Psychgus.dump(BURGERS_DATA,stylers: @flow_styler)
-    assert_equal EXPECTED_BURGERS,Psychgus.dump_stream(BURGERS_DATA,stylers: @flow_styler)
-    assert_equal EXPECTED_BURGERS,BURGERS_DATA.to_yaml(stylers: @flow_styler)
+    assert_equal EXPECTED_BURGERS,Psychgus.dump(TestHelper::BURGERS_DATA,stylers: @flow_styler)
+    assert_equal EXPECTED_BURGERS,Psychgus.dump_stream(TestHelper::BURGERS_DATA,stylers: @flow_styler)
+    assert_equal EXPECTED_BURGERS,TestHelper::BURGERS_DATA.to_yaml(stylers: @flow_styler)
   end
 
   def test_file
     Tempfile.create(['Psychgus','.yaml']) do |file|
-      #puts "Testing #{self.class.name} w/ temp file: #{file.path}"
+      # puts "Testing #{self.class.name} w/ temp file: #{file.path}"
 
-      Psychgus.dump_file(file,BURGERS_DATA,
+      Psychgus.dump_file(
+        file,TestHelper::BURGERS_DATA,
         mode: File::CREAT | File::RDWR,
         opt: {textmode: true},
-        #perm: 644, # Unix only
+        # perm: 644, # Unix only
         stylers: @flow_styler,
       )
 
@@ -94,8 +82,8 @@ Toppings:
   end
 
   def test_indent
-    # Indent of 3 spaces
-    expected = <<-YAML
+    # Indent of 3 spaces, like a crazy person.
+    expected = TestHelper.lstrip_pipe(<<-YAML)
     |---
     |Burgers:
     |   Classic: {Sauce: [Ketchup, Mustard], Cheese: American, Bun: Sesame Seed}
@@ -106,13 +94,12 @@ Toppings:
     |- [Lettuce, Onions, Pickles, Tomatoes]
     |- [[Ketchup, Mustard], [Salt, Pepper]]
     YAML
-    expected = self.class.lstrip_pipe(expected)
 
     # rubocop:disable Style/HashSyntax
-    assert_equal expected,BURGERS_DATA.to_yaml(indent: 3,stylers: @flow_styler)
-    assert_equal expected,BURGERS_DATA.to_yaml(**{:indent => 3,:stylers => @flow_styler})
-    assert_equal expected,BURGERS_DATA.to_yaml(indentation: 3,stylers: @flow_styler)
-    assert_equal expected,BURGERS_DATA.to_yaml(**{:indentation => 3,:stylers => @flow_styler})
+    assert_equal expected,TestHelper::BURGERS_DATA.to_yaml(indent: 3,stylers: @flow_styler)
+    assert_equal expected,TestHelper::BURGERS_DATA.to_yaml(**{:indent => 3,:stylers => @flow_styler})
+    assert_equal expected,TestHelper::BURGERS_DATA.to_yaml(indentation: 3,stylers: @flow_styler)
+    assert_equal expected,TestHelper::BURGERS_DATA.to_yaml(**{:indentation => 3,:stylers => @flow_styler})
     # rubocop:enable all
   end
 
@@ -140,15 +127,27 @@ Toppings:
 
   def test_parse
     parser = Psychgus.parser(stylers: @flow_styler)
-    parser.parse(BURGERS_YAML)
-    yaml = "---\n" + parser.handler.root.to_yaml
+    parser.parse(TestHelper::BURGERS_YAML)
+    yaml = "---\n#{parser.handler.root.to_yaml}"
     assert_equal EXPECTED_BURGERS,yaml
 
-    node = Psychgus.parse(BURGERS_YAML,stylers: @flow_styler)
+    node = Psychgus.parse(TestHelper::BURGERS_YAML,stylers: @flow_styler)
     refute_equal false,node
 
-    yaml = Psychgus.parse_stream(BURGERS_YAML,stylers: @flow_styler).to_yaml
+    yaml = Psychgus.parse_stream(TestHelper::BURGERS_YAML,stylers: @flow_styler).to_yaml
     yaml = "---\n#{yaml}"
     assert_equal EXPECTED_BURGERS,yaml
   end
 end
+
+class FlowStyler
+  include Psychgus::Styler
+
+  def style_mapping(sniffer,node)
+    node.style = Psychgus::MAPPING_FLOW if sniffer.level >= 4
+  end
+
+  def style_sequence(sniffer,node)
+    node.style = Psychgus::SEQUENCE_FLOW if sniffer.level >= 4
+  end
+end

data/test/sniffer_test.rb

@@ -8,23 +8,23 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-require 'psychgus_tester'
+require 'test_helper'
 
 require 'stringio'
 
-class SnifferTest < PsychgusTester
+class SnifferTest < Minitest::Test
   def setup
   end
 
   def assert_hierarchy(*data,expected)
-    expected = self.class.lstrip_pipe(expected)
+    expected = TestHelper.lstrip_pipe(expected)
     hierarchy = Psychgus.hierarchy(*data,verbose: true)
 
     assert_equal expected,hierarchy
   end
 
   def test_multi_doc
-    assert_hierarchy(BURGERS_DATA,COURSES_DATA,DOLPHINS_DATA,<<-HIER)
+    assert_hierarchy(TestHelper::BURGERS_DATA,TestHelper::COURSES_DATA,TestHelper::DOLPHINS_DATA,<<-HIER)
     |(1:1):Psych::Nodes::Stream - <root:(0:0)::(:1)>
     |(1:1):Psych::Nodes::Document - <stream:(1:1)::(:1)>
     |(1:1):Psych::Nodes::Mapping - <doc:(1:1)::(:1)>
@@ -145,7 +145,7 @@ class SnifferTest < PsychgusTester
   end
 
   def test_single_docs
-    assert_hierarchy(BURGERS_DATA,<<-HIER)
+    assert_hierarchy(TestHelper::BURGERS_DATA,<<-HIER)
     |(1:1):Psych::Nodes::Stream - <root:(0:0)::(:1)>
     |(1:1):Psych::Nodes::Document - <stream:(1:1)::(:1)>
     |(1:1):Psych::Nodes::Mapping - <doc:(1:1)::(:1)>
@@ -194,7 +194,7 @@ class SnifferTest < PsychgusTester
     |     (6:2):Pepper - <seq:(5:2)::(:2)>
     HIER
 
-    assert_hierarchy(COURSES_DATA,<<-HIER)
+    assert_hierarchy(TestHelper::COURSES_DATA,<<-HIER)
     |(1:1):Psych::Nodes::Stream - <root:(0:0)::(:1)>
     |(1:1):Psych::Nodes::Document - <stream:(1:1)::(:1)>
     |(1:1):Psych::Nodes::Mapping - <doc:(1:1)::(:1)>

data/test/styler_test.rb

@@ -8,7 +8,34 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-require 'psychgus_tester'
+require 'test_helper'
+
+class StylerTest < Minitest::Test
+  def setup
+    @styler = MyStyler.new
+  end
+
+  def test_styler
+    expected = TestHelper.lstrip_pipe(<<-YAML)
+    |---
+    |Burgers:
+    |  Classic:
+    |    Sauce:
+    |    - Ketchup
+    |    - Mustard
+    |    Cheese: American
+    |    Bun: Sesame Seed
+    |  BBQ: {Sauce: Honey BBQ, Cheese: Cheddar, Bun: Kaiser}
+    |  Fancy: {Sauce: Spicy Wasabi, Cheese: Smoked Gouda, Bun: Hawaiian}
+    |Toppings:
+    |- 'Mushrooms'
+    |- [Spinach, Onions, Pickles, Tomatoes]
+    |- [[Ketchup, Mustard], [Salt, Pepper]]
+    YAML
+
+    assert_equal expected,TestHelper::BURGERS_DATA.to_yaml(stylers: @styler)
+  end
+end
 
 class MyStyler
   include Psychgus::Styler
@@ -23,15 +50,15 @@ class MyStyler
     parent = sniffer.parent
 
     if !parent.nil?
-      # BBQ
+      # BBQ.
       node.style = Psychgus::MAPPING_FLOW if parent.node_of?(:scalar) && parent.value.casecmp('BBQ') == 0
 
-      # Fancy
+      # Fancy.
       node.style = Psychgus::MAPPING_FLOW if parent.level == 4 && parent.position == 3
     end
   end
 
-  def style_scalar(sniffer,node)
+  def style_scalar(_sniffer,node)
     node.style = Psychgus::SCALAR_SINGLE_QUOTED if node.value.casecmp('Mushrooms') == 0
     node.value = 'Spinach' if node.value.casecmp('Lettuce') == 0
   end
@@ -39,35 +66,7 @@ class MyStyler
   def style_sequence(sniffer,node)
     node.style = Psychgus::SEQUENCE_FLOW if sniffer.level >= 3
 
-    # Burgers=>Classic=>Sauce and Mushrooms
+    # Burgers => Classic => Sauce and Mushrooms.
     node.style = Psychgus::SEQUENCE_BLOCK if sniffer.position == 1
   end
 end
-
-class StylerTest < PsychgusTester
-  def setup
-    @styler = MyStyler.new
-  end
-
-  def test_styler
-    expected = <<-YAML
-    |---
-    |Burgers:
-    |  Classic:
-    |    Sauce:
-    |    - Ketchup
-    |    - Mustard
-    |    Cheese: American
-    |    Bun: Sesame Seed
-    |  BBQ: {Sauce: Honey BBQ, Cheese: Cheddar, Bun: Kaiser}
-    |  Fancy: {Sauce: Spicy Wasabi, Cheese: Smoked Gouda, Bun: Hawaiian}
-    |Toppings:
-    |- 'Mushrooms'
-    |- [Spinach, Onions, Pickles, Tomatoes]
-    |- [[Ketchup, Mustard], [Salt, Pepper]]
-    YAML
-    expected = self.class.lstrip_pipe(expected)
-
-    assert_equal expected,BURGERS_DATA.to_yaml(stylers: @styler)
-  end
-end

data/test/stylers_test.rb

@@ -8,71 +8,71 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-require 'psychgus_tester'
+require 'test_helper'
 
-class EggCarton
-  include Psychgus::Blueberry
-
-  def initialize
-    @eggs = {
-      styles: ['omelette','BBQ eggs','hard-boiled eggs','soft_boiled eggs','fried@eggs'],
-      colors: ['brown','white',['blue','green']]
-    }
-  end
-
-  def psychgus_stylers(sniffer)
-    return Psychgus::FlowStyler.new(4)
-  end
-end
-
-class StylersTest < PsychgusTester
+class StylersTest < Minitest::Test
   def setup
     @egg_carton = EggCarton.new
   end
 
   def test_capstyler
     actual = @egg_carton.to_yaml(stylers: Psychgus::CapStyler.new(each_word: false))
-    expected = <<-YAML
+    expected = TestHelper.lstrip_pipe(<<-YAML)
     |--- !ruby/object:EggCarton
     |Eggs:
     |  :styles: [Omelette, BBQ eggs, Hard-boiled eggs, Soft_boiled eggs, Fried@eggs]
     |  :colors: [Brown, White, [Blue, Green]]
     YAML
 
-    assert_equal self.class.lstrip_pipe(expected),actual
+    assert_equal expected,actual
 
     actual = @egg_carton.to_yaml(stylers: Psychgus::CapStyler.new(new_delim: '+',delim: /[\s_\-@]/))
-    expected = <<-YAML
+    expected = TestHelper.lstrip_pipe(<<-YAML)
     |--- !ruby/object:EggCarton
     |Eggs:
     |  :styles: [Omelette, BBQ+Eggs, Hard+Boiled+Eggs, Soft+Boiled+Eggs, Fried+Eggs]
     |  :colors: [Brown, White, [Blue, Green]]
     YAML
 
-    assert_equal self.class.lstrip_pipe(expected),actual
+    assert_equal expected,actual
   end
 
   def test_nosymstyler
     actual = @egg_carton.to_yaml(stylers: Psychgus::NoSymStyler.new)
-    expected = <<-YAML
+    expected = TestHelper.lstrip_pipe(<<-YAML)
     |--- !ruby/object:EggCarton
     |eggs:
     |  Styles: [omelette, BBQ eggs, hard-boiled eggs, soft_boiled eggs, fried@eggs]
     |  Colors: [brown, white, [blue, green]]
     YAML
 
-    assert_equal self.class.lstrip_pipe(expected),actual
+    assert_equal expected,actual
   end
 
   def test_notagstyler
     actual = @egg_carton.to_yaml(stylers: Psychgus::NoTagStyler.new)
-    expected = <<-YAML
+    expected = TestHelper.lstrip_pipe(<<-YAML)
     |---
     |eggs:
     |  :styles: [omelette, BBQ eggs, hard-boiled eggs, soft_boiled eggs, fried@eggs]
     |  :colors: [brown, white, [blue, green]]
     YAML
 
-    assert_equal self.class.lstrip_pipe(expected),actual
+    assert_equal expected,actual
+  end
+end
+
+class EggCarton
+  include Psychgus::Blueberry
+
+  def initialize
+    @eggs = {
+      styles: ['omelette','BBQ eggs','hard-boiled eggs','soft_boiled eggs','fried@eggs'],
+      colors: ['brown','white',['blue','green']],
+    }
+  end
+
+  def psychgus_stylers(_sniffer)
+    return Psychgus::FlowStyler.new(4)
   end
 end

data/test/{psychgus_tester.rb → test_helper.rb}

@@ -12,8 +12,14 @@ require 'minitest/autorun'
 
 require 'psychgus'
 
-# Changing the YAML/data will break tests
-class PsychgusTester < Minitest::Test
+# NOTE: Changing the YAML/data will break tests
+module TestHelper
+  # This is for `<<-` heredoc.
+  # - Purposely not using `<<~` (tilde) for older Ruby versions.
+  def self.lstrip_pipe(str)
+    return str.gsub(/^\s*\|/,'')
+  end
+
   BURGERS_YAML = <<-YAML
 Burgers:
   Classic:
@@ -63,10 +69,4 @@ Popular:
   # Don't do 'aliases: true' because that doesn't exist
   #   in older versions of Psych.
   DOLPHINS_DATA = Psych.unsafe_load(DOLPHINS_YAML).freeze
-
-  # This is for "<<-" heredoc
-  # - Purposely not using "<<~" (tilde) for older Ruby versions
-  def self.lstrip_pipe(str)
-    return str.gsub(/^\s*\|/,'')
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psychgus
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Bradley Whited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -53,19 +53,19 @@ files:
 - psychgus.gemspec
 - test/blueberry_test.rb
 - test/psychgus_test.rb
-- test/psychgus_tester.rb
 - test/sniffer_test.rb
 - test/styler_test.rb
 - test/stylers_test.rb
-- yard/templates/default/layout/html/footer.erb
+- test/test_helper.rb
 homepage: https://github.com/esotericpig/psychgus
 licenses:
 - LGPL-3.0-or-later
 metadata:
+  rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/esotericpig/psychgus
   source_code_uri: https://github.com/esotericpig/psychgus
   bug_tracker_uri: https://github.com/esotericpig/psychgus/issues
-  changelog_uri: https://github.com/esotericpig/psychgus/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/esotericpig/psychgus/blob/main/CHANGELOG.md
   documentation_uri: https://esotericpig.github.io/docs/psychgus/yardoc/index.html
 post_install_message: 
 rdoc_options: []
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.21
 signing_key: 
 specification_version: 4
 summary: Easily style YAML files using Psych.

data/yard/templates/default/layout/html/footer.erb

@@ -1,5 +0,0 @@
-<%# To reduce number of diffs, removed time, YARD version, and Ruby version. %>
-<div id="footer">
-  Generated by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
-</div>