mspec 1.5.15 → 1.5.16

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{2010-02-04}
+  s.date                      = %q{2010-02-08}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

data/lib/mspec/helpers.rb

@@ -7,6 +7,7 @@ require 'mspec/helpers/enumerator_class'
 require 'mspec/helpers/environment'
 require 'mspec/helpers/fixture'
 require 'mspec/helpers/flunk'
+require 'mspec/helpers/fmode'
 require 'mspec/helpers/fs'
 require 'mspec/helpers/hash'
 require 'mspec/helpers/infinity'

data/lib/mspec/helpers/fixture.rb

@@ -15,6 +15,7 @@ class Object
   def fixture(dir, *args)
     path = File.dirname(dir)
     path = path[0..-7] if path[-7..-1] == "/shared"
-    File.expand_path(File.join(path, "fixtures", args))
+    dir = path[-9..-1] == "/fixtures" ? "" : "fixtures"
+    File.expand_path(File.join(path, dir, args))
   end
 end

data/lib/mspec/helpers/fmode.rb

@@ -0,0 +1,15 @@
+require 'mspec/guards/feature'
+
+class Object
+  # This helper simplifies passing file access modes regardless of
+  # whether the :encoding feature is enabled. Only the access specifier
+  # itself will be returned if :encoding is not enabled. Otherwise,
+  # the full mode string will be returned (i.e. the helper is a no-op).
+  def fmode(mode)
+    if FeatureGuard.enabled? :encoding
+      mode
+    else
+      mode.split(':').first
+    end
+  end
+end

data/lib/mspec/matchers.rb

@@ -14,6 +14,7 @@ require 'mspec/matchers/equal_element'
 require 'mspec/matchers/equal_utf16'
 require 'mspec/matchers/have_constant'
 require 'mspec/matchers/have_class_variable'
+require 'mspec/matchers/have_data'
 require 'mspec/matchers/have_instance_method'
 require 'mspec/matchers/have_instance_variable'
 require 'mspec/matchers/have_method'

data/lib/mspec/matchers/have_data.rb

@@ -0,0 +1,48 @@
+require 'mspec/guards/feature'
+require 'mspec/helpers/fmode'
+
+class HaveDataMatcher
+  def initialize(data)
+    @data = data
+  end
+
+  def matches?(name)
+    @name = name
+
+    if FeatureGuard.enabled? :encoding
+      size = @data.bytesize
+    else
+      size = @data.size
+    end
+
+    File.open @name, fmode("rb:binary") do |f|
+      return f.read(size) == @data
+    end
+  end
+
+  def failure_message
+    ["Expected #{@name}",
+     "to have data #{@data.pretty_inspect}"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@name}",
+     "not to have data #{@data.pretty_inspect}"]
+  end
+end
+
+class Object
+  # Opens a file specified by the string the matcher is called on
+  # and compares the +data+ passed to the matcher with the contents
+  # of the file. Expects to match the first N bytes of the file
+  # with +data+. For example, suppose @name is the name of a file:
+  #
+  #   @name.should have_data("123")
+  #
+  # passes if the file @name has "123" as the first 3 bytes. The
+  # file can contain more bytes than +data+. The extra bytes do not
+  # affect the result.
+  def have_data(data)
+    HaveDataMatcher.new(data)
+  end
+end

data/lib/mspec/version.rb

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

data/spec/helpers/fixture_spec.rb

@@ -15,4 +15,9 @@ describe Object, "#fixture" do
     name = fixture("some/path/shared/file.rb", "dir", "file.txt")
     name.should == "#{@dir}/some/path/fixtures/dir/file.txt"
   end
+
+  it "does not append '/fixtures' if it is the suffix of the directory string" do
+    name = fixture("some/path/fixtures/file.rb", "dir", "file.txt")
+    name.should == "#{@dir}/some/path/fixtures/dir/file.txt"
+  end
 end

data/spec/helpers/fmode_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/fmode'
+
+describe Object, "#fmode" do
+  it "returns the argument unmodified if :encoding feature is enabled" do
+    FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(true)
+    fmode("rb:binary:utf-8").should == "rb:binary:utf-8"
+  end
+
+  it "returns only the file access mode if :encoding feature is not enabled" do
+    FeatureGuard.should_receive(:enabled?).with(:encoding).and_return(false)
+    fmode("rb:binary:utf-8").should == "rb"
+  end
+end

data/spec/matchers/have_data_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_data'
+require 'mspec/helpers/tmp'
+require 'mspec/helpers/fs'
+
+describe HaveDataMatcher do
+  before :each do
+    @name = tmp "have_data_matcher"
+    touch(@name) { |f| f.puts "123abc" }
+  end
+
+  after :each do
+    rm_r @name
+  end
+
+  it "raises an IOError if the named file does not exist" do
+    lambda do
+      HaveDataMatcher.new("123").matches?("no_file.txt")
+    end.should raise_error(Errno::ENOENT)
+  end
+
+  it "matches when the named file begins with the same bytes as data" do
+    HaveDataMatcher.new("123a").matches?(@name).should be_true
+  end
+
+  it "does not match when the named file begins with fewer bytes than data" do
+    HaveDataMatcher.new("123abcPQR").matches?(@name).should be_false
+
+  end
+
+  it "does not match when the named file begins with different bytes than data" do
+    HaveDataMatcher.new("abc1").matches?(@name).should be_false
+  end
+
+  it "provides a useful failure message" do
+    matcher = HaveDataMatcher.new("abc1")
+    matcher.matches?(@name)
+    matcher.failure_message.should == [
+      "Expected #{@name}", "to have data \"abc1\"\n"
+    ]
+  end
+
+  it "provides a useful negative failure message" do
+    matcher = HaveDataMatcher.new("123abc")
+    matcher.matches?(@name)
+    matcher.negative_failure_message.should == [
+      "Expected #{@name}", "not to have data \"123abc\"\n"
+    ]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.15
+  version: 1.5.16
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -62,6 +62,7 @@ files:
 - lib/mspec/helpers/environment.rb
 - lib/mspec/helpers/fixture.rb
 - lib/mspec/helpers/flunk.rb
+- lib/mspec/helpers/fmode.rb
 - lib/mspec/helpers/fs.rb
 - lib/mspec/helpers/hash.rb
 - lib/mspec/helpers/infinity.rb
@@ -90,6 +91,7 @@ files:
 - lib/mspec/matchers/equal_utf16.rb
 - lib/mspec/matchers/have_class_variable.rb
 - lib/mspec/matchers/have_constant.rb
+- lib/mspec/matchers/have_data.rb
 - lib/mspec/matchers/have_instance_method.rb
 - lib/mspec/matchers/have_instance_variable.rb
 - lib/mspec/matchers/have_method.rb
@@ -192,6 +194,7 @@ files:
 - spec/helpers/environment_spec.rb
 - spec/helpers/fixture_spec.rb
 - spec/helpers/flunk_spec.rb
+- spec/helpers/fmode_spec.rb
 - spec/helpers/fs_spec.rb
 - spec/helpers/hash_spec.rb
 - spec/helpers/infinity_spec.rb
@@ -218,6 +221,7 @@ files:
 - spec/matchers/equal_utf16_spec.rb
 - spec/matchers/have_class_variable_spec.rb
 - spec/matchers/have_constant_spec.rb
+- spec/matchers/have_data_spec.rb
 - spec/matchers/have_instance_method_spec.rb
 - spec/matchers/have_instance_variable_spec.rb
 - spec/matchers/have_method_spec.rb