hermod 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da9b5d8d5ee3394dccb1cbf50fda9119e997ee142e06d94cc76e1ebb8a4668f5
-  data.tar.gz: 2290b1eb07c850663aa8503a72dbe35220d8cf22c23c3f0410b24e27a598fe81
+  metadata.gz: d661471576b43558cd71f9d1cdd5cc880f309c78b466ff282013691ea1f92f1f
+  data.tar.gz: 111b5510e339ce143736e5d12f29ab7085e17b816702db3b497fe086843b5108
 SHA512:
-  metadata.gz: d16713dc7fff7318109c675c0b38acf6f101fb62adc6fa6005aff97daade193527572d1ccbd152c850e2ff33ecdebb9c35d71aac24fe4b4f70506efa8a70a7c6
-  data.tar.gz: fd12fa60b05c7bb69ce5418ab4fe56ca242527b6102b1b940c9833ad69d7b8a33f72c33035d28c04d7dd848c7b3f08f9a8944da7c64a8379c0c8b2530828089c
+  metadata.gz: ed2e552c55970afb070a10fd8066daba21217aca91a4116ca9f365a31c93f5a9033caf5d356d49e45506bbcb05125f88b1cc5d10540c282d52ba70bd5b654566
+  data.tar.gz: 614466df8d6f6c6ca31a306a680f99f04dc865e14bba6fd7bbb89b272850fe3816234d8861cf2b1b9e711215e63b8f78d1d98e73e02316473f1f1c80430bbb1a

data/.github/workflows/freeagent-gem.yml

@@ -0,0 +1,58 @@
+# Build, test and push gems to the FreeAgent registry.
+# https://github.com/orgs/fac/packages?ecosystem=rubygems
+# https://www.notion.so/freeagent/Internal-gems-5c8098501fcc48e4921be31aa9b4d495
+name: FreeAgent Gem
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  # Install the bundle and run the gems test suite.
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1 # .ruby-version
+      with:
+        bundler-cache: true # bundle install
+
+    - name: Test
+      run: bundle exec rake
+
+  # Builds that pass testing above, will trigger a build and push of the new
+  # gem version to the registry. If the version.rb has not been bumped since
+  # the last release, the push will no-op.
+  release:
+    needs:   tests
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: fac/ruby-gem-setup-credentials-action@v2
+      with:
+        user: ""
+        key: rubygems
+        token: ${{ secrets.FAC_RUBYGEMS_KEY }}
+
+    # Build the gem package
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+    - run: bundle exec rake build
+
+    # Release production gem version from default branch
+    - name: Release
+      if:   github.ref == 'refs/heads/master'
+      uses: fac/ruby-gem-push-action@v2
+      with:
+        key: rubygems
+
+    # PR branch builds will release pre-release gems
+    - name: Pre-Release
+      if:   github.ref != 'refs/heads/master'
+      uses: fac/ruby-gem-push-action@v2
+      with:
+        key: rubygems
+        pre-release: true

data/.github/workflows/reviewdog.yml

@@ -0,0 +1,13 @@
+name: reviewdog
+on: [pull_request]
+jobs:
+  actionlint:
+    name: runner / actionlint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: actionlint
+        uses: reviewdog/action-actionlint@v1
+        with:
+          fail_on_error: true
+          reporter: github-pr-review

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.3

data/CHANGELOG.md

@@ -6,16 +6,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-##[2.6.1] - 2020-10-22
+
+## [2.7.0] - 2022-05-25
+### Fixed
+- Added missing require in `Hermod::XmlSectionBuilder`
+- Fixed deprecations in Minitest
+
+### Removed
+- Remove unused bad_attributes attr_reader on `Hermod::Validators::Attributes`
+
+### Changed
+- Updated development dependencies
+
+## [2.6.2] - 2022-01-10
+### Changed
+- Remove the upper limit on the activesupport version
+
+## [2.6.1] - 2020-10-22
 ## Added
 - Changelog updates
 
