cuke_modeler 2.1.0 → 3.0.0

data/lib/cuke_modeler/models/background.rb

@@ -64,7 +64,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_background.feature')
 
-      parsed_file.first['feature']['elements'].first
+      parsed_file['feature']['elements'].first
     end
 
   end

data/lib/cuke_modeler/models/cell.rb

@@ -41,7 +41,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_cell.feature')
 
-      parsed_file.first['feature']['elements'].first['steps'].first['table']['rows'].first['cells'].first
+      parsed_file['feature']['elements'].first['steps'].first['table']['rows'].first['cells'].first
     end
 
   end

data/lib/cuke_modeler/models/comment.rb

@@ -40,7 +40,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_comment.feature')
 
-      parsed_file.first['comments'].last
+      parsed_file['comments'].last
     end
 
   end

data/lib/cuke_modeler/models/directory.rb

@@ -82,8 +82,8 @@ module CukeModeler
     def process_feature_file(file_path)
       source_text = IO.read(file_path)
 
-      feature_file_data = Parsing::parse_text(source_text, file_path).first
-      feature_file_data = feature_file_data.merge({'path' => 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
     end

data/lib/cuke_modeler/models/doc_string.rb

@@ -45,7 +45,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_doc_string.feature')
 
-      parsed_file.first['feature']['elements'].first['steps'].first['doc_string']
+      parsed_file['feature']['elements'].first['steps'].first['doc_string']
     end
 
     def content_type_output_string

data/lib/cuke_modeler/models/example.rb

@@ -124,7 +124,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_example.feature')
 
-      parsed_file.first['feature']['elements'].first['examples'].first
+      parsed_file['feature']['elements'].first['examples'].first
     end
 
     def determine_buffer_size(index)

data/lib/cuke_modeler/models/feature.rb

@@ -90,7 +90,7 @@ module CukeModeler
     def parse_source(source_text)
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_feature.feature')
 
-      parsed_file.first['feature']
+      parsed_file['feature']
     end
 
     def background_output_string

data/lib/cuke_modeler/models/feature_file.rb

@@ -57,8 +57,8 @@ module CukeModeler
     def process_feature_file(file_path)
       source_text = IO.read(file_path)
 
-      feature_file_data = Parsing::parse_text(source_text, file_path).first
-      feature_file_data = feature_file_data.merge({'path' => 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
     end

data/lib/cuke_modeler/models/outline.rb

@@ -72,7 +72,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_outline.feature')
 
-      parsed_file.first['feature']['elements'].first
+      parsed_file['feature']['elements'].first
     end
 
     def examples_output_string

data/lib/cuke_modeler/models/row.rb

@@ -43,7 +43,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_row.feature')
 
-      parsed_file.first['feature']['elements'].first['steps'].first['table']['rows'].first
+      parsed_file['feature']['elements'].first['steps'].first['table']['rows'].first
     end
 
   end

data/lib/cuke_modeler/models/scenario.rb

@@ -67,7 +67,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_scenario.feature')
 
-      parsed_file.first['feature']['elements'].first
+      parsed_file['feature']['elements'].first
     end
 
   end

data/lib/cuke_modeler/models/step.rb

@@ -64,7 +64,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_step.feature')
 
-      parsed_file.first['feature']['elements'].first['steps'].first
+      parsed_file['feature']['elements'].first['steps'].first
     end
 
     def text_matches?(other_step)

data/lib/cuke_modeler/models/table.rb

@@ -47,7 +47,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_table.feature')
 
-      parsed_file.first['feature']['elements'].first['steps'].first['table']
+      parsed_file['feature']['elements'].first['steps'].first['table']
     end
 
     def row_output_string(row)

data/lib/cuke_modeler/models/tag.rb

@@ -40,7 +40,7 @@ module CukeModeler
 
       parsed_file = Parsing::parse_text(source_text, 'cuke_modeler_stand_alone_tag.feature')
 
-      parsed_file.first['feature']['tags'].first
+      parsed_file['feature']['tags'].first
     end
 
   end

data/lib/cuke_modeler/parsing.rb

@@ -2,35 +2,23 @@
 # be determined and the rest of the needed files can be loaded. The entry points vary across versions,
 # so try them all until one of them works.
 begin
-  # Gherkin 2.x, 8.x, 9.x
+  # Gherkin 9.x
   require 'gherkin'
-rescue LoadError
-  begin
-    require 'gherkin/parser'
-  rescue LoadError
-    # Gherkin 6.x, 7.x
-    require 'gherkin/gherkin'
-  end
+rescue LoadError => e
+  # Add other entry points again if things change again
+  raise e
 end
 
 
-# The *gherkin* gem loads differently and has different grammar rules across major versions. Parsing
-# will be done with an 'adapter' appropriate to the version of the *gherkin* gem that has been activated.
+# The *cucumber-gherkin* gem loads differently and has different grammar rules across major versions. Parsing
+# will be done with an 'adapter' appropriate to the version of the *cucumber-gherkin* gem that has been activated.
 
-gherkin_version = Gem.loaded_specs['gherkin'].version.version
+gherkin_version = Gem.loaded_specs['cucumber-gherkin'].version.version
 gherkin_major_version = gherkin_version.match(/^(\d+)\./)[1].to_i
 
 case gherkin_major_version
-  when 6, 7, 8, 9
-    require 'gherkin/dialect'
-  when 3, 4, 5
-    require 'gherkin/parser'
-  when 2
-    require 'stringio'
-    require 'gherkin/formatter/json_formatter'
-    require 'gherkin'
-    require 'json'
-    require 'multi_json'
+  when 9, 10, 11, 12, 13
+    # Currently nothing else to load beyond the entry point to the gem
   else
     raise("Unknown Gherkin version: '#{gherkin_version}'")
 end
@@ -58,14 +46,15 @@ module CukeModeler
       # The dialects currently known by the gherkin gem
       def dialects
         unless @dialects
-          @dialects = Gem.loaded_specs['gherkin'].version.version[/^2\./] ? Gherkin::I18n::LANGUAGES : Gherkin::DIALECTS
+          @dialects = Gherkin::DIALECTS
         end
 
         @dialects
       end
 
-      # Parses the Cucumber feature given in *source_text* and returns an array
-      # containing the hash representation of its logical structure.
+      # Parses the Cucumber feature given in *source_text* and returns a hash representation of
+      # its logical structure. This is a standardized AST that should remain consistent across
+      # different versions of `cucumber-gherkin`
       def parse_text(source_text, filename = 'cuke_modeler_fake_file.feature')
         raise(ArgumentError, "Text to parse must be a String but got #{source_text.class}") unless source_text.is_a?(String)
 
@@ -79,73 +68,55 @@ module CukeModeler
       end
 
 
-      gherkin_version = Gem.loaded_specs['gherkin'].version.version
+      gherkin_version = Gem.loaded_specs['cucumber-gherkin'].version.version
       gherkin_major_version = gherkin_version.match(/^(\d+)\./)[1].to_i
 
       case gherkin_major_version
-        when 9
+        when 13
+          # 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)
 
-            potential_error_message = messages.find { |message| message[:attachment] }
+            error_message = messages.find { |message| message[:parse_error] }
             gherkin_ast_message = messages.find { |message| message[:gherkin_document] }
 
-            if potential_error_message
-              raise potential_error_message[:attachment][:data] if potential_error_message[:attachment][:data] =~ /expected.*got/
-            end
+            raise error_message[:parse_error][:message] if error_message
 
             gherkin_ast_message[:gherkin_document]
           end
-        when 8
+        when 12
+          # 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)
 
             potential_error_message = messages.find { |message| message[:attachment] }
-            gherkin_ast_message = messages.find { |message| message[:gherkinDocument] }
+            gherkin_ast_message = messages.find { |message| message[:gherkin_document] }
 
             if potential_error_message
-              raise potential_error_message[:attachment][:data] if potential_error_message[:attachment][:data] =~ /expected.*got/
+              raise potential_error_message[:attachment][:body] if potential_error_message[:attachment][:body] =~ /expected.*got/
             end
 
-            gherkin_ast_message[:gherkinDocument]
+            gherkin_ast_message[:gherkin_document]
           end
-        when 6, 7
+        when 9, 10, 11
+          # 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::Gherkin.from_source(filename, source_text).to_a.map(&:to_hash)
+            messages = Gherkin.from_source(filename, source_text, { :include_gherkin_document => true }).to_a.map(&:to_hash)
 
             potential_error_message = messages.find { |message| message[:attachment] }
-            gherkin_ast_message = messages.find { |message| message[:gherkinDocument] }
+            gherkin_ast_message = messages.find { |message| message[:gherkin_document] }
 
             if potential_error_message
-              raise potential_error_message[:attachment][:data] if potential_error_message[:attachment][:data] =~ /expected.*got/
+              raise potential_error_message[:attachment][:text] if potential_error_message[:attachment][:text] =~ /expected.*got/
             end
 
-            gherkin_ast_message[:gherkinDocument]
-          end
-        when 3, 4, 5
-          # todo - make these methods private?
-          # NOT A PART OF THE PUBLIC API
-          # The method to use for parsing Gherkin text
-          # Filename isn't used by this version of Gherkin but keeping the parameter so that the calling method only has to know one method signature
-          def parsing_method(source_text, _filename)
-            Gherkin::Parser.new.parse(source_text)
-          end
-        when 2
-          # NOT A PART OF THE PUBLIC API
-          # The method to use for parsing Gherkin text
-          def parsing_method(source_text, filename)
-            io = StringIO.new
-            formatter = Gherkin::Formatter::JSONFormatter.new(io)
-            parser = Gherkin::Parser::Parser.new(formatter)
-            parser.parse(source_text, filename, 0)
-            formatter.done
-            MultiJson.load(io.string)
+            gherkin_ast_message[:gherkin_document]
           end
         else
           raise("Unknown Gherkin version: '#{gherkin_version}'")

data/lib/cuke_modeler/version.rb

@@ -1,4 +1,4 @@
 module CukeModeler
   # The gem version
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,63 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cuke_modeler
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Eric Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gherkin
+  name: cucumber-gherkin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,16 +84,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: racatt
   requirement: !ruby/object:Gem::Requirement
@@ -170,36 +136,42 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: This gem facilitates modeling a test suite that is written in Gherkin
   (e.g. Cucumber, SpecFlow, Lettuce, etc.). It does this by providing an abstraction
-  layer on top of the Abstract Syntax Tree that the 'gherkin' gem generates when parsing
-  features, as well as providing models for feature files and directories in order
-  to be able to have a fully traversable model tree of a test suite's structure. These
-  models can then be analyzed or manipulated more easily than the underlying AST layer.
+  layer on top of the Abstract Syntax Tree that the 'cucumber-gherkin' gem generates
+  when parsing features, as well as providing models for feature files and directories
+  in order to be able to have a fully traversable model tree of a test suite's structure.
+  These models can then be analyzed or manipulated more easily than the underlying
+  AST layer.
 email:
 - morrow748@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".simplecov"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- appveyor.yml
 - cuke_modeler.gemspec
 - lib/cuke_modeler.rb
-- lib/cuke_modeler/adapters/gherkin_2_adapter.rb
-- lib/cuke_modeler/adapters/gherkin_3_adapter.rb
-- lib/cuke_modeler/adapters/gherkin_4_adapter.rb
-- lib/cuke_modeler/adapters/gherkin_5_adapter.rb
-- lib/cuke_modeler/adapters/gherkin_6_adapter.rb
-- lib/cuke_modeler/adapters/gherkin_7_adapter.rb
-- lib/cuke_modeler/adapters/gherkin_8_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_10_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_11_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_12_adapter.rb
+- lib/cuke_modeler/adapters/gherkin_13_adapter.rb
 - lib/cuke_modeler/adapters/gherkin_9_adapter.rb
 - lib/cuke_modeler/containing.rb
 - lib/cuke_modeler/described.rb
@@ -258,96 +230,6 @@ files:
 - testing/cucumber/features/modeling/table_output.feature
 - testing/cucumber/features/modeling/tag_modeling.feature
 - testing/cucumber/features/modeling/tag_output.feature
-- testing/cucumber/step_definitions/action_steps.rb
-- testing/cucumber/step_definitions/background_steps.rb
-- testing/cucumber/step_definitions/directory_steps.rb
-- testing/cucumber/step_definitions/doc_string_steps.rb
-- testing/cucumber/step_definitions/feature_file_steps.rb
-- testing/cucumber/step_definitions/feature_steps.rb
-- testing/cucumber/step_definitions/modeling_steps.rb
-- testing/cucumber/step_definitions/setup_steps.rb
-- testing/cucumber/step_definitions/step_steps.rb
-- testing/cucumber/step_definitions/table_steps.rb
-- testing/cucumber/step_definitions/tag_steps.rb
-- testing/cucumber/step_definitions/verification_steps.rb
-- testing/cucumber/support/env.rb
-- testing/dialect_helper.rb
-- testing/file_helper.rb
-- testing/gemfiles/gherkin2.gemfile
-- testing/gemfiles/gherkin3.gemfile
-- testing/gemfiles/gherkin4.gemfile
-- testing/gemfiles/gherkin5.gemfile
-- testing/gemfiles/gherkin6.gemfile
-- testing/gemfiles/gherkin7.gemfile
-- testing/gemfiles/gherkin8.gemfile
-- testing/gemfiles/gherkin9.gemfile
-- testing/helper_methods.rb
-- testing/rspec/spec/integration/adapters/gherkin_2_adapter_spec.rb
-- testing/rspec/spec/integration/adapters/gherkin_3_adapter_spec.rb
-- testing/rspec/spec/integration/adapters/gherkin_4_adapter_spec.rb
-- testing/rspec/spec/integration/adapters/gherkin_5_adapter_spec.rb
-- testing/rspec/spec/integration/adapters/gherkin_6_adapter_spec.rb
-- testing/rspec/spec/integration/adapters/gherkin_7_adapter_spec.rb
-- testing/rspec/spec/integration/adapters/gherkin_8_adapter_spec.rb
-- testing/rspec/spec/integration/adapters/gherkin_9_adapter_spec.rb
-- testing/rspec/spec/integration/models/background_integration_spec.rb
-- testing/rspec/spec/integration/models/cell_integration_spec.rb
-- testing/rspec/spec/integration/models/comment_integration_spec.rb
-- testing/rspec/spec/integration/models/directory_integration_spec.rb
-- testing/rspec/spec/integration/models/doc_string_integration_spec.rb
-- testing/rspec/spec/integration/models/example_integration_spec.rb
-- testing/rspec/spec/integration/models/feature_file_integration_spec.rb
-- testing/rspec/spec/integration/models/feature_integration_spec.rb
-- testing/rspec/spec/integration/models/model_integration_spec.rb
-- testing/rspec/spec/integration/models/outline_integration_spec.rb
-- testing/rspec/spec/integration/models/row_integration_spec.rb
-- testing/rspec/spec/integration/models/scenario_integration_spec.rb
-- testing/rspec/spec/integration/models/step_integration_spec.rb
-- testing/rspec/spec/integration/models/table_integration_spec.rb
-- testing/rspec/spec/integration/models/tag_integration_spec.rb
-- testing/rspec/spec/integration/nested_integration_spec.rb
-- testing/rspec/spec/integration/parsing_integration_spec.rb
-- testing/rspec/spec/integration/shared/models_integration_specs.rb
-- testing/rspec/spec/spec_helper.rb
-- testing/rspec/spec/unit/cuke_modeler_unit_spec.rb
-- testing/rspec/spec/unit/described_unit_spec.rb
-- testing/rspec/spec/unit/models/background_unit_spec.rb
-- testing/rspec/spec/unit/models/cell_unit_spec.rb
-- testing/rspec/spec/unit/models/comment_unit_spec.rb
-- testing/rspec/spec/unit/models/directory_unit_spec.rb
-- testing/rspec/spec/unit/models/doc_string_unit_spec.rb
-- testing/rspec/spec/unit/models/example_unit_spec.rb
-- testing/rspec/spec/unit/models/feature_file_unit_spec.rb
-- testing/rspec/spec/unit/models/feature_unit_spec.rb
-- testing/rspec/spec/unit/models/model_unit_spec.rb
-- testing/rspec/spec/unit/models/outline_unit_spec.rb
-- testing/rspec/spec/unit/models/row_unit_spec.rb
-- testing/rspec/spec/unit/models/scenario_unit_spec.rb
-- testing/rspec/spec/unit/models/step_unit_spec.rb
-- testing/rspec/spec/unit/models/table_unit_spec.rb
-- testing/rspec/spec/unit/models/tag_unit_spec.rb
-- testing/rspec/spec/unit/named_unit_spec.rb
-- testing/rspec/spec/unit/nested_unit_spec.rb
-- testing/rspec/spec/unit/parsed_unit_spec.rb
-- testing/rspec/spec/unit/parsing_unit_spec.rb
-- testing/rspec/spec/unit/shared/bare_bones_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/containing_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/described_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/keyworded_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/models_unit_specs.rb
-- testing/rspec/spec/unit/shared/named_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/nested_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/parsed_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/prepopulated_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/sourced_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/stepped_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/stringifiable_models_unit_specs.rb
-- testing/rspec/spec/unit/shared/tagged_models_unit_specs.rb
-- testing/rspec/spec/unit/sourceable_unit_spec.rb
-- testing/rspec/spec/unit/stepped_unit_spec.rb
-- testing/rspec/spec/unit/taggable_unit_spec.rb
-- testing/test_languages.json
-- todo.txt
 homepage: https://github.com/enkessler/cuke_modeler
 licenses:
 - MIT
@@ -360,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.3'
   - - "<"
     - !ruby/object:Gem::Version
       version: '3.0'