rspec-given 2.2.0 → 2.2.1

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-gem 'rspec', '>= 2.0'
+gem 'rspec', '>= 2.12'
 gem 'rake', '>= 0.9.2.2'

data/Gemfile.lock

@@ -3,18 +3,18 @@ GEM
   specs:
     diff-lcs (1.1.3)
     rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.12.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rake (>= 0.9.2.2)
-  rspec (>= 2.0)
+  rspec (>= 2.12)

data/README.md

@@ -1,6 +1,6 @@
 # rspec-given
 
-Covering rspec-given, version 2.2.0.
+Covering rspec-given, version 2.2.1.
 
 rspec-given is an RSpec extension to allow Given/When/Then notation in
 RSpec specifications.  It is a natural extension of the experimental

data/lib/rspec/given/failure.rb

@@ -10,6 +10,10 @@ module RSpec
         @exception = exception
       end
 
+      def is_a?(klass)
+        klass == Failure
+      end
+
       def method_missing(sym, *args, &block)
         ::Kernel.raise @exception
       end

data/lib/rspec/given/have_failed.rb

@@ -2,22 +2,61 @@ module RSpec
   module Given
     module HaveFailed
 
-      # Alias for raise_error(...), but reads a bit better when using
+      # Specializes the RaiseError matcher to handle
+      # Failure/non-failure objects.
+
+      # The implementation of RaiseError changed between RSpec 2.11 and 2.12.
+      if RSpec::Matchers::BuiltIn::RaiseError.instance_methods.include?(:does_not_match?)
+
+        class HaveFailedMatcher < RSpec::Matchers::BuiltIn::RaiseError
+          def matches?(given_proc, negative_expectation = false)
+            if given_proc.is_a?(Failure)
+              super
+            else
+              super(lambda { }, negative_expectation)
+            end
+          end
+
+          def does_not_match?(given_proc)
+            if given_proc.is_a?(Failure)
+              super(given_proc)
+            else
+              super(lambda { })
+            end
+          end
+        end
+
+      else
+
+        class HaveFailedMatcher < RSpec::Matchers::BuiltIn::RaiseError
+          def matches?(given_proc)
+            if given_proc.is_a?(Failure)
+              super
+            else
+              super(lambda { })
+            end
+          end
+        end
+
+      end
+
+      # Simular to raise_error(...), but reads a bit better when using
       # a failure result from a when clause.
       #
-      # NOTE: This is new for 1.6.0.beta.1. A name change for this
-      # method is possible.
-      #
       # Typical Usage:
       #
       #    When(:result) { fail "OUCH" }
       #    Then { result.should have_failed(StandardError, /OUCH/) }
       #
+      #    When(:result) { good_code }
+      #    Then { result.should_not have_failed }
+      #
       # :call-seq:
       #    have_failed([exception_class [, message_pattern]])
+      #    have_failed([exception_class [, message_pattern]]) { |ex| ... }
       #
-      def have_failed(*args, &block)
-        raise_error(*args, &block)
+      def have_failed(error=Exception, message=nil, &block)
+        HaveFailedMatcher.new(error, message, &block)
       end
     end
   end

data/lib/rspec/given/version.rb

@@ -3,7 +3,7 @@ module RSpec
     VERSION_NUMBERS = [
       VERSION_MAJOR = 2,
       VERSION_MINOR = 2,
-      VERSION_BUILD = 0,
+      VERSION_BUILD = 1,
     ]
     VERSION = VERSION_NUMBERS.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-given
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,10 +72,9 @@ files:
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README.md
 - Rakefile
+- README.md
 - lib/rspec-given.rb
-- lib/rspec/given.rb
 - lib/rspec/given/configure.rb
 - lib/rspec/given/extensions.rb
 - lib/rspec/given/failure.rb
@@ -85,6 +84,7 @@ files:
 - lib/rspec/given/module_methods.rb
 - lib/rspec/given/rspec1_given.rb
 - lib/rspec/given/version.rb
+- lib/rspec/given.rb
 - examples/example_helper.rb
 - examples/integration/and_spec.rb
 - examples/integration/focused_line_spec.rb
@@ -112,6 +112,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3954842768326946335
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: