dsl_compose 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6d832ff6a9dbe899f76297a60555caf170045743dd6cf83cbabb6b26e87892
-  data.tar.gz: a9628422e02b4cac58263ad72938c0297f42c75d81dd3337e43d227ec71ba664
+  metadata.gz: ae01b58f13f59318a89b06b444bd0dc0a17487e66d03a7701cb605673774f75a
+  data.tar.gz: 2feeab8f8494a6dea3ee59c52903a21c84cde2da623f406aea9530581146d124
 SHA512:
-  metadata.gz: 82ee9d6210446826e52dec60de79f414d9769e4e571e2d95ccf41c66da3231728ad6ffecb9f55beedeceecbf651c286fc0499b076301d3c7f858fa84bd0d5106
-  data.tar.gz: d30c48922a712e86138867c4b4de9daee988bf99b3af052a407a8b8bc739f292c974a143ea6b93c0de35b84a981d763c08e3da799114a17ca68f1ff4e6b086f4
+  metadata.gz: 6d1b476aef66fcaf034b3e7775a91233b69f30dc46c1dfc6d2891596ed859d0a9219e69c7bfec5ede49179d56a0fa2e59f31398b5b95504eb8ebd72c6f9a4d01
+  data.tar.gz: 565b63fb9b5e24f6d778e74f477b7aea4cd6619bfb39aa5ae62a9651daffd5b54e06ceaa8cef3378c111b508babe89d55d02af768c0692f24e4be9c68ad23845

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.15.1](https://github.com/craigulliott/dsl_compose/compare/v2.15.0...v2.15.1) (2023-10-03)
+
+
+### Bug Fixes
+
+* sorting classes by ancestry chain (i.e. ancestors before descendants) in the parser ([4e7dd6f](https://github.com/craigulliott/dsl_compose/commit/4e7dd6fd302c50ee3147f76f59a52089fb6f39ee))
+
 ## [2.15.0](https://github.com/craigulliott/dsl_compose/compare/v2.14.3...v2.15.0) (2023-10-03)
 
 

data/README.md

@@ -371,7 +371,7 @@ In addition to parser classes (or as a useful tool within parser classes) you ca
 # simple API to access the arguments, methods and method arguments which
 # were provided when using a DSL.
 #
-# In the example below, MyClass is a class, or descendent of a class which
+# In the example below, MyClass is a class, or descendant of a class which
 # had a DSL defined on it with the name :my_dsl.
 #
 # An error will be raised if a DSL with the provided name was never defined

data/lib/dsl_compose/interpreter.rb

@@ -82,7 +82,7 @@ module DSLCompose
     def get_last_dsl_execution klass, dsl_name
       # note that this method does not need to do any special sorting, the required
       # order for getting the most recent execution is already guaranteed because
-      # parent classes in ruby always have to be evaluated before their descendents
+      # parent classes in ruby always have to be evaluated before their descendants
       class_dsl_executions(klass, dsl_name, true, true).last
     end
 

data/lib/dsl_compose/parser/for_children_of_parser/{descendents.rb → descendants.rb}

@@ -3,7 +3,7 @@
 module DSLCompose
   class Parser
     class ForChildrenOfParser
-      class Descendents
+      class Descendants
         def initialize base_class, final_children_only, skip_classes = []
           @base_class = base_class
           @final_children_only = final_children_only
@@ -14,10 +14,21 @@ module DSLCompose
           # all objects which extend the provided base class
           extending_classes = subclasses @base_class
 
-          # sort the results, classes are ordered first by the depth of their namespace, and second
-          # by the presence of decendents and finally by their name
+          # sort the results
+          #
+          # classes are ordered first by name
           extending_classes.sort_by! do |child_class|
-            "#{child_class.name.split("::").count}_#{has_descendents(child_class) ? 0 : 1}_#{child_class.name}"
+            "#{child_class.name.split("::").count}_#{has_descendants(child_class) ? 0 : 1}_#{child_class.name}"
+          end
+          # then by ansestory chain (i.e. ancestors before descendants)
+          extending_classes.sort do |a, b|
+            if a < b
+              1
+            elsif a > b
+              -1
+            else
+              0
+            end
           end
 
           # reject any classes which we are skipping
@@ -27,9 +38,9 @@ module DSLCompose
 
           # if this is not a final child, but we are processing final children only, then skip it
           if @final_children_only
-            # reject any classes which have descendents
+            # reject any classes which have descendants
             extending_classes.reject! do |child_class|
-              has_descendents child_class
+              has_descendants child_class
             end
           end
 
@@ -45,7 +56,7 @@ module DSLCompose
           }.flatten
         end
 
-        def has_descendents base_class
+        def has_descendants base_class
           base_class.subclasses.count { |subclass| class_is_still_defined? subclass } > 0
         end
 

data/lib/dsl_compose/parser/for_children_of_parser.rb

@@ -56,8 +56,8 @@ module DSLCompose
           end
         end
 
-        # yeild the block for all descendents of the provided base_class
-        Descendents.new(base_class, final_children_only, skip_classes).classes.each do |child_class|
+        # yeild the block for all descendants of the provided base_class
+        Descendants.new(base_class, final_children_only, skip_classes).classes.each do |child_class|
           # determine which arguments to send to the block
           args = {}
           if BlockArguments.accepts_argument?(:child_class, &block)

data/lib/dsl_compose/version.rb

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

data/lib/dsl_compose.rb

@@ -42,7 +42,7 @@ require "dsl_compose/interpreter"
 
 require "dsl_compose/parser/for_children_of_parser/for_dsl_parser/for_method_parser"
 require "dsl_compose/parser/for_children_of_parser/for_dsl_parser"
-require "dsl_compose/parser/for_children_of_parser/descendents"
+require "dsl_compose/parser/for_children_of_parser/descendants"
 require "dsl_compose/parser/for_children_of_parser"
 require "dsl_compose/parser/block_arguments"
 require "dsl_compose/parser"

data/sig/dsl_compose/parser/for_children_of_parser/{descendents.rbs → descendants.rbs}

@@ -2,7 +2,7 @@
 module DSLCompose
   class Parser
     class ForChildrenOfParser
-      class Descendents
+      class Descendants
         @base_class: singleton(Object)
         @skip_classes: Array[String]
         @final_children_only: bool
@@ -11,7 +11,7 @@ module DSLCompose
         def classes: -> Array[singleton(Object)]
 
         private
-        def has_descendents: (singleton(Object) base_class) -> bool
+        def has_descendants: (singleton(Object) base_class) -> bool
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dsl_compose
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Craig Ulliott
@@ -70,7 +70,7 @@ files:
 - lib/dsl_compose/parser.rb
 - lib/dsl_compose/parser/block_arguments.rb
 - lib/dsl_compose/parser/for_children_of_parser.rb
-- lib/dsl_compose/parser/for_children_of_parser/descendents.rb
+- lib/dsl_compose/parser/for_children_of_parser/descendants.rb
 - lib/dsl_compose/parser/for_children_of_parser/for_dsl_parser.rb
 - lib/dsl_compose/parser/for_children_of_parser/for_dsl_parser/for_method_parser.rb
 - lib/dsl_compose/reader.rb
@@ -112,7 +112,7 @@ files:
 - sig/dsl_compose/parser.rbs
 - sig/dsl_compose/parser/block_arguments.rbs
 - sig/dsl_compose/parser/for_children_of_parser.rbs
-- sig/dsl_compose/parser/for_children_of_parser/descendents.rbs
+- sig/dsl_compose/parser/for_children_of_parser/descendants.rbs
 - sig/dsl_compose/parser/for_children_of_parser/for_dsl_parser.rbs
 - sig/dsl_compose/parser/for_children_of_parser/for_dsl_parser/for_method_parser.rbs
 - sig/dsl_compose/reader.rbs