turnip_formatter 0.3.1 → 0.3.2

data/lib/turnip_formatter/template.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
 require 'uri'
-require 'sass'
-require 'bootstrap-sass'
 
 module TurnipFormatter
   class Template
@@ -11,21 +9,28 @@ module TurnipFormatter
         TurnipFormatter.configuration.title
       end
 
+      def reset!
+        @js_code_list = []
+        @js_file_list = []
+        @css_code_list = []
+        @css_file_list = []
+      end
+
       def add_javascript(script)
         case
         when local_file?(script)
-          add_javascript_code File.read(script)
+          js_code_list << File.read(script)
         when remote_url?(script)
-          add_javascript_link script
+          js_file_list << script
         end
       end
 
       def add_stylesheet(stylesheet)
         case
         when local_file?(stylesheet)
-          add_stylesheet_code File.read(stylesheet)
+          css_code_list << File.read(stylesheet)
         when remote_url?(stylesheet)
-          add_stylesheet_link stylesheet
+          css_file_list << stylesheet
         end
       end
 
@@ -35,16 +40,16 @@ module TurnipFormatter
 
       def render_javascript_links
         js_file_list.map do |file|
-          "<script src=\"#{file}\" type=\"text/javascript\"></script>"
+          "<script src=\"#{file}\"></script>"
         end.join("\n")
       end
 
       def render_stylesheet_codes
-        TurnipFormatter.step_templates.each do |template|
-          add_stylesheet_code(template.class.scss)
+        codes = TurnipFormatter.step_templates.map do |template|
+          template.class.css
         end
 
-        css_code_list.join("\n")
+        codes.concat(css_code_list).join("\n")
       end
 
       def render_stylesheet_links
@@ -53,6 +58,8 @@ module TurnipFormatter
         end.join("\n")
       end
 
+      private
+
       def js_code_list
         @js_code_list ||= []
       end
@@ -69,28 +76,6 @@ module TurnipFormatter
         @css_file_list ||= []
       end
 
-      def scss_option
-        { syntax: :scss, style: :compressed }
-      end
-
-      private
-
-      def add_javascript_code(code)
-        js_code_list << code
-      end
-
-      def add_javascript_link(link)
-        js_file_list << link
-      end
-
-      def add_stylesheet_code(code)
-        css_code_list << Sass::Engine.new(code, scss_option).render
-      end
-
-      def add_stylesheet_link(file)
-        css_file_list << file
-      end
-
       def local_file?(path)
         File.exist? path
       end
@@ -98,15 +83,15 @@ module TurnipFormatter
       def remote_url?(path)
         uri = URI.parse(path)
         return true if %w(http https).include?(uri.scheme)
-        return true if (uri.scheme.nil? && path.start_with?('//'))
+        return true if uri.scheme.nil? && path.start_with?('//')
         false
       rescue URI::InvalidURIError
-        null
+        false
       end
     end
 
     (File.dirname(__FILE__) + '/template').tap do |dirname|
-      add_stylesheet(dirname + '/turnip_formatter.scss')
+      add_stylesheet(dirname + '/turnip_formatter.css')
       add_javascript(dirname + '/turnip_formatter.js')
     end
   end

data/lib/turnip_formatter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module TurnipFormatter
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/support/example_helper.rb

@@ -4,25 +4,20 @@ module ExampleHelper
   end
 
   def failed_example
-    example = base_example { expect(true).to be false }
-    example.exception.backtrace.push ':in step:0 `'
-    example
+    base_example { expect(true).to be false }
   end
 
   def pending_example
-    if ::RSpec::Version::STRING >= '2.99.0'
-      base_example { skip('No such step(0): ') }
-    else
-      base_example { pending('No such step(0): ') }
-    end
-  end
+    example = if ::RSpec::Version::STRING >= '2.99.0'
+                base_example { skip('No such step(0): ') }
+              else
+                base_example { pending('No such step(0): ') }
+              end
 
-  def invalid_pending_example
-    if ::RSpec::Version::STRING >= '2.99.0'
-      base_example { skip('Pending') }
-    else
-      base_example { pending('Pending') }
-    end
+    # Turnip::Rspec::Execute#run_step
+    example.metadata[:line_number] = 10
+    example.metadata[:location] = "#{example.metadata[:file_path]}:10"
+    example
   end
 
   private
@@ -31,14 +26,18 @@ module ExampleHelper
       group = ::RSpec::Core::ExampleGroup.describe('Feature').describe('Scenario')
       example = group.example('example', example_metadata, &assertion)
       example.metadata[:file_path] = '/path/to/hoge.feature'
