psychgus 1.3.3 → 1.3.5

data/psychgus.gemspec

@@ -1,68 +1,54 @@
 # encoding: UTF-8
 # frozen_string_literal: true
 
-#--
-# This file is part of Psychgus.
-# Copyright (c) 2017-2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Psychgus is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Psychgus.  If not, see <https://www.gnu.org/licenses/>.
-#++
+require_relative 'lib/psychgus/version'
 
-
-lib = File.expand_path('../lib',__FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'psychgus/version'
-
-
-Gem::Specification.new() do |spec|
+Gem::Specification.new do |spec|
   spec.name        = 'psychgus'
   spec.version     = Psychgus::VERSION
-  spec.authors     = ['Jonathan Bradley Whited (@esotericpig)']
-  spec.email       = ['bradley@esotericpig.com']
+  spec.authors     = ['Bradley Whited']
+  spec.email       = ['code@esotericpig.com']
   spec.licenses    = ['LGPL-3.0-or-later']
   spec.homepage    = 'https://github.com/esotericpig/psychgus'
-  spec.summary     = %q(Easily style YAML files using Psych.)
-  spec.description = %q(Easily style YAML files using Psych, like Sequence/Mapping Flow style.)
-  
+  spec.summary     = 'Easily style YAML files using Psych.'
+  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',
-    'homepage_uri'      => 'https://github.com/esotericpig/psychgus',
-    'source_code_uri'   => 'https://github.com/esotericpig/psychgus'
   }
-  
-  spec.require_paths = ['lib']
-  
-  spec.files = Dir.glob(File.join("{#{spec.require_paths.join(',')}}",'**','*.{erb,rb}')) +
-               Dir.glob(File.join('{test,yard}','**','*.{erb,rb}')) +
-               %W( Gemfile #{spec.name}.gemspec Rakefile ) +
-               %w( CHANGELOG.md LICENSE.txt README.md )
-  
-  spec.required_ruby_version = '>= 2.1.10'
-  
+
+  spec.required_ruby_version = '>= 2.2'
+  spec.require_paths         = ['lib']
+  spec.bindir                = 'bin'
+
+  spec.files = [
+    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 ],
+  ].flatten
+
+  # Test using different Gem versions:
+  #   GST=1 bundle update && bundle exec rake test
+  gemspec_test = ENV.fetch('GST','').to_s.strip
+  psych_gemv = false
+
+  if !gemspec_test.empty?
+    case gemspec_test
+    when '1' then psych_gemv = '<= 5.1.1'
+    end
+
+    puts 'Using Gem versions:'
+    puts "  psych: #{psych_gemv.inspect}"
+  end
+
   # 3.0 is needed for this issue:
   # - https://bugs.ruby-lang.org/issues/13115
   # - https://github.com/ruby/psych/commit/712a65a53f3c15105cd86e8ad3ee3c779050ada4
-  spec.add_runtime_dependency 'psych','>= 3.0'
-  
-  spec.add_development_dependency 'bundler'   ,'~> 2.1'
-  spec.add_development_dependency 'minitest'  ,'~> 5.14' # For testing
-  spec.add_development_dependency 'rake'      ,'~> 13.0'
-  spec.add_development_dependency 'rdoc'      ,'~> 6.2'  # For RDoc for YARD (*.rb)
-  spec.add_development_dependency 'redcarpet' ,'~> 3.5'  # For Markdown for YARD (*.md)
-  spec.add_development_dependency 'yard'      ,'~> 0.9'  # For documentation
-  spec.add_development_dependency 'yard_ghurt','~> 1.2'  # For YARD GitHub rake tasks
+  spec.add_dependency 'psych',psych_gemv || '>= 3.0'
 end

data/test/blueberry_test.rb

@@ -1,46 +1,34 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
+# frozen_string_literal: true
 
 #--
 # This file is part of Psychgus.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Psychgus is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Psychgus.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2019 Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-
 require 'psychgus_tester'
 
 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 encode_with(coder)
     coder['Bun'] = @bun
     coder['Cheese'] = @cheese
     coder['Sauce'] = @sauce
   end
-  
+
   def psychgus_stylers(sniffer)
     return BurgerStyler.new(sniffer)
   end
