cuke_modeler 3.10.0 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7821b738cb9b7436e38de701654c9ca04d087ba2e482f01af0600f86383b47d
-  data.tar.gz: 8b71afb721c52cc198243a468807547d45254dab84dd5bafcbec49e9bb4befb0
+  metadata.gz: 42e13fd543b846c0dfd1120e67c157aefb71eeeae7bc68894686813368aace1a
+  data.tar.gz: 676f7198e3746318b0f4a2d79c3a8c410ebcbab00b3e543dbb225cfaa8f4ee58
 SHA512:
-  metadata.gz: f114b4de2f4f2ef4ffd95078c7b8f72db2318174a75c4d4ed86a900ed21585e91e918afe97770afc1857b3cc80c904e471717f59a90c814bd7664575879e07e8
-  data.tar.gz: e870f0c73a8f296f6c8b108956d787586e9f47b3a2bff78db9a10db58c8df2ffc39fed04a1ace3629911c03f36ac6aee6c3e74475c60c58d7d0416f141d07037
+  metadata.gz: 8500092bdeeb98f81134b8e3302ddf796acd867ccd1324b09d2d75103902b6a926d1220ddbaf08aea98624fe64f1246804868fee21e56a9ec24766c0695455f3
+  data.tar.gz: 939fc0d59e4cf3cc194ac28f51a140c928e4ce61f493cc21b03b9a9140c80981fc9e25dbadaa46a4c09f187b8610f37d76a52b708f2ca6434500b2f7324bca7c

data/CHANGELOG.md

@@ -8,6 +8,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Nothing yet...
 
+## [3.14.0] - 2021-11-22
+
+### Added
+  - All models for Gherkin elements now track the column number from which they originate in a source file.
+
+## [3.13.0] - 2021-09-25
+
+### Added
+- Support added for more versions of the `cucumber-gherkin` gem
+   - 22.x
+
+## [3.12.0] - 2021-09-09
+
+### Added
+- Support added for more versions of the `cucumber-gherkin` gem
+   - 21.x
+
+## [3.11.0] - 2021-07-31
+
+### Added
+- Support added for more versions of the `cucumber-gherkin` gem
+    - 20.x
+
+### Fixed
+- `Rule` models are now returnable from `Model#get_ancestor()`. Updating that method was missed when `Rule` models 
+  were first added.
 
 ## [3.10.0] - 2021-05-28
 
@@ -387,7 +413,11 @@ Nothing yet...
  - Initial release
 
 
