cuke_modeler 3.21.0 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c4bf65cd4d0e8f4e2a4c783a4f1147a65f009661058c93c396f7cd6e4f4a11
-  data.tar.gz: 2856196601bbc71ca23a3a8d355c0b3f2f143ebfe6c0a914362edbe1217c939a
+  metadata.gz: bf4f1d5138416caa14ba5bf9f9e646c9fad013008ea24796dc08fc40aacac026
+  data.tar.gz: 4db652f4b23cd03e227fe5f97149075d9ac609bed930e512b0a6f13b04cabb5f
 SHA512:
-  metadata.gz: 3593c025a6b88c7c7c2b629741cc5f612075f64bcd587c3378a4ba1e48655fb341830f1e2dca46ca3c265a3e16b9d4c73d0f637c29d0f776fbaf9e0c46cfc5ac
-  data.tar.gz: 6b370fe5e4598a0ec9836a43ea664d3bd20560402e6a937f251e03d6c61548f542db202798e8db77c009b3fa1c8ab734c8a6ed839eb652a60a988f334c0ac92f
+  metadata.gz: daba53277c9bd55e344d4c11ef75af4543399040559042fd7ce5c0af25743e8cc56b0796239886425d3be7a61d2b3d2d99b86ad59c00fc39b10ef2a33383829c
+  data.tar.gz: 9b28d7021eb73a6b3a788cfa456e42d2a75b9c0bf84f3083fe84de2ef64cf784eb6de55b0c90d481a634edfd0a1b58690f2ce9835dfbc551084e88d4845abcca

data/CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Nothing yet...
 
 
+## [3.22.0] - 2024-10-01
+
+### Added
+- Support added for more versions of the `cucumber-gherkin` gem
+    - 29.x
+
+
 ## [3.21.0] - 2024-03-11
 
 ### Added
@@ -472,7 +479,8 @@ Nothing yet...
  - Initial release
 
 
