hermod 2.4.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cbf3807669ca862241f9283bef0378fd7e6b85d3
-  data.tar.gz: 9f8e3dd588bde55c11d92fc7b8c0b4dca9757492
+SHA256:
+  metadata.gz: da9b5d8d5ee3394dccb1cbf50fda9119e997ee142e06d94cc76e1ebb8a4668f5
+  data.tar.gz: 2290b1eb07c850663aa8503a72dbe35220d8cf22c23c3f0410b24e27a598fe81
 SHA512:
-  metadata.gz: c41fc3dffbabb1d8d42b672005cf7eb8fda5a6e2eaa7c09415303f7bd967cd795e47324876e3c4d42f6ffd0bc9a9f6f300c546edb3a7ca8d53141ac9dafc3b67
-  data.tar.gz: 79456adf4bcbff635ed8ead7656c942925515610e062e8f072761199f5f2d5e33d508e28d44c78bbdd76d3f46cf6d60220702d03c3036bb7876e2a7e178fcd0a
+  metadata.gz: d16713dc7fff7318109c675c0b38acf6f101fb62adc6fa6005aff97daade193527572d1ccbd152c850e2ff33ecdebb9c35d71aac24fe4b4f70506efa8a70a7c6
+  data.tar.gz: fd12fa60b05c7bb69ce5418ab4fe56ca242527b6102b1b940c9833ad69d7b8a33f72c33035d28c04d7dd848c7b3f08f9a8944da7c64a8379c0c8b2530828089c

data/.ruby-version

@@ -0,0 +1 @@
+2.7.1

data/.travis.yml

@@ -8,3 +8,5 @@ gemfile:
   - gemfiles/activesupport-4.0
   - gemfiles/activesupport-4.2
   - gemfiles/activesupport-5.0
+  - gemfiles/activesupport-6.0
+

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+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
+## Added
+- Changelog updates
+
+##[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
+### Added
+- Link wiki to the readme file.
+
+## [2.5.2] - 2019-10-21
+### Added
+- Links for homepage, changelog, issues and source code.
+
+## [2.5.1] - 2019-08-26
+### Added
+- Support Rails 6.0
+
+## [2.5.0] - 2019-07-25
+### Added
+- Adds Jenkins build
+- Upgrades bundler and ruby version file
+
+## [2.4.1] - 2019-07-22
+### Added
+- Resolve BigDecimal deprecation warnings
+
+## [2.0.0] - Unknown
+
+## [1.0.0] - Unknown
+There were a number of "releases" that were made prior to this point. However, we have no good details of what was included in which release

data/Jenkinsfile

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

data/gemfiles/activesupport-6.0

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in xml-section.gemspec
+gemspec :path => "../"
+
+gem "activesupport", "~> 6.0"

