dsl_compose 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc5d05054343d31af8700ec10104ef0040615583c026d5588354888092670e63
-  data.tar.gz: a211ab077787f947eb2337a727c516e600903b6ec5dd4dc4650d3cb16aa264bc
+  metadata.gz: 4fab8958e567edd7044bfef529f74c21930c7c1fba06bfd359d905249fc2d17c
+  data.tar.gz: a167ad2aaaf44b226b2884ee0f4d6447444ebe0629453ca5f288430c5198e683
 SHA512:
-  metadata.gz: 438b429f3fd729f655b474c9d23a4224e41e66d6bcbfd32bf227607772a83c54a5400cb7e5dbdc947a101240ee43f8656fb1f7c4798e0a3c4218679090db00d3
-  data.tar.gz: 8717ba33401dcc579de9de6bb6132263ba1737e87b8820874cc5e1d161651bdffe1481d3f676fb10d1ffef8da254eaaea95a83e1c1bccc58cc16b9511428efc5
+  metadata.gz: fcd2f5ff1b501cffd445d937f4a96e158250e8e76e48969d54760511dc339dc90e0d7d1d3f4f2ed5a14ffc0eafe037a8833122a0f649c071a8188e1819901bb4
+  data.tar.gz: e1df9014ea4b8a20db709e44284ce320a92808085aee70004a4bac19609fad866f271426e2e86c7ec46919f21795f55c91411b1404f73cfd0349544ef71ee408

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.3.0](https://github.com/craigulliott/dsl_compose/compare/v2.2.2...v2.3.0) (2023-07-28)
+
+
+### Features
+
+* added a method_called? helper method to the DSL parser ([48e68a8](https://github.com/craigulliott/dsl_compose/commit/48e68a8d799e297d3433f3d2a6bccb7a077dd9af))
+
+## [2.2.2](https://github.com/craigulliott/dsl_compose/compare/v2.2.1...v2.2.2) (2023-07-27)
+
+
+### Bug Fixes
+
+* argument type :float was not accepting values and did not have validations ([243eff1](https://github.com/craigulliott/dsl_compose/commit/243eff1d0d0cc48602cc626e8a91cdc45b4f9955))
+
 ## [2.2.1](https://github.com/craigulliott/dsl_compose/compare/v2.2.0...v2.2.1) (2023-07-27)
 
 

data/README.md

@@ -286,6 +286,12 @@ class MyParser < DSLCompose::Parser
         other than making calls to `for_method`
       DESCRIPTION
 
+      # Within a `for_dsl` block you can determine if a specific DSL method was used
+      # with the `method_called?` method. This method will return true if the method was
+      # used, otherwise it will return false. If a method with the provided name does not
+      # exist for the DSL, then an error will be raised.
+      was_some_method_name_used = method_called? :some_method_name
+
       # `for_method` accepts a method name or an array of method names and will
       # yield it's provided block once for each time a method with this name is
       # executed within the DSL.

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

@@ -362,6 +362,12 @@ module DSLCompose
             (length_validation.nil? || length_validation.validate!(value))
         end
 
+        # returns true if every provided float validation also returns true
+        def validate_float! value
+          # floats are validated with the same set of validators as integers
+          validate_integer! value
+        end
+
         # returns true if every provided symbol validation also returns true
         def validate_symbol! value
           (format_validation.nil? || format_validation.validate!(value)) &&

data/lib/dsl_compose/dsl/interpreter.rb

@@ -51,7 +51,7 @@ module DSLCompose
       # adds a new optional argument to the DSLMethod
       #
       # name must be a symbol
-      # `type` can be either :integer, :boolean, :float, :string or :symbol
+      # `type` can be either :integer, :boolean, :float, :string, :symbol, :class or :object
       # `block` contains the argument definition and will be evaluated seperately
       # by the Argument::Interpreter
       def optional name, type, array: false, &block
@@ -61,7 +61,7 @@ module DSLCompose
       # adds a new required argument to the DSLMethod
       #
       # name must be a symbol
-      # `type` can be either :integer, :boolean, :float, :string or :symbol
+      # `type` can be either :integer, :boolean, :float, :string, :symbol, :class or :object
       # `block` contains the argument definition and will be evaluated seperately
       # by the Argument::Interpreter
       def requires name, type, array: false, &block

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

@@ -91,6 +91,13 @@ module DSLCompose
                   end
                   optional_argument.validate_integer! value
 
+                when :float
+                  # float allows either floats or integers
+                  unless value.is_a?(Float) || value.is_a?(Integer)
+                    raise InvalidArgumentTypeError, "`#{value}` is not an Float or Integer"
+                  end
+                  optional_argument.validate_float! value
+
                 when :symbol
                   unless value.is_a? Symbol
                     raise InvalidArgumentTypeError, "`#{value}` is not a Symbol"
@@ -175,6 +182,13 @@ module DSLCompose
                 end
                 required_argument.validate_integer! value
 
+              when :float
+                # float allows either floats or integers
+                unless value.is_a?(Float) || value.is_a?(Integer)
+                  raise InvalidArgumentTypeError, "`#{value}` is not an Float or Integer"
+                end
+                required_argument.validate_float! value
+
               when :symbol
                 unless value.is_a? Symbol
                   raise InvalidArgumentTypeError, "`#{value}` is not a Symbol"

data/lib/dsl_compose/parser/for_children_of_parser/for_dsl_parser.rb

@@ -109,6 +109,16 @@ module DSLCompose
           ForMethodParser.new(@base_class, @child_class, @dsl_execution, method_names, &block)
         end
 
+        # Given a method name, will return true if the method was called within the current DSL
+        # execution, otherwise it will return false
+        def method_called? method_name
+          # get the dsl method from the current dsl execution, this
+          # will raise an error if the method does not exist
+          dsl_method = @dsl_execution.dsl.dsl_method(method_name)
+          # was this method called within the current DSL execution?
+          @dsl_execution.method_calls.method_called? dsl_method.name
+        end
+
         # takes a description of what this parser does and stores it against the DSL definition
         # of the current @child_class, this is used to generate documentation for what the parser
         # has done with the DSL

data/lib/dsl_compose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_compose
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Craig Ulliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_spec_helper