dsl_compose 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6093d554121170f4ea168c0a5d0e6480befc3ae02f24396b2006534ac7252b2
-  data.tar.gz: 759d6dcf22ff3f049f29f0e4e5fffac72fd535cd1b4b0927934b94cba379ece0
+  metadata.gz: f8b82032e4bea7187d0dd4a00528472ce1a5b29d4aea64b94d6090b8d013b47b
+  data.tar.gz: 628dda5efddcfdc2b9de8df09245c5af67c233de24dee7654d7266b193b6ef95
 SHA512:
-  metadata.gz: 2406e9b5a49d8764a4dc66b00489f58686cb2135980345cac72dbf451c5b97693cfae625153980dd2c124bf84a80b96c8aa59c924c275b36ae825a366194b194
-  data.tar.gz: 83bf9a8302f434adb63906e1abf07ffb3d56a3bcc9336465b0647710e42ff3b076be3d255df19aad6ff7a6f4a35fcbcec37aee4a3bf1f9d5b05ff767d07a377e
+  metadata.gz: 670c5b83e8d8e3dd986933499d96d92604da968088b31dba613421712beb5ded7c7defec91714a1c23df1a4ba82d55a15a815864376d2ad3970a426232bb42cc
+  data.tar.gz: 48f76cf798a28b60efe4cf1c69d2f21c3594e86de5bbcf674d4a16f68114e76cde998a68c8dfbfbe8860362165bd9af7c37f6be3842e6efbdf9db8568ce72246

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.3.0](https://github.com/craigulliott/dsl_compose/compare/v1.2.0...v1.3.0) (2023-06-22)
+
+
+### Features
+
+* adding an executions_by_class method to make processing the configuration more convenient ([#8](https://github.com/craigulliott/dsl_compose/issues/8)) ([313507c](https://github.com/craigulliott/dsl_compose/commit/313507ca572f59c03162a91d58e62500a9464f25))
+* fixing release please job ([#10](https://github.com/craigulliott/dsl_compose/issues/10)) ([880fa5b](https://github.com/craigulliott/dsl_compose/commit/880fa5b2aceed67aa9ff1e7cf53629af23e31b10))
+
+## [1.2.0](https://github.com/craigulliott/dsl_compose/compare/v1.1.0...v1.2.0) (2023-06-22)
+
+
+### Features
+
+* adding arguments to initial DSL activation method ([bda7cd4](https://github.com/craigulliott/dsl_compose/commit/bda7cd4ef55bcd4bfd2be530b6a28645dee87885))
+
 ## [1.1.0](https://github.com/craigulliott/dsl_compose/compare/v1.0.0...v1.1.0) (2023-06-20)
 
 

data/lib/dsl_compose/composer.rb

@@ -10,13 +10,13 @@ module DSLCompose
 
     class MethodAlreadyExistsWithThisDSLNameError < StandardError
       def message
-        "The define_dsl singleton method already exists for this class."
+        "The `define_dsl` singleton method already exists for this class."
       end
     end
 
     class GetDSLExecutionResultsMethodAlreadyExistsError < StandardError
       def message
-        "The dsl_interpreter singleton method already exists for this class."
+        "The `dsls` singleton method already exists for this class."
       end
     end
 
@@ -30,11 +30,11 @@ module DSLCompose
       interpreter = DSLCompose::Interpreter.new
 
       # return a specific DSL which is defined for this class
-      if klass.respond_to? :dsl_interpreter
+      if klass.respond_to? :dsls
         raise GetDSLExecutionResultsMethodAlreadyExistsError
       end
 
-      klass.define_singleton_method :dsl_interpreter do
+      klass.define_singleton_method :dsls do
         interpreter
       end
 
@@ -56,10 +56,10 @@ module DSLCompose
           end
 
           # add a singleton method with the name of this new DSL onto our class, this is how our new DSL will be accessed
-          define_singleton_method name do |&block|
+          define_singleton_method name do |*args, &block|
             # when it is called, we process this new dynamic DSL with the interpreter
             # `self` here is the class in which the dsl is being used, not the class in which the DSL was defined
-            interpreter.execute_dsl self, dsl, &block
+            interpreter.execute_dsl self, dsl, *args, &block
           end
 
         end

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/equal_to_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class EqualToValidation
           class ValidationFailedError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/format_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class FormatValidation
           class ValidationFailedError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/greater_than_or_equal_to_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class GreaterThanOrEqualToValidation
           class InvalidValueError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/greater_than_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class GreaterThanValidation
           class InvalidValueError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/in_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class InValidation
           class InvalidValueError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/interpreter.rb

@@ -2,13 +2,13 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         # This class is reponsible for parsing and executing argument definitions
         # within our internal DSL. These argument definitions determine what arguments
         # will be available on the methods within our new dynamic DSL.
         #
-        # This class is instantaited by the DSLCompose::DSL::DSLMethod::Argument class and the
+        # This class is instantaited by the DSLCompose::DSL::Arguments::Argument class and the
         # method argument definition part of our internal DSL is evaluated by passing a block
         # to `instance_eval` on this class.
         #

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/length_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class LengthValidation
           class ValidationFailedError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/less_than_or_equal_to_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class LessThanOrEqualToValidation
           class InvalidValueError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/less_than_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class LessThanValidation
           class InvalidValueError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument/not_in_validation.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class NotInValidation
           class InvalidValueError < StandardError

data/lib/dsl_compose/dsl/{dsl_method → arguments}/argument.rb

@@ -2,7 +2,7 @@
 
 module DSLCompose
   class DSL
-    class DSLMethod
+    class Arguments
       class Argument
         class ValidationIncompatibleError < StandardError
           def message

data/lib/dsl_compose/dsl/arguments.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+module DSLCompose
+  class DSL
+    class Arguments
+      class ArgumentDoesNotExistError < StandardError
+        def message
+          "This argument does not exist for this DSLMethod"
+        end
+      end
+
+      class ArgumentOrderingError < StandardError
+        def message
+          "Required arguments can not be added after optional ones"
+        end
+      end
+
+      class ArgumentAlreadyExistsError < StandardError
+        def message
+          "An argument with this name already exists for this DSL method"
+        end
+      end
+
+      class RequestedOptionalArgumentIsRequiredError < StandardError
+        def message
+          "A specific argument which was expected to be optional was requested, but the argument found was flagged as required"
+        end
+      end
+
+      class RequestedRequiredArgumentIsOptionalError < StandardError
+        def message
+          "A specific argument which was expected to be required was requested, but the argument found was flagged as optional"
+        end
+      end
+
+      def initialize
+        @arguments = {}
+      end
+
+      # Returns an array of all this DSLMethods Argument objects.
+      def arguments
+        @arguments.values
+      end
+
+      # Returns an array of only the optional Argument objects on this DSLMethod.
+      def optional_arguments
+        arguments.filter(&:optional?)
+      end
+
+      # Returns an array of only the required Argument objects on this DSLMethod.
+      def required_arguments
+        arguments.filter(&:required?)
+      end
+
+      # returns a specific Argument by it's name, if the Argument does not
+      # exist, then an error is raised
+      def argument name
+        if has_argument? name
+          @arguments[name]
+        else
+          raise ArgumentDoesNotExistError
+        end
+      end
+
+      # returns a specific optional Argument by it's name, if the Argument does not
+      # exist, or if it is required, then an error is raised
+      def optional_argument name
+        arg = argument name
+        if arg.optional?
+          @arguments[name]
+        else
+          raise RequestedOptionalArgumentIsRequiredError
+        end
+      end
+
+      # returns a specific required Argument by it's name, if the Argument does not
+      # exist, or if it is optional, then an error is raised
+      def required_argument name
+        arg = argument name
+        if arg.required?
+          @arguments[name]
+        else
+          raise RequestedRequiredArgumentIsOptionalError
+        end
+      end
+
+      # Returns `true` if an Argument with the provided name exists in this
+      # DSLMethod, otherwise it returns `false`.
+      def has_argument? name
+        @arguments.key? name
+      end
+
+      # Takes a method name, unique flag, required flag, and a block and creates
+      # a new Argument object.
+      #
+      # Argument `name` must be unique within the DSLMethod.
+      # `required` must be a boolean, and determines if this argument will be required
+      # or optional on the method which is exposed in our DSL.
+      def add_argument name, required, type, &block
+        if @arguments.key? name
+          raise ArgumentAlreadyExistsError
+        end
+
+        # required arguments may not come after optional ones
+        if required && optional_arguments.any?
+          raise ArgumentOrderingError
+        end
+
+        @arguments[name] = Argument.new(name, required, type, &block)
+      end
+    end
+  end
+end

data/lib/dsl_compose/dsl/dsl_method/interpreter.rb

@@ -37,9 +37,9 @@ module DSLCompose
         # name must be a symbol
         # `type` can be either :integer, :boolean, :float, :string or :symbol
         # `block` contains the argument definition and will be evaluated seperately
-        # by the DSLMethod::Argument::Interpreter
+        # by the Argument::Interpreter
         def optional name, type, &block
-          @dsl_method.add_argument name, false, type, &block
+          @dsl_method.arguments.add_argument name, false, type, &block
         end
 
         # adds a new required argument to the DSLMethod
@@ -47,9 +47,9 @@ module DSLCompose
         # name must be a symbol
         # `type` can be either :integer, :boolean, :float, :string or :symbol
         # `block` contains the argument definition and will be evaluated seperately
-        # by the DSLMethod::Argument::Interpreter
+        # by the Argument::Interpreter
         def requires name, type, &block
-          @dsl_method.add_argument name, true, type, &block
+          @dsl_method.arguments.add_argument name, true, type, &block
         end
       end
     end

data/lib/dsl_compose/dsl/dsl_method.rb

@@ -66,6 +66,8 @@ module DSLCompose
       # An otional description of this DSLMethod, if provided then it must be a string.
       # The description accepts markdown and is used when generating documentation.
       attr_reader :description
+      # an object which represents the argument configuration
+      attr_reader :arguments
 
       # Create a new DSLMethod object with the provided name and class.
       #
@@ -74,7 +76,7 @@ module DSLCompose
       # `required` is a boolean which determines if this DSLMethod must be called at least once within the DSL.
       # `block` contains the instructions to further configure this DSLMethod
       def initialize name, unique, required, &block
-        @arguments = {}
+        @arguments = Arguments.new
 
         if name.is_a? Symbol
 
@@ -122,59 +124,6 @@ module DSLCompose
         @description.nil? == false
       end
 
-      # Returns an array of all this DSLMethods Argument objects.
-      def arguments
-        @arguments.values
-      end
-
-      # Returns an array of only the optional Argument objects on this DSLMethod.
-      def optional_arguments
-        arguments.filter(&:optional?)
-      end
-
-      # Returns an array of only the required Argument objects on this DSLMethod.
-      def required_arguments
-        arguments.filter(&:required?)
-      end
-
-      # returns a specific Argument by it's name, if the Argument does not
-      # exist, then an error is raised
-      def argument name
-        if has_argument? name
-          @arguments[name]
-        else
-          raise ArgumentDoesNotExistError
-        end
-      end
-
-      # returns a specific optional Argument by it's name, if the Argument does not
-      # exist, or if it is required, then an error is raised
-      def optional_argument name
-        arg = argument name
-        if arg.optional?
-          @arguments[name]
-        else
-          raise RequestedOptionalArgumentIsRequiredError
-        end
-      end
-
-      # returns a specific required Argument by it's name, if the Argument does not
-      # exist, or if it is optional, then an error is raised
-      def required_argument name
-        arg = argument name
-        if arg.required?
-          @arguments[name]
-        else
-          raise RequestedRequiredArgumentIsOptionalError
-        end
-      end
-
-      # Returns `true` if an Argument with the provided name exists in this
-      # DSLMethod, otherwise it returns `false`.
-      def has_argument? name
-        @arguments.key? name
-      end
-
       # returns true if this DSLMethod is flagged as unique, otherwise returns false.
       def unique?
         @unique == true
@@ -189,25 +138,6 @@ module DSLCompose
       def optional?
         @required == false
       end
-
-      # Takes a method name, unique flag, required flag, and a block and creates
-      # a new Argument object.
-      #
-      # Argument `name` must be unique within the DSLMethod.
-      # `required` must be a boolean, and determines if this argument will be required
-      # or optional on the method which is exposed in our DSL.
-      def add_argument name, required, type, &block
-        if @arguments.key? name
-          raise ArgumentAlreadyExistsError
-        end
-
-        # required arguments may not come after optional ones
-        if required && optional_arguments.any?
-          raise ArgumentOrderingError
-        end
-
-        @arguments[name] = Argument.new(name, required, type, &block)
-      end
     end
   end
 end

data/lib/dsl_compose/dsl/interpreter.rb

@@ -47,6 +47,26 @@ module DSLCompose
       def add_unique_method name, required: nil, &block
         @dsl.add_method name, true, required ? true : false, &block
       end
+
+      # adds a new optional argument to the DSLMethod
+      #
+      # name must be a symbol
+      # `type` can be either :integer, :boolean, :float, :string or :symbol
+      # `block` contains the argument definition and will be evaluated seperately
+      # by the Argument::Interpreter
+      def optional name, type, &block
+        @dsl.arguments.add_argument name, false, type, &block
+      end
+
+      # adds a new required argument to the DSLMethod
+      #
+      # name must be a symbol
+      # `type` can be either :integer, :boolean, :float, :string or :symbol
+      # `block` contains the argument definition and will be evaluated seperately
+      # by the Argument::Interpreter
+      def requires name, type, &block
+        @dsl.arguments.add_argument name, true, type, &block
+      end
     end
   end
 end

data/lib/dsl_compose/dsl.rb

@@ -49,6 +49,8 @@ module DSLCompose
     # An otional description of this DSL, if provided then it must be a string.
     # The description accepts markdown and is used when generating documentation.
     attr_reader :description
+    # an object which represents the argument configuration
+    attr_reader :arguments
 
     # Create a new DSL object with the provided name and class.
     #
@@ -57,6 +59,8 @@ module DSLCompose
     def initialize name, klass
       @dsl_methods = {}
 
+      @arguments = Arguments.new
+
       if name.is_a? Symbol
         @name = name
       else

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

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+module DSLCompose
+  class Interpreter
+    class Execution
+      class Arguments
+        class MissingRequiredArgumentsError < StandardError
+          def initialize required_count, provided_count
+            super "This method requires #{required_count} arguments, but only #{required_count} were provided"
+          end
+        end
+
+        class TooManyArgumentsError < StandardError
+          def message
+            "Too many arguments provided to this method"
+          end
+        end
+
+        class OptionalArgsShouldBeHashError < StandardError
+          def message
+            "If provided, then the optional arguments must be last, and be represented as a Hash"
+          end
+        end
+
+        class InvalidArgumentTypeError < StandardError
+          def message
+            "The provided argument is the wrong type"
+          end
+        end
+
+        attr_reader :arguments
+
+        def initialize arguments, *args
+          @arguments = {}
+
+          required_argument_count = arguments.required_arguments.count
+          has_optional_arguments = arguments.optional_arguments.any?
+
+          # the first N args, where N = required_argument_count, are the
+          # provided required arguments
+          required_args = args.slice(0, required_argument_count)
+          # the optional arg which comes next is the hash which represents
+          # all the optional arguments
+          optional_arg = args[required_argument_count]
+
+          # assert that a value is provided for every required argument
+          unless required_argument_count == required_args.count
+            raise MissingRequiredArgumentsError.new required_argument_count, required_args.count
+          end
+
+          # assert that too many arguments have not been provided
+          if args.count > required_argument_count + (has_optional_arguments ? 1 : 0)
+            raise TooManyArgumentsError
+          end
+
+          # asset that, if provided, then the optional argument (always the last one) is a Hash
+          if has_optional_arguments && optional_arg.nil? === false
+            unless optional_arg.is_a? Hash
+              raise OptionalArgsShouldBeHashError
+            end
+
+            # assert the each provided optional argument is valid
+            optional_arg.keys.each do |optional_argument_name|
+              optional_arg_value = optional_arg[optional_argument_name]
+              optional_argument = arguments.optional_argument optional_argument_name
+
+              case optional_argument.type
+              when :integer
+                unless optional_arg_value.is_a? Integer
+                  raise InvalidArgumentTypeError
+                end
+                optional_argument.validate_integer! optional_arg_value
+
+              when :symbol
+                unless optional_arg_value.is_a? Symbol
+                  raise InvalidArgumentTypeError
+                end
+                optional_argument.validate_symbol! optional_arg_value
+
+              when :string
+                unless optional_arg_value.is_a? String
+                  raise InvalidArgumentTypeError
+                end
+                optional_argument.validate_string! optional_arg_value
+
+              when :boolean
+                unless optional_arg_value.is_a?(TrueClass) || optional_arg_value.is_a?(FalseClass)
+                  raise InvalidArgumentTypeError
+                end
+                optional_argument.validate_boolean! optional_arg_value
+
+              else
+                raise InvalidArgumentTypeError
+              end
+
+              # the provided value appears valid for this argument, save the value
+              @arguments[optional_argument_name] = optional_arg_value
+            end
+
+          end
+
+          # validate the value provided to each required argument
+          arguments.required_arguments.each_with_index do |required_argument, i|
+            arg = args[i]
+            case required_argument.type
+            when :integer
+              unless arg.is_a? Integer
+                raise InvalidArgumentTypeError
+              end
+              required_argument.validate_integer! arg
+
+            when :symbol
+              unless arg.is_a? Symbol
+                raise InvalidArgumentTypeError
+              end
+              required_argument.validate_symbol! arg
+
+            when :string
+              unless arg.is_a? String
+                raise InvalidArgumentTypeError
+              end
+              required_argument.validate_string! arg
+
+            when :boolean
+              unless arg.is_a?(TrueClass) || arg.is_a?(FalseClass)
+                raise InvalidArgumentTypeError
+              end
+              required_argument.validate_boolean! arg
+
+            else
+              raise InvalidArgumentTypeError
+            end
+
+            # the provided value appears valid for this argument, save the value
+            @arguments[required_argument.name] = arg
+          end
+        end
+
+        def to_h
+          @arguments
+        end
+      end
+    end
+  end
+end

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

@@ -34,109 +34,7 @@ module DSLCompose
 
           def initialize dsl_method, *args, &block
             @dsl_method = dsl_method
-            @arguments = {}
-
-            required_argument_count = dsl_method.required_arguments.count
-            has_optional_arguments = dsl_method.optional_arguments.any?
-
-            # the first N args, where N = required_argument_count, are the
-            # provided required arguments
-            required_args = args.slice(0, required_argument_count)
-            # the optional arg which comes next is the hash which represents
-            # all the optional arguments
-            optional_arg = args[required_argument_count]
-
-            # assert that a value is provided for every required argument
-            unless required_argument_count == required_args.count
-              raise MissingRequiredArgumentsError.new required_argument_count, required_args.count
-            end
-
-            # assert that too many arguments have not been provided
-            if args.count > required_argument_count + (has_optional_arguments ? 1 : 0)
-              raise TooManyArgumentsError
-            end
-
-            # asset that, if provided, then the optional argument (always the last one) is a Hash
-            if has_optional_arguments && optional_arg.nil? === false
-              unless optional_arg.is_a? Hash
-                raise OptionalArgsShouldBeHashError
-              end
-
-              # assert the each provided optional argument is valid
-              optional_arg.keys.each do |optional_argument_name|
-                optional_arg_value = optional_arg[optional_argument_name]
-                optional_argument = dsl_method.optional_argument optional_argument_name
-
-                case optional_argument.type
-                when :integer
-                  unless optional_arg_value.is_a? Integer
-                    raise InvalidArgumentTypeError
-                  end
-                  optional_argument.validate_integer! optional_arg_value
-
-                when :symbol
-                  unless optional_arg_value.is_a? Symbol
-                    raise InvalidArgumentTypeError
-                  end
-                  optional_argument.validate_symbol! optional_arg_value
-
-                when :string
-                  unless optional_arg_value.is_a? String
-                    raise InvalidArgumentTypeError
-                  end
-                  optional_argument.validate_string! optional_arg_value
-
-                when :boolean
-                  unless optional_arg_value.is_a?(TrueClass) || optional_arg_value.is_a?(FalseClass)
-                    raise InvalidArgumentTypeError
-                  end
-                  optional_argument.validate_boolean! optional_arg_value
-
-                else
-                  raise InvalidArgumentTypeError
-                end
-
-                # the provided value appears valid for this argument, save the value
-                @arguments[optional_argument_name] = optional_arg_value
-              end
-
-            end
-
-            # validate the value provided to each required argument
-            dsl_method.required_arguments.each_with_index do |required_argument, i|
-              arg = args[i]
-              case required_argument.type
-              when :integer
-                unless arg.is_a? Integer
-                  raise InvalidArgumentTypeError
-                end
-                required_argument.validate_integer! arg
-
-              when :symbol
-                unless arg.is_a? Symbol
-                  raise InvalidArgumentTypeError
-                end
-                required_argument.validate_symbol! arg
-
-              when :string
-                unless arg.is_a? String
-                  raise InvalidArgumentTypeError
-                end
-                required_argument.validate_string! arg
-
-              when :boolean
-                unless arg.is_a?(TrueClass) || arg.is_a?(FalseClass)
-                  raise InvalidArgumentTypeError
-                end
-                required_argument.validate_boolean! arg
-
-              else
-                raise InvalidArgumentTypeError
-              end
-
-              # the provided value appears valid for this argument, save the value
-              @arguments[required_argument.name] = arg
-            end
+            @arguments = Arguments.new(dsl_method.arguments, *args)
           end
 
           def method_name
@@ -145,7 +43,7 @@ module DSLCompose
 
           def to_h
             {
-              arguments: @arguments
+              arguments: @arguments.to_h
             }
           end
         end

data/lib/dsl_compose/interpreter/execution.rb

@@ -16,12 +16,16 @@ module DSLCompose
       end
 
       attr_reader :dsl
+      attr_reader :klass
       attr_reader :method_calls
+      attr_reader :arguments
 
       # execute/process a dynamically defined DSL
-      def initialize dsl, &block
+      def initialize klass, dsl, *args, &block
+        @klass = klass
         @dsl = dsl
         @method_calls = MethodCalls.new
+        @arguments = Arguments.new(dsl.arguments, *args)
 
         # dynamically process the DSL by calling the provided block
         # all methods executions will be caught and processed by the method_missing method below

data/lib/dsl_compose/interpreter.rb

@@ -10,32 +10,57 @@ module DSLCompose
     attr_reader :executions
 
     def initialize
-      @executions = {}
+      @executions = []
     end
 
     # Execute/process a dynamically defined DSL on a class.
     # `klass` is the class in which the DSL is being used, not
     # the class in which the DSL was defined.
-    def execute_dsl klass, dsl, &block
-      @executions[klass] ||= []
-      execution = Execution.new(dsl, &block)
-      @executions[klass] << execution
+    def execute_dsl klass, dsl, *args, &block
+      execution = Execution.new(klass, dsl, *args, &block)
+      @executions << execution
       execution
     end
 
     # Returns an array of all executions for a given class.
     def class_executions klass
-      @executions[klass] || []
+      @executions.filter { |e| e.klass == klass }
     end
 
-    def to_h klass
+    # Returns an array of all executions for a given class.
+    def dsl_executions dsl_name
+      @executions.filter { |e| e.dsl.name == dsl_name }
+    end
+
+    def to_h dsl_name
+      h = {}
+      dsl_executions(dsl_name).each do |execution|
+        h[execution.klass] ||= {
+          arguments: execution.arguments.to_h,
+          method_calls: {}
+        }
+        execution.method_calls.method_calls.each do |method_call|
+          h[execution.klass][:method_calls][method_call.method_name] ||= []
+          h[execution.klass][:method_calls][method_call.method_name] << method_call.to_h
+        end
+      end
+      h
+    end
+
+    def executions_by_class
       h = {}
-      class_executions(klass).each do |execution|
-        h[execution.dsl.name] ||= {}
+      executions.each do |execution|
+        h[execution.klass] ||= {}
+        h[execution.klass][execution.dsl.name] ||= []
+        execution_h = {
+          arguments: execution.arguments.to_h,
+          method_calls: {}
+        }
         execution.method_calls.method_calls.each do |method_call|
-          h[execution.dsl.name][method_call.method_name] ||= []
-          h[execution.dsl.name][method_call.method_name] << method_call.to_h
+          execution_h[:method_calls][method_call.method_name] ||= []
+          execution_h[:method_calls][method_call.method_name] << method_call.to_h
         end
+        h[execution.klass][execution.dsl.name] << execution_h
       end
       h
     end

data/lib/dsl_compose/version.rb

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

data/lib/dsl_compose.rb

@@ -2,18 +2,20 @@
 
 require "dsl_compose/version"
 
-require "dsl_compose/dsl/dsl_method/argument/equal_to_validation"
-require "dsl_compose/dsl/dsl_method/argument/format_validation"
-require "dsl_compose/dsl/dsl_method/argument/greater_than_or_equal_to_validation"
-require "dsl_compose/dsl/dsl_method/argument/greater_than_validation"
-require "dsl_compose/dsl/dsl_method/argument/in_validation"
-require "dsl_compose/dsl/dsl_method/argument/length_validation"
-require "dsl_compose/dsl/dsl_method/argument/less_than_or_equal_to_validation"
-require "dsl_compose/dsl/dsl_method/argument/less_than_validation"
-require "dsl_compose/dsl/dsl_method/argument/not_in_validation"
-
-require "dsl_compose/dsl/dsl_method/argument/interpreter"
-require "dsl_compose/dsl/dsl_method/argument"
+require "dsl_compose/dsl/arguments/argument/equal_to_validation"
+require "dsl_compose/dsl/arguments/argument/format_validation"
+require "dsl_compose/dsl/arguments/argument/greater_than_or_equal_to_validation"
+require "dsl_compose/dsl/arguments/argument/greater_than_validation"
+require "dsl_compose/dsl/arguments/argument/in_validation"
+require "dsl_compose/dsl/arguments/argument/length_validation"
+require "dsl_compose/dsl/arguments/argument/less_than_or_equal_to_validation"
+require "dsl_compose/dsl/arguments/argument/less_than_validation"
+require "dsl_compose/dsl/arguments/argument/not_in_validation"
+
+require "dsl_compose/dsl/arguments/argument/interpreter"
+require "dsl_compose/dsl/arguments/argument"
+require "dsl_compose/dsl/arguments"
+
 require "dsl_compose/dsl/dsl_method/interpreter"
 require "dsl_compose/dsl/dsl_method"
 
@@ -23,6 +25,7 @@ require "dsl_compose/dsl"
 
 require "dsl_compose/interpreter/execution/method_calls/method_call"
 require "dsl_compose/interpreter/execution/method_calls"
+require "dsl_compose/interpreter/execution/arguments"
 require "dsl_compose/interpreter/execution"
 require "dsl_compose/interpreter"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_compose
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Craig Ulliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem to add dynamic DSLs to classes. DSLs are added to classes by
   including the DSLCompose module, and then calling the add_dsl singleton method within
@@ -26,23 +26,25 @@ files:
 - lib/dsl_compose.rb
 - lib/dsl_compose/composer.rb
 - lib/dsl_compose/dsl.rb
+- lib/dsl_compose/dsl/arguments.rb
+- lib/dsl_compose/dsl/arguments/argument.rb
+- lib/dsl_compose/dsl/arguments/argument/equal_to_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/format_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/greater_than_or_equal_to_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/greater_than_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/in_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/interpreter.rb
+- lib/dsl_compose/dsl/arguments/argument/length_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/less_than_or_equal_to_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/less_than_validation.rb
+- lib/dsl_compose/dsl/arguments/argument/not_in_validation.rb
 - lib/dsl_compose/dsl/dsl_method.rb
-- lib/dsl_compose/dsl/dsl_method/argument.rb
-- lib/dsl_compose/dsl/dsl_method/argument/equal_to_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/format_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/greater_than_or_equal_to_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/greater_than_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/in_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/interpreter.rb
-- lib/dsl_compose/dsl/dsl_method/argument/length_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/less_than_or_equal_to_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/less_than_validation.rb
-- lib/dsl_compose/dsl/dsl_method/argument/not_in_validation.rb
 - lib/dsl_compose/dsl/dsl_method/interpreter.rb
 - lib/dsl_compose/dsl/interpreter.rb
 - lib/dsl_compose/dsls.rb
 - lib/dsl_compose/interpreter.rb
 - lib/dsl_compose/interpreter/execution.rb
+- lib/dsl_compose/interpreter/execution/arguments.rb
 - lib/dsl_compose/interpreter/execution/method_calls.rb
 - lib/dsl_compose/interpreter/execution/method_calls/method_call.rb
 - lib/dsl_compose/version.rb