mspec 1.5.7 → 1.5.8

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors                   = ["Brian Ford"]
-  s.date                      = %q{2009-2-5}
+  s.date                      = %q{2009-2-9}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

data/lib/mspec/guards/bug.rb

@@ -7,7 +7,7 @@ class BugGuard < VersionGuard
   end
 
   def match?
-    implementation?(:ruby, :ruby18, :ruby19) && ruby_version <= @version
+    standard? && ruby_version <= @version
   end
 end
 

data/lib/mspec/guards/compliance.rb

@@ -1,18 +1,27 @@
 require 'mspec/guards/guard'
 
-class ComplianceGuard < SpecGuard
+class CompliantOnGuard < SpecGuard
+  def match?
+    standard? or implementation?(*@args)
+  end
+end
+
+class NotCompliantOnGuard < SpecGuard
+  def match?
+    standard? or !implementation?(*@args)
+  end
 end
 
 class Object
   def compliant_on(*args)
-    g = ComplianceGuard.new(*args)
+    g = CompliantOnGuard.new(*args)
     yield if g.yield?
     g.unregister
   end
 
   def not_compliant_on(*args)
-    g = ComplianceGuard.new(*args)
-    yield if g.yield? true
+    g = NotCompliantOnGuard.new(*args)
+    yield if g.yield?
     g.unregister
   end
 end

data/lib/mspec/guards/extensions.rb

@@ -1,6 +1,11 @@
 require 'mspec/guards/guard'
 
 class ExtensionsGuard < SpecGuard
+  def match?
+    match = implementation?(*@args)
+    raise Exception, "improper use of extended_on guard" if match and standard?
+    match
+  end
 end
 
 class Object

data/lib/mspec/guards/guard.rb

@@ -39,7 +39,9 @@ class SpecGuard
       n = 4
     end
 
-    version = "#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
+    patch = RUBY_PATCHLEVEL.to_i
+    patch = 0 if patch < 0
+    version = "#{RUBY_VERSION}.#{patch}"
     version.split('.')[0,n].join('.')
   end
 
@@ -87,24 +89,26 @@ class SpecGuard
   def implementation?(*args)
     args.any? do |name|
       !!case name
-      when :rbx, :rubinius
+      when :rubinius
         RUBY_NAME =~ /^rbx/
       when :ruby
         RUBY_NAME =~ /^ruby/
-      when :ruby18
-        RUBY_NAME =~ /^ruby(1.8)?/ and RUBY_VERSION =~ /^1.8/
-      when :ruby19
-        RUBY_NAME =~ /^ruby(1.9)?/ and RUBY_VERSION =~ /^1.9/
       when :jruby
         RUBY_NAME =~ /^jruby/
-      when :ironruby, :ir
+      when :ironruby
         RUBY_NAME =~ /^ironruby/
+      when :macruby
+        RUBY_NAME =~ /^macruby/
       else
         false
       end
     end
   end
 
+  def standard?
+    implementation? :ruby
+  end
+
   def windows?(sym, key)
     sym == :windows && SpecGuard.windows?(key)
   end

data/lib/mspec/guards/noncompliance.rb

@@ -1,6 +1,11 @@
 require 'mspec/guards/guard'
 
 class NonComplianceGuard < SpecGuard
+  def match?
+    match = implementation?(*@args)
+    raise Exception, "improper use of deviates_on guard" if match and standard?
+    match
+  end
 end
 
 class Object

data/lib/mspec/guards/support.rb

@@ -1,6 +1,11 @@
 require 'mspec/guards/guard'
 
 class SupportedGuard < SpecGuard
+  def match?
+    match = implementation?(*@args)
+    raise Exception, "improper use of not_supported_on guard" if match and standard?
+    match
+  end
 end
 
 class Object

data/lib/mspec/matchers.rb

@@ -12,6 +12,7 @@ require 'mspec/matchers/equal'
 require 'mspec/matchers/equal_element'
 require 'mspec/matchers/equal_utf16'
 require 'mspec/matchers/have_instance_method'