-      group.run(NoopObject.new)
+
+      instance_eval <<-EOS, example.metadata[:file_path], 10
+        group.run(NoopObject.new)
+      EOS
+
       example
     end
 
     def example_metadata
       {
         turnip_formatter: {
-          steps: [ { name: 'Step 1', extra_args: [], keyword: 'When' } ],
+          steps: [Turnip::Builder::Step.new('Step 1', [], 1, 'When')],
           tags: []
         }
       }

data/spec/support/step_helper.rb

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

data/spec/turnip_formatter/printer/tab_speed_statistics_spec.rb

@@ -21,7 +21,7 @@ module TurnipFormatter::Printer
           expect(html).to have_tag "tbody tr:nth-child(#{index})" do
             with_tag 'td:nth-child(1) span', text: scenario.feature_name
             with_tag "td:nth-child(2) a[href='\##{scenario.id}']", text: scenario.name
-            with_tag 'td:nth-child(3) span', text: scenario.run_time
+            with_tag 'td:nth-child(3) span', text: /#{scenario.run_time}/
           end
         end
       end

data/spec/turnip_formatter/scenario/failure_spec.rb

@@ -4,6 +4,29 @@ describe TurnipFormatter::Scenario::Failure do
   let(:example) { failed_example }
   let(:scenario) { described_class.new(example) }
 
+  describe '#steps' do
+    let(:example) 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')
+        ],
+        tags: []
+      }
+      example
+    end
+
+    it 'should return steps that has status' do
+      expect = [:passed, :passed, :failed, :unexecuted, :unexecuted]
+      actual = scenario.steps.map(&:status)
+      expect(actual).to eq expect
+    end
+  end
+
   describe '#valid?' do
     subject { scenario.valid? }
 
@@ -13,7 +36,11 @@ describe TurnipFormatter::Scenario::Failure do
 
     context 'called by not turnip example' do
       let(:example) do
-        failed_example.tap { |e| e.exception.backtrace.pop }
+        backtrace = failed_example.exception.backtrace.reject do |b|
+          b.include? failed_example.metadata[:file_path]
+        end
+
+        failed_example.tap { |e| e.exception.set_backtrace(backtrace) }
       end
 
       it { should be false }

data/spec/turnip_formatter/scenario/pending_spec.rb

@@ -4,6 +4,29 @@ describe TurnipFormatter::Scenario::Pending do
   let(:example) { pending_example }
   let(:scenario) { described_class.new(example) }
 
+  describe '#steps' do
+    let(:example) 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')
+        ],
+        tags: []
+      }
+      example
+    end
+
+    it 'should return steps that has status' do
+      expect = [:passed, :passed, :pending, :unexecuted, :unexecuted]
+      actual = scenario.steps.map(&:status)
+      expect(actual).to eq expect
+    end
+  end
+
   describe '#valid?' do
     subject { scenario.valid? }
 
@@ -13,7 +36,7 @@ describe TurnipFormatter::Scenario::Pending do
 
     context 'called by not turnip example' do
       let(:example) do
-        invalid_pending_example
+        pending_example.tap { |e| e.metadata[:line_number] = nil }
       end
 
       it { should be false }

data/spec/turnip_formatter/step_template/exception_spec.rb

@@ -16,7 +16,7 @@ describe TurnipFormatter::StepTemplate::Exception do
     it do
       expect(subject).to have_tag 'div.step_exception' do
         with_tag 'pre'
-        with_tag 'ol > li', text: ':in step:0 `'
+        with_tag 'ol > li'
       end
     end
   end
@@ -26,7 +26,7 @@ describe TurnipFormatter::StepTemplate::Exception do
 
     it do
       expect(subject).to have_tag 'div.step_exception' do
-        with_tag 'pre', text: 'No such step(0):'
+        with_tag 'pre', text: 'No such step(0): '
         with_tag 'ol > li'
       end
     end

data/spec/turnip_formatter/template_spec.rb

@@ -1,6 +1,118 @@
 require 'spec_helper'
 
