cuke_modeler 3.18.0 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ce5182bc247dd91ecfc20e43a317871507326558424d0637ab1035b9b7661fe
-  data.tar.gz: 04b7b4ca30fdfc6fa76e2251179d0b10eb6a7032ba6420e88c345491367f6590
+  metadata.gz: 215d7b396a27b9dec6e5ce4bad0692446e754fd88021f85b570605f33854a324
+  data.tar.gz: 748e499b4bfe721cc8953d5e733652222b7fb019fd0ac232fb85621eb05c9f1a
 SHA512:
-  metadata.gz: f7c314712bb69bd700686c04c92a58abcf7cc1f6bd1bc609caeb0bd51e6444c9932eef6e9f88ee0d827359cdc2c0d2b867182d609cf5c8eb9727436cebbe50f6
-  data.tar.gz: 3615b14eabb2e9117a37c805957425d7814a69cc1e0e72398608e2a5bd1c101f55f4bbf75cfc3432c9f4687511f36d42096b76bfd020dfd9b461d00768a21b63
+  metadata.gz: aa017464c7b23bfffc33a1e37c92c8823e0a5fd42c2505e251c36f9d092e444ff04d61457957d56a2a197f56030d5de0e73a4071226fc38e2e801ffd646bd2fd
+  data.tar.gz: 2c5a264af86979e6250d4763e5572e93a2136855f1c3c3572019d18374e7dfd7bf37669f814667c4c308e98553e2bb2287bf6aadddd9a04d98e59fe155b716e8

data/CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Nothing yet...
 
+## [3.19.0] - 2023-1-22
+
+### Added
+- Support added for more versions of the `cucumber-gherkin` gem
+    - 26.x
+
 ## [3.18.0] - 2022-11-16
 
 ### Added
@@ -436,7 +442,8 @@ Nothing yet...
  - Initial release
 
 
