allure-rspec 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94fdce22859d8df7204968151db9efb0cade07aa
-  data.tar.gz: cd36d1f23992e382b80e403409c6c0302082d5df
+  metadata.gz: 508534700db94be2b689f750c44328efdd5de1c9
+  data.tar.gz: 1f08ed1aaa1e60d1828e356fd4b0809e71acb714
 SHA512:
-  metadata.gz: 3880801f35eee981a6b783956b57543b365409b2638f508cac7f1fabb73ab699d88d9c026bde1f59a237c3e2a971d594a8e7b89e59f7146c555be1c7591f972c
-  data.tar.gz: c9c303a719d88f107c074a35445cfdac20a1ccca46dc1de498f8bb816764a2ed50bab6a1f516d57d5504b7a34503bafec7edf34e9b70d55d2fd96830a8ba9f08
+  metadata.gz: 7cd225374e89b44d2b6b6968a5710483e91d62efac8728cc4a296d2bf28d9898590b56c4bc9d1b5a7d1766b0763c41d75f1ef8c88ca41dc7d16edd7c4f4f02da
+  data.tar.gz: 186f6bea16e012666d0c9b6fa16343254b6dcdaff55630cd55ca9f70bb5bf26c6f5f70446424b7da65c526f748697d100d1bc0678fdac511cfe5c8f41cf11a8c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    allure-rspec (0.3.4)
+    allure-rspec (0.4.0)
       mimemagic
       nokogiri (~> 1.6.0)
       rspec (~> 2.14.0)

data/lib/allure-rspec.rb

@@ -3,6 +3,7 @@ require 'allure-rspec/formatter'
 require 'allure-rspec/adaptor'
 require 'allure-rspec/dsl'
 require 'allure-rspec/builder'
+require 'allure-rspec/hooks'
 
 module AllureRSpec
   include AllureRSpec::DSL
@@ -10,12 +11,17 @@ module AllureRSpec
   module Config
     class << self
       attr_accessor :output_dir
+      attr_accessor :rspec
 
       DEFAULT_OUTPUT_DIR = 'allure/data'
 
       def output_dir
         @output_dir || DEFAULT_OUTPUT_DIR
       end
+
+      def rspec
+        @rspec
+      end
     end
   end
 

data/lib/allure-rspec/adaptor.rb

@@ -1,10 +1,12 @@
 module AllureRSpec
   module Adaptor
     def self.included(base)
+      AllureRSpec::Config.rspec = base
       base.send :include, AllureRSpec::DSL
       if RSpec.configuration.formatters.find_all {|f| f.is_a?(AllureRSpec::Formatter)}.empty?
         RSpec.configuration.add_formatter(AllureRSpec::Formatter)
       end
+      RSpec::Core::ExampleGroup.send :include, AllureRSpec::Hooks
     end
   end
 end

data/lib/allure-rspec/dsl.rb

@@ -3,8 +3,6 @@ require 'mimemagic'
 module AllureRSpec
   module DSL
 
-    ALLOWED_ATTACH_EXTS = %w[txt html xml png jpg json]
-
     def __mutex
       @@__mutex ||= Mutex.new
     end
@@ -19,9 +17,14 @@ module AllureRSpec
 
     def __with_step(step, &block)
       __mutex.synchronize do
-        @@__current_step = step
-        yield
-        @@__current_step = nil
+        begin
+          Config.rspec.send :run_hook, :before, :step, example
+          @@__current_step = step
+          yield
+        ensure
+          Config.rspec.send :run_hook, :after, :step, example
+          @@__current_step = nil
+        end
       end
     end
 

data/lib/allure-rspec/hooks.rb

@@ -0,0 +1,55 @@
+module AllureRSpec
+  module Hooks
+
+    def self.included(cls)
+      cls.extend OverrideHooksMethods
+    end
+
+    module OverrideHooksMethods
+      include RSpec::Core::Hooks
+      alias_method :old_extract_scope_from, :extract_scope_from
+      alias_method :old_hooks, :hooks
+      alias_method :old_find_hook, :find_hook
+
+      SCOPES = [:each, :all, :suite, :step]
+
+      def hooks
+        if @__hooks.nil?
+          @__hooks ||= old_hooks
+          [:before, :after].each { |scope|
+            @__hooks[scope][:step] = HookCollection.new
+          }
+        end
+        @__hooks
+      end
+
+      def before_step_hooks_for(example)
+        HookCollection.new(parent_groups.reverse.map { |a| a.hooks[:before][:step] }.flatten).for(example)
+      end
+
+      def after_step_hooks_for(example)
+        HookCollection.new(parent_groups.map { |a| a.hooks[:after][:step] }.flatten).for(example)
+      end
+
+      def find_hook(hook, scope, example_or_group, initial_procsy)
+        case [hook, scope]
+          when [:before, :step]
+            before_step_hooks_for(example_or_group)
+          when [:after, :step]
+            after_step_hooks_for(example_or_group)
+          else
+            old_find_hook(hook, scope, example_or_group, initial_procsy)
+        end
+      end
+
+      def extract_scope_from(args)
+        if SCOPES.include?(args.first)
+          args.shift
+        else
+          old_extract_scope_from(args)
+        end
+      end
+    end
+  end
+end
+

data/lib/allure-rspec/version.rb

@@ -1,5 +1,5 @@
 module AllureRSpec # :nodoc:
   module Version # :nodoc:
-    STRING = '0.3.4'
+    STRING = '0.4.0'
   end
 end

data/spec/another_spec.rb

@@ -3,6 +3,14 @@ require 'tempfile'
 
 describe "Some another spec" do
 
+  before(:each) do
+    puts "before each"
+  end
+
+  after(:each) do
+    puts "after each"
+  end
+
   it "10 cannot be greater than 19" do
     10.should > 19
   end

data/spec/extend_steps_spec.rb

@@ -2,6 +2,39 @@ require 'spec_helper'
 require 'tempfile'
 
 describe AllureRSpec do
+
+  before(:suite) do
+    puts "before suite"
+  end
+
+  before(:all) do
+    puts "before all"
+  end
+
+  before(:step) do
+    puts "before step"
+  end
+
+  before(:each) do
+    puts "before each"
+  end
+
+  after(:step) do
+    puts "after step"
+  end
+
+  after(:each) do
+    puts "after each"
+  end
+
+  after(:suite) do
+    puts "after suite"
+  end
+
+  after(:all) do
+    puts "after all"
+  end
+
   it "should build" do
     attach_file "test-file1", Tempfile.new("test")
     step "step1" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-rspec
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Ilya Sadykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -112,6 +112,7 @@ files:
 - lib/allure-rspec/builder.rb
 - lib/allure-rspec/dsl.rb
 - lib/allure-rspec/formatter.rb
+- lib/allure-rspec/hooks.rb
 - lib/allure-rspec/version.rb
 - logo.png
 - spec/another_spec.rb
@@ -140,5 +141,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: allure-rspec-0.3.4
+summary: allure-rspec-0.4.0
 test_files: []