dsl_compose 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f39f962fc5991e68164ab544ca3cb85b7f538296d393f360fdda683956c883bd
-  data.tar.gz: d68a46d791c33ac1ed435d9be92490ebbd76b053f13d2ef5a17247caf245b148
+  metadata.gz: 7fc1bd78d6f3926b9ee718a6e2191cefd5aecd40fcfbb5de9a8cfbd8c602e65c
+  data.tar.gz: 7b9fd87ecf61b71831f56ab9120562cb3fbb3d49424dc7862c31014e6dc96d45
 SHA512:
-  metadata.gz: 97b3fdcdd3b2ded2028155a9a767fb9cacf8a0e39b00a3cf8e203290d78a7bdbce9119b0b2b856b82afb61c209e24025c9e94991dfa5abe7383f55efc69446e4
-  data.tar.gz: 38d4eda779bb41af8300ce7d266307eb8fa58529bca51d9c9dcf1589ed1b11f535d4a0746ea359c18f56ca5aae30a13655d987bc0f3de06bf2bdc6f560701f82
+  metadata.gz: d3f750f7d8d5d1d7b2014cd84ad10d656d005e2738b18c8ed89f108656b5f9037a428f6ec1094af5382d9788985f3c205c68f06198c8a18e2dfc01f518203cb6
+  data.tar.gz: 12a823a699962ee5426a53ab66517f5acb23bd1fbc6834b219d6209d09ba78a9a9b249a1169497a0a2773287f24abf2d7c065c3f126f702bf4927c13180a15aa

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.9.1](https://github.com/craigulliott/dsl_compose/compare/v1.9.0...v1.9.1) (2023-07-11)
+
+
+### Bug Fixes
+
+* bug fix where argument class was using wrong type check for start and end with validators ([#25](https://github.com/craigulliott/dsl_compose/issues/25)) ([d16fd35](https://github.com/craigulliott/dsl_compose/commit/d16fd35d0b574eafe6ad9d68d4e7f5884e89c521))
+
+## [1.9.0](https://github.com/craigulliott/dsl_compose/compare/v1.8.0...v1.9.0) (2023-07-11)
+
+
+### Features
+
+* start_with, not_start_with, end_with and not_end_with validators now accept an array of values to test against ([#23](https://github.com/craigulliott/dsl_compose/issues/23)) ([cddcb4b](https://github.com/craigulliott/dsl_compose/commit/cddcb4b629499e3af0d71cc27f5c2f1dd8ae76d5))
+
 ## [1.8.0](https://github.com/craigulliott/dsl_compose/compare/v1.7.0...v1.8.0) (2023-07-11)
 
 

data/README.md

@@ -293,16 +293,16 @@ The following validations can be added to the arguments of your DSL methods. Val
         validate_in ["cat", "dog"]
 
         # The argument must start with the following string.
-        validate_start_with ["foo_"]
+        validate_start_with [:foo_]
 
         # The argument must not start with the following string.
-        validate_not_start_with ["foo_"]
+        validate_not_start_with [:foo_]
 
         # The argument must end with the following string.
-        validate_end_with ["_foo"]
+        validate_end_with [:_foo]
 
         # The argument must not end with the following string.
-        validate_not_end_with ["_foo"]
+        validate_not_end_with [:_foo]
 
         # The argument must match the provided regex.
         validate_format /\A[A-Z][a-z]+\Z/
@@ -340,16 +340,16 @@ The following validations can be added to the arguments of your DSL methods. Val
         validate_in [:cat, :dog]
 
         # The argument must start with the following string.
-        validate_start_with ["foo_"]
+        validate_start_with [:foo_]
 
         # The argument must not start with the following string.
-        validate_not_start_with ["foo_"]
+        validate_not_start_with [:foo_]
 
         # The argument must end with the following string.
-        validate_end_with ["_foo"]
+        validate_end_with [:_foo]
 
         # The argument must not end with the following string.
-        validate_not_end_with ["_foo"]
+        validate_not_end_with [:_foo]
 
         # The argument must match the provided regex.
         validate_format /\A[A-Z][a-z]+\Z/

data/lib/dsl_compose/dsl/arguments/argument/end_with_validation.rb

@@ -11,16 +11,27 @@ module DSLCompose
           class ValidationFailedError < StandardError
           end
 
-          def initialize value
-            unless value.is_a?(String)
-              raise InvalidValueError, "The value `#{value}` provided to this validator must be of type String"
+          def initialize values
+            # if the provided values is a symbol, then convert it to an array
+            if values.is_a? Symbol
+              values = [values]
             end
 
-            @value = value
+            # assert that the provided values is an array
+            unless values.is_a? Array
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            # assert that the provided values is an array of symbols
+            unless values.all? { |value| value.is_a? Symbol }
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            @values = values
           end
 
           def validate! value
-            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to end with `#{@value}`" unless value.end_with? @value
+            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to end with `#{@values}`" unless @values.filter { |v| value.end_with? v.to_s }.any?
             true
           end
         end

data/lib/dsl_compose/dsl/arguments/argument/not_end_with_validation.rb

@@ -11,16 +11,27 @@ module DSLCompose
           class ValidationFailedError < StandardError
           end
 
-          def initialize value
-            unless value.is_a?(String)
-              raise InvalidValueError, "The value `#{value}` provided to this validator must be of type String"
+          def initialize values
+            # if the provided values is a symbol, then convert it to an array
+            if values.is_a? Symbol
+              values = [values]
             end
 
-            @value = value
+            # assert that the provided values is an array
+            unless values.is_a? Array
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            # assert that the provided values is an array of symbols
+            unless values.all? { |value| value.is_a? Symbol }
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            @values = values
           end
 
           def validate! value
-            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to not end with `#{@value}`" if value.end_with? @value
+            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to not end with `#{@values}`" if @values.filter { |v| value.end_with? v.to_s }.any?
             true
           end
         end

data/lib/dsl_compose/dsl/arguments/argument/not_start_with_validation.rb

@@ -11,16 +11,27 @@ module DSLCompose
           class ValidationFailedError < StandardError
           end
 
-          def initialize value
-            unless value.is_a?(String)
-              raise InvalidValueError, "The value `#{value}` provided to this validator must be of type String"
+          def initialize values
+            # if the provided values is a symbol, then convert it to an array
+            if values.is_a? Symbol
+              values = [values]
             end
 
-            @value = value
+            # assert that the provided values is an array
+            unless values.is_a? Array
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            # assert that the provided values is an array of symbols
+            unless values.all? { |value| value.is_a? Symbol }
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            @values = values
           end
 
           def validate! value
-            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to not start with `#{@value}`" if value.start_with? @value
+            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to not start with `#{@values}`" if @values.filter { |v| value.start_with? v.to_s }.any?
             true
           end
         end

data/lib/dsl_compose/dsl/arguments/argument/start_with_validation.rb

@@ -11,16 +11,27 @@ module DSLCompose
           class ValidationFailedError < StandardError
           end
 
-          def initialize value
-            unless value.is_a?(String)
-              raise InvalidValueError, "The value `#{value}` provided to this validator must be of type String"
+          def initialize values
+            # if the provided values is a symbol, then convert it to an array
+            if values.is_a? Symbol
+              values = [values]
             end
 
-            @value = value
+            # assert that the provided values is an array
+            unless values.is_a? Array
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            # assert that the provided values is an array of symbols
+            unless values.all? { |value| value.is_a? Symbol }
+              raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
+            end
+
+            @values = values
           end
 
           def validate! value
-            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to start with `#{@value}`" unless value.start_with? @value
+            raise ValidationFailedError, "The argument is invalid. Expected `#{value}` to start with `#{@values}`" unless @values.filter { |v| value.start_with? v.to_s }.any?
             true
           end
         end

data/lib/dsl_compose/dsl/arguments/argument.rb

@@ -260,8 +260,8 @@ module DSLCompose
             raise ValidationAlreadyExistsError, "The validation `end_with` has already been applied to this method option."
           end
 
-          unless value.is_a? String
-            raise ValidationInvalidArgumentError, value
+          unless value.is_a?(Symbol) || (value.is_a?(Array) && value.all? { |value| value.is_a? Symbol })
+            raise ValidationInvalidArgumentError, "The value `#{value}` provided to this validator must be a Symbol or an Array of Symbols"
           end
 
           unless @type == :string || @type == :symbol
@@ -276,8 +276,8 @@ module DSLCompose
             raise ValidationAlreadyExistsError, "The validation `not_end_with` has already been applied to this method option."
           end
 
-          unless value.is_a? String
-            raise ValidationInvalidArgumentError, value
+          unless value.is_a?(Symbol) || (value.is_a?(Array) && value.all? { |value| value.is_a? Symbol })
+            raise ValidationInvalidArgumentError, "The value `#{value}` provided to this validator must be a Symbol or an Array of Symbols"
           end
 
           unless @type == :string || @type == :symbol
@@ -292,8 +292,8 @@ module DSLCompose
             raise ValidationAlreadyExistsError, "The validation `start_with` has already been applied to this method option."
           end
 
-          unless value.is_a? String
-            raise ValidationInvalidArgumentError, value
+          unless value.is_a?(Symbol) || (value.is_a?(Array) && value.all? { |value| value.is_a? Symbol })
+            raise ValidationInvalidArgumentError, "The value `#{value}` provided to this validator must be a Symbol or an Array of Symbols"
           end
 
           unless @type == :string || @type == :symbol
@@ -308,8 +308,8 @@ module DSLCompose
             raise ValidationAlreadyExistsError, "The validation `not_start_with` has already been applied to this method option."
           end
 
-          unless value.is_a? String
-            raise ValidationInvalidArgumentError, value
+          unless value.is_a?(Symbol) || (value.is_a?(Array) && value.all? { |value| value.is_a? Symbol })
+            raise ValidationInvalidArgumentError, "The value `#{value}` provided to this validator must be a Symbol or an Array of Symbols"
           end
 
           unless @type == :string || @type == :symbol

data/lib/dsl_compose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DSLCompose
-  VERSION = "1.8.0"
+  VERSION = "1.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dsl_compose
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Craig Ulliott