ae 1.5.0 → 1.6.0

data/HISTORY.rdoc

@@ -1,9 +1,23 @@
 = RELEASE HISTORY
 
+== 1.6.0 / 2010-11-04
+
+Support libraries defining toplevel methods, such as `legacy.rb`, now place
+their methods in AE::World module instead of Object. AE::World needs to
+to be included in the context desired for the testing framework used. This
+is important to prevent polution of the the Object namespace.
+
+Changes:
+
+* Toplevel extras are defined in AE::World instead of Object.
+* In dot.rb #true/#false methods renamed to `#true!`/`#false!`.
+* In dot.rb `#true!`/`#false!` methods can take an error or error message.
+
+
 == 1.5.0 / 2010-09-06
 
 This release adds adapters for TestUnit, MiniTest and RSpec. AE worked with
-them previously but AE assertions were seen as errors rather than natice
+them previously but AE assertions were seen as errors rather than nice
 assertions. Likewise assertion counts were off in the final tally. These
 adapters insert AE's counts so the the tally's are correct.
 

data/lib/ae/assertion.rb

@@ -11,6 +11,7 @@ require 'ae/core_ext'
 #
 class Assertion < Exception
 
+  # TODO: This doesn't seem to cut it anymore!
   @count = 0
   @fails = 0
 
@@ -44,6 +45,7 @@ class Assertion < Exception
     # is increased. If +pass+ if false then both +@count+ and +@fails+
     # are incremented.
     def increment(pass)
+      recount unless instance_variable_defined?('@count') # TODO: Come on, there has to be a better way!
       @count += 1
       @fails += 1 unless pass
     end

data/lib/ae/assertor.rb

@@ -102,7 +102,7 @@ class Assertor < AE::BasicObject
         rescue match => error
           pass = true
           msg  = "#{match} raised"
-        rescue Exception => error
+        rescue ::Exception => error
           pass = false
           msg  = "#{match} expected but #{error.class} was raised"
         ensure

data/lib/ae/check.rb

@@ -0,0 +1,23 @@
+module AE
+
+  module CheckOK
+    def check(&block)
+      @_check = block
+    end
+
+    def ok(*args)
+      @_check.call(*args)
+    end
+
+    #def no(*args)
+    #  @_check.call(*args)
+    #end
+  end
+
+  module World
+    include CheckOK
+  end
+
+end
+
+

data/lib/ae/detest.rb

@@ -0,0 +1,68 @@
+require 'ae/assertion'
+
+class AE
+  # Given that x is "tom" then we can assert it
+  # is using an asseretion pipe.
+  #
+  #  x = "tom"
+  #
+  #  T x == "tom"
+  #
+  # We can assert the opposite using F.
+  #
+  #  F x == "tom"
+  #
+  # These can be used at any point of return.
+  #
+  #  T case x
+  #     when 'tom' then true
+  #     else false
+  #     end
+  #
+  module Detest
+
+    # Test for true.
+    #
+    #   T 1 == 1
+    #
+    def T(x=nil, &b)
+      Assertion.test(x || b.call, :backtrace=>caller)
+    end
+
+    # Test for not.
+    #
+    #   F 1 == 2
+    #
+    def F(x=nil, &b)
+      Assertion.test(!(x || b.call), :backtrace=>caller)
+    end
+
+    # Test for nil?.
+    #
+    #   N nil
+    #
+    def N(x=nil,&b)
+      Assertion.test(nil == (x || b.call), :backtrace=>caller)
+    end
+
+    # Expect and error.
+    #
+    #   E { raise }
+    #
+    # Unless #T, #F and #N, the #E method only supports block notation.
+    def E(&b)
+      expect(Exception, &b)
+    end
+
+    # Catch a symbol.
+    #def C
+    #end
+  end
+
+  module World
+    include AE::Detest
+  end
+
+end
+
+

data/lib/ae/dot.rb

@@ -1,20 +1,44 @@
 # Expiremental Concept
 
+#
 class TrueClass
-  def true
+  # Assert true.
+  #
+  #   (x == y).true!
+  #
+  def true!(msg=nil)
     true
   end
-  def false
-    fail Assertion.new('true', :backtrace=>caller)
-    #raise Assertion
+  # Assert false.
+  #
+  #   (x == y).false!
+  #
+  def false!(err="not false")
+    if Exception === err
+      fail err
+    else
+      fail Assertion.new(err.to_s, :backtrace=>caller)
+    end
   end
 end
 
 class FalseClass
-  def true
-    fail Assertion.new('false', :backtrace=>caller)
+  # Assert true.
+  #
+  #   (x == y).true!
+  #
+  def true!(err="not true")
+    if Exception === err
+      fail err
+    else
+      fail Assertion.new(err.to_s, :backtrace=>caller)
+    end
   end
-  def false
+  # Assert false.
+  #
+  #   (x == y).false!
+  #
+  def false!(msg=nil)
     true
   end
 end

data/lib/ae/legacy.rb

@@ -282,9 +282,10 @@ module AE
 #    include Legacy::Assertions
 #  end
 
-end
+  module World
+    include AE::Legacy::Assertions
+  end
 
-class ::Object #:nodoc:
-  include AE::Legacy::Assertions
 end
 
+

data/lib/ae/meta/package

@@ -1,6 +1,6 @@
 name    : ae
-date    : 2010-09-06
-version : 1.5.0
+date    : 2010-11-04
+version : 1.6.0
 
 requires:
   - syckle (build)

data/lib/ae/meta/profile

@@ -3,16 +3,21 @@ title  : AE
 summary: Assertive Expressive
 suite  : proutils
 contact: trans <transfire@gmail.com>
