turnip_formatter 0.5.0 → 0.6.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f8621af1f4f10c1d79cc179059ade67809e222d
-  data.tar.gz: 7b11ed4cee5665a49ea8710f39d17c458a9f0158
+  metadata.gz: 195374f593f8a0a948c425c5b30846125ce713c2
+  data.tar.gz: 5062b23635c5b9bcbda2a3c58997b3cee708836e
 SHA512:
-  metadata.gz: fbbc44cc9b341da339e7319c91bfa78a4c553a45ce861c6987a9daa96af50082e69d12350b2140572e4b16dca13fee7c97204fc6884693221dae660dd618d23e
-  data.tar.gz: 8cf4ebefef3f777077e7d5a503dd1c4dc7b7c6969f374af77e2fdbc5bc270ce86483fe65e6970a5601fc414961a8bd7366ae99a36aa8d886f692cbb981cfe355
+  metadata.gz: 497aa307340cf60835a20d682fb8fb9d165b4de27292ea7620422397e56d0be6ebe55e8bef2a7b5a88340802a272994b8c62961d820b47c1bfb35fc48bfeae62
+  data.tar.gz: dcf3718d91084ab6d4115208426c8036ed357c78c6bae0f73606ee7bfa719069f4f9d3aaddbe9fbb3b3cfbfd515aeacb425cb2ef752f0e338fb758a31064975e

data/README.md

@@ -12,7 +12,7 @@ Requirements
 --------------------
 
 * Ruby
-    * `2.0.0` or later
+    * `2.1.0` or later
 
 Installation
 --------------------

data/lib/turnip_formatter/ext/turnip/rspec.rb

@@ -27,7 +27,7 @@ module Turnip
         feature.scenarios.zip(examples).each do |scenario, parent_example|
           example = parent_example.examples.first
           steps   = background_steps + scenario.steps
-          tags    = (feature.tags + scenario.tags).uniq
+          tags    = (feature.tag_names + scenario.tag_names).uniq
 
           example.metadata[:turnip_formatter] = { steps: steps, tags: tags }
         end

data/lib/turnip_formatter/printer/step.rb

@@ -1,5 +1,4 @@
 require 'turnip_formatter/printer'
-require 'turnip_formatter/printer/step_extra_args'
 
 module TurnipFormatter
   module Printer
@@ -22,7 +21,7 @@ module TurnipFormatter
         private
 
         def has_args_or_documents?(step, templates)
-          (step.extra_args.length + templates.length) > 0
+          step.argument || (templates.length > 0)
         end
 
         def documents(step, templates)

data/lib/turnip_formatter/printer/step_extra_args.rb

@@ -6,16 +6,17 @@ module TurnipFormatter
       class << self
         include TurnipFormatter::Printer
 
-        def print_out(args)
-          return '' if args.nil?
+        #
+        # @param  [nil or String or Turnip::Table]  Step argument
+        #
+        def print_out(argument)
+          return '' if argument.nil?
 
-          args.map do |arg|
-            if arg.instance_of?(Turnip::Table)
-              render_template(:step_outline, { table: arg.to_a })
-            else
-              render_template(:step_multiline, { lines: arg })
-            end
-          end.join
+          if argument.instance_of?(Turnip::Table)
+            render_template(:step_outline, { table: argument.to_a })
+          else
+            render_template(:step_multiline, { lines: argument })
+          end
         end
       end
     end

data/lib/turnip_formatter/step.rb

@@ -4,14 +4,14 @@ module TurnipFormatter
   class Step
     extend Forwardable
 
-    attr_reader :name, :example, :extra_args
+    attr_reader :name, :example, :argument
     attr_accessor :status
 
-    def_delegators :@raw, :extra_args, :line, :keyword, :description
+    def_delegators :@raw, :argument, :line, :keyword, :description
 
     #
     # @param  [RSpec::Core::Example]   example
-    # @param  [Turnip::Builder::Step]  raw
+    # @param  [Turnip::Node::Step]  raw
     #
     def initialize(example, raw)
       @example = example

data/lib/turnip_formatter/template/step.slim

@@ -2,5 +2,5 @@ div class="step #{step.status}"
   .step-title= step.name
   - if has_args_or_documents
     div.step-body
-      == TurnipFormatter::Printer::StepExtraArgs.print_out(step.extra_args)
+      == TurnipFormatter::Printer::StepExtraArgs.print_out(step.argument)
       == step_docs

data/lib/turnip_formatter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module TurnipFormatter
-  VERSION = '0.5.0'
+  VERSION = '0.6.0-beta.1'
 end

data/spec/support/example_helper.rb

@@ -20,6 +20,18 @@ module ExampleHelper
     example
   end
 
+  def create_step_node(keyword, text, line)
+    step_metadata = {
+      type: :Step,
+      location: { line: line, column: 1 },
+      keyword: keyword,
+      text: text,
+      argument: nil
+    }
+
+    Turnip::Node::Step.new(step_metadata)
+  end
+
   private
 
     def base_example(&assertion)
