given_core 3.0.0.beta.1 → 3.0.0.beta.2

data/Rakefile

@@ -80,7 +80,6 @@ end
 desc "Run the examples in Minitest"
 task :mt_examples do
   puts "Running examples (with Minitest)"
-  ENV['FRAMEWORK'] = 'Minitest'
   sh "ruby -Ilib:examples examples/loader.rb #{EXAMPLES}"
 end
 

data/lib/given/minispec/all.rb

@@ -0,0 +1,11 @@
+require 'minitest/spec'
+require 'given'
+
+require 'given/minispec/before_extension'
+require 'given/minispec/context_extension'
+require 'given/minispec/framework'
+require 'given/minispec/configure'
+
+unless Minitest::Spec.instance_methods.include?(:assertions)
+  require 'given/minispec/new_assertions'
+end

data/lib/given/minispec/before_extension.rb

@@ -0,0 +1,36 @@
+
+# The before blocks defined in Minitest are inadequate for our use.
+# This before_extension file allows us to use real before blocks.
+
+module Minitest
+  class Spec
+
+    # Redefine setup to trigger before chains
+    alias original_setup_without_given setup
+    def setup
+      original_setup_without_given
+      _gvn_establish_befores
+    end
+
+    # Establish the before blocks
+    def _gvn_establish_befores
+      return if defined?(@_gvn_ran_befores) && @_gvn_ran_befores
+      @_gvn_ran_befores = true
+      _gvn_contexts.each do |context|
+        context._Gvn_before_blocks.each do |before_block|
+          instance_eval(&before_block)
+        end
+      end
+    end
+
+    # Lazy accessor for Given's before blocks
+    def self._Gvn_before_blocks
+      @_Gvn_before_blocks ||= []
+    end
+
+    # Define a Given style before block
+    def self._Gvn_before(&block)
+      _Gvn_before_blocks << block
+    end
+  end
+end

data/lib/given/minispec/configure.rb

@@ -0,0 +1,6 @@
+
+# Configure Minitest to use the Given extensions.
+
+Minitest::Spec.send(:extend, Given::ClassExtensions)
+Minitest::Spec.send(:include, Given::FailureMethod)
+Minitest::Spec.send(:include, Given::InstanceExtensions)

data/lib/given/minispec/context_extension.rb

@@ -0,0 +1,3 @@
+
+# Minitest Specs don't provide a context.
+alias :context :describe

data/lib/given/minispec/framework.rb

@@ -0,0 +1,37 @@
+
+module Minitest
+  module Given
+
+    # Framework adapter for Minitest/Given
+    #
+    class Framework
+      def start_evaluation
+        @starting_assertion_count = example.assertions
+      end
+
+      def explicit_assertions?
+        example.assertions > @starting_assertion_count
+      end
+
+      def count_assertion
+        example.assertions += 1
+      end
+
+      def fail_with(*args)
+        raise Minitest::Assertion, args.join(" ")
+      end
+
+      def pending_error
+        Minitest::Skip
+      end
+
+      private
+
+      def example
+        Minitest::Spec.current
+      end
+    end
+  end
+end
+
+Given.framework = Minitest::Given::Framework.new

data/lib/given/minispec/new_assertions.rb

@@ -0,0 +1,22 @@
+
+module Minitest
+  module Given
+
+    # If this version of Minitest does not support the #assertions and
+    # #assertions= methods, define a working version of them.
+    #
+    # This allows Minitest/Given to work with Minitest 4.x.
+    #
+    module NewAssertions
+      def assertions
+        _assertions
+      end
+
+      def assertions=(new_value)
+        self._assertions = new_value
+      end
+    end
+  end
+end
+
+Minitest::Spec.__send__(:include, Minitest::Given::NewAssertions)

data/lib/given/rspec/all.rb

