turnip 2.1.1 → 3.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4688d31baee09b9a1620f80d29a619ac86d73db9
-  data.tar.gz: 6c2ca9e0469398260c5f558bfb4c0a43f24a752b
+  metadata.gz: a8425f714759628ba119de6a3d1c4f8d7b8822c1
+  data.tar.gz: 342a721605fd9f29e0812962c1abbd7f98d5eaa7
 SHA512:
-  metadata.gz: da9af90c2aa18ea9bdb22b4854fd60e64cb4652b2c247cf1701afcf2ebce10d924e96ca8bba1168d5320205e8a15d74acbf5ca071f33232968435b84254be249
-  data.tar.gz: 139d1bd5f7af49ca90545ec0a31c216dcdd37bfd264b0cb74a2d016713c49cf9634494c2e75177bc1a33dcdb87e02d2dd9cf3b9072ade20a61643361028944aa
+  metadata.gz: 83c07693eb5d083086cbd570532566e3bbcdbce60b5114f57091612b2d4dc1ec25b46794d9c5603eee547a4167eaad555d6cc9969a8bac2e53941455b51ad649
+  data.tar.gz: 2116eac308a84e0d4119f26fef894dafd9fcfbf11d34671297bf50920268e8b4a2102da61aeae8b43396a1c4a1fad0f16847b23aa45ccba2575367461059ba64

data/lib/turnip/builder.rb

@@ -1,10 +1,11 @@
-require "gherkin"
+require "gherkin/parser"
+require "gherkin/token_scanner"
 
 module Turnip
   class Builder
     module Tags
       def tags
-        @raw.tags.map { |tag| tag.name.sub(/^@/, '') }
+        @raw[:tags].map { |tag| tag[:name].sub(/^@/, '') }
       end
 
       def tags_hash
@@ -18,13 +19,30 @@ module Turnip
 
     module Name
       def name
-        @raw.name
+        @raw[:name]
       end
     end
 
     module Line
       def line
-        @raw.line
+        @raw[:location][:line]
+      end
+    end
+
+    module Steps
+      def steps
+        @steps ||= @raw[:steps].map do |step|
+          extra_args = []
+          if (arg = step[:argument])
+            if arg[:type] == :DataTable
+              table = Turnip::Table.new(arg[:rows].map {|r| r[:cells].map {|c| c[:value]}})
+              extra_args.push(table)
+            else
+              extra_args.push arg[:content]
+            end
+          end
+          Step.new(step[:text], extra_args, step[:location][:line], step[:keyword])
+        end
       end
     end
 
@@ -48,10 +66,10 @@ module Turnip
     end
 
     class Background
-      attr_reader :steps
+      include Steps
+
       def initialize(raw)
         @raw = raw
-        @steps = []
       end
     end
 
@@ -59,47 +77,48 @@ module Turnip
       include Tags
       include Name
       include Line
+      include Steps
 
-      attr_accessor :steps
+      attr_writer :steps
 
       def initialize(raw)
         @raw = raw
-        @steps = []
       end
     end
 
     class ScenarioOutline
       include Tags
       include Name
-
-      attr_reader :steps
+      include Steps
 
       def initialize(raw)
         @raw = raw
-        @steps = []
-      end
-
-      def to_scenarios(examples)
-        rows = examples.rows.map(&:cells)
-        headers = rows.shift
-        rows.map do |row|
-          Scenario.new(@raw).tap do |scenario|
-            scenario.steps = steps.map do |step|
-              new_description = substitute(step.description, headers, row)
-              new_extra_args = step.extra_args.map do |ea|
-                case ea
-                when String
-                  substitute(ea, headers, row)
-                when Turnip::Table
-                  Turnip::Table.new(ea.map {|t_row| t_row.map {|t_col| substitute(t_col, headers, row) } })
-                else
-                  ea
+      end
+
+      def to_scenarios
+        return [] unless @raw[:examples]
+        @raw[:examples].map { |example|
+          headers = example[:tableHeader][:cells].map {|c| c[:value]}
+          rows = example[:tableBody].map {|r| r[:cells].map {|c| c[:value]}}
+          rows.map do |row|
+            Scenario.new(@raw).tap do |scenario|
+              scenario.steps = steps.map do |step|
+                new_description = substitute(step.description, headers, row)
+                new_extra_args = step.extra_args.map do |ea|
+                  case ea
+                  when String
+                    substitute(ea, headers, row)
+                  when Turnip::Table
+                    Turnip::Table.new(ea.map {|t_row| t_row.map {|t_col| substitute(t_col, headers, row) } })
+                  else
+                    ea
+                  end
                 end
+                Step.new(new_description, new_extra_args, step.line, step.keyword)
               end
-              Step.new(new_description, new_extra_args, step.line, step.keyword)
             end
           end
-        end
+        }.flatten
       end
 
       private
@@ -120,8 +139,9 @@ module Turnip
     class << self
       def build(feature_file)
         Turnip::Builder.new.tap do |builder|
-          parser = Gherkin::Parser::Parser.new(builder, true)
-          parser.parse(File.read(feature_file), feature_file, 0)
+          parser = Gherkin::Parser.new
+          result = parser.parse(File.read(feature_file))
+          builder.build(result)
         end
       end
     end
@@ -130,44 +150,21 @@ module Turnip
       @features = []
     end
 
-    def background(background)
-      @current_step_context = Background.new(background)
-      @current_feature.backgrounds << @current_step_context
-    end
-
-    def feature(feature)
-      @current_feature = Feature.new(feature)
-      @features << @current_feature
-    end
-
-    def scenario(scenario)
-      @current_step_context = Scenario.new(scenario)
-      @current_feature.scenarios << @current_step_context
-    end
-
-    def scenario_outline(outline)
-      @current_step_context = ScenarioOutline.new(outline)
-    end
-
-    def examples(examples)
-      @current_feature.scenarios.push(*@current_step_context.to_scenarios(examples))
-    end
-
-    def step(step)
-      extra_args = []
-      if step.doc_string
-        extra_args.push step.doc_string.value
-      elsif step.rows
-        table = Turnip::Table.new(step.rows.map(&:cells).map(&:to_a))
-        extra_args.push(table)
+    def build(attributes)
+      return unless attributes[:feature]
+      attr = attributes[:feature]
+      feature = Feature.new(attr)
+      attr[:children].each do |child|
+        case child[:type]
+        when :Background
+          feature.backgrounds << Background.new(child)
+        when :Scenario
+          feature.scenarios << Scenario.new(child)
+        else
+          feature.scenarios.push(*ScenarioOutline.new(child).to_scenarios)
+        end
       end
-      @current_step_context.steps << Step.new(step.name, extra_args, step.line, step.keyword)
-    end
-
-    def uri(*)
-    end
-
-    def eof
+      @features << feature
     end
   end
 end

data/lib/turnip/version.rb

@@ -1,3 +1,3 @@
 module Turnip
-  VERSION = '2.1.1'
+  VERSION = '3.0.0-beta.1'
 end

data/turnip.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "rspec", [">=3.0", "<4.0"]
-  s.add_runtime_dependency "gherkin", "~> 2.5"
+  s.add_runtime_dependency "gherkin", "~> 4.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnip
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0.pre.beta.1
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,9 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: turnip
 rubygems_version: 2.5.1