dsl_compose 2.4.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43cfe766f3e464ba7f5a22128e7f5155806f92686555aef5f2f06af2b58916af
-  data.tar.gz: 999dc31a662af4684b2956a50c226aa596b345ece609d2b9ace058eea211f924
+  metadata.gz: d558cb69dae4f6a6ea4e6a2fe996a88ea0a94545e94f68c22c0800732d0745da
+  data.tar.gz: 9527152eda7312f711c9881fffb26cc2feae295d67be646ace5ce9a20f6dc88b
 SHA512:
-  metadata.gz: 78b2add3e95f52ae184abb3d2a30f9218d966a8d44e378b72ea37c5ad2dfd6c3409f7a9cf08e4762d17cf717c2ff35c2f7da4ce5a28d8959eacbcf92c484c0db
-  data.tar.gz: 7d4e1550f001a40d0665c6258eff2cd16d0052f209b1c6741a3252b0623f698345d8344014555153649dd705077dda8cc39d08531bb95bd5df4611cde257c156
+  metadata.gz: 5c60f96f11f85c753138ea3a1f4fefe227fdb7ce48191e6dc204380e603916204e62e398ca0813487ed92f15dea9f38596050e5f91484a9ceab604ef11ff828e
+  data.tar.gz: 7eae02a8c4d6fa2e43ab4789ae1399c74e744bbccdfb46e60804f41d7982e11e9187b2f332fe6db53f858b867584f4317b981ca360f982d78fe05346db576f94

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.5.1](https://github.com/craigulliott/dsl_compose/compare/v2.5.0...v2.5.1) (2023-08-17)
+
+
+### Bug Fixes
+
+* defaulting optional boolean values to false instead of nil in the parser ([3a4b4d7](https://github.com/craigulliott/dsl_compose/commit/3a4b4d7df315e60dca0e66af37d77b800dc6be2c))
+* stripping white space off descriptions ([93ba9d2](https://github.com/craigulliott/dsl_compose/commit/93ba9d21f57a4f58f70f24a44cd58121741da8d0))
+
+## [2.5.0](https://github.com/craigulliott/dsl_compose/compare/v2.4.0...v2.5.0) (2023-08-01)
+
+
+### Features
+
+* you can call validators which accept arrays (such as `validate_in`) multiple times and they will be combined ([e1b4411](https://github.com/craigulliott/dsl_compose/commit/e1b441176768726cecd828e303781a57d4e36750))
+
 ## [2.4.0](https://github.com/craigulliott/dsl_compose/compare/v2.3.0...v2.4.0) (2023-07-31)
 
 

data/README.md

@@ -42,7 +42,7 @@ class Foo
   define_dsl :your_dsl do
 
     # A description of your DSL
-    description <<-DESCRIPTION
+    description <<~DESCRIPTION
       Add a description of your DSL here, this description will be
       used when generating the documentation for your DSL.
 
@@ -191,7 +191,7 @@ class MyClientLibrary
     description "Configure the settings for MyClientLibrary"
 
     add_unique_method :api_key, required: true do
-      description <<-DESCRIPTION
+      description <<~DESCRIPTION
         Your API key.
 
         API keys can be generated from your developer
@@ -247,7 +247,7 @@ class MyParser < DSLCompose::Parser
   # which extend the provided base class, but do not have their own children) then
   # use `for_final_children_of` instead of `for_children_of`
   for_children_of SomeBaseClass do |child_class:|
-    description <<-DESCRIPTION
+    description <<~DESCRIPTION
       You can optionally provide a description of anything specific that your parser
       does in this block, this description will be used when generating documentation
 
@@ -281,7 +281,7 @@ class MyParser < DSLCompose::Parser
     # which were called within this use of your DSL. There is more documentation about
     # Reader classes below.
     for_dsl [:dsl1, :dsl2] do |dsl_name:, a_dsl_argument:, reader:|
-      description <<-DESCRIPTION
+      description <<~DESCRIPTION
         You can optionally provide a description of anything specific that your parser
         does in this block, this description will be used when generating documentation.
 
@@ -308,7 +308,7 @@ class MyParser < DSLCompose::Parser
       # are provided then the requested dsl argument must be present on all DSLs
       # otherwise an error will be raised.
       for_method :some_method_name do |method_name:, a_method_argument:|
-        description <<-DESCRIPTION
+        description <<~DESCRIPTION
           You can optionally provide a description of anything specific that your parser
           does in this block, this description will be used when generating documentation.
 

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

@@ -12,6 +12,11 @@ module DSLCompose
           end
 
           def initialize values
+            @values = []
+            add_values values
+          end
+
+          def add_values values
             # if the provided values is a symbol, then convert it to an array
             if values.is_a? Symbol
               values = [values]
@@ -27,7 +32,7 @@ module DSLCompose
               raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
             end
 
-            @values = values
+            @values += values
           end
 
           def validate! value

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

@@ -12,11 +12,16 @@ module DSLCompose
           end
 
           def initialize values
+            @values = []
+            add_values values
+          end
+
+          def add_values values
             unless values.is_a?(Array)
               raise InvalidValueError, "The value `#{values}` provided to this validator must be of type Array"
             end
 
-            @values = values
+            @values += values
           end
 
           def validate! value

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

@@ -12,6 +12,11 @@ module DSLCompose
           end
 
           def initialize values
+            @values = []
+            add_values values
+          end
+
+          def add_values values
             # if the provided values is a symbol, then convert it to an array
             if values.is_a? Symbol
               values = [values]
@@ -27,7 +32,7 @@ module DSLCompose
               raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
             end
 
-            @values = values
+            @values += values
           end
 
           def validate! value

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

@@ -12,11 +12,16 @@ module DSLCompose
           end
 
           def initialize values
+            @values = []
+            add_values values
+          end
+
+          def add_values values
             unless values.is_a?(Array)
               raise InvalidValueError, "The value `#{values}` provided to this validator must be of type Array"
             end
 
-            @values = values
+            @values += values
           end
 
           def validate! value

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

@@ -12,6 +12,11 @@ module DSLCompose
           end
 
           def initialize values
+            @values = []
+            add_values values
+          end
+
+          def add_values values
             # if the provided values is a symbol, then convert it to an array
             if values.is_a? Symbol
               values = [values]
@@ -27,7 +32,7 @@ module DSLCompose
               raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
             end
 
-            @values = values
+            @values += values
           end
 
           def validate! value

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

@@ -12,6 +12,11 @@ module DSLCompose
           end
 
           def initialize values
+            @values = []
+            add_values values
+          end
+
+          def add_values values
             # if the provided values is a symbol, then convert it to an array
             if values.is_a? Symbol
               values = [values]
@@ -27,7 +32,7 @@ module DSLCompose
               raise ValidationFailedError, "The value `#{values}` provided to this validator must be a Symbol or an Array of Symbols"
             end
 
-            @values = values
+            @values += values
           end
 
           def validate! value

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

@@ -112,7 +112,7 @@ module DSLCompose
         # `description` must be a string with a length greater than 0.
         # The `description` can only be set once per Argument
         def set_description description
-          unless description.is_a?(String) && description.length > 0
+          unless description.is_a?(String) && description.strip.length > 0
             raise InvalidDescriptionError, "The option description `#{description}` is invalid, it must be of type string and have length greater than 0."
           end
 
@@ -120,7 +120,7 @@ module DSLCompose
             raise DescriptionAlreadyExistsError, "The description has already been set"
           end
 
-          @description = FixHeredocIndentation.fix_heredoc_indentation description
+          @description = description.strip
         end
 
         # Returns `true` if this DSL has a description, else false.
@@ -230,10 +230,6 @@ module DSLCompose
         end
 
         def validate_in values
-          if @in_validation
-            raise ValidationAlreadyExistsError, "The validation `in` has already been applied to this method option."
-          end
-
           unless values.is_a? Array
             raise ValidationInvalidArgumentError, values
           end
@@ -242,14 +238,15 @@ module DSLCompose
             raise ValidationIncompatibleError, "The validation type #{@type} is not compatible with this argument type"
           end
 
-          @in_validation = InValidation.new values
+          # if this validation has already been applied, then add the values to the existing validation
+          if @in_validation
+            @in_validation.add_values values
+          else
+            @in_validation = InValidation.new values
+          end
         end
 
         def validate_not_in values
-          if @not_in_validation
-            raise ValidationAlreadyExistsError, "The validation `not_in` has already been applied to this method option."
-          end
-
           unless values.is_a? Array
             raise ValidationInvalidArgumentError, values
           end
@@ -258,14 +255,15 @@ module DSLCompose
             raise ValidationIncompatibleError, "The validation type #{@type} is not compatible with this argument type"
           end
 
-          @not_in_validation = NotInValidation.new values
+          # if this validation has already been applied, then add the values to the existing validation
+          if @not_in_validation
+            @not_in_validation.add_values values
+          else
+            @not_in_validation = NotInValidation.new values
+          end
         end
 
         def validate_end_with value
-          if @end_with_validation
-            raise ValidationAlreadyExistsError, "The validation `end_with` has already been applied to this method option."
-          end
-
           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
@@ -274,14 +272,15 @@ module DSLCompose
             raise ValidationIncompatibleError, "The validation type #{@type} is not compatible with this argument type"
           end
 
-          @end_with_validation = EndWithValidation.new value
+          # if this validation has already been applied, then add the values to the existing validation
+          if @end_with_validation
+            @end_with_validation.add_values value
+          else
+            @end_with_validation = EndWithValidation.new value
+          end
         end
 
         def validate_not_end_with value
-          if @not_end_with_validation
-            raise ValidationAlreadyExistsError, "The validation `not_end_with` has already been applied to this method option."
-          end
-
           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
@@ -290,14 +289,15 @@ module DSLCompose
             raise ValidationIncompatibleError, "The validation type #{@type} is not compatible with this argument type"
           end
 
-          @not_end_with_validation = NotEndWithValidation.new value
+          # if this validation has already been applied, then add the values to the existing validation
+          if @not_end_with_validation
+            @not_end_with_validation.add_values value
+          else
+            @not_end_with_validation = NotEndWithValidation.new value
+          end
         end
 
         def validate_start_with value
-          if @start_with_validation
-            raise ValidationAlreadyExistsError, "The validation `start_with` has already been applied to this method option."
-          end
-
           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
@@ -306,14 +306,15 @@ module DSLCompose
             raise ValidationIncompatibleError, "The validation type #{@type} is not compatible with this argument type"
           end
 
-          @start_with_validation = StartWithValidation.new value
+          # if this validation has already been applied, then add the values to the existing validation
+          if @start_with_validation
+            @start_with_validation.add_values value
+          else
+            @start_with_validation = StartWithValidation.new value
+          end
         end
 
         def validate_not_start_with value
-          if @not_start_with_validation
-            raise ValidationAlreadyExistsError, "The validation `not_start_with` has already been applied to this method option."
-          end
-
           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
@@ -322,7 +323,12 @@ module DSLCompose
             raise ValidationIncompatibleError, "The validation type #{@type} is not compatible with this argument type"
           end
 
-          @not_start_with_validation = NotStartWithValidation.new value
+          # if this validation has already been applied, then add the values to the existing validation
+          if @not_start_with_validation
+            @not_start_with_validation.add_values value
+          else
+            @not_start_with_validation = NotStartWithValidation.new value
+          end
         end
 
         def validate_length maximum: nil, minimum: nil, is: nil

data/lib/dsl_compose/dsl/dsl_method.rb

@@ -68,7 +68,7 @@ module DSLCompose
       # `description` must be a string with a length greater than 0.
       # The `description` can only be set once per DSLMethod
       def set_description description
-        unless description.is_a?(String) && description.length > 0
+        unless description.is_a?(String) && description.strip.length > 0
           raise InvalidDescriptionError, "The DSL method description `#{description}` is invalid, it must be of type string and have length greater than 0"
         end
 
@@ -76,7 +76,7 @@ module DSLCompose
           raise DescriptionAlreadyExistsError, "The description has already been set"
         end
 
-        @description = FixHeredocIndentation.fix_heredoc_indentation description
+        @description = description.strip
       end
 
       # Returns `true` if this DSL has a description, else false.

data/lib/dsl_compose/dsl.rb

@@ -74,7 +74,7 @@ module DSLCompose
     # `description` must be a string with a length greater than 0.
     # The `description` can only be set once per DSL
     def set_description description
-      unless description.is_a?(String) && description.length > 0
+      unless description.is_a?(String) && description.strip.length > 0
         raise InvalidDescriptionError, "The DSL description `#{description}` is invalid, it must be of type string and have length greater than 0"
       end
 
@@ -82,7 +82,7 @@ module DSLCompose
         raise DescriptionAlreadyExistsError, "The DSL description has already been set"
       end
 
-      @description = FixHeredocIndentation.fix_heredoc_indentation description
+      @description = description.strip
     end
 
     # Returns `true` if this DSL has a description, else false.

data/lib/dsl_compose/interpreter/execution/arguments.rb

@@ -44,10 +44,11 @@ module DSLCompose
             raise TooManyArgumentsError, "Too many arguments provided"
           end
 
-          # assume all optonal arguments are nil. If actual values were provided, then they will be set below
+          # Assume all optonal arguments are nil (except booleans, which default to false).
+          # If actual values were provided, then they will be set further below.
           if arguments.optional_arguments.any?
             arguments.optional_arguments.each do |optional_argument|
-              @arguments[optional_argument.name] = nil
+              @arguments[optional_argument.name] = (optional_argument.type == :boolean) ? false : nil
             end
           end
 

data/lib/dsl_compose/interpreter/execution/method_calls/method_call.rb

@@ -5,6 +5,9 @@ module DSLCompose
     class Execution
       class MethodCalls
         class MethodCall
+          class InvalidDescriptionError < StandardError
+          end
+
           attr_reader :dsl_method
           attr_reader :arguments
 
@@ -26,8 +29,12 @@ module DSLCompose
           # the parser can provide usage notes for how this dsl is being used, these are used to
           # generate documentation
           def add_parser_usage_note note
+            unless note.is_a?(String) && note.strip.length > 0
+              raise InvalidDescriptionError, "The parser usage description `#{note}` is invalid, it must be of type string and have length greater than 0"
+            end
+
             @parser_usage_notes ||= []
-            @parser_usage_notes << DSLCompose::FixHeredocIndentation.fix_heredoc_indentation(note)
+            @parser_usage_notes << note.strip
           end
 
           # return the list of notes which describe how the parsers are using this DSL

data/lib/dsl_compose/interpreter/execution.rb

@@ -9,6 +9,9 @@ module DSLCompose
       class RequiredMethodNotCalledError < StandardError
       end
 
+      class InvalidDescriptionError < StandardError
+      end
+
       attr_reader :dsl
       attr_reader :klass
       attr_reader :method_calls
@@ -39,8 +42,12 @@ module DSLCompose
       # the parser can provide usage notes for how this dsl is being used, these are used to
       # generate documentation
       def add_parser_usage_note note
+        unless note.is_a?(String) && note.strip.length > 0
+          raise InvalidDescriptionError, "The parser usage description `#{note}` is invalid, it must be of type string and have length greater than 0"
+        end
+
         @parser_usage_notes ||= []
-        @parser_usage_notes << DSLCompose::FixHeredocIndentation.fix_heredoc_indentation(note)
+        @parser_usage_notes << note.strip
       end
 
       # return the list of notes which describe how the parsers are using this DSL

data/lib/dsl_compose/interpreter.rb

@@ -7,6 +7,9 @@ module DSLCompose
     class DSLExecutionNotFoundError < StandardError
     end
 
+    class InvalidDescriptionError < StandardError
+    end
+
     # A dynamic DSL can be used multiple times on the same class, each time the DSL is used
     # a corresponding execution will be created. The execution contains the resulting configuration
     # from that particular use of the DSL.
@@ -19,9 +22,12 @@ module DSLCompose
     # the parser can provide usage notes for how this dsl is being used, these are used to
     # generate documentation
     def add_parser_usage_note child_class, note
+      unless note.is_a?(String) && note.strip.length > 0
+        raise InvalidDescriptionError, "The parser usage description `#{note}` is invalid, it must be of type string and have length greater than 0"
+      end
       @parser_usage_notes ||= {}
       @parser_usage_notes[child_class] ||= []
-      @parser_usage_notes[child_class] << DSLCompose::FixHeredocIndentation.fix_heredoc_indentation(note)
+      @parser_usage_notes[child_class] << note.strip
     end
 
     # return the list of notes which describe how the parsers are using this DSL

data/lib/dsl_compose/version.rb

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

data/lib/dsl_compose.rb

@@ -51,8 +51,6 @@ require "dsl_compose/composer"
 
 require "dsl_compose/class_coerce"
 
-require "dsl_compose/fix_heredoc_indentation"
-
 require "dsl_compose/shared_configuration"
 
 require "dsl_compose/dsls"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_compose
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Craig Ulliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_spec_helper
@@ -62,7 +62,6 @@ files:
 - lib/dsl_compose/dsl/dsl_method/interpreter.rb
 - lib/dsl_compose/dsl/interpreter.rb
 - lib/dsl_compose/dsls.rb
-- lib/dsl_compose/fix_heredoc_indentation.rb
 - lib/dsl_compose/interpreter.rb
 - lib/dsl_compose/interpreter/execution.rb
 - lib/dsl_compose/interpreter/execution/arguments.rb

data/lib/dsl_compose/fix_heredoc_indentation.rb

@@ -1,21 +0,0 @@
-module DSLCompose
-  # A small helper to fix indentation and clean up whitespace in
-  # strings which were created with rubys heredoc syntax.
-  module FixHeredocIndentation
-    # This method is used to trim empty lines from the start and end of
-    # a block of markdown, it will also fix the indentation of heredoc
-    # strings by removing the leading whitespace from the first line, and
-    # that same amount of white space from every other line
-    def self.fix_heredoc_indentation string
-      # replace all tabs with spaces
-      string = string.gsub(/\t/, "  ")
-      # remove empty lines from the start of the string
-      string = string.gsub(/\A( *\n)+/, "")
-      # remove empty lines from the end of the string
-      string = string.gsub(/( *\n)+\Z/, "")
-      # removes the number of leading spaces on the first line, from
-      # all the other lines
-      string.gsub(/^#{string[/\A */]}/, "")
-    end
-  end
-end