dsl_compose 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535a5086604fa5366f7a9baf2cc1a1ef823d4f29f16d8fc273b78a680180c3e2
-  data.tar.gz: 12f9bfc80a59ad1cbf61ad03795fd6e29535618c41143dbb7d8afb1228c7f3ae
+  metadata.gz: 826d148f5440924eeea1a56699ec7f6a421dcf5fe273012e7e9cf9010ab4cb66
+  data.tar.gz: 0fa06d0fcf99bea843da3b3b5cb66f196be88a923287ba4df64459e6289f7054
 SHA512:
-  metadata.gz: 768fbc012d89a3542f0c96934bfc9187098c790a4a7d975dff80ae63ba1e50c0eb19e8f8abddacf234410839fd1a5688eb76c30a51ed939485d219c67263c5f7
-  data.tar.gz: 3553a51fc949265b84866761ce8ee5ed2ae4de67d2db17da36b4d646a21a5feb34b91f0085a3fcdfa54c5707457aa3cc0adc9c63d3da5820e042e372d5224603
+  metadata.gz: c4bcce09e0c5b3028c97ac09dbd16a6481ed8514857e7bcaecbbe7b40aebec22b8d7b4220f299380363dd9b87de9c0585fa456d8c70c031e967d3e6048711b60
+  data.tar.gz: 20eb3288cafb32aafddc8efe78e2e8fba5cf088c1896b5a9e82eb42e21c63c84d6e2536888d5e938f9f4b9bc80d064bfb5e95ca2fdb410316707f0362e0bf6cf

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.1.1](https://github.com/craigulliott/dsl_compose/compare/v2.1.0...v2.1.1) (2023-07-26)
+
+
+### Bug Fixes
+
+* fixed bug where Execution classes were being returned from within the Reader but ExecutionReader classes were expected ([#56](https://github.com/craigulliott/dsl_compose/issues/56)) ([546cdaf](https://github.com/craigulliott/dsl_compose/commit/546cdaf323f3fc3be6ad09a47e5f99c3a59a50e2))
+
 ## [2.1.0](https://github.com/craigulliott/dsl_compose/compare/v2.0.1...v2.1.0) (2023-07-24)
 
 

data/README.md

@@ -168,7 +168,7 @@ You can use `import_shared` anywhere within your DSL definition, you can even us
 Child classes can then use your new DSL
 
 ```ruby
-class Bar << Foo
+class Bar < Foo
 
   your_dsl :first_dsl_argument, do
     your_method "first_method_argument", optional_argument: 123
@@ -239,7 +239,7 @@ A parser class can be used to process complicated DSLs. In the example below, a
 
 ```ruby
 # create your own parser by creating a new class which extends DSLCompose::Parser
-MyParser < DSLCompose::Parser
+class MyParser < DSLCompose::Parser
   # `for_children_of` will process SomeBaseClass and yield the provided
   # block once for every class which extends SomeBaseClass.
   #
@@ -312,7 +312,7 @@ MyParser < DSLCompose::Parser
 end
 ```
 
-In addition to parser classes (or as a useful tool within parser classes) you can access the results of DSL execution via the class (or via a descendent of the class) where the DSL was originally defined.
+In addition to parser classes (or as a useful tool within parser classes) you can access the results of DSL execution with a Reader class.
 
 ```ruby
 # Create a new Reader object.

data/lib/dsl_compose/reader/execution_reader.rb

@@ -15,6 +15,8 @@ module DSLCompose
       class MethodDoesNotExist < StandardError
       end
 
+      attr_reader :execution
+
       def initialize execution
         raise InvalidExecution unless execution.is_a? Interpreter::Execution
         @execution = execution

data/lib/dsl_compose/reader.rb

@@ -51,13 +51,15 @@ module DSLCompose
     # 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
-      @dsl_defining_class.dsls.get_last_dsl_execution @klass, @dsl_name
+      ExecutionReader.new(@dsl_defining_class.dsls.get_last_dsl_execution(@klass, @dsl_name))
     end
 
     # Returns an array of ExecutionReaders to represent each time the DSL was used
     # on the provided class.
     def executions
-      @dsl_defining_class.dsls.class_dsl_executions @klass, @dsl_name, true, false
+      @dsl_defining_class.dsls.class_dsl_executions(@klass, @dsl_name, true, false).map do |execution|
+        ExecutionReader.new execution
+      end
     end
 
     # Returns an array of ExecutionReaders to represent each time the DSL was used
@@ -66,7 +68,9 @@ module DSLCompose
     # earliest ancestor first and if the DSL was used more than once on a class then
     # the order they were used.
     def ancestor_executions
-      @dsl_defining_class.dsls.class_dsl_executions @klass, @dsl_name, false, true
+      @dsl_defining_class.dsls.class_dsl_executions(@klass, @dsl_name, false, true).map do |execution|
+        ExecutionReader.new execution
+      end
     end
 
     # Returns an array of ExecutionReaders to represent each time the DSL was used
@@ -74,7 +78,9 @@ module DSLCompose
     # be returned in the order they were executed, which is the earliest ancestor first
     # and if the DSL was used more than once on a class then the order they were used.
     def all_executions
-      @dsl_defining_class.dsls.class_dsl_executions @klass, @dsl_name, true, true
+      @dsl_defining_class.dsls.class_dsl_executions(@klass, @dsl_name, true, true).map do |execution|
+        ExecutionReader.new execution
+      end
     end
   end
 end

data/lib/dsl_compose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_compose
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Craig Ulliott
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_spec_helper
@@ -79,13 +79,13 @@ files:
 - lib/dsl_compose/reader/execution_reader/arguments_reader.rb
 - lib/dsl_compose/shared_configuration.rb
 - lib/dsl_compose/version.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/craigulliott/dsl_compose/
   changelog_uri: https://github.com/craigulliott/dsl_compose/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.26
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby gem to add dynamic DSLs to classes
 test_files: []