-[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.10.0...HEAD
+[Unreleased]: https://github.com/enkessler/cuke_modeler/compare/v3.14.0...HEAD
+[3.14.0]: https://github.com/enkessler/cuke_modeler/compare/v3.13.0...v3.14.0
+[3.13.0]: https://github.com/enkessler/cuke_modeler/compare/v3.12.0...v3.13.0
+[3.12.0]: https://github.com/enkessler/cuke_modeler/compare/v3.11.0...v3.12.0
+[3.11.0]: https://github.com/enkessler/cuke_modeler/compare/v3.10.0...v3.11.0
 [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

data/README.md

@@ -8,8 +8,7 @@ User stuff:
 [![Yard Docs](http://img.shields.io/badge/Documentation-API-blue.svg)](https://www.rubydoc.info/gems/cuke_modeler)
 
 Developer stuff:
-[![Build Status](https://travis-ci.org/enkessler/cuke_modeler.svg?branch=master)](https://travis-ci.org/enkessler/cuke_modeler)
-[![Build status](https://ci.appveyor.com/api/projects/status/is8xqvoqn3pjh9l0/branch/master?svg=true)](https://ci.appveyor.com/project/enkessler/cuke-modeler)
+[![Build Status](https://github.com/enkessler/cuke_modeler/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/enkessler/cuke_modeler/actions/workflows/ci.yml?query=branch%3Amaster)
 [![Coverage Status](https://coveralls.io/repos/github/enkessler/cuke_modeler/badge.svg?branch=master)](https://coveralls.io/github/enkessler/cuke_modeler?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/83986d8f7a918fed9707/maintainability)](https://codeclimate.com/github/enkessler/cuke_modeler/maintainability)
 [![Inline docs](http://inch-ci.org/github/enkessler/cuke_modeler.svg?branch=master)](https://inch-ci.org/github/enkessler/cuke_modeler)

data/cuke_modeler.gemspec

@@ -36,11 +36,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3', '< 4.0'
 
-  spec.add_runtime_dependency 'cucumber-gherkin', '< 20.0'
+  spec.add_runtime_dependency 'cucumber-gherkin', '< 23.0'
 
   spec.add_development_dependency 'bundler', '< 3.0'
   spec.add_development_dependency 'childprocess', '< 5.0'
-  spec.add_development_dependency 'coveralls', '< 1.0.0'
   spec.add_development_dependency 'ffi', '< 2.0' # This is an invisible dependency for the `childprocess` gem on Windows
   # Cucumber 4.x is the earliest version to use cucumber-gherkin
   spec.add_development_dependency 'cucumber', '>= 4.0.0', '< 7.0.0'
@@ -50,8 +49,8 @@ Gem::Specification.new do |spec|
   # 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'
-  # Coveralls gem does not support any newer version than this
-  spec.add_development_dependency 'simplecov', '<= 0.16.1'
+  spec.add_development_dependency 'simplecov', '< 1.0'
+  spec.add_development_dependency 'simplecov-lcov', '< 1.0'
   spec.add_development_dependency 'test-unit', '< 4.0.0'
   spec.add_development_dependency 'yard', '< 1.0'
 end

data/lib/cuke_modeler/adapters/gherkin_20_adapter.rb

@@ -0,0 +1,350 @@
+require_relative 'gherkin_base_adapter'
+
+# Some things just aren't going to get better due to the inherent complexity of the AST
+# rubocop:disable Metrics/ClassLength, Metrics/AbcSize, Metrics/MethodLength
+
+module CukeModeler
+
+  # NOT A PART OF THE PUBLIC API
+  # An adapter that can convert the output of version 20.x of the *cucumber-gherkin* gem into input that is consumable
+  # by this gem.
+  class Gherkin20Adapter < GherkinBaseAdapter
+
+    # Adapts the given AST into the shape that this gem expects
+    def adapt(ast)
+      adapted_ast = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_ast, ast)
+      clear_child_elements(adapted_ast, [[:feature], [:comments]])
+
+      adapted_ast['comments'] = adapt_comments(ast)
+      adapted_ast['feature'] = adapt_feature(ast.feature)
+
+      adapted_ast
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given feature node.
+    def adapt_feature(feature_ast)
+      return nil unless feature_ast
+
+      adapted_feature = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_feature, feature_ast)
+      clear_child_elements(adapted_feature, [[:tags],
+                                             [:children]])
+
+      adapted_feature['keyword'] = feature_ast.keyword
+      adapted_feature['name'] = feature_ast.name
+      adapted_feature['description'] = feature_ast.description
+      adapted_feature['line'] = feature_ast.location.line
+      adapted_feature['column'] = feature_ast.location.column
+
+      adapted_feature['elements'] = adapt_child_elements(feature_ast)
+      adapted_feature['tags'] = adapt_tags(feature_ast)
+
+      adapted_feature
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given background node.
+    def adapt_background(background_ast)
+      adapted_background = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_background, background_ast)
+      clear_child_elements(adapted_background, [[:background, :steps]])
+
+      adapted_background['type'] = 'Background'
+      adapted_background['keyword'] = background_ast.background.keyword
+      adapted_background['name'] = background_ast.background.name
+      adapted_background['description'] = background_ast.background.description
+      adapted_background['line'] = background_ast.background.location.line
+      adapted_background['column'] = background_ast.background.location.column
+
+      adapted_background['steps'] = adapt_steps(background_ast.background)
+
+      adapted_background
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given rule node.
+    def adapt_rule(rule_ast)
+      adapted_rule = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_rule, rule_ast)
+      clear_child_elements(adapted_rule, [[:rule, :tags],
+                                          [:rule, :children]])
+
+      adapted_rule['type'] = 'Rule'
+      adapted_rule['keyword'] = rule_ast.rule.keyword
+      adapted_rule['name'] = rule_ast.rule.name
+      adapted_rule['description'] = rule_ast.rule.description
+      adapted_rule['line'] = rule_ast.rule.location.line
+      adapted_rule['column'] = rule_ast.rule.location.column
+
+      adapted_rule['elements'] = adapt_child_elements(rule_ast.rule)
+      adapted_rule['tags'] = adapt_tags(rule_ast.rule)
+
+      adapted_rule
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given scenario node.
+    def adapt_scenario(test_ast)
+      adapted_scenario = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_scenario, test_ast)
+      clear_child_elements(adapted_scenario, [[:scenario, :tags],
+                                              [:scenario, :steps]])
+
+      adapted_scenario['type'] = 'Scenario'
+      adapted_scenario['keyword'] = test_ast.scenario.keyword
+      adapted_scenario['name'] = test_ast.scenario.name
+      adapted_scenario['description'] = test_ast.scenario.description
+      adapted_scenario['line'] = test_ast.scenario.location.line
+      adapted_scenario['column'] = test_ast.scenario.location.column
+
+      adapted_scenario['tags'] = adapt_tags(test_ast.scenario)
+      adapted_scenario['steps'] = adapt_steps(test_ast.scenario)
+
+      adapted_scenario
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given outline node.
+    def adapt_outline(test_ast)
+      adapted_outline = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_outline, test_ast)
+      clear_child_elements(adapted_outline, [[:scenario, :tags],
+                                             [:scenario, :steps],
+                                             [:scenario, :examples]])
+
+      adapted_outline['type'] = 'ScenarioOutline'
+      adapted_outline['keyword'] = test_ast.scenario.keyword
+      adapted_outline['name'] = test_ast.scenario.name
+      adapted_outline['description'] = test_ast.scenario.description
+      adapted_outline['line'] = test_ast.scenario.location.line
+      adapted_outline['column'] = test_ast.scenario.location.column
+
+      adapted_outline['tags'] = adapt_tags(test_ast.scenario)
+      adapted_outline['steps'] = adapt_steps(test_ast.scenario)
+      adapted_outline['examples'] = adapt_examples(test_ast.scenario)
+
+      adapted_outline
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given example node.
+    def adapt_example(example_ast)
+      adapted_example = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_example, example_ast)
+      clear_child_elements(adapted_example, [[:tags],
+                                             [:table_header],
+                                             [:table_body]])
+
+      adapted_example['keyword'] = example_ast.keyword
+      adapted_example['name'] = example_ast.name
+      adapted_example['line'] = example_ast.location.line
+      adapted_example['column'] = example_ast.location.column
+      adapted_example['description'] = example_ast.description
+
+      adapted_example['rows'] = []
+      adapted_example['rows'] << adapt_table_row(example_ast.table_header) if example_ast.table_header
+
+      example_ast.table_body&.each do |row|
+        adapted_example['rows'] << adapt_table_row(row)
+      end
+
+      adapted_example['tags'] = adapt_tags(example_ast)
+
+      adapted_example
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given tag node.
+    def adapt_tag(tag_ast)
+      adapted_tag = {}
+
+      # Saving off the original data
+      save_original_data(adapted_tag, tag_ast)
+
+      adapted_tag['name'] = tag_ast.name
+      adapted_tag['line'] = tag_ast.location.line
+      adapted_tag['column'] = tag_ast.location.column
+
+      adapted_tag
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given comment node.
+    def adapt_comment(comment_ast)
+      adapted_comment = {}
+
+      # Saving off the original data
+      save_original_data(adapted_comment, comment_ast)
+
+      adapted_comment['text'] = comment_ast.text
+      adapted_comment['line'] = comment_ast.location.line
+      adapted_comment['column'] = comment_ast.location.column
+
+      adapted_comment
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given step node.
+    def adapt_step(step_ast)
+      adapted_step = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_step, step_ast)
+      clear_child_elements(adapted_step, [[:data_table],
+                                          [:doc_string]])
+
+      adapted_step['keyword'] = step_ast.keyword
+      adapted_step['name'] = step_ast.text
+      adapted_step['line'] = step_ast.location.line
+      adapted_step['column'] = step_ast.location.column
+
+      if step_ast.doc_string
+        adapted_step['doc_string'] = adapt_doc_string(step_ast.doc_string)
+      elsif step_ast.data_table
+        adapted_step['table'] = adapt_step_table(step_ast.data_table)
+      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 = {}
+
+      # Saving off the original data
+      save_original_data(adapted_doc_string, doc_string_ast)
+
+      adapted_doc_string['value'] = doc_string_ast.content
+      adapted_doc_string['content_type'] = doc_string_ast.media_type
+      adapted_doc_string['line'] = doc_string_ast.location.line
+      adapted_doc_string['column'] = doc_string_ast.location.column
+
+      adapted_doc_string
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given table node.
+    def adapt_step_table(step_table_ast)
+      adapted_step_table = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_step_table, step_table_ast)
+      clear_child_elements(adapted_step_table, [[:rows]])
+
+      adapted_step_table['rows'] = []
+      step_table_ast.rows.each do |row|
+        adapted_step_table['rows'] << adapt_table_row(row)
+      end
+      adapted_step_table['line'] = step_table_ast.location.line
+      adapted_step_table['column'] = step_table_ast.location.column
+
+      adapted_step_table
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given row node.
+    def adapt_table_row(table_row_ast)
+      adapted_table_row = {}
+
+      # Saving off the original data and removing parsed data for child elements in order to avoid duplicating data
+      save_original_data(adapted_table_row, table_row_ast)
+      clear_child_elements(adapted_table_row, [[:cells]])
+
+      adapted_table_row['line'] = table_row_ast.location.line
+      adapted_table_row['column'] = table_row_ast.location.column
+
+      adapted_table_row['cells'] = []
+      table_row_ast.cells.each do |row|
+        adapted_table_row['cells'] << adapt_table_cell(row)
+      end
+
+      adapted_table_row
+    end
+
+    # Adapts the AST sub-tree that is rooted at the given cell node.
+    def adapt_table_cell(cell_ast)
+      adapted_cell = {}
+
+      # Saving off the original data
+      save_original_data(adapted_cell, cell_ast)
+
+      adapted_cell['value'] = cell_ast.value
+      adapted_cell['line'] = cell_ast.location.line
+      adapted_cell['column'] = cell_ast.location.column
+
+      adapted_cell
+    end
+
+
+    private
+
+
+    def adapt_comments(file_ast)
+      file_ast.comments.map { |comment| adapt_comment(comment) }
+    end
+
+    def adapt_tags(element_ast)
+      element_ast.tags.map { |tag| adapt_tag(tag) }
+    end
+
+    def adapt_steps(element_ast)
+      element_ast.steps.map { |step| adapt_step(step) }
+    end
+
+    def adapt_examples(element_ast)
+      element_ast.examples.map { |example| adapt_example(example) }
+    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
+      end
+
+      adapted_children
+    end
+
+    def adapt_test(test_ast)
+      if test_has_examples?(test_ast) || test_uses_outline_keyword?(test_ast)
+        adapt_outline(test_ast)
+      else
+        adapt_scenario(test_ast)
+      end
+    end
+
+    def clear_child_elements(ast, child_paths)
+      # rubocop:disable Security/Eval - This is not blind data
+      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
+      end
+      # rubocop:enable Security/Eval
+    end
+
+    def test_has_examples?(ast_node)
+      ast_node.scenario.examples.any?
+    end
+
+    def test_uses_outline_keyword?(test_ast)
+      Parsing.dialects[Parsing.dialect]['scenarioOutline'].include?(test_ast.scenario.keyword)
+    end
+
+  end
+end
+
+# rubocop:enable Metrics/ClassLength, Metrics/AbcSize, Metrics/MethodLength

data/lib/cuke_modeler/adapters/gherkin_21_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 21.x of the *cucumber-gherkin* gem into input that is consumable
+  # by this gem.
+
+  class Gherkin21Adapter < Gherkin20Adapter
+
+  end
+end

data/lib/cuke_modeler/adapters/gherkin_22_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 22.x of the *cucumber-gherkin* gem into input that is consumable
+  # by this gem.
+
+  class Gherkin22Adapter < Gherkin20Adapter
+
+  end
+end

data/lib/cuke_modeler/adapters/gherkin_9_adapter.rb

@@ -1,3 +1,5 @@
+require_relative 'gherkin_base_adapter'
+
 # Some things just aren't going to get better due to the inherent complexity of the AST
 # rubocop:disable Metrics/ClassLength, Metrics/AbcSize, Metrics/MethodLength
 
@@ -6,7 +8,7 @@ module CukeModeler
   # NOT A PART OF THE PUBLIC API
   # An adapter that can convert the output of version 9.x of the *cucumber-gherkin* gem into input that is consumable
   # by this gem.
-  class Gherkin9Adapter
+  class Gherkin9Adapter < GherkinBaseAdapter
 
     # Adapts the given AST into the shape that this gem expects
     def adapt(ast)
@@ -38,6 +40,7 @@ module CukeModeler
       adapted_feature['name'] = feature_ast[:name]
       adapted_feature['description'] = feature_ast[:description] || ''
       adapted_feature['line'] = feature_ast[:location][:line]
+      adapted_feature['column'] = feature_ast[:location][:column]
 
       adapted_feature['elements'] = adapt_child_elements(feature_ast)
       adapted_feature['tags'] = adapt_tags(feature_ast)
@@ -58,6 +61,7 @@ module CukeModeler
       adapted_background['name'] = background_ast[:background][:name]
       adapted_background['description'] = background_ast[:background][:description] || ''
       adapted_background['line'] = background_ast[:background][:location][:line]
+      adapted_background['column'] = background_ast[:background][:location][:column]
 
       adapted_background['steps'] = adapt_steps(background_ast[:background])
 
@@ -77,6 +81,7 @@ module CukeModeler
       adapted_rule['name'] = rule_ast[:rule][:name]
       adapted_rule['description'] = rule_ast[:rule][:description] || ''
       adapted_rule['line'] = rule_ast[:rule][:location][:line]
+      adapted_rule['column'] = rule_ast[:rule][:location][:column]
 
       adapted_rule['elements'] = adapt_child_elements(rule_ast[:rule])
 
@@ -97,6 +102,7 @@ module CukeModeler
       adapted_scenario['name'] = test_ast[:scenario][:name]
       adapted_scenario['description'] = test_ast[:scenario][:description] || ''
       adapted_scenario['line'] = test_ast[:scenario][:location][:line]
+      adapted_scenario['column'] = test_ast[:scenario][:location][:column]
 
       adapted_scenario['tags'] = adapt_tags(test_ast[:scenario])
       adapted_scenario['steps'] = adapt_steps(test_ast[:scenario])
@@ -119,6 +125,7 @@ module CukeModeler
       adapted_outline['name'] = test_ast[:scenario][:name]
       adapted_outline['description'] = test_ast[:scenario][:description] || ''
       adapted_outline['line'] = test_ast[:scenario][:location][:line]
+      adapted_outline['column'] = test_ast[:scenario][:location][:column]
 
       adapted_outline['tags'] = adapt_tags(test_ast[:scenario])
       adapted_outline['steps'] = adapt_steps(test_ast[:scenario])
@@ -140,6 +147,7 @@ module CukeModeler
       adapted_example['keyword'] = example_ast[:keyword]
       adapted_example['name'] = example_ast[:name]
       adapted_example['line'] = example_ast[:location][:line]
+      adapted_example['column'] = example_ast[:location][:column]
       adapted_example['description'] = example_ast[:description] || ''
 
       adapted_example['rows'] = []
@@ -163,6 +171,7 @@ module CukeModeler
 
       adapted_tag['name'] = tag_ast[:name]
       adapted_tag['line'] = tag_ast[:location][:line]
+      adapted_tag['column'] = tag_ast[:location][:column]
 
       adapted_tag
     end
@@ -176,6 +185,7 @@ module CukeModeler
 
       adapted_comment['text'] = comment_ast[:text]
       adapted_comment['line'] = comment_ast[:location][:line]
+      adapted_comment['column'] = comment_ast[:location][:column]
 
       adapted_comment
     end
@@ -192,6 +202,7 @@ module CukeModeler
       adapted_step['keyword'] = step_ast[:keyword]
       adapted_step['name'] = step_ast[:text]
       adapted_step['line'] = step_ast[:location][:line]
+      adapted_step['column'] = step_ast[:location][:column]
 
       if step_ast[:doc_string]
         adapted_step['doc_string'] = adapt_doc_string(step_ast[:doc_string])
@@ -212,6 +223,7 @@ module CukeModeler
       adapted_doc_string['value'] = doc_string_ast[:content]
       adapted_doc_string['content_type'] = doc_string_ast[:media_type]
       adapted_doc_string['line'] = doc_string_ast[:location][:line]
+      adapted_doc_string['column'] = doc_string_ast[:location][:column]
 
       adapted_doc_string
     end
@@ -229,6 +241,7 @@ module CukeModeler
         adapted_step_table['rows'] << adapt_table_row(row)
       end
       adapted_step_table['line'] = step_table_ast[:location][:line]
+      adapted_step_table['column'] = step_table_ast[:location][:column]
 
       adapted_step_table
     end
@@ -242,6 +255,7 @@ module CukeModeler
       clear_child_elements(adapted_table_row, [[:cells]])
 
       adapted_table_row['line'] = table_row_ast[:location][:line]
+      adapted_table_row['column'] = table_row_ast[:location][:column]
 
       adapted_table_row['cells'] = []
       table_row_ast[:cells].each do |row|
@@ -260,6 +274,7 @@ module CukeModeler
 
       adapted_cell['value'] = cell_ast[:value]
       adapted_cell['line'] = cell_ast[:location][:line]
+      adapted_cell['column'] = cell_ast[:location][:column]
 
       adapted_cell
     end
@@ -322,10 +337,6 @@ module CukeModeler
       end
     end
 
-    def save_original_data(adapted_ast, raw_ast)
-      adapted_ast['cuke_modeler_parsing_data'] = Marshal.load(Marshal.dump(raw_ast))
-    end
-
     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

data/lib/cuke_modeler/adapters/gherkin_base_adapter.rb

@@ -0,0 +1,14 @@
+module CukeModeler
+
+  # NOT A PART OF THE PUBLIC API
+  # A class providing some basic and common adapter functionality.
+  class GherkinBaseAdapter
+
+    private
+
+    def save_original_data(adapted_ast, raw_ast)
+      adapted_ast['cuke_modeler_parsing_data'] = Marshal.load(Marshal.dump(raw_ast))
+    end
+
+  end
+end