-[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.18.0...HEAD
+[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.19.0...HEAD
+[3.19.0]: https://github.com/enkessler/cuke_modeler/compare/v3.18.0...v3.19.0
 [3.18.0]: https://github.com/enkessler/cuke_modeler/compare/v3.17.0...v3.18.0
 [3.17.0]: https://github.com/enkessler/cuke_modeler/compare/v3.16.0...v3.17.0
 [3.16.0]: https://github.com/enkessler/cuke_modeler/compare/v3.15.0...v3.16.0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2022 Eric Kessler, et al
+Copyright (c) 2014-2023 Eric Kessler, et al
 
 MIT License
 

data/cuke_modeler.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.metadata = {
-    'bug_tracker_uri'   => 'https://github.com/enkessler/cuke_modeler/issues',
-    'changelog_uri'     => 'https://github.com/enkessler/cuke_modeler/blob/master/CHANGELOG.md',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/cuke_modeler',
-    'homepage_uri'      => 'https://github.com/enkessler/cuke_modeler',
-    'source_code_uri'   => 'https://github.com/enkessler/cuke_modeler'
+    'bug_tracker_uri'       => 'https://github.com/enkessler/cuke_modeler/issues',
+    'changelog_uri'         => 'https://github.com/enkessler/cuke_modeler/blob/master/CHANGELOG.md',
+    'documentation_uri'     => 'https://www.rubydoc.info/gems/cuke_modeler',
+    'homepage_uri'          => 'https://github.com/enkessler/cuke_modeler',
+    'source_code_uri'       => 'https://github.com/enkessler/cuke_modeler',
+    'rubygems_mfa_required' => 'true'
   }
 
   # Specify which files should be added to the gem when it is released.
@@ -36,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3', '< 4.0'
 
-  spec.add_runtime_dependency 'cucumber-gherkin', '< 26.0'
+  spec.add_runtime_dependency 'cucumber-gherkin', '< 27.0'
 
   spec.add_development_dependency 'bundler', '< 3.0'
   spec.add_development_dependency 'childprocess', '< 5.0'
@@ -46,9 +47,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rainbow', '< 4.0.0'
   spec.add_development_dependency 'rake', '< 14.0.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  # RuboCop drops Ruby 2.3 support after this version and we need to maintain Ruby 2.3 compatibility when writing code
-  # for this gem
-  spec.add_development_dependency 'rubocop', '< 0.82.0'
+  # Running recent RuboCop versions requires a recent version of Ruby but it can still lint against Ruby 2.3 styles
+  spec.add_development_dependency 'rubocop', '< 2.0'
   spec.add_development_dependency 'simplecov', '< 1.0'
   spec.add_development_dependency 'simplecov-lcov', '< 1.0'
   spec.add_development_dependency 'test-unit', '< 4.0.0'

data/lib/cuke_modeler/adapters/gherkin_20_adapter.rb

@@ -327,14 +327,23 @@ module CukeModeler
 
     def clear_child_elements(ast, child_paths)
       # rubocop:disable Security/Eval - This is not blind data
+      # rubocop:disable Style/DocumentDynamicEvalDefinition - Nice idea but bad detection ability
       child_paths.each do |traversal_path|
-        # Wipe the value if it's there but don't add any attributes to the object if it didn't already have them
-        if eval("ast['cuke_modeler_parsing_data'].#{traversal_path.join('.')}", binding, __FILE__, __LINE__)
-          property_path = traversal_path[0..-2].join('.')
-          eval("ast['cuke_modeler_parsing_data']#{property_path.empty? ? '' : '.' + property_path}.instance_variable_set(\"@#{traversal_path.last}\", nil)", binding, __FILE__, __LINE__) # rubocop:disable Layout/LineLength
-        end
+        # Don't add any properties to the object if it didn't already have them
+        # e.g. ast['cuke_modeler_parsing_data'].background.steps
+        # e.g. ast['cuke_modeler_parsing_data'].data_table
+        next unless eval("ast['cuke_modeler_parsing_data'].#{traversal_path.join('.')}", binding, __FILE__, __LINE__)
+
+
+        # Determine the path to the property and wipe it
+        property_path = traversal_path[0..-2].join('.')
+        property_path = property_path.empty? ? '' : ".#{property_path}"
+
+        # e.g. ast['cuke_modeler_parsing_data'].scenario.instance_variable_set("@steps", nil)
+        # e.g. ast['cuke_modeler_parsing_data'].instance_variable_set("@tags", nil)
+        eval("ast['cuke_modeler_parsing_data']#{property_path}.instance_variable_set(\"@#{traversal_path.last}\", nil)", binding, __FILE__, __LINE__) # rubocop:disable Layout/LineLength
       end
-      # rubocop:enable Security/Eval
+      # rubocop:enable Security/Eval, Style/DocumentDynamicEvalDefinition
     end
 
     def test_has_examples?(ast_node)

data/lib/cuke_modeler/adapters/gherkin_26_adapter.rb

@@ -0,0 +1,13 @@
+require_relative 'gherkin_20_adapter'
+
+
+module CukeModeler
+
+  # NOT A PART OF THE PUBLIC API
+  # An adapter that can convert the output of version 26.x of the *cucumber-gherkin* gem into input that is consumable
+  # by this gem.
+
+  class Gherkin26Adapter < Gherkin20Adapter
+
+  end
+end

data/lib/cuke_modeler/described.rb

@@ -52,7 +52,7 @@ module CukeModeler
     end
 
     def trim_leading_spaces(description)
-      non_blank_lines = description.select { |line| line =~ /\S/ }
+      non_blank_lines = description.grep(/\S/)
 
       fewest_spaces = non_blank_lines.collect { |line| line[/^\s*/].length }.min || 0
 

data/lib/cuke_modeler/models/cell.rb

@@ -34,8 +34,6 @@ module CukeModeler
     private
 
 
-    # It's only considered complex because of how deeply nested cells are in the tree. It's not REALLY complex.
-    # rubocop:disable Metrics/AbcSize
     def parse_source(source_text)
       base_file_string = "# language: #{Parsing.dialect}
       #{dialect_feature_keyword}: Fake feature to parse
@@ -47,7 +45,6 @@ module CukeModeler
 
       parsed_file['feature']['elements'].first['steps'].first['table']['rows'].first['cells'].first
     end
-    # rubocop:enable Metrics/AbcSize
 
   end
 

data/lib/cuke_modeler/models/directory.rb

@@ -75,12 +75,10 @@ module CukeModeler
     end
 
     def process_feature_file(file_path)
-      source_text = IO.read(file_path)
-
+      source_text = File.read(file_path)
       feature_file_data = Parsing.parse_text(source_text, file_path)
-      feature_file_data = feature_file_data.merge({ 'path' => file_path })
 
-      feature_file_data
+      feature_file_data.merge({ 'path' => file_path })
     end
 
   end

data/lib/cuke_modeler/models/doc_string.rb

@@ -55,7 +55,7 @@ module CukeModeler
     end
 
     def content_output_string
-      content.nil? || content.empty? ? '' : content.gsub('"""', '\"\"\"') + "\n"
+      content.nil? || content.empty? ? '' : "#{content.gsub('"""', '\"\"\"')}\n"
     end
 
   end

data/lib/cuke_modeler/models/example.rb

@@ -44,7 +44,7 @@ module CukeModeler
       # A quick 'deep clone' so that the input isn't modified
       row = Marshal.load(Marshal.dump(row))
 
-      values = if row.is_a?(Array)
+      values = if row.is_a?(Array) # rubocop:disable Style/CaseLikeIf # False positive
                  row
                elsif row.is_a?(Hash)
                  # There is no guarantee that the user built up their hash with the keys in the same order as
@@ -64,7 +64,7 @@ module CukeModeler
     def remove_row(row_removed)
       return if argument_rows.empty?
 
-      values = if row_removed.is_a?(Array)
+      values = if row_removed.is_a?(Array) # rubocop:disable Style/CaseLikeIf # False positive
                  row_removed
                elsif row_removed.is_a?(Hash)
                  # There is no guarantee that the user built up their hash with the keys in the same order as
@@ -99,7 +99,7 @@ module CukeModeler
     end
 
     # Building strings just isn't pretty
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize
 
     # Returns a string representation of this model. For an example model,
     # this will be Gherkin text that is equivalent to the example being modeled.
@@ -116,7 +116,7 @@ module CukeModeler
       text
     end
 
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize
 
 
     private

data/lib/cuke_modeler/models/feature_file.rb

@@ -52,12 +52,10 @@ module CukeModeler
 
 
     def process_feature_file(file_path)
-      source_text = IO.read(file_path)
-
+      source_text = File.read(file_path)
       feature_file_data = Parsing.parse_text(source_text, file_path)
-      feature_file_data = feature_file_data.merge({ 'path' => file_path })
 
-      feature_file_data
+      feature_file_data.merge({ 'path' => file_path })
     end
 
   end

data/lib/cuke_modeler/models/model.rb

@@ -16,12 +16,17 @@ module CukeModeler
       # This should be overridden by a child class
     end
 
+    # It's a lazy implementation but it's mandatory for the class to define this method
+    # rubocop:disable Lint/UselessMethodDefinition
+
     # Returns a string representation of this model.
     def to_s
       # This should be overridden by a child class
       super
     end
 
+    # rubocop:enable Lint/UselessMethodDefinition
+
     # Returns the model objects that belong to this model.
     def children
       []

data/lib/cuke_modeler/models/outline.rb

@@ -47,7 +47,7 @@ module CukeModeler
     end
 
     # Building strings just isn't pretty
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize
 
     # Returns a string representation of this model. For an outline model,
     # this will be Gherkin text that is equivalent to the outline being modeled.
@@ -64,7 +64,7 @@ module CukeModeler
       text
     end
 
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize
 
 
     private

data/lib/cuke_modeler/models/rule.rb

@@ -60,9 +60,6 @@ module CukeModeler
       models
     end
 
-    # Building strings just isn't pretty
-    # rubocop:disable Metrics/AbcSize
-
     # Returns a string representation of this model. For a rule model,
     # this will be Gherkin text that is equivalent to the rule being modeled.
     def to_s
@@ -76,7 +73,6 @@ module CukeModeler
 
       text
     end
-    # rubocop:enable Metrics/AbcSize
 
 
     private

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..25)
+supported_gherkin_versions = (9..26)
 
 raise("Unknown Gherkin version: '#{gherkin_version}'") unless supported_gherkin_versions.include?(gherkin_major_version)
 
@@ -63,7 +63,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
+        when 20, 21, 22, 23, 24, 25, 26
           # TODO: make these methods private?
           # NOT A PART OF THE PUBLIC API
           # The method to use for parsing Gherkin text

data/lib/cuke_modeler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuke_modeler
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.0
 platform: ruby
 authors:
 - Eric Kessler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2023-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-gherkin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '26.0'
+        version: '27.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '26.0'
+        version: '27.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,7 @@ files:
 - lib/cuke_modeler/adapters/gherkin_23_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_24_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_25_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_26_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_9_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_base_adapter.rb
 - lib/cuke_modeler/containing.rb
@@ -303,6 +304,7 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/cuke_modeler
   homepage_uri: https://github.com/enkessler/cuke_modeler
   source_code_uri: https://github.com/enkessler/cuke_modeler
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -321,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A gem providing functionality to model Gherkin based test suites.