@@ -49,21 +37,21 @@ end
 class Burgers
   attr_accessor :burgers
   attr_accessor :toppings
-  
-  def initialize()
+
+  def initialize
     @burgers = {
       'Classic' => Burger.new(['Ketchup','Mustard'],'American','Sesame Seed'),
       'BBQ'     => Burger.new('Honey BBQ','Cheddar','Kaiser'),
       'Fancy'   => Burger.new('Spicy Wasabi','Smoked Gouda','Hawaiian')
     }
-    
+
     @toppings = [
       'Mushrooms',
-      %w(Lettuce Onions Pickles Tomatoes),
-      [%w(Ketchup Mustard),%w(Salt Pepper)]
+      %w[Lettuce Onions Pickles Tomatoes],
+      [%w[Ketchup Mustard],%w[Salt Pepper]]
     ]
   end
-  
+
   def encode_with(coder)
     coder['Burgers'] = @burgers
     coder['Toppings'] = @toppings
@@ -72,46 +60,46 @@ end
 
 class BurgerStyler
   include Psychgus::Styler
-  
+
   def initialize(sniffer)
     @level = sniffer.level
     @position = sniffer.position
   end
-  
+
   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?()
+
+    if !parent.nil?
       # BBQ
       node.style = Psychgus::MAPPING_FLOW if parent.respond_to?(:value) && parent.value.casecmp('BBQ') == 0
     end
   end
-  
+
   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]
     node.style = Psychgus::SEQUENCE_FLOW if relative_level == 3
   end
 end
 
 class BlueberryTest < PsychgusTester
-  def setup()
-    @burgers = Burgers.new()
+  def setup
+    @burgers = Burgers.new
   end
-  
-  def test_blueberry()
-    expected = <<-EOY
+
+  def test_blueberry
+    expected = <<-YAML
     |--- !ruby/object:Burgers
     |Burgers:
     |  Classic:
@@ -133,9 +121,9 @@ class BlueberryTest < PsychgusTester
     |    - Mustard
     |  - - Salt
     |    - Pepper
-    EOY
+    YAML
     expected = self.class.lstrip_pipe(expected)
-    
-    assert_equal expected,@burgers.to_yaml()
+
+    assert_equal expected,@burgers.to_yaml
   end
 end

data/test/psychgus_test.rb

@@ -1,43 +1,31 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
+# frozen_string_literal: true
 
 #--
 # This file is part of Psychgus.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Psychgus is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Psychgus.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2019 Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-
 require 'psychgus_tester'
 
 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
-  EXPECTED_BURGERS = <<-EOY
+  EXPECTED_BURGERS = <<-YAML
 ---
 Burgers:
   Classic: {Sauce: [Ketchup, Mustard], Cheese: American, Bun: Sesame Seed}
@@ -47,14 +35,14 @@ Toppings:
 - Mushrooms
 - [Lettuce, Onions, Pickles, Tomatoes]
 - [[Ketchup, Mustard], [Salt, Pepper]]
-  EOY
-  
-  def setup()
-    @flow_styler = FlowStyler.new()
+  YAML
+
+  def setup
+    @flow_styler = FlowStyler.new
   end
-  
-  def test_alias()
-    expected = <<-EOY
+
+  def test_alias
+    expected = <<-YAML
     |---
     |Dolphins:
     |  Common: {Length: "~2.5m", Weight: "~235kg"}
@@ -64,56 +52,50 @@ Toppings:
     |Popular:
     |- {Length: "~4m", Weight: "~300kg"}
     |- {Length: "~7m", Weight: "~3600kg"}
-    EOY
+    YAML
     expected = self.class.lstrip_pipe(expected)
-    
+
     assert_equal expected,DOLPHINS_DATA.to_yaml(deref_aliases: true,stylers: @flow_styler)
   end
-  
-  def test_dump()
+
+  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)
   end
-  
-  # Execute "rake test_all" if you update Psychgus.dump_file()/load_file()
-  def test_file()
-    if !TEST_ALL
-      skip(TEST_ALL_SKIP_MSG)
-      return # Justin Case
-    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,
         mode: File::CREAT | File::RDWR,
         opt: {textmode: true},
         #perm: 644, # Unix only
         stylers: @flow_styler,
       )
