expect 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7390ce50fc4637aebceecbab541c3fc6d4625a46
-  data.tar.gz: 8e3b891f69b01d01354bf3550ac4d5ef63f618d7
+  metadata.gz: ffa099c977ed5d55292506e72d845fda55dc9bf7
+  data.tar.gz: 26925a6847c0ca076c42cc65eab5d6639ece5363
 SHA512:
-  metadata.gz: ea5940e683012a0972f82aef6e124d79bfb890cfdffeddacc861888ba048bf8415b74f78138b4942d0b6bebcb740155e1c29d3d23dceb6248afebe6ef6607e44
-  data.tar.gz: dff2a2e61bfbc4af5ec08a903283a975cdf4c475def48126a5db23a1527da4be472aefe1bbad4aeb4d861afd75cf99901bace01ea960ef2ef10b5a7e71dfa56e
+  metadata.gz: 0e529e8db912b1fee5713f663e44217cb0aab3cd66471c8a2aa4782a07118f237c3bd65d69103bab7cff4e9746cb78fceceafaa1c04f677b6109afd14ea37c26
+  data.tar.gz: 2138f50c1647baddc35fc928fdedba3c747a540e4edddd73d921a50f1b3d0ae2f2857d84fb88bc2be7f4ea2fc2c59a47a4c840f2dfd0a4fd9fb25345d7ebd486

data/Rakefile

@@ -2,7 +2,6 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.pattern = File.join 'test', '**', 'test_*.rb'
   t.verbose = true
   t.warning = true
 end

data/VERSION.semver

@@ -1 +1 @@
-0.0.9
+0.0.10

data/expect.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'matchi',                 '~> 0.0.5'
 
-  spec.add_development_dependency 'bundler',    '~> 1.8'
-  spec.add_development_dependency 'rake',       '~> 10.0'
+  spec.add_development_dependency 'bundler',    '~> 1.9'
+  spec.add_development_dependency 'rake',       '~> 10.4'
   spec.add_development_dependency 'yard',       '~> 0.8'
-  spec.add_development_dependency 'simplecov',  '~> 0.9.1'
+  spec.add_development_dependency 'simplecov',  '~> 0.9.2'
   spec.add_development_dependency 'rubocop',    '~> 0.29'
 end

data/lib/expect.rb

@@ -14,6 +14,8 @@ module Expect
   # @example Identity expectation
   #   this { 42 }.to Equal: 42 # => true
   #
+  # @param input [Proc] the code to test.
+  #
   # @return [ExpectationTarget] the expectation target.
   def self.this(&input)
     ExpectationTarget.new(&input)

data/lib/expect/expectation_target.rb

@@ -1,8 +1,8 @@
-require_relative File.join 'exception', 'failure'
-require_relative 'matcher'
+require 'matchi'
 
 module Expect
-  # Wraps the target of an expectation.
+  # Wraps the target of an expectation.  This class is responsible for reporting
+  # if the expectation is true or false.
   #
   # @api private
   #
@@ -12,22 +12,24 @@ module Expect
     # Create a new expection target
     #
     # @example
-    #   ExpectationTarget.new { block of code }
+    #   new { 42 }.to Equal: 42 # => true
     #
-    # @yieldparam actual the value which is compared with the expected value.
+    # @param actual [Proc] the value which is compared with the expected value.
     def initialize(&actual)
       @actual = actual
     end
 
+    attr_reader :actual
+
     # Evaluate to a positive assertion.
     #
     # @api public
     #
     # @param [Hash, Symbol] definition
     #
-    # @return [Boolean] pass or fail the spec
+    # @return [Boolean] report if the expectation is true or false
     def to(definition)
-      match?(definition) || fail(Failure)
+      matcher(definition).matches?(&actual)
     end
 
     # Evaluate to a negative assertion.
@@ -36,22 +38,21 @@ module Expect
     #
     # @param [Hash, Symbol] definition
     #
-    # @return [Boolean] pass or fail the spec
+    # @return [Boolean] report if the expectation is not true or not false
     def not_to(definition)
-      match?(definition).equal?(false) || fail(Failure)
+      !to(definition)
     end
 
     private
 
-    # Boolean comparison between the actual value and the expected value.
+    # Load the matcher.
     #
-    # @api private
+    # @param [Array, Hash, Symbol] definition
     #
-    # @param [Hash, Symbol] definition
-    #
-    # @return [Boolean] report if the expectation is true or false
-    def match?(definition)
-      Matcher.pass?(definition, &@actual)
+    # @return [#matches?] the matcher
+    def matcher(definition)
+      params = Array(definition).flatten(1)
+      Matchi.fetch(params.first, *params[1..-1])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expect
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Cyril Wack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matchi
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -114,9 +114,7 @@ files:
 - bin/setup
 - expect.gemspec
 - lib/expect.rb
-- lib/expect/exception/failure.rb
 - lib/expect/expectation_target.rb
-- lib/expect/matcher.rb
 homepage: https://github.com/fixrb/expect
 licenses:
 - MIT

data/lib/expect/exception/failure.rb

@@ -1,7 +0,0 @@
-module Expect
-  # This exception is raised in order to fail a spec.
-  #
-  # @api private
-  class Failure < StandardError
-  end
-end

data/lib/expect/matcher.rb

@@ -1,18 +0,0 @@
-require 'matchi'
-
-module Expect
-  # This module provides matchers to define expectations.
-  module Matcher
-    # Evaluate the expectation with the passed block.
-    #
-    # @param [Array, Hash, Symbol] definition
-    #
-    # @return [Boolean] report if the expectation is true or false
-    def self.pass?(definition, &actual)
-      params  = Array(definition).flatten(1)
-      matcher = Matchi.fetch(params.first, *params[1..-1])
-
-      matcher.matches?(&actual)
-    end
-  end
-end