data/hermod.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{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
   runtime validation.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/fac/hermod"
   spec.license       = "Apache License, Version 2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -22,12 +22,19 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.0.0"
 
-  spec.add_runtime_dependency "libxml-ruby", "~> 2.7", ">= 2.7.0"
-  spec.add_runtime_dependency "activesupport", "> 3.2", "< 6"
+  spec.add_runtime_dependency "libxml-ruby", "~> 3.2"
+  spec.add_runtime_dependency "activesupport", "> 3.2", "< 7"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 11.1"
+  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.metadata = {
+    "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",
+    "wiki_uri"          => "https://github.com/fac/hermod/blob/master/README.md"
+  }
 end

data/lib/hermod/validators/allowed_values.rb

@@ -13,11 +13,11 @@ module Hermod
 
       private
 
-      def test
+      def test(value, attributes)
         value.blank? || allowed_values.include?(value)
       end
 
-      def message
+      def message(value, attributes)
         list_of_values = allowed_values.to_sentence(last_word_connector: ", or ", two_words_connector: " or ")
         "must be one of #{list_of_values}, not #{value}"
       end

data/lib/hermod/validators/attributes.rb

@@ -13,16 +13,18 @@ module Hermod
 
       private
 
-      def test
-        @bad_attributes = [] # reset this for each time the validator is used
-        attributes.each do |attribute, _|
-          bad_attributes << attribute unless allowed_attributes.include? attribute
-        end
-        bad_attributes == []
+      def bad_attributes(attributes)
+        attributes.map do |attribute, _|
+          attribute unless allowed_attributes.include? attribute
+        end.compact
       end
 
-      def message
-        "has attributes it doesn't accept: #{bad_attributes.to_sentence}"
+      def test(value, attributes)
+        bad_attributes(attributes) == []
+      end
+
+      def message(value, attributes)
+        "has attributes it doesn't accept: #{bad_attributes(attributes).to_sentence}"
       end
     end
   end

data/lib/hermod/validators/base.rb

@@ -3,16 +3,13 @@ require 'active_support/core_ext/array/conversions'
 module Hermod
   module Validators
     class Base
-      attr_reader :value, :attributes
-
       # Public: Runs the test for the validator returning true if it passes and
       # raising if it fails
       #
       # Raises a Hermod::InvalidInputError if the test fails
       # Returns true if it succeeds
       def valid?(value, attributes)
-        @value, @attributes = value, attributes
-        !!test || raise(InvalidInputError, message)
+        !!test(value, attributes) || raise(InvalidInputError, message(value, attributes))
       end
 
       private
@@ -21,14 +18,14 @@ module Hermod
       # validator
       #
       # Returns a boolean
-      def test
+      def test(value, attributes)
         raise NotImplementedError
       end
 
       # Private: override in subclasses to provide a more useful error message
       #
       # Returns a string
-      def message
+      def message(value, attributes)
         "is invalid"
       end
     end

data/lib/hermod/validators/non_negative.rb

@@ -7,11 +7,11 @@ module Hermod
 
       private
 
-      def test
+      def test(value, attributes)
         value.blank? || value >= 0
       end
 
-      def message
+      def message(value, attributes)
         "cannot be negative"
       end
     end

data/lib/hermod/validators/non_zero.rb

@@ -7,11 +7,11 @@ module Hermod
 
       private
 
-      def test
+      def test(value, attributes)
         value.blank? || value.to_i != 0
       end
 
-      def message
+      def message(value, attributes)
         "cannot be zero"
       end
     end

data/lib/hermod/validators/range.rb

@@ -16,11 +16,11 @@ module Hermod
 
       private
 
-      def test
+      def test(value, attributes)
         value.blank? || range.cover?(value)
       end
 
-      def message
+      def message(value, attributes)
         "must be between #{range.min} and #{range.max}"
       end
     end

data/lib/hermod/validators/regular_expression.rb

@@ -17,11 +17,11 @@ module Hermod
       # because those are checked by the ValuePresence validator if necessary.
       #
       # Returns a boolean
-      def test
+      def test(value, attributes)
         value.blank? || value =~ pattern
       end
 
-      def message
+      def message(value, attributes)
         "#{value.inspect} does not match #{pattern.inspect}"
       end
     end

data/lib/hermod/validators/type_checker.rb

@@ -23,11 +23,11 @@ module Hermod
 
       private
 
-      def test
+      def test(value, attributes)
         value.blank? || checker.call(value)
       end
 
-      def message
+      def message(value, attributes)
         expected_class_name = expected_class.name.downcase
         join_word = (%w(a e i o u).include?(expected_class_name[0]) ? "an" : "a")
         "must be #{join_word} #{expected_class_name}"

data/lib/hermod/validators/value_presence.rb

@@ -7,11 +7,11 @@ module Hermod
 
       private
 
-      def test
+      def test(value, attributes)
         value.present?
       end
 
-      def message
+      def message(value, attributes)
         "isn't optional but no value was provided"
       end
     end

data/lib/hermod/validators/whole_units.rb

@@ -8,11 +8,11 @@ module Hermod
 
       private
 
-      def test
+      def test(value, attributes)
         value.blank? || value == value.to_i
       end
 
-      def message
+      def message(value, attributes)
         "must be in whole units"
       end
     end

data/lib/hermod/version.rb

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

data/spec/hermod/validators/base_spec.rb

@@ -13,7 +13,7 @@ module Hermod
 
       it "has a default error message" do
         class TestValidator < Base
-          def test
+          def test(value, attributes)
             false
           end
         end

data/spec/hermod/xml_section_builder/string_node_spec.rb

@@ -72,6 +72,19 @@ module Hermod
         ex.message.must_equal "mood must be one of Happy, Sad, or Hangry, not Jubilant"
       end
 
+      it "should be thread safe for validation" do
+        subject1 = StringXml.new do |string_xml|
+          string_xml.greeting "Hello"
+        end
+
+        Thread.new do
+          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"
+      end
+
       it "should use the given keys for attributes" do
         subject.title "Sir", masculine: "no"
         attributes_for_node("Title").keys.first.must_equal "Male"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hermod
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Harry Mills
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +33,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,35 +43,35 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -137,9 +131,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
+- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
@@ -147,6 +144,7 @@ files:
 - gemfiles/activesupport-4.0
 - gemfiles/activesupport-4.2
 - gemfiles/activesupport-5.0
+- gemfiles/activesupport-6.0
 - hermod.gemspec
 - lib/hermod.rb
 - lib/hermod/input_mutator.rb
@@ -186,10 +184,14 @@ files:
 - spec/hermod/xml_section_spec.rb
 - spec/hermod_spec.rb
 - spec/minitest_helper.rb
-homepage: ''
+homepage: https://github.com/fac/hermod
 licenses:
 - Apache License, Version 2.0
-metadata: {}
+metadata:
+  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
+  wiki_uri: https://github.com/fac/hermod/blob/master/README.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -205,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby library for talking to the HMRC Government Gateway.