minitest-spec-expect 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a50c5c9f12125db25fb9e4987a71522e32bf0d5
+  data.tar.gz: 63509bc103ada84823b2614234a69b22388a687a
+SHA512:
+  metadata.gz: a9ef9c3cc729a0749f296c3fd37930a5e240a4904a3dcf3d423bf052302f51f9524c312b18c32f011bd232fca2baea3904a942bc863dc1555b27cf96e2a1b428
+  data.tar.gz: dc346ef3e862b222b1bc6adfc3707517a5a3bb9de42c03c4d304cd6797dcd97e9a9e549d6785b8ab97a9acd59c056c61e4978812461ce589df490f22fb6a1721

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - rbx-19mode
+  - jruby-19mode
+script: rake

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+#### version 0.1.0 - *May 23, 2013*
+* Added ability to pass a block to `#expect`. When a block is passed to it, the expect object responds
+to `#to_throw`, `#to_raise`, `#to_output`, and `#to_be_silent`. Big thanks to
+[@splattael](https://github.com/splattael).

data/README.md

@@ -1,6 +1,9 @@
 # minitest-spec-expect
-Expect syntax for [minitest](http://docs.seattlerb.org/minitest/index.html). Made out of love for
-both rspec2's expect syntax and minitest's lightweight feel.
+
+[![Build Status](https://travis-ci.org/davejachimiak/minitest-spec-expect.png?branch=master)](https://travis-ci.org/davejachimiak/minitest-spec-expect)
+
+Expect syntax for [MiniTest](http://docs.seattlerb.org/minitest/index.html). Made out of love for
+both rspec2's expect syntax and MiniTest's lightweight feel.
 ## Install
 In your Gemfile:
 ```ruby
@@ -15,7 +18,7 @@ Then require it in the file that you require `minitest/autorun`:
 require 'minitest/spec/expect'
 ```
 ## Usage
-Wrap the object under test in an `expect()` object. Then call a minitest expectation on it,
+Wrap the object under test in an `expect()` object. Then call a MiniTest expectation on it,
 substituting `must` and `wont` with `to` and `to_not`.
 
 For example:
@@ -47,10 +50,8 @@ describe Integer do
 end
 ```
 ## API
-Please see the minitest [expectation](http://docs.seattlerb.org/minitest/Minitest/Expectations.html)
-and [assertion](http://docs.seattlerb.org/minitest/Minitest/Assertions.html) docs for more details
-on implementations for the `must` and `wont` methods transposed to `to` and `to_not` methods transposed
-here.
+Please see the MiniTest [expectation](http://docs.seattlerb.org/minitest/Minitest/Expectations.html)
+docs for details on corresponding `must_*` and `wont_*` methods.
 ### `#*be`
 ```ruby
 expect(1).to_be :<, 2
@@ -90,8 +91,8 @@ an_object = Object.new
 expect(Object.new).to_not_be_same_as an_object
 ```
 ### `#to_be_silent`
-(`#must_be_silent` availble with Minitest 5.0)
 ```ruby
+expect { '' }.to_be_silent
 expect(->{''}).to_be_silent
 ```
 ### `#*be_within_epsilon`
@@ -111,16 +112,17 @@ expect(['tim', 'eric']).to_not_include 'brule'
 ```
 ### `#*match`
 ```ruby
-expect(/(fart)*/).to_match 'fartfartfartfart'
-expect(/fart/).to_not_match 'barf'
+expect('fartfartfartfart').to_match /(fart)*/
+expect('bart').to_not_match /fart/
 ```
 ### `#to_output`
-(`#must_output` availble with Minitest 5.0)
 ```ruby
+expect { puts 'barf' }.to_output "barf\n"
 expect(->{ puts 'barf' }).to_output "barf\n"
 ```
 ### `#to_raise`
 ```ruby
+expect { raise RuntimeError }.to_raise RuntimeError
 expect(->{ raise RuntimeError }).to_raise RuntimeError
 ```
 ### `#*respond_to`
@@ -130,19 +132,15 @@ expect(Object.new).to_not_respond_to :fart_factory
 ```
 ### `#*throw`
 ```ruby
+expect { throw StandardError }.to_throw StandardError
 expect(->{ throw StandardError }).to_throw StandardError
 ```
 ## Contribute
 1. Fork the repo.
 2. Create a branch.
-3. Make sure specs are green (`$ rake test`)
-3. Open a pull request.
-
-##### A note on the current specs
-The specs at `spec/integration_spec.rb` test a couple of minitest expectations that aren't included
-in previous minitest versions to 5.0. To install the newest minitest, do `$ sudo gem install
-minitest`. Because of the way Ruby installs and loads its native libraries, `sudo` before
-`gem install` is necessary, unfortunately.
+3. Code.
+4. Ensure the specs are green (`$ rake`)
+5. Open a pull request.
 
 ## License
 The MIT License (MIT)

data/Rakefile

@@ -1,6 +1,9 @@
 require 'rake/testtask'
 
-desc 'run the tests'
+desc 'Run the tests'
+task :default => :test
+
+desc 'Run the tests'
 Rake::TestTask.new do |t|
-  t.pattern = 'spec/integration_spec.rb'
+  t.pattern = 'spec/*.rb'
 end

data/lib/minitest/spec/expect.rb

@@ -1,21 +1,46 @@
 module Kernel
-  def expect object
-    MiniTest::Spec::Expect.new object
+  def expect arg=NO_ARG, &block
+    raise_errors arg, block
+    MiniTest::Spec::Expect.create arg, &block
   end
+
+  private
+
+  def raise_errors object, block
+    if object == NO_ARG
+      raise ArgumentError, 'must pass an argument or a block' if !block
+    else
+      raise ArgumentError, 'cannot handle both an argument and a block' if block
+    end
+  end
+
+  NO_ARG = Object.new
 end
 
 require 'minitest/spec'
 
 class MiniTest::Spec::Expect
-  require 'minitest/spec/expect_syntax'
+  OBJECT_UNDER_TEST = 'object'
 
-  OBJECT = 'object'
+  attr_reader OBJECT_UNDER_TEST
 
-  attr_reader OBJECT.to_sym
+  class_eval <<-EOM
+    def initialize #{OBJECT_UNDER_TEST}
+      @#{OBJECT_UNDER_TEST} = #{OBJECT_UNDER_TEST}
+    end
+  EOM
 
-  def initialize object
-    @object = object
+  def self.create arg, &block
+    block ? ForBlock.new(block) : ForArg.new(arg)
   end
 
-  MiniTest::Spec::ExpectSyntax.new(self).set_expectations
+  class ForArg < self
+    require 'minitest/spec/expect_syntax_for_arg'
+    MiniTest::Spec::ExpectSyntaxForArg.new(self).set_expectations
+  end
+
+  class ForBlock < self
+    require 'minitest/spec/expect_syntax_for_block'
+    MiniTest::Spec::ExpectSyntaxForBlock.new(self).set_expectations
+  end
 end

data/lib/minitest/spec/expect/version.rb

@@ -1,3 +1,3 @@
 class MiniTest::Spec::Expect
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/lib/minitest/spec/expect_syntax.rb

@@ -1,5 +1,6 @@
 class MiniTest::Spec::ExpectSyntax
-  TRANSPOSITIONS = {'must' => 'to', 'wont' => 'to_not'}
+  TRANSPOSITIONS = { 'must' => 'to', 'wont' => 'to_not' }
+  TRANSPOSITION_REGEXP = Regexp.union TRANSPOSITIONS.keys
 
   attr_reader :expect_class
 
@@ -8,15 +9,15 @@ class MiniTest::Spec::ExpectSyntax
   end
 
   def set_expectations
-    spec_expectation_names.each do |spec_expectation_name|
-      set_expectation spec_expectation_name
+    expectation_names.each do |expectation_name|
+      set_expectation expectation_name
     end
   end
 
   private
 
-  def spec_expectation_names
-    MiniTest::Expectations.instance_methods
+  def expectation_names
+    raise NotImplementedError
   end
 
   def set_expectation expectation_name
@@ -28,17 +29,12 @@ class MiniTest::Spec::ExpectSyntax
   def expect_method expectation_name
     """
       def #{expect_method_name expectation_name } *args
-        #{expect_class::OBJECT}.#{expectation_name} *args
+        #{expect_class::OBJECT_UNDER_TEST}.#{expectation_name} *args
       end
     """
   end
 
   def expect_method_name expectation_name
-    TRANSPOSITIONS.inject('') do |memo, transposition|
-      string = memo.empty? ? expectation_name.to_s : memo
-
-      string.gsub transposition.first, transposition.last
-    end
+    expectation_name.to_s.gsub TRANSPOSITION_REGEXP, TRANSPOSITIONS
   end
 end
-

data/lib/minitest/spec/expect_syntax_for_arg.rb

@@ -0,0 +1,9 @@
+require 'minitest/spec/expect_syntax'
+
+class MiniTest::Spec::ExpectSyntaxForArg < MiniTest::Spec::ExpectSyntax
+  private
+
+  def expectation_names
+    MiniTest::Expectations.instance_methods
+  end
+end

data/lib/minitest/spec/expect_syntax_for_block.rb

@@ -0,0 +1,19 @@
+require 'minitest/spec/expect_syntax'
+
+class MiniTest::Spec::ExpectSyntaxForBlock < MiniTest::Spec::ExpectSyntax
+  BLOCK_PASSING_EXPECTATION_REGEXES = [/silent/, /output/, /raise/, /throw/]
+
+  private
+
+  def expectation_names
+    MiniTest::Expectations.instance_methods.select do |method|
+      detect_block_passing_expectation method
+    end
+  end
+
+  def detect_block_passing_expectation method
+    BLOCK_PASSING_EXPECTATION_REGEXES.detect do |regex|
+      regex.match method
+    end
+  end
+end

data/spec/integration_spec.rb

@@ -65,6 +65,7 @@ describe 'expect syntax' do
   end
 
   it 'supports must_be_silent as to_be_silent' do
+    expect { '' }.to_be_silent
     expect(->{''}).to_be_silent
   end
 
@@ -93,18 +94,20 @@ describe 'expect syntax' do
   end
 
   it 'supports must_match as to_match' do
-    expect(/(fart)*/).to_match 'fartfartfartfart'
+    expect('fartfartfartfart').to_match /(fart)*/
   end
 
   it 'supports wont_match as to_not_match' do
-    expect(/fart/).to_not_match 'barf'
+    expect('bart').to_not_match /fart/
   end
 
   it 'supports must_output as to_output' do
+    expect { puts 'barf' }.to_output "barf\n"
     expect(->{ puts 'barf' }).to_output "barf\n"
   end
 
   it 'supports must_raise as to_raise' do
+    expect { raise RuntimeError }.to_raise RuntimeError
     expect(->{ raise RuntimeError }).to_raise RuntimeError
   end
 
@@ -117,6 +120,7 @@ describe 'expect syntax' do
   end
 
   it 'supports must_throw as to_throw' do
+    expect { throw StandardError }.to_throw StandardError
     expect(->{ throw StandardError }).to_throw StandardError
   end
 end

data/spec/kernel_spec.rb

@@ -0,0 +1,46 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require 'minitest/spec/expect'
+require 'minitest/autorun'
+
+describe Kernel do
+  describe '#expect' do
+    it 'explodes if nothing is passed to it' do
+      ->{ expect }.must_raise ArgumentError, 'must pass an argument or a block'
+    end
+
+    it 'explodes if both an arg and a block passed to it' do
+      ->{ expect(:straw_man) { :cinder } }.
+        must_raise ArgumentError, 'cannot handle both an argument and a block'
+    end
+
+    describe 'when a block is passed' do
+      before do
+        expectations              = MiniTest::Expectations.instance_methods
+        block_expectation_regexes = [/silent/, /output/, /raise/, /throw/]
+
+        non_block_expectations = expectations.reject do |method|
+          block_expectation_regexes.detect do |regex|
+            method.to_s.match regex
+          end
+        end
+
+        transpositions = { 'must' => 'to', 'wont' => 'to_not' }
+
+        @non_block_expect_methods = non_block_expectations.map do |expectation|
+          non_block_expect_method = transpositions.inject('') do |memo, transposition|
+            string = memo.empty? ? expectation.to_s : memo
+
+            string.gsub transposition.first, transposition.last
+          end.to_sym
+        end
+      end
+
+      it "won't respond to non-block-passing expectations" do
+        @non_block_expect_methods.each do |method|
+          expect { :muscular_son }.wont_respond_to method
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-spec-expect
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Dave Jachimiak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies: []
 description: Expect syntax for minitest specs.
 email: dave.jachimiak@gmail.com
@@ -18,36 +17,41 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - README.md
 - Rakefile
 - lib/minitest/spec/expect.rb
 - lib/minitest/spec/expect/version.rb
 - lib/minitest/spec/expect_syntax.rb
+- lib/minitest/spec/expect_syntax_for_arg.rb
+- lib/minitest/spec/expect_syntax_for_block.rb
 - minitest-spec-expect.gemspec
 - spec/integration_spec.rb
+- spec/kernel_spec.rb
 homepage: http://github.com/davejachimiak/minitest-spec-expect
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use the expect syntax with transposed minitest expectations.
 test_files:
 - spec/integration_spec.rb
+- spec/kernel_spec.rb