mcmire-matchy 0.5.0 → 0.5.1

data/lib/matchy.rb

@@ -74,6 +74,7 @@ module Matchy
     end
   
     def init
+      require 'matchy/assertions'
       require 'matchy/expectation_builder'
       require 'matchy/modals'
       require 'matchy/matcher_builder'
@@ -86,9 +87,12 @@ module Matchy
       require 'matchy/built_in/operator_expectations'
       require 'matchy/built_in/change_expectations'
 
-      # Track the current testcase and 
-      # provide it to the operator matchers.
       Matchy.test_case_class.class_eval do
+        include Matchy::Expectations::TestCaseExtensions
+        include Matchy::Assertions
+        
+        # Track the current testcase and 
+        # provide it to the operator matchers.
         alias_method :old_run_method_aliased_by_matchy, :run
         def run(whatever, *args, &block)
           $current_test_case = self
@@ -96,8 +100,7 @@ module Matchy
         end
       end
 
-      Matchy.test_case_class.send(:include, Matchy::Expectations::TestCaseExtensions)
-      Object.send(:include, Matchy::CustomMatcher)
+      Object.class_eval { include Matchy::CustomMatcher }
     end
   end
 end

data/lib/matchy/assertions.rb

@@ -0,0 +1,16 @@
+module Matchy
+  module Assertions
+    # Asserts that the given matcher returns true when +target+ is passed to #matches?
+    def assert_accepts(matcher, target)
+      success = matcher.matches?(target)
+      assert_block(matcher.failure_message) { success }
+    end
+
+    # Asserts that the given matcher returns false when +target+ is passed to #matches?
+    def assert_rejects(matcher, target)
+      success = !matcher.matches?(target)
+      assert_block(matcher.negative_failure_message) { success }
+    end
+  end
+
+end

data/lib/matchy/expectation_builder.rb

@@ -1,9 +1,13 @@
 module Matchy
   module ExpectationBuilder
-    def self.build_expectation(match, exp, obj)
-      return Matchy::Expectations::OperatorExpectation.new(obj, match) unless exp
+    def self.build_expectation(should_succeed, matcher, object)
+      return Matchy::Expectations::OperatorExpectation.new(object, should_succeed) unless matcher
       
-      (exp.matches?(obj) != match) ? exp.fail!(match) : exp.pass!(match)
+      if should_succeed
+        $current_test_case.assert_accepts(matcher, object)
+      else
+        $current_test_case.assert_rejects(matcher, object)
+      end
     end
   end
-end
+end

data/lib/matchy/matcher_builder.rb

@@ -34,18 +34,10 @@ module Matchy
           @match_block.call(given, self)
         end
         
-        def fail!(which)
-          @test_case.flunk(which ? failure_message : negative_failure_message)
-        end
-
-        def pass!(which)
-          @test_case.assert true
-        end
-        
         alias_method :failure_message, :positive_failure_message
       end
       
       Class.new(&body).new(match_block, self)
     end
   end
-end
+end

data/lib/matchy/version.rb

@@ -2,7 +2,7 @@ module Matchy
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mcmire-matchy
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Jeremy McAnally
@@ -28,6 +28,7 @@ files:
 - Rakefile
 - countloc.rb
 - lib/matchy.rb
+- lib/matchy/assertions.rb
 - lib/matchy/built_in/change_expectations.rb
 - lib/matchy/built_in/enumerable_expectations.rb
 - lib/matchy/built_in/error_expectations.rb