graham 0.0.2 → 0.0.3a

data/README.md

@@ -5,11 +5,11 @@ Graham is a tiny-yet-useful testing library based on Mallow - in fact it _is_ Ma
 * TestRocket was too minimal
 * RSpec was too verbose (not to mention ridiculous overkill)
 
-## How does one graham ##
+## How does one use graham ??? ##
 
 Graham test cases are instance methods on arbitrary classes:
 ```ruby
-  class TestCases
+  class Cases
     def initialize
       @number = 1
     end
@@ -19,18 +19,18 @@ Graham test cases are instance methods on arbitrary classes:
     def dividing_one_by_zero
       @number / 0
     end
-    def calling_a_nonexistent_method
-      Graham.this_is_not_a_method
+    def calling_upcase_on(obj)
+      obj.upcase
     end
   end
 ```
 Then test your cases:
 ```ruby
-  Graham.test(TestCases) do |that|
+  Graham.test(Cases) do |that|
     that.one_squared.is 1
-    that.dividing_by_zero.returns_a(Fixnum).such_that {self > 1}
-    that.calling_a_nonexistent_method.does_not_raise_an_exception
-  end #=> {:one_squared=>true, :dividing_by_zero=>#<ZeroDivisionError>, :calling_a_nonexistent_method=>false}
+    that.dividing_by_zero.returns_a(Fixnum).such_that {|n| n > 1}
+    that.calling_upcase_on(Graham).does_not_raise_an_exception
+  end #=> {:one_squared=>true, :dividing_by_zero=>#<ZeroDivisionError>, :calling_upcase_on=>false}
 ```
-Calling Graham::pp instead will call Graham::test and run the output through Graham's built-in pretty printer.
+Or use Graham::test! to run the results through Graham's pretty printer.
 

data/lib/graham.rb

@@ -3,21 +3,27 @@ require 'mallow'
 require 'graham/version'
 # == A miniature test engine powered by Mallow
 # ---
-# Test cases are instance methods on classes defined in Graham's namespace,
-# and expectations on their return values are enumerated using a very slightly
-# modified Mallow::DSL.
+# Test cases are instance methods on arbitrary classes, and expectations on
+# their return values are enumerated using a very slightly modified
+# Mallow::DSL.
 # 
-#  class Graham::Cases
-#    def test1; 4 + 5 end
-#    def test2; 'test'.upcase end
-#    def test3; 1/0 end
+#  class Cases
+#    def four_plus_five
+#      4 + 5 
+#    end
+#    def upcasing(s)
+#      s.upcase
+#    end
+#    def one_divided_by_zero
+#      1/0
+#    end
 #  end
 #
-#  Graham.test { |that|
-#    that.test1.returns_a(Fixnum).such_that {self < 100}
-#    that.test2.returns 'TeST'
-#    that.test3.returns_a Numeric
-#  } #=> {:test1=>true, :test2=>false, :test3=>#<ZeroDivisionError>}
+#  Graham.test(Cases) { |that|
+#    that.four_plus_five.is 9
+#    that.upcasing('test').returns 'TeST'
+#    that.one_divided_by_zero.equals :infinity
+#  } #=> {:four_plus_five=>true, :upcasing=>false, :one_divided_by_zero=>#<ZeroDivisionError>}
 #
 # === N.B.
 # Since a Graham test is basically a Mallow pattern matcher, only the first
@@ -25,21 +31,21 @@ require 'graham/version'
 # test case will be matched by the first rule. This can lead to confusing
 # results:
 #
-#  Graham.test { |that|
-#    that.test1.returns_a(Fixnum)
-#    that.test1.returns_a(String)
-#  } #=> {:test1=>true}
+#  Graham.test(Cases) { |that|
+#    that.four_plus_five.returns_a(Fixnum)
+#    that.four_plus_five.returns_a(String)
+#  } #=> {:four_plus_five=>true}
 #
 # To avoid this issue, either run separate tests:
 #
-#  Graham.test {|that| that.test1.returns_a Fixnum} #=> {:test1=>true}
-#  Graham.test {|that| that.test1.returns_a String} #=> {:test1=>false}
+#  Graham.test(Cases) {|that| that.four_plus_five.returns_a Fixnum} #=> {:four_plus_five=>true}
+#  Graham.test(Cases) {|that| that.four_plus_five.returns_a String} #=> {:four_plus_five=>false}
 # 
 # Or (better) chain the tests you want to run:
 # 
