tiramisu 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a209cd49ba2dcf6462a297a09c967f59c1edff
-  data.tar.gz: c76e48db62fee768e7307da6b14250fa10f706a4
+  metadata.gz: 11710019095024e6b7c71230fe7be0f81c9b9588
+  data.tar.gz: 2a7bef2e89bb2b583d90542d9884d78a3e01ec94
 SHA512:
-  metadata.gz: 434656cd75baf8224f27ff707b9022d71b5d1ca5d5e16a244b9c86b6804e90a92c0ab9a23a9c9a43a4675ea40ee2451a30d27fb9c683496019d07a77fe09b571
-  data.tar.gz: 7be65f54d0f46526c3835b5abe5efe355bd55557cc1524350148333d0039cbbd2ad0b2c0f9354d213cc0cf3a48240345f8b523a15532228a8984ae596c13c9c1
+  metadata.gz: 6f4411008a3917843a7c522988841600e0d590e28e5b924bac1387f9f214e104e557d12c8bfa2a99bce99e9fe2461fb1df54d9b237cc9b766b0d142e7a66f233
+  data.tar.gz: 15c34e4091e5b6b2f9ce1ac64739a940beb109df843c56cc80aad3fa3abba2f5872e33584cc25638a7b82481e6a80d46500b6ba2bda2f44135612f0a1056eda1

data/README.md