+require 'mspec/matchers/have_method'
 require 'mspec/matchers/have_private_instance_method'
 require 'mspec/matchers/include'
 require 'mspec/matchers/match_yaml'

data/lib/mspec/matchers/have_instance_method.rb

@@ -1,24 +1,18 @@
-require 'mspec/utils/version'
-
-class HaveInstanceMethodMatcher
-  def initialize(method, include_super=true)
-    @include_super = include_super
-    version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
-    @method = version < 0 ? method.to_s : method
-  end
+require 'mspec/matchers/method'
 
+class HaveInstanceMethodMatcher < MethodMatcher
   def matches?(mod)
     @mod = mod
     mod.instance_methods(@include_super).include? @method
   end
 
   def failure_message
-    ["Expected #{@mod} to have private method '#{@method.to_s}'",
+    ["Expected #{@mod} to have instance method '#{@method.to_s}'",
      "but it does not"]
   end
 
   def negative_failure_message
-    ["Expected #{@mod} NOT to have private method '#{@method.to_s}'",
+    ["Expected #{@mod} NOT to have instance method '#{@method.to_s}'",
      "but it does"]
   end
 end

data/lib/mspec/matchers/have_method.rb

@@ -0,0 +1,24 @@
+require 'mspec/matchers/method'
+
+class HaveMethodMatcher < MethodMatcher
+  def matches?(mod)
+    @mod = mod
+    @mod.methods(@include_super).include? @method
+  end
+
+  def failure_message
+    ["Expected #{@mod} to have method '#{@method.to_s}'",
+     "but it does not"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@mod} NOT to have method '#{@method.to_s}'",
+     "but it does"]
+  end
+end
+
+class Object
+  def have_method(method, include_super=true)
+    HaveMethodMatcher.new method, include_super
+  end
+end

data/lib/mspec/matchers/have_private_instance_method.rb

@@ -1,24 +1,18 @@
-require 'mspec/utils/version'
-
-class HavePrivateInstanceMethodMatcher
-  def initialize(method, include_super=true)
-    @include_super = include_super
-    version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
-    @method = version < 0 ? method.to_s : method
-  end
+require 'mspec/matchers/method'
 
+class HavePrivateInstanceMethodMatcher < MethodMatcher
   def matches?(mod)
     @mod = mod
     mod.private_instance_methods(@include_super).include? @method
   end
 
   def failure_message
-    ["Expected #{@mod} to have private method '#{@method.to_s}'",
+    ["Expected #{@mod} to have private instance method '#{@method.to_s}'",
      "but it does not"]
   end
 
   def negative_failure_message
-    ["Expected #{@mod} NOT to have private method '#{@method.to_s}'",
+    ["Expected #{@mod} NOT to have private instance method '#{@method.to_s}'",
      "but it does"]
   end
 end

data/lib/mspec/matchers/method.rb

@@ -0,0 +1,13 @@
+require 'mspec/utils/version'
+
+class MethodMatcher
+  def initialize(method, include_super=true)
+    @include_super = include_super
+    version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
+    @method = version < 0 ? method.to_s : method
+  end
+
+  def matches?(mod)
+    raise Exception, "define #matches? in the subclass"
+  end
+end

data/lib/mspec/version.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/version'
 
 module MSpec
-  VERSION = SpecVersion.new "1.5.7"
+  VERSION = SpecVersion.new "1.5.8"
 end

data/spec/guards/compliance_spec.rb

@@ -2,69 +2,85 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/guards/compliance'
 
 describe Object, "#compliant_on" do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+    @ruby_name = Object.const_get :RUBY_NAME if Object.const_defined? :RUBY_NAME
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+    if @ruby_name
+      Object.const_set :RUBY_NAME, @ruby_name
+    else
+      Object.send :remove_const, :RUBY_NAME
+    end
+  end
+
   before :each do
-    @guard = ComplianceGuard.new
-    ComplianceGuard.stub!(:new).and_return(@guard)
     ScratchPad.clear
   end
 
-  it "does not yield when #implementation? and #platform? return false" do
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(false)
-    compliant_on(:rbx) { @ScratchPad.record :yield }
+  it "does not yield when #standard? and #implementation? return false" do
+    Object.const_set :RUBY_NAME, "jruby"
+    compliant_on(:rubinius, :ironruby) { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
 
-  it "yields when #implementation? or #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(false)
-    compliant_on(:rbx) { ScratchPad.record :yield }
+  it "yields when #standard? returns true" do
+    Object.const_set :RUBY_NAME, "ruby"
+    compliant_on(:rubinius) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
+  end
 
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(true)
-    compliant_on(:rbx) { ScratchPad.record :yield }
+  it "yields when #implementation? returns true" do
+    Object.const_set :RUBY_NAME, "jruby"
+    compliant_on(:jruby) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 
-  it "yields when #implementation? and #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(true)
-    compliant_on(:rbx) { ScratchPad.record :yield }
-    ScratchPad.recorded.should == :yield
+  it "does not yield when #implementation? returns false" do
+    Object.const_set :RUBY_NAME, "jruby"
+    compliant_on(:rubinius) { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
   end
 end
 
 describe Object, "#not_compliant_on" do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+    @ruby_name = Object.const_get :RUBY_NAME if Object.const_defined? :RUBY_NAME
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+    if @ruby_name
+      Object.const_set :RUBY_NAME, @ruby_name
+    else
+      Object.send :remove_const, :RUBY_NAME
+    end
+  end
+
   before :each do
-    @guard = ComplianceGuard.new
-    ComplianceGuard.stub!(:new).and_return(@guard)
     ScratchPad.clear
   end
 
-  it "does not yield when #implementation? and #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(true)
-    not_compliant_on(:rbx) { ScratchPad.record :yield }
-    ScratchPad.recorded.should_not == :yield
+  it "yields when #standard? returns true" do
+    Object.const_set :RUBY_NAME, "ruby"
+    not_compliant_on(:rubinius) { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
   end
 
-  it "does not yield when #implementation? or #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(false)
-    not_compliant_on(:rbx) { ScratchPad.record :yield }
-    ScratchPad.recorded.should_not == :yield
-
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(true)
-    not_compliant_on(:rbx) { ScratchPad.record :yield }
+  it "does not yield when #implementation? returns true" do
+    Object.const_set :RUBY_NAME, "jruby "
+    not_compliant_on(:jruby) { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
 
-  it "yields when #implementation? and #platform? return false" do
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(false)
-    not_compliant_on(:rbx) { ScratchPad.record :yield }
+  it "yields when #implementation? returns false" do
+    Object.const_set :RUBY_NAME, "jruby "
+    not_compliant_on(:rubinius) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 end

data/spec/guards/extensions_spec.rb

@@ -2,35 +2,42 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/guards/extensions'
 
 describe Object, "#extended_on" do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+    @ruby_name = Object.const_get :RUBY_NAME if Object.const_defined? :RUBY_NAME
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+    if @ruby_name
+      Object.const_set :RUBY_NAME, @ruby_name
+    else
+      Object.send :remove_const, :RUBY_NAME
+    end
+  end
+
   before :each do
-    @guard = ExtensionsGuard.new
-    ExtensionsGuard.stub!(:new).and_return(@guard)
     ScratchPad.clear
   end
 
-  it "does not yield when #implementation? and #platform? return false" do
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(false)
-    extended_on(:rbx) { ScratchPad.record :yield }
+  it "raises an Exception when #standard? returns true" do
+    Object.const_set :RUBY_NAME, "ruby"
+    lambda {
+      extended_on(:ruby) { ScratchPad.record :yield }
+    }.should raise_error(Exception)
     ScratchPad.recorded.should_not == :yield
   end
 
-  it "yields when #implementation? or #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(false)
-    extended_on(:rbx) { ScratchPad.record :yield }
-    ScratchPad.recorded.should == :yield
-
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(true)
-    extended_on(:rbx) { ScratchPad.record :yield }
-    ScratchPad.recorded.should == :yield
+  it "does not yield when #implementation? returns false" do
+    Object.const_set :RUBY_NAME, "jruby"
+    extended_on(:rubinius) { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
   end
 
-  it "yields when #implementation? and #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(true)
-    extended_on(:rbx) { ScratchPad.record :yield }
+  it "yields when #implementation? returns true" do
+    Object.const_set :RUBY_NAME, "rbx"
+    extended_on(:rubinius) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 end

data/spec/guards/guard_spec.rb

@@ -57,6 +57,11 @@ describe SpecGuard, ".ruby_version" do
     SpecGuard.ruby_version(:full).should == "8.2.3.71"
   end
 
+  it "returns 0 for negative RUBY_PATCHLEVEL values" do
+    Object.const_set :RUBY_PATCHLEVEL, -1
+    SpecGuard.ruby_version(:full).should == "8.2.3.0"
+  end
+
   it "returns major.minor.tiny for :tiny" do
     SpecGuard.ruby_version(:tiny).should == "8.2.3"
   end
@@ -182,11 +187,6 @@ describe SpecGuard, "#implementation?" do
     @guard.implementation?(:ruby).should == true
   end
 
-  it "returns true if passed :rbx and RUBY_NAME == 'rbx'" do
-    Object.const_set :RUBY_NAME, 'rbx'
-    @guard.implementation?(:rbx).should == true
-  end
-
   it "returns true if passed :rubinius and RUBY_NAME == 'rbx'" do
     Object.const_set :RUBY_NAME, 'rbx'
     @guard.implementation?(:rubinius).should == true
@@ -197,12 +197,44 @@ describe SpecGuard, "#implementation?" do
     @guard.implementation?(:jruby).should == true
   end
 
+  it "returns true if passed :ironruby and RUBY_NAME == 'ironruby'" do
+    Object.const_set :RUBY_NAME, 'ironruby'
+    @guard.implementation?(:ironruby).should == true
+  end
+
+  it "returns true if passed :ruby and RUBY_NAME matches /^ruby/" do
+    Object.const_set :RUBY_NAME, 'ruby'
+    @guard.implementation?(:ruby).should == true
+
+    Object.const_set :RUBY_NAME, 'ruby1.8'
+    @guard.implementation?(:ruby).should == true
+
+    Object.const_set :RUBY_NAME, 'ruby1.9'
+    @guard.implementation?(:ruby).should == true
+  end
+
   it "returns false when passed an unrecognized name" do
     Object.const_set :RUBY_NAME, 'ruby'
     @guard.implementation?(:python).should == false
   end
 end
 
+describe SpecGuard, "#standard?" do
+  before :each do
+    @guard = SpecGuard.new
+  end
+
+  it "returns true if #implementation? returns true" do
+    @guard.should_receive(:implementation?).with(:ruby).and_return(true)
+    @guard.standard?.should be_true
+  end
+
+  it "returns false if #implementation? returns false" do
+    @guard.should_receive(:implementation?).with(:ruby).and_return(false)
+    @guard.standard?.should be_false
+  end
+end
+
 describe SpecGuard, "#platform?" do
   before :all do
     @verbose = $VERBOSE

data/spec/guards/noncompliance_spec.rb

@@ -2,35 +2,42 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/guards/noncompliance'
 
 describe Object, "#deviates_on" do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+    @ruby_name = Object.const_get :RUBY_NAME if Object.const_defined? :RUBY_NAME
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+    if @ruby_name
+      Object.const_set :RUBY_NAME, @ruby_name
+    else
+      Object.send :remove_const, :RUBY_NAME
+    end
+  end
+
   before :each do
-    @guard = NonComplianceGuard.new
-    NonComplianceGuard.stub!(:new).and_return(@guard)
     ScratchPad.clear
   end
 
-  it "does not yield when #implementation? and #platform? return false" do
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(false)
-    deviates_on(:rbx) { ScratchPad.record :yield }
+  it "raises an Exception when when #standard? returns true" do
+    Object.const_set :RUBY_NAME, "ruby"
+    lambda {
+      deviates_on(:ruby) { ScratchPad.record :yield }
+    }.should raise_error(Exception)
     ScratchPad.recorded.should_not == :yield
   end
 
-  it "yields when #implementation? or #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(false)
-    deviates_on(:rbx) { ScratchPad.record :yield }
-    ScratchPad.recorded.should == :yield
-
-    @guard.stub!(:implementation?).and_return(false)
-    @guard.stub!(:platform?).and_return(true)
-    deviates_on(:rbx) { ScratchPad.record :yield }
-    ScratchPad.recorded.should == :yield
+  it "does not yield when #implementation? returns false" do
+    Object.const_set :RUBY_NAME, "jruby"
+    deviates_on(:rubinius) { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
   end
 
-  it "yields when #implementation? and #platform? return true" do
-    @guard.stub!(:implementation?).and_return(true)
-    @guard.stub!(:platform?).and_return(true)
-    deviates_on(:rbx) { ScratchPad.record :yield }
+  it "yields when #implementation? returns true" do
+    Object.const_set :RUBY_NAME, "jruby"
+    deviates_on(:jruby) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 end

data/spec/guards/support_spec.rb

@@ -2,21 +2,42 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/guards/support'
 
 describe Object, "#not_supported_on" do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+    @ruby_name = Object.const_get :RUBY_NAME if Object.const_defined? :RUBY_NAME
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+    if @ruby_name
+      Object.const_set :RUBY_NAME, @ruby_name
+    else
+      Object.send :remove_const, :RUBY_NAME
+    end
+  end
+
   before :each do
-    @guard = SupportedGuard.new
-    SupportedGuard.stub!(:new).and_return(@guard)
     ScratchPad.clear
   end
 
+  it "raises an Exception when when #standard? returns true" do
+    Object.const_set :RUBY_NAME, "ruby"
+    lambda {
+      not_supported_on(:ruby) { ScratchPad.record :yield }
+    }.should raise_error(Exception)
+    ScratchPad.recorded.should_not == :yield
+  end
+
   it "does not yield when #implementation? returns true" do
-    @guard.stub!(:implementation?).and_return(true)
-    not_supported_on(:rbx) { ScratchPad.record :yield }
+    Object.const_set :RUBY_NAME, "jruby"
+    not_supported_on(:jruby) { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
 
   it "yields when #implementation? returns false" do
-    @guard.stub!(:implementation?).and_return(false)
-    not_supported_on(:rbx) { ScratchPad.record :yield }
+    Object.const_set :RUBY_NAME, "ruby"
+    not_supported_on(:rubinius) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 end

data/spec/matchers/have_instance_method_spec.rb

@@ -13,13 +13,17 @@ class HIMMSpecs
 end
 
 describe HaveInstanceMethodMatcher do
-  it "matches when mod has the private instance method" do
+  it "inherits from MethodMatcher" do
+    HaveInstanceMethodMatcher.new(:m).should be_kind_of(MethodMatcher)
+  end
+
+  it "matches when mod has the instance method" do
     matcher = HaveInstanceMethodMatcher.new :instance_method
     matcher.matches?(HIMMSpecs).should be_true
     matcher.matches?(HIMMSpecs::Subclass).should be_true
   end
 
-  it "does not match when mod does not have the private instance method" do
+  it "does not match when mod does not have the instance method" do
     matcher = HaveInstanceMethodMatcher.new :another_method
     matcher.matches?(HIMMSpecs).should be_false
   end
@@ -33,7 +37,7 @@ describe HaveInstanceMethodMatcher do
     matcher = HaveInstanceMethodMatcher.new :some_method
     matcher.matches?(HIMMSpecs)
     matcher.failure_message.should == [
-      "Expected HIMMSpecs to have private method 'some_method'",
+      "Expected HIMMSpecs to have instance method 'some_method'",
       "but it does not"
     ]
   end
@@ -42,41 +46,8 @@ describe HaveInstanceMethodMatcher do
     matcher = HaveInstanceMethodMatcher.new :some_method
     matcher.matches?(HIMMSpecs)
     matcher.negative_failure_message.should == [
-      "Expected HIMMSpecs NOT to have private method 'some_method'",
+      "Expected HIMMSpecs NOT to have instance method 'some_method'",
       "but it does"
     ]
   end
 end
-
-describe HaveInstanceMethodMatcher do
-  before :all do
-    @verbose = $VERBOSE
-    $VERBOSE = nil
-  end
-
-  after :all do
-    $VERBOSE = @verbose
-  end
-
-  before :each do
-    @ruby_version = Object.const_get :RUBY_VERSION
-
-    @method = mock("method name")
-  end
-
-  after :each do
-    Object.const_set :RUBY_VERSION, @ruby_version
-  end
-
-  it "converts the method name to a string if RUBY_VERSION < 1.9" do
-    Object.const_set :RUBY_VERSION, "1.8.6"
-    @method.should_receive(:to_s).and_return("method_name")
-    HaveInstanceMethodMatcher.new @method
-  end
-
-  it "does not convert the method name to a string if RUBY_VERSION >= 1.9" do
-    Object.const_set :RUBY_VERSION, "1.9.0"
-    @method.should_not_receive(:to_s)
-    HaveInstanceMethodMatcher.new @method
-  end
-end

data/spec/matchers/have_method_spec.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_method'
+
+class HMMSpecs
+  def instance_method
+  end
+
+  class Subclass < HMMSpecs
+    def instance_sub_method
+    end
+  end
+end
+
+describe HaveMethodMatcher do
+  it "inherits from MethodMatcher" do
+    HaveMethodMatcher.new(:m).should be_kind_of(MethodMatcher)
+  end
+
+  it "matches when mod has the method" do
+    matcher = HaveMethodMatcher.new :instance_method
+    matcher.matches?(HMMSpecs).should be_true
+    matcher.matches?(HMMSpecs.new).should be_true
+    matcher.matches?(HMMSpecs::Subclass).should be_true
+    matcher.matches?(HMMSpecs::Subclass.new).should be_true
+  end
+
+  it "does not match when mod does not have the method" do
+    matcher = HaveMethodMatcher.new :another_method
+    matcher.matches?(HMMSpecs).should be_false
+  end
+
+  it "does not match if the method is in a superclass and include_super is false" do
+    matcher = HaveMethodMatcher.new :instance_method, false
+    matcher.matches?(HMMSpecs::Subclass).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HaveMethodMatcher.new :some_method
+    matcher.matches?(HMMSpecs)
+    matcher.failure_message.should == [
+      "Expected HMMSpecs to have method 'some_method'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HaveMethodMatcher.new :some_method
+    matcher.matches?(HMMSpecs)
+    matcher.negative_failure_message.should == [
+      "Expected HMMSpecs NOT to have method 'some_method'",
+      "but it does"
+    ]
+  end
+end

data/spec/matchers/have_private_instance_method_spec.rb

@@ -17,6 +17,10 @@ class HPIMMSpecs
 end
 
 describe HavePrivateInstanceMethodMatcher do
+  it "inherits from MethodMatcher" do
+    HavePrivateInstanceMethodMatcher.new(:m).should be_kind_of(MethodMatcher)
+  end
+
   it "matches when mod has the private instance method" do
     matcher = HavePrivateInstanceMethodMatcher.new :private_method
     matcher.matches?(HPIMMSpecs).should be_true
@@ -37,7 +41,7 @@ describe HavePrivateInstanceMethodMatcher do
     matcher = HavePrivateInstanceMethodMatcher.new :some_method
     matcher.matches?(HPIMMSpecs)
     matcher.failure_message.should == [
-      "Expected HPIMMSpecs to have private method 'some_method'",
+      "Expected HPIMMSpecs to have private instance method 'some_method'",
       "but it does not"
     ]
   end
@@ -46,41 +50,8 @@ describe HavePrivateInstanceMethodMatcher do
     matcher = HavePrivateInstanceMethodMatcher.new :some_method
     matcher.matches?(HPIMMSpecs)
     matcher.negative_failure_message.should == [
-      "Expected HPIMMSpecs NOT to have private method 'some_method'",
+      "Expected HPIMMSpecs NOT to have private instance method 'some_method'",
       "but it does"
     ]
   end
 end
-
-describe HavePrivateInstanceMethodMatcher do
-  before :all do
-    @verbose = $VERBOSE
-    $VERBOSE = nil
-  end
-
-  after :all do
-    $VERBOSE = @verbose
-  end
-
-  before :each do
-    @ruby_version = Object.const_get :RUBY_VERSION
-
-    @method = mock("method name")
-  end
-
-  after :each do
-    Object.const_set :RUBY_VERSION, @ruby_version
-  end
-
-  it "converts the method name to a string if RUBY_VERSION < 1.9" do
-    Object.const_set :RUBY_VERSION, "1.8.6"
-    @method.should_receive(:to_s).and_return("method_name")
-    HavePrivateInstanceMethodMatcher.new @method
-  end
-
-  it "does not convert the method name to a string if RUBY_VERSION >= 1.9" do
-    Object.const_set :RUBY_VERSION, "1.9.0"
-    @method.should_not_receive(:to_s)
-    HavePrivateInstanceMethodMatcher.new @method
-  end
-end

data/spec/matchers/method_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_instance_method'
+
+describe MethodMatcher do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+  end
+
+  before :each do
+    @ruby_version = Object.const_get :RUBY_VERSION
+
+    @method = mock("method name")
+  end
+
+  after :each do
+    Object.const_set :RUBY_VERSION, @ruby_version
+  end
+
+  it "converts the method name to a string if RUBY_VERSION < 1.9" do
+    Object.const_set :RUBY_VERSION, "1.8.6"
+    @method.should_receive(:to_s).and_return("method_name")
+    MethodMatcher.new @method
+  end
+
+  it "does not convert the method name to a string if RUBY_VERSION >= 1.9" do
+    Object.const_set :RUBY_VERSION, "1.9.0"
+    @method.should_not_receive(:to_s)
+    MethodMatcher.new @method
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -77,9 +77,11 @@ files:
 - lib/mspec/matchers/equal_element.rb
 - lib/mspec/matchers/equal_utf16.rb
 - lib/mspec/matchers/have_instance_method.rb
+- lib/mspec/matchers/have_method.rb
 - lib/mspec/matchers/have_private_instance_method.rb
 - lib/mspec/matchers/include.rb
 - lib/mspec/matchers/match_yaml.rb
+- lib/mspec/matchers/method.rb
 - lib/mspec/matchers/output.rb
 - lib/mspec/matchers/output_to_fd.rb
 - lib/mspec/matchers/raise_error.rb
@@ -184,9 +186,11 @@ files:
 - spec/matchers/equal_spec.rb
 - spec/matchers/equal_utf16_spec.rb
 - spec/matchers/have_instance_method_spec.rb
+- spec/matchers/have_method_spec.rb
 - spec/matchers/have_private_instance_method_spec.rb
 - spec/matchers/include_spec.rb
 - spec/matchers/match_yaml_spec.rb
+- spec/matchers/method_spec.rb
 - spec/matchers/output_spec.rb
 - spec/matchers/output_to_fd_spec.rb
 - spec/matchers/raise_error_spec.rb