brass 1.0.0 → 1.1.0

data/.ruby

@@ -41,7 +41,7 @@ revision: 0
 created: '2012-01-24'
 summary: Bare-Metal Ruby Assertion System Standard
 title: BRASS
-version: 1.0.0
+version: 1.1.0
 name: brass
 description: ! 'BRASS stands for Bare-Metal Ruby Assertion System Standard. It is
   a very basic
@@ -50,4 +50,4 @@ description: ! 'BRASS stands for Bare-Metal Ruby Assertion System Standard. It i
 
   to make use so they can all work together harmoniously.'
 organization: Rubyworks
-date: '2012-01-24'
+date: '2012-01-25'

data/HISTORY.rdoc

@@ -1,5 +1,16 @@
 = HISTORY
 
+== 1.1.0 | 2012-01-25
+
+Quick fix for issue with parsing arguments of #assert and #refute methods.
+Also added #fail! method to dry-up code.
+
+Changes:
+
+* Fix arguments parsing for assert/refute.
+* Add #fail! method to dry-up code.
+
+
 == 1.0.0 | 2012-01-24
 
 This is the initial release of BRASS. It is given a 1.0.0 version

data/lib/brass.rb

@@ -10,6 +10,12 @@ class Exception
     @assertion = boolean  # ? true : false
   end
 
+  # Set message.
+  # (not strictly needed here, but can be useful anyway).
+  def set_message(msg)
+    @mesg = msg.to_str
+  end
+
 end
 
 module Kernel
@@ -29,18 +35,7 @@ module Kernel
       # if fail set assertion=true then just,
       #   fail *raise_arguments
       # but alas ...
-      if Exception === raise_arguments.first
-        error = raise_arguments.shift
-      else
-        if Exception > raise_arguments.first
-          error_class = raise_arguments.shift
-        else
-          error_class = StandardError
-        end
-        error = error_class.new(*raise_arguments)
-      end
-      error.set_assertion(true)
-      raise error
+      fail! *raise_arguments
     end
   end
 
@@ -56,18 +51,7 @@ module Kernel
       # if fail set assertion=true then just,
       #   fail *raise_arguments
       # but alas ...
-      if Exception === raise_arguments.first
-        error = raise_arguments.shift
-      else
-        if Exception > raise_arguments.first
-          error_class = raise_arguments.shift
-        else
-          error_class = StandardError
-        end
-        error = error_class.new(*raise_arguments)
-      end
-      error.set_assertion(true)
-      raise error
+      fail! *raise_arguments
     else
       $ASSERTION_COUNTS[:pass] += 1
     end
@@ -75,4 +59,39 @@ module Kernel
 
   module_function :refute
 
+  #
+  # Alternate for #fail that also sets assertion flag to +true+.
+  #
+  def fail!(*raise_arguments)
+    backtrace = case raise_arguments.last
+                when Array
+                  raise_arguments.pop
+                else
+                  nil
+                end
+
+    exception = case raise_arguments.first
+                when Exception
+                  raise_arguments.shift
+                when Class
+                  raise ArgumentError unless Exception > raise_arguments.first
+                  error_class = raise_arguments.shift
+                  error_class.new(*raise_arguments)
+                else
+                  error_class = StandardError
+                  error_class.new(*raise_arguments)
+                end
+
+    exception.set_backtrace(backtrace) if backtrace
+    exception.set_assertion(true)
+
+    fail exception
+  end
+
+  module_function :fail!
+
+  private :assert
+  private :refute
+  private :fail!
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brass
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &26437340 !ruby/object:Gem::Requirement
+  requirement: &19650860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26437340
+  version_requirements: *19650860
 - !ruby/object:Gem::Dependency
   name: lemon
-  requirement: &26436120 !ruby/object:Gem::Requirement
+  requirement: &19650020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26436120
+  version_requirements: *19650020
 - !ruby/object:Gem::Dependency
   name: rubytest
-  requirement: &26460580 !ruby/object:Gem::Requirement
+  requirement: &19649060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26460580
+  version_requirements: *19649060
 description: ! 'BRASS stands for Bare-Metal Ruby Assertion System Standard. It is
   a very basic