-      
-      file.rewind()
-      
-      lines = file.readlines().join()
+
+      file.rewind
+
+      lines = file.readlines.join
       assert_equal EXPECTED_BURGERS,lines
-      
-      file.rewind()
-      file.close()
-      
+
+      file.rewind
+      file.close
+
       data = Psych.load_file(file)
       refute_equal false,data
       refute_equal nil,data
-      
+
       data = Psychgus.parse_file(file)
       refute_equal false,data
       refute_equal nil,data
     end
   end
-  
-  def test_indent()
+
+  def test_indent
     # Indent of 3 spaces
-    expected = <<-EOY
+    expected = <<-YAML
     |---
     |Burgers:
     |   Classic: {Sauce: [Ketchup, Mustard], Cheese: American, Bun: Sesame Seed}
@@ -123,47 +105,49 @@ Toppings:
     |- Mushrooms
     |- [Lettuce, Onions, Pickles, Tomatoes]
     |- [[Ketchup, Mustard], [Salt, Pepper]]
-    EOY
+    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(**{: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,BURGERS_DATA.to_yaml(**{:indentation => 3,:stylers => @flow_styler})
+    # rubocop:enable all
   end
-  
-  def test_node_consts()
+
+  def test_node_consts
     assert_equal Psych::Nodes::Mapping::ANY,Psychgus::MAPPING_ANY
     assert_equal Psych::Nodes::Mapping::BLOCK,Psychgus::MAPPING_BLOCK
     assert_equal Psych::Nodes::Mapping::FLOW,Psychgus::MAPPING_FLOW
-    
+
     assert_equal Psych::Nodes::Scalar::ANY,Psychgus::SCALAR_ANY
     assert_equal Psych::Nodes::Scalar::PLAIN,Psychgus::SCALAR_PLAIN
     assert_equal Psych::Nodes::Scalar::SINGLE_QUOTED,Psychgus::SCALAR_SINGLE_QUOTED
     assert_equal Psych::Nodes::Scalar::DOUBLE_QUOTED,Psychgus::SCALAR_DOUBLE_QUOTED
     assert_equal Psych::Nodes::Scalar::LITERAL,Psychgus::SCALAR_LITERAL
     assert_equal Psych::Nodes::Scalar::FOLDED,Psychgus::SCALAR_FOLDED
-    
+
     assert_equal Psych::Nodes::Sequence::ANY,Psychgus::SEQUENCE_ANY
     assert_equal Psych::Nodes::Sequence::BLOCK,Psychgus::SEQUENCE_BLOCK
     assert_equal Psych::Nodes::Sequence::FLOW,Psychgus::SEQUENCE_FLOW
-    
+
     assert_equal Psych::Nodes::Stream::ANY,Psychgus::STREAM_ANY
     assert_equal Psych::Nodes::Stream::UTF8,Psychgus::STREAM_UTF8
     assert_equal Psych::Nodes::Stream::UTF16LE,Psychgus::STREAM_UTF16LE
     assert_equal Psych::Nodes::Stream::UTF16BE,Psychgus::STREAM_UTF16BE
   end
-  
-  def test_parse()
+
+  def test_parse
     parser = Psychgus.parser(stylers: @flow_styler)
     parser.parse(BURGERS_YAML)
-    yaml = "---\n" + parser.handler.root.to_yaml()
+    yaml = "---\n" + parser.handler.root.to_yaml
     assert_equal EXPECTED_BURGERS,yaml
-    
+
     node = Psychgus.parse(BURGERS_YAML,stylers: @flow_styler)
     refute_equal false,node
-    
-    yaml = Psychgus.parse_stream(BURGERS_YAML,stylers: @flow_styler).to_yaml()
+
+    yaml = Psychgus.parse_stream(BURGERS_YAML,stylers: @flow_styler).to_yaml
     yaml = "---\n#{yaml}"
     assert_equal EXPECTED_BURGERS,yaml
   end

data/test/psychgus_tester.rb

@@ -1,42 +1,20 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Psychgus.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Psychgus is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Psychgus.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2019 Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-
 require 'minitest/autorun'
 
 require 'psychgus'
 
 # Changing the YAML/data will break tests
 class PsychgusTester < Minitest::Test
-  # If true, will...
-  # - Run tests that create temp file(s).
-  #   - I don't like creating temp file(s) every time I run tests (which is a lot).
-  # 
-  # To do this, execute:
-  #   rake test_all
-  TEST_ALL = (ENV['PSYCHGUS_TEST'].to_s().strip().casecmp('all') == 0)
-  TEST_ALL_SKIP_MSG = %q(Execute "rake test_all" for this test)
-  
-  BURGERS_YAML = <<-EOY.freeze()
+  BURGERS_YAML = <<-YAML
 Burgers:
   Classic:
     Sauce:  [Ketchup,Mustard]
@@ -54,10 +32,10 @@ Toppings:
   - Mushrooms
   - [Lettuce, Onions, Pickles, Tomatoes]
   - [[Ketchup,Mustard], [Salt,Pepper]]
-  EOY
-  BURGERS_DATA = Psych.load(BURGERS_YAML).freeze()
-  
-  COURSES_YAML = <<-EOY.freeze()
+  YAML
+  BURGERS_DATA = Psych.load(BURGERS_YAML).freeze
+
+  COURSES_YAML = <<-YAML
 Courses:
   COSC: [470,'Computer Science']
   MUSC: [340,'Music']
@@ -67,10 +45,10 @@ Schedule:
 - {Course: MUSC,Time: '10:30'}
 - {Course: ARTS,Time: '15:10'}
 - {Course: COSC,Time: '13:10'}
-  EOY
-  COURSES_DATA = Psych.load(COURSES_YAML).freeze()
-  
-  DOLPHINS_YAML = <<-EOY.freeze()
+  YAML
+  COURSES_DATA = Psych.load(COURSES_YAML).freeze
+
+  DOLPHINS_YAML = <<-YAML
 Dolphins:
   Common:     &com {Length: ~2.5m, Weight:  ~235kg}
   Bottlenose: &bot {Length:   ~4m, Weight:  ~300kg}
@@ -79,9 +57,13 @@ Dolphins:
 Popular:
   - *bot
   - *orc
-  EOY
-  DOLPHINS_DATA = Psych.load(DOLPHINS_YAML).freeze()
-  
+  YAML
+  # Psych v4+ uses safe_load() by default for load(),
+  #   so use unsafe_load() to have aliases turned on.
+  # 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)

data/test/sniffer_test.rb

@@ -1,42 +1,30 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
+# frozen_string_literal: true
 
 #--
 # This file is part of Psychgus.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Psychgus is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Psychgus.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2019 Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
-
 require 'psychgus_tester'
 
 require 'stringio'
 
 class SnifferTest < PsychgusTester
-  def setup()
+  def setup
   end
-  
+
   def assert_hierarchy(*data,expected)
     expected = self.class.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,<<-EOH
+
+  def test_multi_doc
+    assert_hierarchy(BURGERS_DATA,COURSES_DATA,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)>
@@ -153,12 +141,11 @@ class SnifferTest < PsychgusTester
     |  (3:1):Psych::Nodes::Sequence - <Popular:(2:2):value:(:1)>
     |   (4:1):Psych::Nodes::Alias - <seq:(3:1)::(:1)>
     |   (4:2):Psych::Nodes::Alias - <seq:(3:1)::(:2)>
-    EOH
-    )
+    HIER
   end
-  
-  def test_single_docs()
-    assert_hierarchy(BURGERS_DATA,<<-EOH
+
+  def test_single_docs
+    assert_hierarchy(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)>
@@ -205,10 +192,9 @@ class SnifferTest < PsychgusTester
     |    (5:2):Psych::Nodes::Sequence - <seq:(4:3)::(:2)>
     |     (6:1):Salt - <seq:(5:2)::(:1)>
     |     (6:2):Pepper - <seq:(5:2)::(:2)>
-    EOH
-    )
-    
-    assert_hierarchy(COURSES_DATA,<<-EOH
+    HIER
+
+    assert_hierarchy(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)>
@@ -248,7 +234,6 @@ class SnifferTest < PsychgusTester
     |     (6:1):COSC - <Course:(5:1):value:(:1)>
     |    (5:2):Time - <map:(4:4):key:(:2)>
     |     (6:1):13:10 - <Time:(5:2):value:(:1)>
-    EOH
-    )
+    HIER
   end
 end