-created: 2008-08-17 09:00:06
+created: 2008-08-17
 authors: Thomas Sawyer
 license: MIT
 
 description:
-  Assertive Expressive is an assertions library intended for reuse
-  by any TDD, BDD or the like system.
+  Assertive Expressive is an assertions library specifically 
+  designed for reuse by other test frameworks.
 
 resources:
-  homepage: http://proutils.github.com/ae
-  repository: git://github.com/proutils/ae.git
+  home: http://proutils.github.com/ae
+  code: http://github.com/proutils/ae
+  docs: http://wiki.github.com/proutils/ae/docs/qed
+  wiki: http://wiki.github.com/proutils/ae
+  bugs: http://github.com/proutils/ae/issues
+  mail: http://groups.google.com/group/rubyworks-mailinglist
+  repo: git://github.com/proutils/ae.git
 
 copyright: Copyright (c) 2008 Thomas Sawyer

data/qed/06_counts.rdoc

@@ -0,0 +1,29 @@
+= Assertion Counts
+
+AE tracks the number of assertions made and the number that failed to pass.
+We can reset the count using the +recount+ class method.
+
+  fails, total = Assertion.recount
+
+For example if we one assertion fails and another fails.
+
+  assert(true)
+
+  expect Assertion do
+    assert(false)
+  end
+
+We will see that AE counted three assertions and one failure.
+
+  Assertion.count.assert == 3
+  Assertion.fails.assert == 1
+
+The #expect call is an assertion too, which is why the count is 3
+rather than 2.
+
+Now that we are done checking counts we will restore them so that
+any other demos being run with this will tally correctly.
+
+  Assertion.fails = fails
+  Assertion.count = total + 3
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ae
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: false
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 -04:00
+date: 2010-11-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
-description: Assertive Expressive is an assertions library intended for reuse by any TDD, BDD or the like system.
+description: Assertive Expressive is an assertions library specifically designed for reuse by other test frameworks.
 email: transfire@gmail.com
 executables: []
 
@@ -55,16 +55,12 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- demo/cucumber/features/cucumber.feature
-- demo/cucumber/features/step_definitions/cucumber_steps.rb
-- demo/cucumber/features/support/env.rb
-- demo/minitest/example.rb
-- demo/testunit/example.rb
 - qed/01_overview.rdoc
 - qed/02_assertion.rdoc
 - qed/03_assert.rdoc
 - qed/04_subjunctive.rdoc
 - qed/05_expect.rdoc
+- qed/06_counts.rdoc
 - qed/07_matchers.rdoc
 - lib/ae/adapter.rb
 - lib/ae/adapters/minitest.rb
@@ -74,7 +70,9 @@ files:
 - lib/ae/assertion.rb
 - lib/ae/assertor.rb
 - lib/ae/basic_object.rb
+- lib/ae/check.rb
 - lib/ae/core_ext.rb
+- lib/ae/detest.rb
 - lib/ae/dot.rb
 - lib/ae/expect.rb
 - lib/ae/legacy.rb
@@ -130,3 +128,4 @@ summary: Assertive Expressive
 test_files: 
 - lib/ae/adapters/minitest.rb
 - lib/ae/adapters/testunit.rb
+- lib/ae/detest.rb

data/demo/cucumber/features/cucumber.feature

@@ -1,10 +0,0 @@
-Feature: Cucumber SUpport
-  In order to please people who like Cucumber
-  As an AE user
-  I want to be able to use assert in my step definitions
-
-  Scenario: assert
-    Given x = 5
-    And y = 5
-    Then I can assert that x.assert == y
-

data/demo/cucumber/features/step_definitions/cucumber_steps.rb

@@ -1,11 +0,0 @@
-
-Given /^(\w+) = (\w+)$/ do |var, value|
-  instance_variable_set("@#{var}", value)
-end
-
-Then /^I can assert that (\w+).assert == (\w+)$/ do |var_a, var_b|
-  a = instance_variable_get("@#{var_a}")
-  b = instance_variable_get("@#{var_b}")
-  a.assert == b
-end
-

data/demo/cucumber/features/support/env.rb

@@ -1 +0,0 @@
-require 'ae'

data/demo/minitest/example.rb

@@ -1,34 +0,0 @@
-require 'minitest/autorun'
-require 'ae/adapters/minitest'
-
-class MiniTestSupport < MiniTest::Unit::TestCase
-
-  def test_assert_pass
-    x = 5
-    y = 5
-    x.assert == y
-  end
-
-  def test_assert_fail
-    x = 5
-    y = 6
-    x.assert == y
-  end
-
-  def test_assert_fail_original
-    x = 5
-    y = 6
-    assert_equal(x, y)
-  end
-
-  def test_assert_pass_original
-    x = 5
-    y = 5
-    assert_equal(x, y)
-  end
-
-  def test_exception
-    raise
-  end
-
-end

data/demo/testunit/example.rb

@@ -1,34 +0,0 @@
-require 'test/unit'
-require 'ae/adapters/testunit'
-
-class TestUnitSupport < Test::Unit::TestCase
-
-  def test_assert_pass
-    x = 5
-    y = 5
-    x.assert == y
-  end
-
-  def test_assert_fail
-    x = 5
-    y = 6
-    x.assert == y
-  end
-
-  def test_assert_fail_original
-    x = 5
-    y = 6
-    assert_equal(x, y)
-  end
-
-  def test_assert_pass_original
-    x = 5
-    y = 5
-    assert_equal(x, y)
-  end
-
-  def test_exception
-    raise
-  end
-
-end