wrong 0.3.2 → 0.3.3

data/README.markdown

@@ -10,7 +10,7 @@ Wrong is alpha-quality. We'd very much appreciate feedback and bug reports. Ther
 
 It relies on [Predicated](http://github.com/sconover/predicated) for its main failure message.
 
-Inspired by [assert { 2.0 }](http://assert2.rubyforge.org/) but rewritten from scratch. Compatible with Ruby 1.8 and 1.9.
+Inspired by [assert { 2.0 }](http://assert2.rubyforge.org/) but rewritten from scratch. Compatible with Ruby (MRI) 1.8, 1.9, and JRuby 1.5.
 
 ## Usage ##
 

data/lib/predicated/lib/predicated/sexp_patch.rb

@@ -0,0 +1,39 @@
+
+
+#see http://gist.github.com/321038
+# # Monkey-patch to have Ruby2Ruby#translate with r2r >= 1.2.3, from
+# # http://seattlerb.rubyforge.org/svn/ruby2ruby/1.2.2/lib/ruby2ruby.rb
+class ::Ruby2Ruby < ::SexpProcessor
+  def self.translate(klass_or_str, method = nil)
+    sexp = ParseTree.translate(klass_or_str, method)
+    unifier = Unifier.new
+    unifier.processors.each do |p|
+      p.unsupported.delete :cfunc # HACK
+    end
+    sexp = unifier.process(sexp)
+    self.new.process(sexp)
+  end
+
+  #sconover - 7/2010 - monkey-patch
+  #{1=>2}=={1=>2}
+  #The right side was having its braces cut off because of
+  #special handling of hashes within arglists within the seattlerb code.
+  #I tried to fork r2r and add a test, but a lot of other tests
+  #broke, and I just dont understand the test in ruby2ruby.
+  #So I'm emailing the author...
+  def process_hash(exp)
+    result = []
+    until exp.empty?
+      lhs = process(exp.shift)
+      rhs = exp.shift
+      t = rhs.first
+      rhs = process rhs
+      rhs = "(#{rhs})" unless [:lit, :str].include? t # TODO: verify better!
+
+      result << "#{lhs} => #{rhs}"
+    end
+
+    return "{ #{result.join(', ')} }"
+  end
+
+end

data/lib/wrong.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 require "predicated"
 require "wrong/assert"
 require "wrong/chunk"

data/lib/wrong/adapters/minitest.rb

@@ -5,4 +5,22 @@ class MiniTest::Unit::TestCase
   def failure_class
     MiniTest::Assertion
   end
+
+  def assert(*args)
+    if block_given? 
+      self._assertions += 1
+      super(explanation=args.first, depth=1)
+    else
+      super
+    end
+  end
+
+  def deny(*args)
+    if block_given? 
+      self._assertions += 1
+      super(explanation=args.first, depth=1)
+    else
+      super
+    end
+  end
 end

data/lib/wrong/assert.rb

@@ -1,5 +1,5 @@
 require "predicated/predicate"
-require "predicated/from/callable_object"
+require "predicated/from/ruby_code_string"
 require "predicated/to/sentence"
 require "wrong/chunk"
 require "wrong/config"
@@ -123,6 +123,7 @@ module Wrong
       unless value
         chunk = Wrong::Chunk.from_block(block, depth + 2)
         code = chunk.code
+
         predicate = begin
           Predicated::Predicate.from_ruby_code_string(code, block.binding)
         rescue Predicated::Predicate::DontKnowWhatToDoWithThisSexpError

data/lib/wrong/version.rb

@@ -1,3 +1,3 @@
 module Wrong
-  VERSION = "0.3.2" unless defined?(Wrong::VERSION)
+  VERSION = "0.3.3" unless defined?(Wrong::VERSION)
 end

data/test/adapters/minitest_test.rb

@@ -61,10 +61,37 @@ describe "basic assert features" do
     end
 
     msg = rescuing { MyFailingAssertTest.new.test_fail }.message
+
     assert { msg.include?("1 is not equal to 2") }
 
     msg = rescuing { MyFailingDenyTest.new.test_fail }.message
     assert { msg.include?("1 is equal to 1") }
   end
+end
+
+describe 'reports number of assertions' do
+  before do
+    @test = Class.new(MiniTest::Unit::TestCase).new("x")
+  end
+  
+  it 'assert{} should bump number of assertions' do
+    @test.assert {true}
+    assert {@test._assertions == 1}
+  end
+  
+  it 'assert() should not bump twice number of assertions' do
+    @test.assert(true)
+    assert {@test._assertions == 1}
+  end
 
+  it 'deny{} should bump number of assertions' do
+    @test.deny {false}
+    assert {@test._assertions == 1}
+  end 
+  
+  it 'deny() should bump once number of assertions' do
+    @test.deny(false)
+    assert {@test._assertions == 1}
+  end  
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrong
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Steve Conover
@@ -20,8 +20,24 @@ date: 2010-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ParseTree
+  name: predicated
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,10 +50,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,10 +66,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,10 +82,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: diff
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,10 +98,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,7 +114,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 description: |-
   Wrong provides a general assert method that takes a predicate block. Assertion failure
   messages are rich in detail. The Wrong idea is to replace all those countless assert_this,
@@ -113,6 +129,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- lib/predicated/lib/predicated/sexp_patch.rb
 - lib/wrong/adapters/minitest.rb
 - lib/wrong/adapters/rspec.rb
 - lib/wrong/adapters/test_unit.rb