-##[2.6.0] - 2020-10-22
+## [2.6.0] - 2020-10-22
 ## Added
 - Update libxml-ruby to version ~> 3.2
 - Update ruby-version to 2.7.1
 
-##[2.5.3] - 2019-11-01
+## [2.5.3] - 2019-11-01
 ### Added
 - Link wiki to the readme file.
 

data/README.md

@@ -1,5 +1,6 @@
 # Hermod
 
+[![Gem](https://github.com/fac/hermod/actions/workflows/freeagent-gem.yml/badge.svg)](https://github.com/fac/hermod/actions/workflows/freeagent-gem.yml)
 [![Code
 Climate](https://codeclimate.com/github/fac/hermod/badges/gpa.svg)](https://codeclimate.com/github/fac/hermod)
 [![Build Status](https://travis-ci.org/fac/hermod.svg?branch=master)](https://travis-ci.org/fac/hermod)

data/hermod.gemspec

@@ -23,15 +23,16 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_runtime_dependency "libxml-ruby", "~> 3.2"
-  spec.add_runtime_dependency "activesupport", "> 3.2", "< 7"
+  spec.add_runtime_dependency "activesupport", "> 3.2"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "13.0.1"
-  spec.add_development_dependency "minitest", "~> 5.3"
-  spec.add_development_dependency "minitest-reporters", "~> 1.0", ">= 1.0.16"
-  spec.add_development_dependency "nokogiri", "~> 1.5"
+  spec.add_development_dependency "minitest", "~> 5.15"
+  spec.add_development_dependency "minitest-reporters", ">= 1.0.16", "~> 1.5"
+  spec.add_development_dependency "nokogiri", "~> 1.13"
 
   spec.metadata = {
+    "allowed_push_host" => "https://rubygems.org",
     "bug_tracker_uri"   => "https://github.com/fac/hermod/issues",
     "changelog_uri"     => "https://github.com/fac/hermod/blob/master/CHANGELOG.md",
     "source_code_uri"   => "https://github.com/fac/hermod",

data/lib/hermod/validators/attributes.rb

@@ -4,7 +4,7 @@ module Hermod
   module Validators
     # Checks the attributes are in a list of allowed attributes
     class Attributes < Base
-      attr_reader :allowed_attributes, :bad_attributes
+      attr_reader :allowed_attributes
 
       # Public: Sets up the list of allowed attributes
       def initialize(allowed_attributes)

data/lib/hermod/version.rb

@@ -1,3 +1,3 @@
 module Hermod
-  VERSION = "2.6.1"
+  VERSION = "2.7.0"
 end

data/lib/hermod/xml_section_builder.rb

@@ -1,7 +1,8 @@
-require 'bigdecimal'
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/blank'
+require 'bigdecimal'
+require 'date'
 
 require 'hermod/xml_node'
 require 'hermod/input_mutator'

data/spec/hermod/validators/allowed_values_spec.rb

@@ -8,17 +8,17 @@ module Hermod
       end
 
       it "permits values in the list" do
-        subject.valid?("Cat", {}).must_equal true
+        expect(subject.valid?("Cat", {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?("", {}).must_equal true
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?("", {})).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values not in the list" do
-        ex = proc { subject.valid?("Albatross", {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be one of Antelope, Bear, Cat, Dog, or Elephant, not Albatross"
+        ex = expect { subject.valid?("Albatross", {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be one of Antelope, Bear, Cat, Dog, or Elephant, not Albatross"
       end
     end
   end

data/spec/hermod/validators/attributes_spec.rb

@@ -8,12 +8,12 @@ module Hermod
       end
 
       it "permits attributes in the list" do
-        subject.valid?(nil, {species: "Felis catus", genus: "Felis"}).must_equal true
+        expect(subject.valid?(nil, {species: "Felis catus", genus: "Felis"})).must_equal true
       end
 
       it "raises an error for attributes not in the list" do
-        ex = proc { subject.valid?(nil, {phylum: "Chordata"}) }.must_raise InvalidInputError
-        ex.message.must_equal "has attributes it doesn't accept: phylum"
+        ex = expect { subject.valid?(nil, {phylum: "Chordata"}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "has attributes it doesn't accept: phylum"
       end
     end
   end

data/spec/hermod/validators/base_spec.rb

@@ -8,7 +8,7 @@ module Hermod
       end
 
       it "doesn't implement a test" do
-        proc { subject.valid?(nil, {}) }.must_raise NotImplementedError
+        expect { subject.valid?(nil, {}) }.must_raise NotImplementedError
       end
 
       it "has a default error message" do
@@ -17,8 +17,8 @@ module Hermod
             false
           end
         end
-        ex = proc { TestValidator.new.valid?(nil, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "is invalid"
+        ex = expect { TestValidator.new.valid?(nil, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "is invalid"
       end
     end
   end

data/spec/hermod/validators/non_negative_spec.rb

@@ -8,20 +8,20 @@ module Hermod
       end
 
       it "allows positive values" do
-        subject.valid?(1, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
       end
 
       it "allows zero values" do
-        subject.valid?(0, {}).must_equal true
+        expect(subject.valid?(0, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for negative values" do
-        ex = proc { subject.valid?(-1, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "cannot be negative"
+        ex = expect { subject.valid?(-1, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "cannot be negative"
       end
     end
   end

data/spec/hermod/validators/non_zero_spec.rb

@@ -8,20 +8,20 @@ module Hermod
       end
 
       it "allows positive values" do
-        subject.valid?(1, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
       end
 
       it "allows negative values" do
-        subject.valid?(-1, {}).must_equal true
+        expect(subject.valid?(-1, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for zero values" do
-        ex = proc { subject.valid?(0, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "cannot be zero"
+        ex = expect { subject.valid?(0, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "cannot be zero"
       end
     end
   end

data/spec/hermod/validators/range_spec.rb

@@ -8,21 +8,21 @@ module Hermod
       end
 
       it "allows values in the range" do
-        subject.valid?(1, {}).must_equal true
-        subject.valid?(7, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
+        expect(subject.valid?(7, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values outwith the range" do
-        ex = proc { subject.valid?(0, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be between 1 and 7"
+        ex = expect { subject.valid?(0, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be between 1 and 7"
       end
 
       it "can also take a min and max as arguments" do
-        Range.new(1, 7).valid?(3, {}).must_equal true
+        expect(Range.new(1, 7).valid?(3, {})).must_equal true
       end
     end
   end

data/spec/hermod/validators/regular_expression_spec.rb

@@ -8,17 +8,17 @@ module Hermod
       end
 
       it "allows values that match the pattern" do
-        subject.valid?("AB123456C", {}).must_equal true
+        expect(subject.valid?("AB123456C", {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?("", {}).must_equal true
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?("", {})).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values that don't match the pattern" do
-        ex = proc { subject.valid?("fish", {}) }.must_raise InvalidInputError
-        ex.message.must_equal "\"fish\" does not match /\\A[A-Z]{2} [0-9]{6} [A-D]\\z/x"
+        ex = expect { subject.valid?("fish", {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "\"fish\" does not match /\\A[A-Z]{2} [0-9]{6} [A-D]\\z/x"
       end
     end
   end

data/spec/hermod/validators/type_checker_spec.rb

@@ -5,27 +5,27 @@ module Hermod
     describe TypeChecker do
       it "uses a default block that checks the value is an instance of the given class" do
         checker = TypeChecker.new(Integer)
-        checker.valid?(1, {}).must_equal true
-        proc { checker.valid?(1.0, {}) }.must_raise InvalidInputError
+        expect(checker.valid?(1, {})).must_equal true
+        expect { checker.valid?(1.0, {}) }.must_raise InvalidInputError
       end
 
       it "allows you to give a block to be more discerning" do
         checker = TypeChecker.new(Integer) { |val| val > 0 }
-        checker.valid?(5, {}).must_equal true
-        proc { checker.valid?(-2, {}) }.must_raise InvalidInputError
+        expect(checker.valid?(5, {})).must_equal true
+        expect { checker.valid?(-2, {}) }.must_raise InvalidInputError
       end
 
       it "ignores blank values" do
         checker = TypeChecker.new(Integer)
-        checker.valid?(nil, {}).must_equal true
+        expect(checker.valid?(nil, {})).must_equal true
       end
 
       it "gives the correct message" do
-        ex = proc { TypeChecker.new(Integer).valid?(1.0, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be an integer"
+        ex = expect { TypeChecker.new(Integer).valid?(1.0, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be an integer"
 
-        ex = proc { TypeChecker.new(Float).valid?(1, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be a float"
+        ex = expect { TypeChecker.new(Float).valid?(1, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be a float"
       end
     end
   end

data/spec/hermod/validators/value_presence_spec.rb

@@ -8,12 +8,12 @@ module Hermod
       end
 
       it "allows values that are present" do
-        subject.valid?(1, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
       end
 
       it "raises an error for missing values" do
-        ex = proc { subject.valid?(nil, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "isn't optional but no value was provided"
+        ex = expect { subject.valid?(nil, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "isn't optional but no value was provided"
       end
     end
   end

data/spec/hermod/validators/whole_units_spec.rb

@@ -8,16 +8,16 @@ module Hermod
       end
 
       it "allows values that are in whole units" do
-        subject.valid?(1.0, {}).must_equal true
+        expect(subject.valid?(1.0, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values with a fractional componant" do
-        ex = proc { subject.valid?(3.1415, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be in whole units"
+        ex = expect { subject.valid?(3.1415, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be in whole units"
       end
     end
   end

data/spec/hermod/xml_section_builder/date_node_spec.rb

@@ -16,16 +16,16 @@ module Hermod
       end
 
       it "should format the date with the given date string" do
-        value_of_node("DateOfBirth").must_equal "1988-08-13"
+        expect(value_of_node("DateOfBirth")).must_equal "1988-08-13"
       end
 
       it "should raise an error if given something that isn't a date" do
-        proc { subject.anniversary "yesterday" }.must_raise InvalidInputError
+        expect { subject.anniversary "yesterday" }.must_raise InvalidInputError
       end
 
       it "should ignore blank dates if the date is optional" do
         subject.anniversary nil
-        nodes("Anniversary").must_be_empty
+        expect(nodes("Anniversary")).must_be_empty
       end
     end
   end

data/spec/hermod/xml_section_builder/datetime_node_spec.rb

@@ -16,16 +16,16 @@ module Hermod
       end
 
       it "should format the datetime with the given format string" do
-        value_of_node("Published").must_equal "2015-03-14 12:30:56"
+        expect(value_of_node("Published")).must_equal "2015-03-14 12:30:56"
       end
 
       it "should raise an error if given something that isn't a date" do
-        proc { subject.redacted "yesterday" }.must_raise InvalidInputError
+        expect { subject.redacted "yesterday" }.must_raise InvalidInputError
       end
 
       it "should ignore blank dates if the date is optional" do
         subject.redacted nil
-        nodes("Redacted").must_be_empty
+        expect(nodes("Redacted")).must_be_empty
       end
     end
   end

data/spec/hermod/xml_section_builder/integer_node_spec.rb

@@ -14,15 +14,15 @@ module Hermod
 
       it "should accept a valid number" do
         subject.day_of_the_week 7
-        value_of_node("DayOfTheWeek").must_equal "7"
+        expect(value_of_node("DayOfTheWeek")).must_equal "7"
       end
 
       it "should raise an error if the number is above the maximum" do
-        proc { subject.day_of_the_week 8 }.must_raise InvalidInputError
+        expect { subject.day_of_the_week 8 }.must_raise InvalidInputError
       end
 
       it "should raise an error if the number is below the minimum" do
-        proc { subject.day_of_the_week 0 }.must_raise InvalidInputError
+        expect { subject.day_of_the_week 0 }.must_raise InvalidInputError
       end
     end
   end

data/spec/hermod/xml_section_builder/monetary_node_spec.rb

@@ -20,44 +20,44 @@ module Hermod
       end
 
       it "should format values with the provided format string" do
-        value_of_node("Pay").must_equal "123.45"
+        expect(value_of_node("Pay")).must_equal "123.45"
       end
 
       it "should not include optional nodes if they're zero" do
-        number_of_nodes("Tax").must_equal 0
+        expect(number_of_nodes("Tax")).must_equal 0
       end
 
       it "should use xml_name as the node name if provided" do
         subject.ni 100
-        number_of_nodes("NI").must_equal 1
+        expect(number_of_nodes("NI")).must_equal 1
       end
 
       it "should raise an error if given a negative number for a field that cannot be negative" do
-        ex = proc { subject.ni -100 }.must_raise InvalidInputError
-        ex.message.must_equal "ni cannot be negative"
+        ex = expect { subject.ni(-100) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "ni cannot be negative"
       end
 
       it "should allow negative numbers for fields by default" do
         subject.pension(-100)
-        value_of_node("Pension").must_equal "-100.00"
+        expect(value_of_node("Pension")).must_equal "-100.00"
       end
 
       it "should not allow decimal values for whole unit nodes" do
-        ex = proc { subject.pension BigDecimal("12.34") }.must_raise InvalidInputError
-        ex.message.must_equal "pension must be in whole units"
+        ex = expect { subject.pension BigDecimal("12.34") }.must_raise InvalidInputError
+        expect(ex.message).must_equal "pension must be in whole units"
       end
 
       it "should not allow zero for nodes that disallow it" do
-        ex = proc { subject.student_loan 0 }.must_raise Hermod::InvalidInputError
-        ex.message.must_equal "student_loan cannot be zero"
+        ex = expect { subject.student_loan 0 }.must_raise Hermod::InvalidInputError
+        expect(ex.message).must_equal "student_loan cannot be zero"
       end
 
       it "should treat blank nodes as zero nodes" do
         subject.ni nil
-        value_of_node("NI").must_equal "0.00"
+        expect(value_of_node("NI")).must_equal "0.00"
 
         subject.tax nil
-        nodes("Tax").must_be_empty
+        expect(nodes("Tax")).must_be_empty
       end
     end
   end

data/spec/hermod/xml_section_builder/parent_node_spec.rb

@@ -21,7 +21,7 @@ module Hermod
 
       it "should correctly wrap the inner XML" do
         expected = "<ParentXml>\n  <InnerXml>\n    <Inside>layered like an onion</Inside>\n  </InnerXml>\n</ParentXml>"
-        subject.to_xml.to_s.must_equal expected
+        expect(subject.to_xml.to_s).must_equal expected
       end
     end
   end

data/spec/hermod/xml_section_builder/string_node_spec.rb

@@ -33,43 +33,43 @@ module Hermod
       end
 
       it "should set node contents correctly" do
-        value_of_node("Greeting").must_equal "Hello"
+        expect(value_of_node("Greeting")).must_equal "Hello"
       end
 
       it "should allow values that pass the regex validation" do
         subject.title "Sir"
-        value_of_node("Title").must_equal "Sir"
+        expect(value_of_node("Title")).must_equal "Sir"
       end
 
       it "should raise an error when the regex validation fails" do
-        ex = proc { subject.title "Laird" }.must_raise InvalidInputError
-        ex.message.must_equal %(title "Laird" does not match /\\ASir|Dame\\z/)
+        ex = expect { subject.title "Laird" }.must_raise InvalidInputError
+        expect(ex.message).must_equal %(title "Laird" does not match /\\ASir|Dame\\z/)
       end
 
       it "should require all non-optional nodes to have content" do
-        ex = proc { subject.required "" }.must_raise InvalidInputError
-        ex.message.must_equal "required isn't optional but no value was provided"
+        ex = expect { subject.required "" }.must_raise InvalidInputError
+        expect(ex.message).must_equal "required isn't optional but no value was provided"
       end
 
       it "should apply changes to the inputs if a input_mutator is provided" do
         subject.gender "Male"
-        value_of_node("Gender").must_equal "M"
+        expect(value_of_node("Gender")).must_equal "M"
       end
 
       it "should allow input_mutators to access nodes the instance" do
         subject.mood "Hangry"
         subject.status "Eating cookies"
-        value_of_node("Status").must_equal "Eating cookies furiously"
+        expect(value_of_node("Status")).must_equal "Eating cookies furiously"
       end
 
       it "should restrict values to those in the list of allowed values if such a list is provided" do
         subject.mood "Hangry"
-        value_of_node("Mood").must_equal "Hangry"
+        expect(value_of_node("Mood")).must_equal "Hangry"
       end
 
       it "should raise an error if the value is not in the list of allowed values" do
-        ex = proc { subject.mood "Jubilant" }.must_raise InvalidInputError
-        ex.message.must_equal "mood must be one of Happy, Sad, or Hangry, not Jubilant"
+        ex = expect { subject.mood "Jubilant" }.must_raise InvalidInputError
+        expect(ex.message).must_equal "mood must be one of Happy, Sad, or Hangry, not Jubilant"
       end
 
       it "should be thread safe for validation" do
@@ -81,23 +81,23 @@ module Hermod
           subject1.mood "Hangry"
         end
 
-        ex = proc { subject.mood "Jubilant" }.must_raise InvalidInputError
-        ex.message.must_equal "mood must be one of Happy, Sad, or Hangry, not Jubilant"
+        ex = expect { subject.mood "Jubilant" }.must_raise InvalidInputError
+        expect(ex.message).must_equal "mood must be one of Happy, Sad, or Hangry, not Jubilant"
       end
 
       it "should use the given keys for attributes" do
         subject.title "Sir", masculine: "no"
-        attributes_for_node("Title").keys.first.must_equal "Male"
-        attributes_for_node("Title")["Male"].value.must_equal "no"
+        expect(attributes_for_node("Title").keys.first).must_equal "Male"
+        expect(attributes_for_node("Title")["Male"].value).must_equal "no"
       end
 
       it "should raise an error if given an attribute that isn't expected" do
-        proc { subject.title "Sir", knight: "yes" }.must_raise InvalidInputError
+        expect { subject.title "Sir", knight: "yes" }.must_raise InvalidInputError
       end
 
       it "should not include empty, optional nodes" do
         subject.name ""
-        nodes("Name").must_be_empty
+        expect(nodes("Name")).must_be_empty
       end
     end
   end

data/spec/hermod/xml_section_builder/yes_no_node_spec.rb

@@ -16,7 +16,7 @@ module Hermod
         end
 
         it "should include the node with yes as the contents" do
-          value_of_node("Awesome").must_equal "yes"
+          expect(value_of_node("Awesome")).must_equal "yes"
         end
       end
 
@@ -28,7 +28,7 @@ module Hermod
         end
 
         it "should include the node with no as the contents" do
-          value_of_node("Awesome").must_equal "no"
+          expect(value_of_node("Awesome")).must_equal "no"
         end
       end
     end

data/spec/hermod/xml_section_builder/yes_node_spec.rb

@@ -16,7 +16,7 @@ module Hermod
         end
 
         it "should include the node with yes as the contents" do
-          value_of_node("Awesome").must_equal "yes"
+          expect(value_of_node("Awesome")).must_equal "yes"
         end
       end
 
@@ -28,7 +28,7 @@ module Hermod
         end
 
         it "should not include the node" do
-          number_of_nodes("Awesome").must_equal 0
+          expect(number_of_nodes("Awesome")).must_equal 0
         end
       end
     end

data/spec/hermod/xml_section_spec.rb

@@ -21,7 +21,7 @@ module Hermod
       end
 
       it "should use the class name as the XML node name" do
-        subject.to_xml.name.must_equal "UnnamedXML"
+        expect(subject.to_xml.name).must_equal "UnnamedXML"
       end
     end
 
@@ -31,7 +31,7 @@ module Hermod
       end
 
       it "should use the class name as the XML node name" do
-        subject.to_xml.name.must_equal "Testing"
+        expect(subject.to_xml.name).must_equal "Testing"
       end
     end
 
@@ -44,11 +44,11 @@ module Hermod
       end
 
       it "formats dates in yyyy-mm-dd form" do
-        value_of_node("Birthday").must_equal("1988-08-13")
+        expect(value_of_node("Birthday")).must_equal("1988-08-13")
       end
 
       it "formats money to two decimal places" do
-        value_of_node("Allowance").must_equal("20.00")
+        expect(value_of_node("Allowance")).must_equal("20.00")
       end
     end
 
@@ -63,32 +63,32 @@ module Hermod
       end
 
       it "should order nodes by the order they were defined when the class was built" do
-        node_by_index(0).name.must_equal "First"
-        node_by_index(0).content.must_equal "alpha"
+        expect(node_by_index(0).name).must_equal "First"
+        expect(node_by_index(0).content).must_equal "alpha"
 
-        node_by_index(1).name.must_equal "Repeated"
-        node_by_index(1).content.must_equal "beta"
+        expect(node_by_index(1).name).must_equal "Repeated"
+        expect(node_by_index(1).content).must_equal "beta"
 
-        node_by_index(-1).name.must_equal "Last"
-        node_by_index(-1).content.must_equal "epsilon"
+        expect(node_by_index(-1).name).must_equal "Last"
+        expect(node_by_index(-1).content).must_equal "epsilon"
       end
 
       it "should order nodes called multiple times in the order they were called" do
-        node_by_index(1).name.must_equal "Repeated"
-        node_by_index(1).content.must_equal "beta"
+        expect(node_by_index(1).name).must_equal "Repeated"
+        expect(node_by_index(1).content).must_equal "beta"
 
-        node_by_index(2).name.must_equal "Repeated"
-        node_by_index(2).content.must_equal "gamma"
+        expect(node_by_index(2).name).must_equal "Repeated"
+        expect(node_by_index(2).content).must_equal "gamma"
       end
 
       it "should order nodes at XML generation time, not at call time" do
         subject.repeated "delta"
 
-        node_by_index(-2).name.must_equal "Repeated"
-        node_by_index(-2).content.must_equal "delta"
+        expect(node_by_index(-2).name).must_equal "Repeated"
+        expect(node_by_index(-2).content).must_equal "delta"
 
-        node_by_index(-1).name.must_equal "Last"
-        node_by_index(-1).content.must_equal "epsilon"
+        expect(node_by_index(-1).name).must_equal "Last"
+        expect(node_by_index(-1).content).must_equal "epsilon"
       end
     end
   end

data/spec/hermod_spec.rb

@@ -2,6 +2,6 @@ require 'minitest_helper'
 
 describe Hermod do
   it "should have a version number" do
-    Hermod::VERSION.wont_be_nil
+    expect(Hermod::VERSION).wont_be_nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hermod
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Harry Mills
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -31,9 +31,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +38,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,48 +72,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.16
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.16
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.13'
 description: |-
   A Ruby library for talking to the HMRC Government Gateway.
     This provides a builder for creating classes that can generate the XML needed complete with type information and
@@ -130,13 +124,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/freeagent-gem.yml"
+- ".github/workflows/reviewdog.yml"
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
-- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
@@ -188,6 +183,7 @@ homepage: https://github.com/fac/hermod
 licenses:
 - Apache License, Version 2.0
 metadata:
+  allowed_push_host: https://rubygems.org
   bug_tracker_uri: https://github.com/fac/hermod/issues
   changelog_uri: https://github.com/fac/hermod/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/fac/hermod
@@ -207,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A Ruby library for talking to the HMRC Government Gateway.

data/Jenkinsfile

@@ -1,11 +0,0 @@
-#!groovy
-
-@Library('freeagent') _
-
-freeagentGem(
-    node: 'smartos',
-    slack: [channel: '#tax-eng-ci'],
-    remote:        "https://rubygems.org",
-    key:           "rubygems",
-    pushTag:       true,
-    forcePush:     true )