@@ -37,7 +49,7 @@ module ExampleHelper
     def example_metadata
       {
         turnip_formatter: {
-          steps: [Turnip::Builder::Step.new('Step 1', [], 1, 'When')],
+          steps: [create_step_node('Step', 'Step 1', 1)],
           tags: []
         }
       }

data/spec/support/step_helper.rb

@@ -22,6 +22,6 @@ module StepHelper
     end
 
     def step_description
-      Turnip::Builder::Step.new('StepName', ['Docstring'], 1, 'Keyword')
+      create_step_node('Keyword', 'StepName', 1)
     end
 end

data/spec/turnip_formatter/printer/step_extra_args_spec.rb

@@ -13,7 +13,7 @@ module TurnipFormatter::Printer
             ])
         end
 
-        subject { StepExtraArgs.print_out([string]) }
+        subject { StepExtraArgs.print_out(string) }
 
         it { should match %r{<td>State</td>[[:space:]]*<td>Money</td>} }
         it { should match %r{<td>&lt;Tokushima&gt;</td>[[:space:]]*<td>555</td>} }
@@ -24,7 +24,7 @@ module TurnipFormatter::Printer
     context 'String' do
       describe '.print_out' do
         let(:string) { 'a<a>a' }
-        subject { StepExtraArgs.print_out([string]) }
+        subject { StepExtraArgs.print_out(string) }
         it { should match %r{<pre class="multiline">a&lt;a&gt;a</pre>} }
       end
     end

data/spec/turnip_formatter/printer/step_spec.rb

@@ -8,7 +8,7 @@ describe TurnipFormatter::Printer::Step do
     context 'not has extra argument' do
       let(:step) do
         step = passed_step
-        expect(step).to receive(:extra_args).and_return([])
+        expect(step).to receive(:argument).and_return(nil)
         step
       end
 
@@ -23,7 +23,7 @@ describe TurnipFormatter::Printer::Step do
 
       let(:step) do
         step = passed_step
-        allow(step).to receive(:extra_args).and_return([table])
+        allow(step).to receive(:argument).and_return(table)
         step
       end
 
@@ -35,7 +35,9 @@ describe TurnipFormatter::Printer::Step do
 
     context 'has outline argument' do
       let(:step) do
-        passed_step
+        step = passed_step
+        allow(step).to receive(:argument).and_return('DocString')
+        step
       end
 
       it {

data/spec/turnip_formatter/scenario/failure_spec.rb

@@ -9,11 +9,11 @@ describe TurnipFormatter::Scenario::Failure do
       example = failed_example
       example.metadata[:turnip_formatter] = {
         steps: [
-          Turnip::Builder::Step.new('Step 1', [],  1, 'When'),
-          Turnip::Builder::Step.new('Step 2', [],  3, 'When'),
-          Turnip::Builder::Step.new('Step 3', [], 10, 'When'), # failed line
-          Turnip::Builder::Step.new('Step 4', [], 11, 'When'),
-          Turnip::Builder::Step.new('Step 5', [], 12, 'When')
+          create_step_node('When', 'Step 1',  1),
+          create_step_node('When', 'Step 2',  3),
+          create_step_node('When', 'Step 3', 10), # failed line
+          create_step_node('When', 'Step 4', 11),
+          create_step_node('When', 'Step 5', 12)
         ],
         tags: []
       }

data/spec/turnip_formatter/scenario/pending_spec.rb

@@ -9,11 +9,11 @@ describe TurnipFormatter::Scenario::Pending do
       example = pending_example
       example.metadata[:turnip_formatter] = {
         steps: [
-          Turnip::Builder::Step.new('Step 1', [],  1, 'When'),
-          Turnip::Builder::Step.new('Step 2', [],  3, 'When'),
-          Turnip::Builder::Step.new('Step 3', [], 10, 'When'), # pending line
-          Turnip::Builder::Step.new('Step 4', [], 11, 'When'),
-          Turnip::Builder::Step.new('Step 5', [], 12, 'When')
+          create_step_node('When', 'Step 1',  1),
+          create_step_node('When', 'Step 2',  3),
+          create_step_node('When', 'Step 3', 10), # pending line
+          create_step_node('When', 'Step 4', 11),
+          create_step_node('When', 'Step 5', 12)
         ],
         tags: []
       }

data/turnip_formatter.gemspec

@@ -18,13 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'turnip', '~> 2.1.0'
+  spec.add_dependency 'turnip', '~> 3.0.0.pre.beta'
   spec.add_dependency 'slim'
-  spec.add_dependency 'rspec', [">=3.0", "<4.0"]
+  spec.add_dependency 'rspec', [">=3.0", "<3.5"]
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'bootstrap-sass'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnip_formatter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.pre.beta.1
 platform: ruby
 authors:
 - Wataru MIYAGUNI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0.pre.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0.pre.beta
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -248,12 +234,12 @@ 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: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec custom formatter for Turnip