dsl_compose 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409bc8ce86ea967b4a22f675ea029b609a9bb925d8b35255dd4f0a010049f115
-  data.tar.gz: e8d99aa8be417b6c670978dc5cf4461be8ca65dc4316b27ee840b63d82128738
+  metadata.gz: 1b5f53afb63b68aac27995b0fee8dceb7c0f5649a171f187bf95c85ebe29215e
+  data.tar.gz: 9ee378a6a342684339a0ff2472ed0aa37fb4d3a5e3e3f71f9eb9b87d5f013b37
 SHA512:
-  metadata.gz: a57708bdfb09d3d35cfa3b3e6a76ffa931bcf71c34c14ece5b8737079f6660fefc9596ab5d079cfbf7fed3f733896212b60f81f23a02504dccbcd89a110e01c1
-  data.tar.gz: d87d67e5e6a1f22d49d0b8bb0642f97755f004684d8c0fa7ca1850ba3ce64e46dc016f3ab5fb21edd068e221734d2bae52c09e92f59135f94b0fabd7ac7d3356
+  metadata.gz: 6f9494f1e9054d83bff8601aa6bf2c7e6fc887af2a7c3f762649d32d71116fa0c9856f1d94811df32246f7cf345eafdb06987946da9524832d2a8c9e366f4284
+  data.tar.gz: 42f04fe0ee1e3341716a446fd3747ba7bce072d921dcb2cf62ebe3a8d4e7112336ec3b5d42cd87c56076cbbaf36f29ccfe3925f1e1f13776d4d5a38f244f1b9f

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
+
+
+### Bug Fixes
+
+* last_execution was raising error instead of returning nil  when no executions were found ([bedef1e](https://github.com/craigulliott/dsl_compose/commit/bedef1ec606801a4507ce77c39a33d14cb79818f))
+
 ## [2.2.0](https://github.com/craigulliott/dsl_compose/compare/v2.1.1...v2.2.0) (2023-07-27)
 
 

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/reader.rb

@@ -66,22 +66,23 @@ module DSLCompose
     # Returns an ExecutionReader class which exposes a simple API to access the
     # arguments, methods and method arguments provided when using this DSL.
     #
-    # If the dsl has been executed once or more on the provided class, then
-    # the last (most recent) execution will be returned. If the DSL was not
+    # If the dsl has been executed once or more on the provided class, then a reader
+    # for the last (most recent) execution will be returned. If the DSL was not
     # executed on the provided class, then we traverse up the classes ancestors
     # and look for the last time it was executed on each ancestor.
     # If no execution of the DSL is found, then nil will be returned
     def last_execution
-      ExecutionReader.new(@dsl_defining_class.dsls.get_last_dsl_execution(@klass, @dsl_name))
+      execution = @dsl_defining_class.dsls.get_last_dsl_execution(@klass, @dsl_name)
+      if execution.nil?
+        nil
+      else
+        ExecutionReader.new execution
+      end
     end
 
     # A wrapper for last_execution which raises an error if no execution exists
     def last_execution!
-      execution = @dsl_defining_class.dsls.get_last_dsl_execution(@klass, @dsl_name)
-      if execution.nil?
-        raise NoDSLExecutionFound, "No execution of the `#{@dsl_name}` dsl was found on `#{@klass}` or any of its ancestors"
-      end
-      ExecutionReader.new execution
+      last_execution || (raise NoDSLExecutionFound, "No execution of the `#{@dsl_name}` dsl was found on `#{@klass}` or any of its ancestors")
     end
 
     # Returns an array of ExecutionReaders to represent each time the DSL was used

data/lib/dsl_compose/version.rb

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

metadata

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