@@ -0,0 +1,29 @@
+require 'rspec'
+require 'given'
+
+module RSpec
+  module Given
+  end
+end
+
+if Given::NATURAL_ASSERTIONS_SUPPORTED
+  require 'given/rspec/monkey'
+  raise "Unsupported version of RSpec (unable to detect assertions)" unless RSpec::Given::MONKEY
+end
+
+require 'given/rspec/have_failed'
+require 'given/rspec/before_extensions'
+require 'given/rspec/framework'
+require 'given/rspec/use_natural_assertions'
+require 'given/rspec/configure'
+
+module Given
+  def self.using_old_rspec?
+    defined?(Spec) &&
+      defined?(Spec::VERSION) &&
+      defined?(Spec::VERSION::SUMMARY) &&
+      Spec::VERSION::SUMMARY =~ /^rspec +1\./
+  end
+end
+
+raise "Unsupported version of RSpec" if Given.using_old_rspec?

data/lib/given/rspec/before_extensions.rb

@@ -0,0 +1,15 @@
+
+module RSpec
+  module Given
+    module BeforeHack
+
+      # Some frameworks don't support a robust before block, so we
+      # always use this one. In RSpec, we just delegate to the real
+      # before block handler.
+      def _Gvn_before(*args, &block)
+        before(*args, &block)
+      end
+
+    end
+  end
+end

data/lib/given/rspec/configure.rb

@@ -0,0 +1,19 @@
+require 'rspec'
+require 'rspec/given'
+
+RSpec.configure do |c|
+  c.extend(Given::ClassExtensions)
+  c.include(Given::InstanceExtensions)
+  c.include(Given::Fuzzy)
+  c.include(Given::FailureMethod)
+  c.extend(RSpec::Given::BeforeHack)
+  c.include(RSpec::Given::HaveFailed)
+
+  if c.respond_to?(:backtrace_exclusion_patterns)
+    c.backtrace_exclusion_patterns << /lib\/rspec\/given/
+  else
+    c.backtrace_clean_patterns << /lib\/rspec\/given/
+  end
+
+  Given.detect_formatters(c)
+end

data/lib/given/rspec/framework.rb

@@ -0,0 +1,34 @@
+
+module RSpec
+  module Given
+
+    # Framework interface for RSpec/Given.
+    #
+    class Framework
+      def start_evaluation
+        @matcher_called = false
+      end
+
+      def explicit_assertions?
+        @matcher_called
+      end
+
+      def count_assertion
+      end
+
+      def explicitly_asserted
+        @matcher_called = true
+      end
+
+      def fail_with(*args)
+        ::RSpec::Expectations.fail_with(*args)
+      end
+
+      def pending_error
+        RSpec::Core::Pending::PendingDeclaredInExample
+      end
+    end
+  end
+end
+
+Given.framework = RSpec::Given::Framework.new

data/lib/given/rspec/have_failed.rb

@@ -0,0 +1,37 @@
+
+# The implementation of RaiseError changed between RSpec 2.11 and 2.12.
+if RSpec::Matchers::BuiltIn::RaiseError.instance_methods.include?(:does_not_match?)
+  require 'given/rspec/have_failed_212.rb'
+else
+  require 'given/rspec/have_failed_pre212.rb'
+end
+
+module RSpec
+  module Given
+    module HaveFailed
+
+      # Specializes the RaiseError matcher to handle
+      # Failure/non-failure objects.
+
+      # Simular to raise_error(...), but reads a bit better when using
+      # a failure result from a when clause.
+      #
+      # 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(error=Exception, message=nil, &block)
+        HaveFailedMatcher.new(error, message, &block)
+      end
+      alias have_raised have_failed
+    end
+  end
+end

data/lib/given/rspec/have_failed_212.rb

