hermod 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652870a795e31ffd24407d314cf997c6ff85ce15f3c9078ed4bd7ae550ca6529
-  data.tar.gz: 4fd45beae242cdb967f50799d11caf7fab88ce3254a59b6391a4f52dddd254b8
+  metadata.gz: 1af9ca7e6027368f2615529ae3f56b58171ee2597ce575a88ffc63e127c2c623
+  data.tar.gz: 36952a0ca5738aa2dcd1e449aef92a8d4b32b9eac5efa7fa5690f8fd8343b2bf
 SHA512:
-  metadata.gz: b43d2fe41563423861f21b994e0ecb6d826fae8e1529724ab4943864e86a9dcd4d08ba9c23571c83bc6ba85e2c76e5acd87a42ff7ce6c28cb6d132044156d2d9
-  data.tar.gz: 90700da84b912ce6ecbdd83b3ea5cfa8cc415201a852279b54856bf90747c19853473500fb41f15a89dd1715df85314f1a5cd5783baa8c9d0be89f687eb36fba
+  metadata.gz: af62bdb50c430197615ed0872d0c1bc9077167b7fcb4caedd7f7856064224b5c479a830dc1c756cf1f5bfe9e8d4d28edfbd8508fe0a951881fc2f921e484ba5d
+  data.tar.gz: d167424a6e95f53df15188b30b84ee0b7a82b581286f7c2a06c66d2fb451dbfda8eea3c65c87cbe1b553f297171e6d4ad0b84891e720b1578a5c0715cbf1c6d7

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

@@ -7,13 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.5.1] - 2019-08-26
+### Added
+- Support Rails 6.0
+
 ## [2.5.0] - 2019-07-25
 ### Added
-- Adds Jenkins build 
+- Adds Jenkins build
 - Upgrades bundler and ruby version file
 
 ## [2.4.1] - 2019-07-22
-### Added Resolve BigDecimal deprecation warnings
+### Added
+- Resolve BigDecimal deprecation warnings
 
 ## [2.0.0] - Unknown
 

data/Jenkinsfile

@@ -6,6 +6,6 @@ freeagentGem(
     node: 'smartos',
     slack: [channel: '#tax-eng-ci'],
     remote:        "https://rubygems.org",
-    key:           "rubygems_api_key",
+    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

@@ -23,7 +23,7 @@ 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 "activesupport", "> 3.2", "< 7"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 11.1"

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.5.0"
+  VERSION = "2.5.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.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Harry Mills
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -39,7 +39,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,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