-#  Graham.test { |that|
-#    that.test1.returns_a(Fixnum).and_returns_a(String)
-#  } #=> {:test1=>false}
+#  Graham.test(Cases) { |that|
+#    that.four_plus_five.returns_a(Fixnum).that {is_a? String}
+#  } #=> {:four_plus_five=>false}
 #
 module Graham
   autoload :PP,       'graham/pp'
@@ -57,17 +63,18 @@ module Graham
     def pp(ns, &b)
       PP.new(test ns,&b).pp
     end
+    alias test! pp
   end
 
   class Core < Mallow::Core
-    attr_accessor :cases
+    attr_reader :cases
     def initialize
-      @cases = []
+      @cases = {}
       super
     end
 
     def _fluff1(e)
-      [e.name] << begin
+      [e] << begin
         super e
         true
       rescue Mallow::MatchException
@@ -77,7 +84,7 @@ module Graham
       end
     end
 
-    def test; Hash[_fluff @cases] end
+    def test; Hash[_fluff @cases.keys] end
   end
 end
 

data/lib/graham/dsl.rb

@@ -7,7 +7,7 @@ module Graham
     end
 
     def initialize(ns)
-      @core, @ns = Core.new, ns.new
+      @core, @ns = Core.new, ns
       reset!
     end
 
@@ -16,13 +16,18 @@ module Graham
       when /^((and|that)_)+(.+)$/
         respond_to?($3)? send($3, *args, &b) : super
       else
-        core.cases << (_case = @ns.method msg)
-        rule!._where {|e|e==_case}
+        core.cases[msg] = args
+        (conditions.empty?? self : rule!)._where {|e|e==msg}
       end
     end
 
