passert 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24bc8b6a6f929cd97fbca9a3d4b72e99a7f779ff
-  data.tar.gz: f6991f53e826b87bc11d14a3fc4c84b176c6ece3
+SHA256:
+  metadata.gz: 8903935f3bebcb9affa052c61128c916f98d3e5c8730f633e31a39449a116a0a
+  data.tar.gz: d9c50854c5693e1d2496918520df36ecb14ec106d64c8f8994c2093b0f042bdd
 SHA512:
-  metadata.gz: 72cb81ca9f2eb946b11c3d3d45107f97bf2fcee0dfff7f66b110c168ed184ccdc8d70fed967dc19b00050c66f4c4f50e7496275c41a9db127e605d40c5cd35c5
-  data.tar.gz: f4eb8ab3a43fd7c586e02cb14ce25b38ed44272f0b4361acaedc751c868c75924fbe31e14080aa916215cd36109b90b65b0887d9b9391632ec767114bdc57721
+  metadata.gz: 300cbefe7fe1782620c5352fa4e9d0d5bd6914fd3b339dd4804a23db9996349940ab9621bd9cb9bd08a5408dee55253896d6f30437474b38f5a76a1953f2bda4
+  data.tar.gz: bc0293cfed20301b4507cf2d4a23fb51ae13658e732bb6ee22ef7adc6f1ffcacf6d431b822f379a4ad06c4acabfe74ec02c76a416f6faab97e85e24ffe22a6c9

data/lib/passert.rb

@@ -4,36 +4,20 @@ module Passert
   class AssertionFailed < StandardError; end
 
   class << self
-    def assert(first, second = (second_omitted = true; nil))
-      # Want to support:
-      #   assert(x)                       # Truthiness.
-      #   assert(thing, other)            # Trip-equals.
-      #   assert([thing1, thing2], other) # Multiple Trip-equals.
-
-      if second_omitted
-        comparison = nil
-        truth      = first
-      else
-        comparison = first
-        truth      = second
-      end
-
-      pass =
-        if second_omitted
-          truth
-        elsif comparison.is_a?(Array)
-          comparison.any? { |k| k === truth }
-        else
-          comparison === truth
-        end
+    def assert?(*args)
+      pass, _, _ = _check_assertion(*args)
+      pass
+    end
 
-      return truth if pass
+    def assert(*args)
+      pass, expected, actual = _check_assertion(*args)
+      return actual if pass
 
       message =
         if block_given?
           yield
-        elsif comparison
-          "Expected #{comparison.inspect}, got #{truth.inspect}!"
+        elsif expected
+          "Expected #{expected.inspect}, got #{actual.inspect}!"
         else
           "Assertion failed!"
         end
@@ -48,5 +32,33 @@ module Passert
         raise AssertionFailed, message.to_s, backtrace
       end
     end
+
+    private
+
+    def _check_assertion(first, second = (second_omitted = true; nil))
+      # Want to support:
+      #   assert(x)                       # Truthiness.
+      #   assert(thing, other)            # Trip-equals.
+      #   assert([thing1, thing2], other) # Multiple Trip-equals.
+
+      if second_omitted
+        expected = nil
+        actual   = first
+      else
+        expected = first
+        actual   = second
+      end
+
+      pass =
+        if second_omitted
+          actual
+        elsif expected.is_a?(Array)
+          expected.any? { |k| k === actual }
+        else
+          expected === actual
+        end
+
+      [!!pass, expected, actual]
+    end
   end
 end

data/lib/passert/core_ext.rb

@@ -5,9 +5,13 @@ AssertionFailed = Passert::AssertionFailed
 module Kernel
   def assert(*args, &block)
     Passert.assert(*args, &block)
-  rescue => e
+  rescue AssertionFailed => e
     # Remove this method from the backtrace, since it's not helpful.
     e.backtrace.shift
     raise e
   end
+
+  def assert?(*args, &block)
+    Passert.assert?(*args, &block)
+  end
 end

data/lib/passert/version.rb

@@ -1,3 +1,3 @@
 module Passert
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passert
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Simple assertions in Ruby.