-[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.21.0...HEAD
+[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.22.0...HEAD
+[3.22.0]: https://github.com/enkessler/cuke_modeler/compare/v3.21.1...v3.22.0
 [3.21.0]: https://github.com/enkessler/cuke_modeler/compare/v3.20.1...v3.21.0
 [3.20.1]: https://github.com/enkessler/cuke_modeler/compare/v3.20.0...v3.20.1
 [3.20.0]: https://github.com/enkessler/cuke_modeler/compare/v3.19.0...v3.20.0

data/cuke_modeler.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3', '< 4.0'
 
-  spec.add_runtime_dependency 'cucumber-gherkin', '< 29.0'
+  spec.add_runtime_dependency 'cucumber-gherkin', '< 30.0'
 
   spec.add_development_dependency 'bundler', '< 3.0'
   spec.add_development_dependency 'childprocess', '< 5.0'

data/lib/cuke_modeler/adapters/gherkin_18_adapter.rb

@@ -11,7 +11,7 @@ module CukeModeler
 
     # Adapts the AST sub-tree that is rooted at the given rule node.
     def adapt_rule(rule_ast)
-      adapted_rule = super(rule_ast)
+      adapted_rule = super
 
       clear_child_elements(adapted_rule, [[:rule, :tags]])
 

data/lib/cuke_modeler/adapters/gherkin_19_adapter.rb

@@ -11,7 +11,7 @@ module CukeModeler
 
     # Adapts the AST sub-tree that is rooted at the given step node.
     def adapt_step(step_ast)
-      adapted_step = super(step_ast)
+      adapted_step = super
 
       clear_child_elements(adapted_step, [[:dataTable],
                                           [:docString]])
@@ -27,7 +27,7 @@ module CukeModeler
 
     # Adapts the AST sub-tree that is rooted at the given doc string node.
     def adapt_doc_string(doc_string_ast)
-      adapted_doc_string = super(doc_string_ast)
+      adapted_doc_string = super
 
       adapted_doc_string['content_type'] = doc_string_ast[:mediaType]
 
@@ -36,7 +36,7 @@ module CukeModeler
 
     # Adapts the AST sub-tree that is rooted at the given example node.
     def adapt_example(example_ast)
-      adapted_example = super(example_ast)
+      adapted_example = super
 
       clear_child_elements(adapted_example, [[:tableHeader],
                                              [:tableBody]])

data/lib/cuke_modeler/adapters/gherkin_20_adapter.rb

@@ -303,19 +303,15 @@ module CukeModeler
     end
 
     def adapt_child_elements(element_ast)
-      adapted_children = []
-
-      element_ast.children.each do |child_element|
-        adapted_children << if child_element.background
-                              adapt_background(child_element)
-                            elsif child_element.respond_to?(:rule) && child_element.rule
-                              adapt_rule(child_element)
-                            else
-                              adapt_test(child_element)
-                            end
+      element_ast.children.map do |child_element|
+        if child_element.background
+          adapt_background(child_element)
+        elsif child_element.respond_to?(:rule) && child_element.rule
+          adapt_rule(child_element)
+        else
+          adapt_test(child_element)
+        end
       end
-
-      adapted_children
     end
 
     def adapt_test(test_ast)

data/lib/cuke_modeler/adapters/gherkin_29_adapter.rb

@@ -0,0 +1,13 @@
+require_relative 'gherkin_20_adapter'
+
+
+module CukeModeler
+
+  # @api private
+  #
+  # An adapter that can convert the output of version 29.x of the *cucumber-gherkin* gem into input that is consumable
+  # by this gem. Internal helper class.
+  class Gherkin29Adapter < Gherkin20Adapter; end
+
+  private_constant :Gherkin29Adapter
+end

data/lib/cuke_modeler/adapters/gherkin_9_adapter.rb

@@ -312,19 +312,15 @@ module CukeModeler
     def adapt_child_elements(element_ast)
       return [] unless element_ast[:children]
 
-      adapted_children = []
-
-      element_ast[:children].each do |child_element|
-        adapted_children << if child_element[:background]
-                              adapt_background(child_element)
-                            elsif child_element[:rule]
-                              adapt_rule(child_element)
-                            else
-                              adapt_test(child_element)
-                            end
+      element_ast[:children].map do |child_element|
+        if child_element[:background]
+          adapt_background(child_element)
+        elsif child_element[:rule]
+          adapt_rule(child_element)
+        else
+          adapt_test(child_element)
+        end
       end
-
-      adapted_children
     end
 
     def adapt_test(test_ast)

data/lib/cuke_modeler/models/background.rb

@@ -28,7 +28,7 @@ module CukeModeler
     def initialize(source_text = nil)
       @steps = []
 
-      super(source_text)
+      super
     end
 
     # TODO: Have (all) models be equivalent if they have the same #to_s output. Would
@@ -91,7 +91,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @name: #{name.inspect}>"
     end

data/lib/cuke_modeler/models/cell.rb

@@ -23,7 +23,7 @@ module CukeModeler
     # @raise [ArgumentError] If *source_text* is not a String
     # @return [Cell] A new Cell instance
     def initialize(source_text = nil)
-      super(source_text)
+      super
     end
 
     # Returns a string representation of this model. For a Cell model,
@@ -52,7 +52,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @value: #{value.inspect}>"
     end

data/lib/cuke_modeler/models/comment.rb

@@ -23,7 +23,7 @@ module CukeModeler
     # @raise [ArgumentError] If *source_text* is not a String
     # @return [Comment] A new Comment instance
     def initialize(source_text = nil)
-      super(source_text)
+      super
     end
 
     # Returns a string representation of this model. For a Comment model,
@@ -50,7 +50,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @text: #{text.inspect}>"
     end

data/lib/cuke_modeler/models/directory.rb

@@ -30,7 +30,7 @@ module CukeModeler
       @feature_files = []
       @directories = []
 
-      super(directory_path)
+      super
     end
 
     # Returns the name of the modeled directory.
@@ -81,7 +81,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @path: #{@path.inspect}>"
     end

data/lib/cuke_modeler/models/doc_string.rb

@@ -26,7 +26,7 @@ module CukeModeler
     # @raise [ArgumentError] If *source_text* is not a String
     # @return [DocString] A new DocString instance
     def initialize(source_text = nil)
-      super(source_text)
+      super
     end
 
     # Returns a string representation of this model. For a DocString model,
@@ -56,7 +56,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @content: #{content.inspect}>"
     end

data/lib/cuke_modeler/models/example.rb

@@ -35,7 +35,7 @@ module CukeModeler
       @tags = []
       @rows = []
 
-      super(source_text)
+      super
     end
 
     # TODO: Deprecate using symbol keys in a Hash
@@ -183,7 +183,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @name: #{name.inspect}>"
     end

data/lib/cuke_modeler/models/feature.rb

@@ -41,7 +41,7 @@ module CukeModeler
       @rules = []
       @tests = []
 
-      super(source_text)
+      super
     end
 
     # Returns *true* if the feature contains a background, *false* otherwise.
@@ -150,7 +150,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @name: #{name.inspect}>"
     end

data/lib/cuke_modeler/models/feature_file.rb

@@ -31,7 +31,7 @@ module CukeModeler
       @path = file_path
       @comments = []
 
-      super(file_path)
+      super
     end
 
     # Returns the name of the modeled feature file.
@@ -81,7 +81,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @path: #{@path.inspect}>"
     end

data/lib/cuke_modeler/models/outline.rb

@@ -34,7 +34,7 @@ module CukeModeler
       @tags = []
       @examples = []
 
-      super(source_text)
+      super
     end
 
     # Compares this model with another object. Returns *true* if the two objects
@@ -102,7 +102,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @name: #{name.inspect}>"
     end

data/lib/cuke_modeler/models/row.rb

@@ -24,7 +24,7 @@ module CukeModeler
     def initialize(source_text = nil)
       @cells = []
 
-      super(source_text)
+      super
     end
 
     # Returns the model objects that are children of this model. For a
@@ -65,7 +65,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       cell_output = @cells&.collect(&:value)
 

data/lib/cuke_modeler/models/rule.rb

@@ -35,7 +35,7 @@ module CukeModeler
       @tags = []
       @tests = []
 
-      super(source_text)
+      super
     end
 
     # Returns *true* if the rule contains a background, *false* otherwise.
@@ -118,7 +118,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @name: #{@name.inspect}>"
     end

data/lib/cuke_modeler/models/scenario.rb

@@ -30,7 +30,7 @@ module CukeModeler
       @steps = []
       @tags = []
 
-      super(source_text)
+      super
     end
 
     # Compares this model with another object. Returns *true* if the two objects
@@ -96,7 +96,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @name: #{name.inspect}>"
     end

data/lib/cuke_modeler/models/step.rb

@@ -29,7 +29,7 @@ module CukeModeler
     # @raise [ArgumentError] If *source_text* is not a String
     # @return [Step] A new Step instance
     def initialize(source_text = nil)
-      super(source_text)
+      super
     end
 
     # Compares this model with another object. Returns *true* if the two objects
@@ -87,7 +87,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @text: #{@text.inspect}>"
     end

data/lib/cuke_modeler/models/table.rb

@@ -25,7 +25,7 @@ module CukeModeler
     def initialize(source_text = nil)
       @rows = []
 
-      super(source_text)
+      super
     end
 
     # Returns the model objects that are children of this model. For a
@@ -64,7 +64,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       row_output = @rows&.collect { |row| row.cells.collect(&:value) }
 

data/lib/cuke_modeler/models/tag.rb

@@ -20,7 +20,7 @@ module CukeModeler
     # @raise [ArgumentError] If *source_text* is not a String
     # @return [Tag] A new Tag instance
     def initialize(source_text = nil)
-      super(source_text)
+      super
     end
 
     # Returns a string representation of this model. For a Tag model,
@@ -47,7 +47,7 @@ module CukeModeler
     #   the object. Defaults to false.
     # @return [String] A string representation of this model
     def inspect(verbose: false)
-      return super(verbose: verbose) if verbose
+      return super if verbose
 
       "#{super.chop} @name: #{@name.inspect}>"
     end

data/lib/cuke_modeler/parsing.rb

@@ -9,7 +9,7 @@ require 'gherkin'
 # an 'adapter' appropriate to the version of the *cucumber-gherkin* gem that has been activated.
 gherkin_version = Gem.loaded_specs['cucumber-gherkin'].version.version
 gherkin_major_version = gherkin_version.match(/^(\d+)\./)[1].to_i
-supported_gherkin_versions = (9..28)
+supported_gherkin_versions = (9..29)
 
 raise("Unknown Gherkin version: '#{gherkin_version}'") unless supported_gherkin_versions.include?(gherkin_major_version)
 
@@ -86,7 +86,7 @@ module CukeModeler
       # inside of it, so I'm leaving this here in case it changes again
       # rubocop:disable Lint/DuplicateMethods
       case gherkin_major_version
-        when 20, 21, 22, 23, 24, 25, 26, 27, 28
+        when 20, 21, 22, 23, 24, 25, 26, 27, 28, 29
           # The method to use for parsing Gherkin text
           def parsing_method(source_text, filename)
             messages = Gherkin.from_source(filename,

data/lib/cuke_modeler/version.rb

@@ -1,4 +1,4 @@
 module CukeModeler
   # The gem version
-  VERSION = '3.21.0'.freeze
+  VERSION = '3.22.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuke_modeler
 version: !ruby/object:Gem::Version
-  version: 3.21.0
+  version: 3.22.0
 platform: ruby
 authors:
 - Eric Kessler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-gherkin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '29.0'
+        version: '30.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '29.0'
+        version: '30.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,7 @@ files:
 - lib/cuke_modeler/adapters/gherkin_26_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_27_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_28_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_29_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_9_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_base_adapter.rb
 - lib/cuke_modeler/containing.rb