test-belt 1.0.1 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-belt (1.0.1)
+    test-belt (1.1.0)
       leftright (~> 0.9.0)
 
 GEM

data/lib/test_belt/matchers.rb

@@ -23,7 +23,7 @@ module TestBelt::Matchers
   end
 
   def assert_matcher(matcher)
-    assert_block(matcher.fail_message) { matcher.matches?(subject) }
+    instance_exec(*matcher.args, &matcher.test)
   end
 
 end

data/lib/test_belt/matchers/base.rb

@@ -1,20 +1,25 @@
 module TestBelt::Matchers
 
   # Test Belt provides matchers to test common scenarios.  Use these matchers
-  # in combination with the 'should' method to run common test cases.  All
-  # matchers should subclass this base class.
+  # in combination with the 'should' method to run common tests.  All matchers
+  # should subclass this base class.
 
   class Base
+    attr_accessor :args
+
     def desc
-      raise NotImplementedError, "no description provided for the matcher"
+      raise NotImplementedError, "provide a 'desc' method"
     end
 
-    def matches?(*args)
-      raise NotImplementedError, "no matches? test logic provided for the matcher"
+    def test
+      raise NotImplementedError, "provide a 'test' method that returns a Proc that runs the matcher test"
     end
 
-    def fail_message
-      raise NotImplementedError, "no fail message provided for the matcher"
+    protected
+
+    def using(*args, &block)
+      self.args = args
+      block
     end
   end
 

data/lib/test_belt/matchers/have_class_methods.rb

@@ -26,13 +26,10 @@ module TestBelt::Matchers
         "respond to class method ##{@method}"
       end
 
-      def matches?(subject)
-        @subject = subject
-        subject.class.respond_to?(@method)
-      end
-
-      def fail_message
-        "#{@subject.class.name} does not have the class method ##{@method}"
+      def test
+        using(@method) do |method|
+          assert subject.class.respond_to?(method), "#{subject.class.name} does not have the class method ##{method}"
+        end
       end
     end
 

data/lib/test_belt/matchers/have_files.rb

@@ -25,12 +25,10 @@ module TestBelt::Matchers
         "have the file path '#{@file_path}'"
       end
 
-      def matches?(subject)
-        File.exists?(@file_path)
-      end
-
-      def fail_message
-        "'#{@file}' does not exist"
+      def test
+        using(@file_path) do |path|
+          assert File.exists?(path), "'#{path}' does not exist"
+        end
       end
     end
 

data/lib/test_belt/matchers/have_instance_methods.rb

@@ -22,21 +22,18 @@ module TestBelt::Matchers
         @method = method
       end
 
-      def method_type
-        "instance method"
-      end
-
       def desc
         "respond to #{method_type} ##{@method}"
       end
 
-      def matches?(subject)
-        @subject = subject
-        subject.respond_to?(@method)
+      def test
+        using(@method) do |method|
+          assert subject.respond_to?(method), "#{subject.class.name} does not have instance method ##{method}"
+        end
       end
 
-      def fail_message
-        "#{@subject.class.name} does not have instance method ##{@method}"
+      def method_type
+        "instance method"
       end
     end
 

data/lib/test_belt/version.rb

@@ -1,3 +1,3 @@
 module TestBelt
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/matchers_test.rb

@@ -34,6 +34,16 @@ module TestBelt::Matchers
     include TestBelt
 
     context "the HaveInstanceMethods matcher"
+    subject {
+      class InstanceMethodsTest
+        def meth1
+          'meth1'
+        end
+
+        attr_reader :meth2
+      end
+      InstanceMethodsTest.new
+    }
 
     should "take one string/symbol method argument" do
       [nil, 12, Object, [], {}].each do |arg|
@@ -48,21 +58,9 @@ module TestBelt::Matchers
       end
     end
 
-    should "match things with the expected instance method" do
-      {
-        :meth1 => (class Test1; def meth1; 'meth1'; end; end; Test1.new),
-        'meth2' => (class Test2; attr_reader :meth2; end; Test2.new)
-      }.each do |meth, subject|
-        assert HaveInstanceMethods::Matcher.new(meth).matches?(subject)
-      end
-    end
-
-    should "not match things without the expected instance methods" do
-      {
-        :meth3 => (class Test3; def meth1; 'meth1'; end; end; Test3.new),
-        'meth1' => (class Test4; attr_reader :meth2; end; Test4.new)
-      }.each do |meth, subject|
-        assert !HaveInstanceMethods::Matcher.new(meth).matches?(subject)
+    should "assert an expected instance method is present on the subject" do
+      [:meth1, 'meth2'].each do |meth|
+        assert_matcher HaveInstanceMethods::Matcher.new(meth)
       end
     end
   end
@@ -73,6 +71,16 @@ module TestBelt::Matchers
     include TestBelt
 
     context "the HaveClassMethods matcher"
+    subject {
+      class ClassMethodsTest
+        def self.meth1
+          'meth1'
+        end
+
+        attr_reader :meth2
+      end
+      ClassMethodsTest.new
+    }
 
     should "take one string/symbol method argument" do
       [nil, 12, Object, [], {}].each do |arg|
@@ -87,19 +95,9 @@ module TestBelt::Matchers
       end
     end
 
-    should "match things with the expected class method" do
-      { :meth1 => (class Test1; def self.meth1; 'meth1'; end; end; Test1.new)
-      }.each do |meth, subject|
-        assert HaveClassMethods::Matcher.new(meth).matches?(subject)
-      end
-    end
-
-    should "not match things without the expected class methods" do
-      { :meth3 => (class Test3; def self.meth1; 'meth1'; end; end; Test3.new),
-        :meth2 => (class Test2; def meth2; 'meth2'; end; end; Test2.new),
-        'meth1' => (class Test4; attr_reader :meth2; end; Test4.new)
-      }.each do |meth, subject|
-        assert !HaveClassMethods::Matcher.new(meth).matches?(subject)
+    should "assert an expected class method is present on the subject" do
+      [:meth1].each do |meth, subject|
+        assert_matcher HaveClassMethods::Matcher.new(meth)
       end
     end
   end
@@ -111,22 +109,9 @@ module TestBelt::Matchers
 
     context "the HaveFiles matcher"
 
-    should "match on file paths that exist" do
-      assert HaveFiles::Matcher.new('./test/fixtures/').matches?(subject)
-      assert HaveFiles::Matcher.new('test/fixtures/thing.rb').matches?(subject)
-    end
-
-    should "not match on file paths that do not exist" do
-      assert !HaveFiles::Matcher.new('./test/no_exist').matches?(subject)
-      assert !HaveFiles::Matcher.new('test/fixtures/no_exist.file').matches?(subject)
-    end
-
-    # should provide these macros
-    should "provide a set of macros" do
-      assert self.class.respond_to?(:have_directories), "no :should_have_directories macro"
-      assert self.class.respond_to?(:have_directory), "no :should_have_directory macro"
-      assert self.class.respond_to?(:have_files), "no :should_have_files macro"
-      assert self.class.respond_to?(:have_file), "no :should_have_file macro"
+    should "assert an existing file path actually exists" do
+      assert_matcher HaveFiles::Matcher.new('./test/fixtures/')
+      assert_matcher HaveFiles::Matcher.new('test/fixtures/thing.rb')
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test-belt
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Kelly D. Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 Z
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler