cuke_modeler 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bac7201e203c0357c8137182d821bd7537968c2db97572dcc27e118ec3ccf489
-  data.tar.gz: c08252bb8906a1648bb3f846bd1a17481316003bacc0526cbcfb2b321c9675c9
+  metadata.gz: d7821b738cb9b7436e38de701654c9ca04d087ba2e482f01af0600f86383b47d
+  data.tar.gz: 8b71afb721c52cc198243a468807547d45254dab84dd5bafcbec49e9bb4befb0
 SHA512:
-  metadata.gz: 12647de1b642dbffff2c4a4567977c603dbbd138ce0ba465f0003ccf7455860e4fbf7abe82988da5878db2de6fbb8e4ac69541bca98005ecb9381fd40cc2d80e
-  data.tar.gz: 6362c9a41314a6b66ac73ab8d11111e08947e0e3d6e4d7d4f43a593270947400242aa29ec82bf514ea93b4f4497f769bbb856117e8e74c1a9271eeb90837639b
+  metadata.gz: f114b4de2f4f2ef4ffd95078c7b8f72db2318174a75c4d4ed86a900ed21585e91e918afe97770afc1857b3cc80c904e471717f59a90c814bd7664575879e07e8
+  data.tar.gz: e870f0c73a8f296f6c8b108956d787586e9f47b3a2bff78db9a10db58c8df2ffc39fed04a1ace3629911c03f36ac6aee6c3e74475c60c58d7d0416f141d07037

data/CHANGELOG.md

@@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Nothing yet...
 
 
+## [3.10.0] - 2021-05-28
+
+### Added
+ - Support added for more versions of the `cucumber-gherkin` gem
+   - 19.x
+
+### Fixed
+ - `Rule` models now clear out parsing data for their tags. This data was an unintentional duplication of the 
+   parsing data that the `Tag` models already contained. 
+
+
 ## [3.9.0] - 2021-04-23
 
 ### Added
@@ -376,7 +387,8 @@ Nothing yet...
  - Initial release
 
 
-[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.9.0...HEAD
+[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.10.0...HEAD
+[3.10.0]: https://github.com/enkessler/cuke_modeler/compare/v3.9.0...v3.10.0
 [3.9.0]: https://github.com/enkessler/cuke_modeler/compare/v3.8.0...v3.9.0
 [3.8.0]: https://github.com/enkessler/cuke_modeler/compare/v3.7.0...v3.8.0
 [3.7.0]: https://github.com/enkessler/cuke_modeler/compare/v3.6.0...v3.7.0

data/cuke_modeler.gemspec

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

data/lib/cuke_modeler/adapters/gherkin_18_adapter.rb

@@ -12,6 +12,8 @@ module CukeModeler
     def adapt_rule(rule_ast)
       adapted_rule = super(rule_ast)
 
+      clear_child_elements(adapted_rule, [[:rule, :tags]])
+
       # Tagging of Rules was added in Gherkin 18
       adapted_rule['tags'] = adapt_tags(rule_ast[:rule])
 

data/lib/cuke_modeler/adapters/gherkin_19_adapter.rb

@@ -0,0 +1,61 @@
+require_relative 'gherkin_18_adapter'
+
+
+module CukeModeler
+
+  # NOT A PART OF THE PUBLIC API
+  # An adapter that can convert the output of version 19.x of the *cucumber-gherkin* gem into input that is consumable
+  # by this gem.
+  class Gherkin19Adapter < Gherkin18Adapter
+
+    # Adapts the AST sub-tree that is rooted at the given step node.
+    def adapt_step(step_ast)
+      adapted_step = super(step_ast)
+
+      clear_child_elements(adapted_step, [[:dataTable],
+                                          [:docString]])
+
+      if step_ast[:docString]
+        adapted_step['doc_string'] = adapt_doc_string(step_ast[:docString])
+      elsif step_ast[:dataTable]
+        adapted_step['table'] = adapt_step_table(step_ast[:dataTable])
+      end
+
+      adapted_step
+    end
+
+    # 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['content_type'] = doc_string_ast[:mediaType]
+
+      adapted_doc_string
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given example node.
+    def adapt_example(example_ast)
+      adapted_example = super(example_ast)
+
+      clear_child_elements(adapted_example, [[:tableHeader],
+                                             [:tableBody]])
+
+      adapted_example['rows'] << adapt_table_row(example_ast[:tableHeader]) if example_ast[:tableHeader]
+
+      example_ast[:tableBody].each do |row|
+        adapted_example['rows'] << adapt_table_row(row)
+      end
+
+      adapted_example
+    end
+
+
+    private
+
+
+    def test_has_examples?(ast_node)
+      ast_node[:scenario][:examples].any?
+    end
+
+  end
+end

data/lib/cuke_modeler/adapters/gherkin_9_adapter.rb

@@ -328,6 +328,7 @@ module CukeModeler
 
     def clear_child_elements(ast, child_paths)
       child_paths.each do |traversal_path|
+        # Wipe the value if it's there but don't add any keys to the hash if it didn't already have them
         if ast['cuke_modeler_parsing_data'].dig(*traversal_path)
           bury(ast['cuke_modeler_parsing_data'], traversal_path, nil)
         end
@@ -346,11 +347,11 @@ module CukeModeler
     end
 
     def test_node?(ast_node)
-      ast_node[:scenario]
+      !ast_node[:scenario].nil?
     end
 
     def test_has_examples?(ast_node)
-      ast_node[:scenario][:examples]
+      !ast_node[:scenario][:examples].nil?
     end
 
     def test_uses_outline_keyword?(test_ast)

data/lib/cuke_modeler/parsing.rb

@@ -7,7 +7,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, 10, 11, 12, 13, 14, 15, 16, 17, 18]
+supported_gherkin_versions = (9..19)
 
 raise("Unknown Gherkin version: '#{gherkin_version}'") unless supported_gherkin_versions.include?(gherkin_major_version)
 
@@ -61,6 +61,23 @@ 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 19
+          # TODO: make these methods private?
+          # NOT A PART OF THE PUBLIC API
+          # The method to use for parsing Gherkin text
+          def parsing_method(source_text, filename)
+            messages = Gherkin.from_source(filename,
+                                           source_text,
+                                           { include_gherkin_document: true })
+                              .to_a.map(&:to_hash)
+
+            error_message = messages.find { |message| message[:parseError] }
+            gherkin_ast_message = messages.find { |message| message[:gherkinDocument] }
+
+            raise error_message[:parseError][:message] if error_message
+
+            gherkin_ast_message[:gherkinDocument]
+          end
         when 13, 14, 15, 16, 17, 18
           # TODO: make these methods private?
           # NOT A PART OF THE PUBLIC API

data/lib/cuke_modeler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuke_modeler
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Eric Kessler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-gherkin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '19.0'
+        version: '20.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '19.0'
+        version: '20.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +225,7 @@ files:
 - lib/cuke_modeler/adapters/gherkin_16_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_17_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_18_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_19_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_9_adapter.rb
 - lib/cuke_modeler/containing.rb
 - lib/cuke_modeler/described.rb