exemplor 2010.1.0 → 2010.2.0

data/VERSION

@@ -1 +1 @@
-2010.1.0
+2010.2.0

data/examples.rb

@@ -46,6 +46,7 @@ eg { check_output_matches_expected_for :assertion_success }
 eg { check_output_matches_expected_for :assertion_failure }
 eg { check_output_matches_expected_for :assertion_success_and_failure }
 eg { check_output_matches_expected_for :assertion_success_and_info }
+eg { check_output_matches_expected_for :failure_halts_execution }
 eg { check_output_matches_expected_for :helpers }
 eg { check_output_matches_expected_for :with_setup }
 eg { check_output_matches_expected_for :checking_nil }

data/examples/failure_halts_execution.rb

@@ -0,0 +1,17 @@
+require 'exemplor'
+
+eg 'Failures halt execution' do
+  list = [1, 2, 3]
+  Check(list.first).is(1_000_000) # fail!
+  raise "foo" # we never get here
+end
+
+__END__
+
+- name: Failures halt execution
+  status: failure
+  result: 
+  - name: list.first
+    status: failure
+    expected: 1000000
+    actual: 1

data/lib/checker.rb

@@ -18,9 +18,13 @@ module Exemplor
       @name + (defined?(@disambiguate) ? " #{@disambiguate}" : '')
     end
 
+    # might be better to use throw here
+    class Failure < StandardError; end
+
     def is(expectation)
       @expectation = expectation
       @status = (value == expectation) ? :success : :failure
+      raise Failure if failure?
     end
 
     def success?

data/lib/environment.rb

@@ -18,10 +18,14 @@ module Exemplor
 
           env.instance_eval(&self.setup_block) if self.setup_block
           value = env.instance_eval(&code)
-          result = env._status == :info ?
-            render_value(value) : render_checks(env._checks)
-          [env._status, result]
+          if env._checks.empty?
+            [:info, render_value(value)]
+          else # :infos or :success
+            [env._status, render_checks(env._checks)]
+          end
 
+        rescue Check::Failure => failure
+          [:failure, render_checks(env._checks)]
         rescue Object => error
           [:error, render_error(error)]
         ensure
@@ -99,8 +103,6 @@ module Exemplor
     end
 
     def _status
-      (:info    if _checks.empty?) ||
-      (:failure if _checks.any? { |c| c.failure? }) ||
       (:success if _checks.all? { |c| c.success? }) ||
        :infos
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2010
-  - 1
+  - 2
   - 0
-  version: 2010.1.0
+  version: 2010.2.0
 platform: ruby
 authors: 
 - Myles Byrne
@@ -70,6 +70,7 @@ files:
 - examples/check_with_disambiguation.rb
 - examples/checking_nil.rb
 - examples/dumping_classes.rb
+- examples/failure_halts_execution.rb
 - examples/helpers.rb
 - examples/no_checks.rb
 - examples/no_checks_non_string.rb
@@ -124,6 +125,7 @@ test_files:
 - examples/check_with_disambiguation.rb
 - examples/checking_nil.rb
 - examples/dumping_classes.rb
+- examples/failure_halts_execution.rb
 - examples/helpers.rb
 - examples/no_checks.rb
 - examples/no_checks_non_string.rb