@@ -1,8 +1,8 @@
 [![Build Status](https://travis-ci.org/sleewoo/tiramisu.svg)](https://travis-ci.org/sleewoo/tiramisu)
 
-## Tiramisu - a super-simple testing library for Ruby
+## Tiramisu - super-simple testing library for Ruby
 
-Its base API consist of just 10(yes, ten!) memorable methods:
+Its base API consist of just 10 memorable methods:
 
 - spec, context
 - before, around, after

data/lib/tiramisu.rb

@@ -106,10 +106,6 @@ module Tiramisu
   def fail reason, caller
     throw(:__tiramisu_status__, GenericFailure.new(Array(reason), caller))
   end
-
-  def void_hooks
-    {before: {}, around: {}, after: {}}
-  end
 end
 
 require 'tiramisu/core_ext'

data/lib/tiramisu/run.rb

@@ -64,7 +64,7 @@ module Tiramisu
   end
 
   def render_exception indent, failure
-    progress.log indent + underline.bright_red(failure.message)
+    progress.log indent + underline.bright_red([failure.class, failure.message]*': ')
     pretty_backtrace(failure).each {|l| progress.log(indent + l)}
   end
 

data/lib/tiramisu/unit.rb

@@ -34,7 +34,7 @@ module Tiramisu
     def __run__ test, before, around, after
       __send__(before) if before
       if around
-        __send__(around) {__send__(test)}
+        __send__(around, proc {__send__(test)})
       else
         __send__(test)
       end
@@ -58,6 +58,10 @@ module Tiramisu
 
   class << Unit
 
+    def inherited base
+      base.instance_variable_set(:@__tiramisu_hooks__, Marshal.load(Marshal.dump(hooks)))
+    end
+
     def spec
       raise(NotImplementedError, 'Nested specs not supported. Please use a context instead')
     end
@@ -89,9 +93,9 @@ module Tiramisu
       @__tiramisu_tests__ ||= {}
     end
 
-    # run some code before/around/after any or specific tests
+    # run some code before/around/after tests
     #
-    # @example call :define_users before any test (in current spec)
+    # @example
     #   spec User do
     #     before do
     #       @users = ...
@@ -102,20 +106,9 @@ module Tiramisu
     #     end
     #   end
     #
-    # @example run only after :photos test
-    #   spec User do
-    #     after :photos do
-    #       ...
-    #     end
-    #
-    #     test :photos do
-    #       ...
-    #     end
-    #   end
-    #
-    # @example run around :authorize and :authenticate tests
+    # @example
     #   spec User do
-    #     around :authorize, :authenticate do |&test|
+    #     around |&test|
     #       SomeApi.with_auth do
     #         test.call # run the test
     #       end
@@ -124,26 +117,33 @@ module Tiramisu
     #     test :authorize do
     #       # will run inside `with_auth` block
     #     end
-    #
-    #     test :authenticate do
-    #       # same
-    #     end
     #   end
     #
-    # @note if multiple hooks defined for same test only the last one will run
-    # @note named hooks will have precedence over wildcard ones
+    # @note hooks are inherited from parent spec or context
     #
-    # @example  named hooks have precedence over wildcard ones
-    #   before :math do
-    #     # named hook, to run only before :math test
-    #   end
+    # @example
+    #   spec Math do
+    #     before { @n = rand }
     #
-    #   before do
-    #     # wildcard hook, to run before any test
+    #     context :PI do
+    #       test :some_test do
+    #         # @n available here
+    #       end
+    #     end
     #   end
     #
-    #   test :math do
-    #     # only `bofore :math` hook will run here
+    # @note defined hooks will override inherited ones
+    #
+    # @example
+    #   spec Math do
+    #     before { @n = 1 }
+    #
+    #     context :x do
+    #       before { @n = 0 }
+    #       test :some_test do
+    #         # @n is zero here
+    #       end
+    #     end
     #   end
     #
     [
@@ -151,17 +151,15 @@ module Tiramisu
       :around,
       :after
     ].each do |hook|
-      define_method hook do |*tests,&block|
+      define_method hook do |&block|
         block || raise(ArgumentError, 'block missing')
-        meth = :"__tiramisu_hooks_#{hook}_#{block.source_location.join}__"
-        tests = [:__tiramisu_hooks_any__] if tests.empty?
-        tests.each {|t| (hooks[hook] ||= {})[t] = meth}
-        define_method(meth, &block)
+        hooks[hook] = :"__tiramisu__#{hook}_hook__"
+        define_method(hooks[hook], &block)
       end
     end
 
     def hooks
-      @__tiramisu_hooks__ ||= Tiramisu.void_hooks
+      @__tiramisu_hooks__ ||= {}
     end
 
     # skipping a whole spec/context
@@ -180,10 +178,7 @@ module Tiramisu
     def run test
       tests[test] || raise(StandardError, 'Undefined test %s at "%s"' % [test.inspect, __identity__])
       catch :__tiramisu_status__ do
-        allocate.__run__ tests[test],
-          hooks[:before][test] || hooks[:before][:__tiramisu_hooks_any__],
-          hooks[:around][test] || hooks[:around][:__tiramisu_hooks_any__],
-          hooks[:after][test]  || hooks[:after][:__tiramisu_hooks_any__]
+        allocate.__run__(tests[test], hooks[:before], hooks[:around], hooks[:after])
       end
     end
   end

data/test/context_inheritance_test.rb

@@ -49,17 +49,4 @@ describe :context_inheritance_test do
     assert_equal 1, spec_tests
     assert_equal 0, context_tests
   end
-
-  it 'does not inherit hooks' do
-    spec_hooks, context_hooks = nil
-    spec rand do
-      before {}
-      context rand do
-        context_hooks = hooks[:before].size
-      end
-      spec_hooks = hooks[:before].size
-    end
-    assert_equal 1, spec_hooks
-    assert_equal 0, context_hooks
-  end
 end

data/test/hooks_test.rb

@@ -1,36 +1,35 @@
 describe :hooks do
-  it 'calls wildcard hooks' do
+
+  it 'calls before and after hooks' do
     called = 0
     spec rand do
       before {called += 1}
-      test(:a) {}
-      test(:b) {}
-      run(:a)
-      run(:b)
+      after {called += 1}
+      test(:x) {}
+      run(:x)
     end
     assert_equal 2, called
   end
 
-  it 'calls named hooks' do
-    called = 0
+  it 'calls around hooks' do
+    called = false
     spec rand do
-      after(:b) {called += 1}
-      test(:a) {}
-      test(:b) {}
-      run(:a)
-      run(:b)
+      around {|test| test.call}
+      test(:x) {called = true}
+      run(:x)
     end
-    assert_equal 1, called
+    assert_equal true, called
   end
 
-  it 'prefers named hooks over wildcard ones' do
-    called = nil
+  it 'inherits hooks' do
+    spec_hooks, context_hooks = nil
     spec rand do
-      around(:a) {called = :named}
-      around {called = :wildcard}
-      test(:a) {}
-      run(:a)
+      before {}
+      context rand do
+        context_hooks = hooks
+      end
+      spec_hooks = hooks
     end
-    assert_equal :named, called
+    assert_equal context_hooks, spec_hooks
   end
 end

data/tiramisu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'tiramisu'
-  spec.version     = '0.0.3'
+  spec.version     = '0.0.4'
   spec.authors     = ['Slee Woo']
   spec.email       = ['mail@sleewoo.com']
   spec.description = 'Super-simple testing library for Ruby'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiramisu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-progressbar
@@ -191,5 +191,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: tiramisu-0.0.3
+summary: tiramisu-0.0.4
 test_files: []