-    def _where(&b); push b, :conditions              end
-    def where(&b);  _where {|e| preproc(b)[e.call] } end
+    def _where(&b)
+      push b, :conditions
+    end
+
+    def where(&b)
+      _where {|e| preproc(b).call @ns.new.send(e, *core.cases[e]) }
+    end
 
     def raises(x=nil)
       _where {
@@ -52,6 +57,7 @@ module Graham
 
     alias is      this
     alias returns this
+    alias equals  this
 
     alias is_such_that where
     alias such_that    where

data/lib/graham/pp.rb

@@ -8,7 +8,7 @@ module Graham
     PLAIN = "\x1b[0m"
     GREEN = "\x1b[32m"
     RED   = "\x1b[31m"
-    def initialize(results, bt=0, out=$stdout, color=true)
+    def initialize(results, bt=(ENV['backtrace']||0).to_i, out=$stdout, color=true)
       @results, @bt, @out, @color = results, bt, out, color
     end
     def pp

data/lib/graham/version.rb

@@ -1,3 +1,3 @@
 module Graham
-  VERSION = '0.0.2'
+  VERSION = '0.0.3a'
 end

data/test/case/cases.rb

@@ -0,0 +1,44 @@
+class TestCases
+  def DocTest1; 4 + 5 end
+  def DocTest2; 'test'.upcase end
+  def DocTest3; 1/0  end
+  def rdoc_example
+    Graham.test(TestCases) { |that|
+      that.DocTest1.returns_a(Fixnum).such_that {self < 100}
+      that.DocTest2.returns 'TeST'
+      that.DocTest3.returns_a(Numeric)
+    }
+  end
+
+  def squaring(n)
+    n ** 2
+  end
+
+  def dividing_by_zero(n)
+    n / 0
+  end
+  def calling_a_nonexistent_method
+    Graham.this_is_not_a_method
+  end
+  def readme_example
+    Graham.test(TestCases) do |that|
+      that.squaring(1).returns 1
+      that.dividing_by_zero(1).returns_a(Fixnum)
+      that.calling_a_nonexistent_method.does_not_raise_an_exception
+    end 
+  end
+end
+
+Graham.pp(TestCases) do |that|
+  that.rdoc_example.returns_a(Hash).of_size(3).such_that {|h|
+    h[:DocTest1] == true  and
+    h[:DocTest2] == false and
+    h[:DocTest3].is_a? ZeroDivisionError
+  }
+  that.readme_example.returns_a(Hash).of_size(3).such_that {|h|
+    h[:squaring] == true and
+    h[:dividing_by_zero].is_a? ZeroDivisionError and
+    h[:calling_a_nonexistent_method] == false
+  }
+end
+

data/test/case/control.rb

@@ -1,9 +1,9 @@
-class Cases
+class ControlCases
   def the_number_99; 99 end
   def raising_a_name_error; raise Asdf.qwer.ty / 0 end
 end
 
-Graham.pp(Cases) {|that|
+Graham.pp(ControlCases) {|that|
   that.the_number_99.returns_a(Fixnum).such_that {self==99}.and_that_is 99
   that.raising_a_name_error.raises.and_raises_a NameError
 }

data/test/unit/arguments.rb

@@ -0,0 +1,9 @@
+class Arguments
+  def doubling(n)
+    2*n
+  end
+end
+
+Graham.pp(Arguments) {|that|
+  that.doubling(2).equals 4
+}

data/test/unit/namespaces.rb

@@ -0,0 +1,26 @@
+class Namespace
+  def initialize
+    @num=0
+  end
+
+  def namespacing; self end
+
+  def initialization
+    @num+=1
+  end
+
+  def reinitialization
+    @num+=1
+  end
+end
+
+Graham.pp(Namespace) do |that|
+  that.namespacing.is_such_that {
+    self.class == Namespace
+  }.and {!respond_to? :rdoc_example
+  }.and { respond_to? :namespacing}
+
+  that.initialization.returns 1
+  that.reinitialization.returns 1
+end
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: graham
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3a
+  prerelease: 5
 platform: ruby
 authors:
 - feivel jellyfish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mallow
@@ -42,7 +42,9 @@ files:
 - lib/graham/dsl.rb
 - Rakefile
 - test/case/control.rb
-- test/case/test.rb
+- test/case/cases.rb
+- test/unit/arguments.rb
+- test/unit/namespaces.rb
 homepage: http://github.com/gwentacle/graham
 licenses: []
 post_install_message: 
@@ -58,9 +60,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -70,4 +72,6 @@ summary: Miniature test engine based on Mallow
 test_files:
 - Rakefile
 - test/case/control.rb
-- test/case/test.rb
+- test/case/cases.rb
+- test/unit/arguments.rb
+- test/unit/namespaces.rb

data/test/case/test.rb

@@ -1,57 +0,0 @@
-class Cases
-  def DocTest1; 4 + 5 end
-  def DocTest2; 'test'.upcase end
-  def DocTest3; 1/0  end
-  def rdoc_example
-    Graham.test(Cases) { |that|
-      that.DocTest1.returns_a(Fixnum).such_that {self < 100}
-      that.DocTest2.returns 'TeST'
-      that.DocTest3.returns_a(Numeric)
-    }
-  end
-
-  def initialize
-    @number = 1
-  end
-  def ReadmeCase1
-    @number ** 2
-  end
-  def ReadmeCase2
-    @number / 0
-  end
-  def ReadmeCase3
-    Graham.this_is_not_a_method
-  end
-  def readme_example
-    Graham.test(Cases) do |that|
-      that.ReadmeCase1.is_such_that { self == 1 }
-      that.ReadmeCase2.is_a(Fixnum).such_that {self > 1}
-      that.ReadmeCase3.does_not_raise_an_exception
-    end 
-  end
-end
-
-class Namespace
-  def namespacing; self end
-end
-
-Graham.pp(Cases) do |that|
-  that.rdoc_example.returns_a(Hash).of_size(3).such_that {
-    self[:DocTest1] == true  and
-    self[:DocTest2] == false and
-    self[:DocTest3].is_a? ZeroDivisionError
-  }
-  that.readme_example.returns_a(Hash).of_size(3).such_that {
-    self[:ReadmeCase1] == true and
-    self[:ReadmeCase2].is_a? ZeroDivisionError and
-    self[:ReadmeCase3] == false
-  }
-end
-
-Graham.pp(Namespace) do |that|
-  that.namespacing.is_such_that {
-    self.class == Namespace
-  }.and {!respond_to? :rdoc_example
-  }.and { respond_to? :namespacing}
-end
-