@@ -0,0 +1,30 @@
+module RSpec
+  module Given
+    module HaveFailed
+
+      # The RSpec-2.12 and later version of the have_failed matcher
+
+      class HaveFailedMatcher < RSpec::Matchers::BuiltIn::RaiseError
+        def matches?(given_proc, negative_expectation = false)
+          if given_proc.is_a?(::Given::Failure)
+            super
+          else
+            super(lambda { }, negative_expectation)
+          end
+        end
+
+        def does_not_match?(given_proc)
+          if given_proc.is_a?(::Given::Failure)
+            super(given_proc)
+          else
+            super(lambda { })
+          end
+        end
+
+        def to_s
+          "<Failure matching #{@expected_error}: #{@expected_message.inspect}>"
+        end
+      end
+    end
+  end
+end

data/lib/given/rspec/have_failed_pre212.rb

@@ -0,0 +1,22 @@
+module RSpec
+  module Given
+    module HaveFailed
+
+      # The Pre-Rspec 2.12 version of the matcher
+
+      class HaveFailedMatcher < RSpec::Matchers::BuiltIn::RaiseError
+        def matches?(given_proc)
+          if given_proc.is_a?(::Given::Failure)
+            super
+          else
+            super(lambda { })
+          end
+        end
+
+        def to_s
+          "<FailureMatcher on #{@expected_error}: #{@expected_message.inspect}>"
+        end
+      end
+    end
+  end
+end

data/lib/given/rspec/monkey.rb

@@ -0,0 +1,41 @@
+require 'rspec'
+require 'given/module_methods'
+
+# Monkey patch RSpec to detect matchers used in expectations.
+
+unless defined?(RSpec::Given::MONKEY)
+
+  if defined?(RSpec::Expectations::PositiveExpectationHandler) &&
+      defined?(RSpec::Expectations::NegativeExpectationHandler)
+
+    RSpec::Given::MONKEY = true
+
+    module RSpec
+      module Expectations
+        class PositiveExpectationHandler
+          class << self
+            alias _gvn_rspec_original_handle_matcher handle_matcher
+            def handle_matcher(actual, matcher, message=nil, &block)
+              ::Given.framework.explicitly_asserted
+              _gvn_rspec_original_handle_matcher(actual, matcher, message, &block)
+            end
+          end
+        end
+
+        class NegativeExpectationHandler
+          class << self
+            alias _gvn_rspec_original_handle_matcher handle_matcher
+            def handle_matcher(actual, matcher, message=nil, &block)
+              ::Given.framework.explicitly_asserted
+              _gvn_rspec_original_handle_matcher(actual, matcher, message, &block)
+            end
+          end
+        end
+      end
+    end
+
+  else
+    RSpec::Given::MONKEY = false
+  end
+
+end

data/lib/given/rspec/use_natural_assertions.rb

@@ -0,0 +1,10 @@
+
+module RSpec
+  module Given
+
+    # Defined for backwards compatibility
+    def self.use_natural_assertions(*args)
+      ::Given.use_natural_assertions(*args)
+    end
+  end
+end

data/lib/given/version.rb

@@ -5,7 +5,7 @@ module Given
     VERSION_MINOR = 0,
     VERSION_BUILD = 0,
     BETA = 'beta',
-    BETA_NUMBER = 1,
+    BETA_NUMBER = 2,
   ]
   VERSION = VERSION_NUMBERS.join(".")
 end

data/rakelib/gemspec.rake

@@ -16,16 +16,19 @@ else
   ]
   PKG_FILES.exclude('TAGS')
   GIVEN_CORE_FILES = FileList[*PKG_FILES].
-    exclude("lib/minitest/**/*").
+    exclude("lib/*-given.rb").
     exclude("lib/rspec/**/*").
+    exclude("lib/mini*/**/*").
     exclude("spec/**/*").
     exclude("examples/**/*")
   RSPEC_GIVEN_FILES = FileList[*PKG_FILES].
-    exclude("lib/minitest/**/*").
+    exclude("lib/mini*/**/*").
+    exclude("lib/mini*-given.rb").
     exclude("lib/given/**/*")
-  MINITEST_GIVEN_FILES = FileList[*PKG_FILES].
+  MINISPEC_GIVEN_FILES = FileList[*PKG_FILES].
     exclude("spec/**/*").