-module TurnipFormatter
-  describe Template do
+describe TurnipFormatter::Template do
+  let(:template) { described_class }
+
+  let(:local_js_path) do
+    Tempfile.open('local.js') do |f|
+      f.write('alert("local!");')
+      f.path
+    end
+  end
+
+  let(:local_css_path) do
+    Tempfile.open('local.css') do |f|
+      f.write('body { color: green; }')
+      f.path
+    end
+  end
+
+  let(:remote_js_path) { 'http://example.com/foo.js' }
+  let(:remote_css_path) { 'http://example.com/foo.css' }
+
+  before do
+    template.reset!
+  end
+
+  describe '.render_javascript_codes' do
+    subject { template.render_javascript_codes }
+
+    before do
+      template.add_javascript(path)
+    end
+
+    context 'added local javascript file' do
+      let(:path) { local_js_path }
+      it { should include 'alert("local!");' }
+    end
+
+    context 'add remote javascript file' do
+      let(:path) { remote_js_path }
+      it { should be_empty }
+    end
+  end
+
+  describe '.render_javascript_links' do
+    subject { template.render_javascript_links }
+
+    before do
+      template.add_javascript(path)
+    end
+
+    context 'added local javascript file' do
+      let(:path) { local_js_path }
+      it { should be_empty }
+    end
+
+    context 'add remote javascript file' do
+      let(:path) { remote_js_path }
+      it { should include %Q(<script src="#{path}"></script>) }
+    end
+
+    context 'add remote javascript file (no schema)' do
+      let(:path) { '//example.com/foo.js' }
+      it { should include %Q(<script src="#{path}"></script>) }
+    end
+
+    context 'add incorrect uri' do
+      let(:path) { 'http://e_xample.com/foo.js' }
+      it { should be_empty }
+    end
+  end
+
+  describe '.render_stylesheet_codes' do
+    subject { template.render_stylesheet_codes }
+
+    before do
+      template.add_stylesheet(path)
+    end
+
+    context 'added local stylesheet file' do
+      let(:path) { local_css_path }
+      it { should include 'body { color: green; }' }
+    end
+
+    context 'add remote stylesheet file' do
+      let(:path) { remote_css_path }
+      it { should be_empty }
+    end
+  end
+
+  describe '.render_stylesheet_links' do
+    subject { template.render_stylesheet_links }
+
+    before do
+      template.add_stylesheet(path)
+    end
+
+    context 'added local stylesheet file' do
+      let(:path) { local_js_path }
+      it { should be_empty }
+    end
+
+    context 'add remote stylesheet file' do
+      let(:path) { remote_css_path }
+      it { should include %Q(<link rel="stylesheet" href="#{path}">) }
+    end
+
+    context 'add remote stylesheet file (no schema)' do
+      let(:path) { '//example.com/foo.css' }
+      it { should include %Q(<link rel="stylesheet" href="#{path}">) }
+    end
+
+    context 'add incorrect uri' do
+      let(:path) { 'http://e_xample.com/foo.css' }
+      it { should be_empty }
+    end
   end
 end

data/turnip_formatter.gemspec

@@ -18,15 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'turnip', '~> 1.2.2'
-  spec.add_dependency 'tilt'
-  spec.add_dependency 'haml'
-  spec.add_dependency 'sass'
-  spec.add_dependency 'bootstrap-sass'
+  spec.add_dependency 'turnip', '~> 1.2.4'
+  spec.add_dependency 'slim'
   spec.add_dependency 'rspec', ['>=2.14.0', '<4.0']
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec-html-matchers'
   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.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Wataru MIYAGUNI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,41 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,41 +87,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-html-matchers
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -225,18 +211,20 @@ files:
 - lib/turnip_formatter/step.rb
 - lib/turnip_formatter/step_template/base.rb
 - lib/turnip_formatter/step_template/exception.rb
+- lib/turnip_formatter/step_template/exception.slim
 - lib/turnip_formatter/step_template/source.rb
 - lib/turnip_formatter/template.rb
-- lib/turnip_formatter/template/exception.haml
-- lib/turnip_formatter/template/index.haml
-- lib/turnip_formatter/template/runtime_exception.haml
-- lib/turnip_formatter/template/scenario.haml
-- lib/turnip_formatter/template/step.haml
-- lib/turnip_formatter/template/step_multiline.haml
-- lib/turnip_formatter/template/step_outline.haml
-- lib/turnip_formatter/template/tab_feature_statistics.haml
-- lib/turnip_formatter/template/tab_speed_statistics.haml
-- lib/turnip_formatter/template/tab_tag_statistics.haml
+- lib/turnip_formatter/template/exception.slim
+- lib/turnip_formatter/template/index.slim
+- lib/turnip_formatter/template/runtime_exception.slim
+- lib/turnip_formatter/template/scenario.slim
+- lib/turnip_formatter/template/step.slim
+- lib/turnip_formatter/template/step_multiline.slim
+- lib/turnip_formatter/template/step_outline.slim
+- lib/turnip_formatter/template/tab_feature_statistics.slim
+- lib/turnip_formatter/template/tab_speed_statistics.slim
+- lib/turnip_formatter/template/tab_tag_statistics.slim
+- lib/turnip_formatter/template/turnip_formatter.css
 - lib/turnip_formatter/template/turnip_formatter.js
 - lib/turnip_formatter/template/turnip_formatter.scss
 - lib/turnip_formatter/version.rb

data/lib/turnip_formatter/template/exception.haml

@@ -1,8 +0,0 @@
-%dt&= title + ' Exception'
-%dd
-  %pre&= exception.to_s
-%dt&= title + ' Exception Backtrace'
-%dd
-  %ol
-    - exception.backtrace.each do |line|
-      %li&= line