-    exclude("lib/rspec/**/*").
+    exclude("lib/rspec-given.rb").
+    exclude("lib/rspec*/**/*").
     exclude("lib/given/**/*")
 
   RSPEC_GIVEN_SPEC = Gem::Specification.new do |s|
@@ -56,20 +59,20 @@ EOF
     s.rubyforge_project = "given"
   end
 
-  MINITEST_GIVEN_SPEC = Gem::Specification.new do |s|
-    s.name = 'minitest-given'
+  MINISPEC_GIVEN_SPEC = Gem::Specification.new do |s|
+    s.name = 'minispec-given'
     s.version = Given::VERSION
-    s.summary = "Given/When/Then Specification Extensions for MiniTest::Spec."
+    s.summary = "Given/When/Then Specification Extensions for Minispec::Spec."
     s.description = <<EOF
 Given is a Minitest::Spec extension that allows the use of Given/When/Then
 terminology when defining specifications.
 EOF
-    s.files = MINITEST_GIVEN_FILES.to_a
+    s.files = MINISPEC_GIVEN_FILES.to_a
     s.require_path = 'lib'                         # Use these for libraries.
     s.rdoc_options = [
       '--line-numbers', '--inline-source',
       '--main' , 'doc/main.rdoc',
-      '--title', 'Minitest Given Extensions'
+      '--title', 'Minitest::Spec Given Extensions'
     ]
 
     s.add_dependency("given_core", "= #{Given::VERSION}")
@@ -89,8 +92,9 @@ EOF
     s.version = Given::VERSION
     s.summary = "Core engine for RSpec::Given and Minitest::Given."
     s.description = <<EOF
-Given is an RSpec/Minitest extension that allows the use of Given/When/Then
-terminology when defining specifications.
+Given_core is the basic functionality behind rspec-given and minispec-given,
+extensions that allow the use of Given/When/Then terminology when defining
+specifications.
 EOF
     s.files = GIVEN_CORE_FILES.to_a
     s.require_path = 'lib'                         # Use these for libraries.
@@ -111,7 +115,7 @@ EOF
     s.rubyforge_project = "given"
   end
 
-  Gem::PackageTask.new(MINITEST_GIVEN_SPEC) do |pkg|
+  Gem::PackageTask.new(MINISPEC_GIVEN_SPEC) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -131,9 +135,9 @@ EOF
     open(t.name, "w") { |f| f.puts RSPEC_GIVEN_SPEC.to_yaml }
   end
 
-  file "minitest-given.gemspec" => ["rakelib/gemspec.rake"] do |t|
+  file "minispec-given.gemspec" => ["rakelib/gemspec.rake"] do |t|
     require 'yaml'
-    open(t.name, "w") { |f| f.puts MINITEST_GIVEN_SPEC.to_yaml }
+    open(t.name, "w") { |f| f.puts MINISPEC_GIVEN_SPEC.to_yaml }
   end
 
   file "given_core.gemspec" => ["rakelib/gemspec.rake"] do |t|
@@ -142,7 +146,7 @@ EOF
   end
 
   desc "Create a stand-alone gemspec"
-  task :gemspec => ["rspec-given.gemspec", "minitest-given.gemspec", "given_core.gemspec"]
+  task :gemspec => ["rspec-given.gemspec", "minispec-given.gemspec", "given_core.gemspec"]
 
   desc "Check Filelists"
   task :filelists do
@@ -151,7 +155,7 @@ EOF
     puts "==============="
     puts "RSPEC_GIVEN_FILES=#{RSPEC_GIVEN_FILES.inspect}"
     puts "==============="
-    puts "MINITEST_GIVEN_FILES=#{MINITEST_GIVEN_FILES.inspect}"
+    puts "MINISPEC_GIVEN_FILES=#{MINISPEC_GIVEN_FILES.inspect}"
     puts "==============="
   end
 end