lax 0.0.2 → 0.0.3

data/README.md

@@ -1,30 +1,29 @@
 lax
 ===
-A bright smidgen of a testing framework that is not the boss of you.
+An insouciant smidgen of a testing framework that is not the boss of you.
 ```ruby
-  Lax.test { |assert|
-    assert.calling(:/).on(1).with(0).raises ZeroDivisionError
+  Lax.test {
+    calling(:/).on(1).with(0).raises ZeroDivisionError
 
-    assert.satisfies(->(n) { n == 1 }) { |returns_one|
-      returns_one.calling(:+).on(0).with 1
+    returns(1) {
+      calling(:+).on(0).with 1
 
-      returns_one.on(1) { |id_on_one|
-        id_on_one.calling(:+).with 0
-        id_on_one.calling(:*).with 1
+      on(1) {
+        calling(:+).with 0
+        calling(:*).with 1
 
         0.upto(10) { |n|
-          id_on_one.calling(:**).with n
+          calling(:**).with n
         }
       }
     }
   }
-  Lax.go
+  Lax.test!
 ```
 yes but why
 -----------
 * Everything about a test is independently scopeable - methods, arguments, receivers, blocks, expectations, hooks, and any metadata you might care to attach. Testing that one method call satisfies three conditions is as natural as testing that one condition is satisfied by three different method calls. Write tests in whatever way makes sense.
 * No hardcoded constraints on terminal output, handling of failed tests, w/e - it's all done with user-configurable hooks.
-* Support for (optional) concurrent testing (via threads - not currently known to be threadsafe in JRuby).
 * Code footprint so small, it's hardly there at all (< 200 SLOC).
 * Does not pollute your toplevel namespace or infect the entire Ruby object hierarchy with its code.
 

data/lax.gemspec

@@ -11,6 +11,6 @@ Gem::Specification.new do |spec|
   spec.test_files  = FileList['rakefile','test/**/*.rb']
   spec.license     = 'MIT/X11'
   spec.homepage    = 'http://github.com/gwentacle/lax'
-  spec.summary     = 'A more forgiving testing framework.'
-  spec.description = 'A testing framework that tries to stay out of your way.'
+  spec.summary     = 'An insouciant smidgen of a testing framework.'
+  spec.description = 'A lightweight testing framework that is not the boss of you.'
 end

data/lib/lax/case.rb

@@ -0,0 +1,17 @@
+module Lax
+  class Case < Hash
+    def test
+      Lax.call self[:before], self
+      self[:pass] = begin
+        self[:cond][self[:value]=self[:obj].__send__(self[:msg],*self[:args],&self[:blk])]
+      rescue self[:xptn] => e
+        true
+      rescue => e
+        self[:xptn] = e
+        false
+      end
+      Lax.call self[:after], self
+    end
+  end
+end
+

data/lib/lax/hook.rb

@@ -0,0 +1,24 @@
+module Lax
+  class Hook < Proc
+    def <<(cb); Hook.new {|e| self[cb[e]]}    end
+    def +(cb);  Hook.new {|e| self[e]; cb[e]} end
+
+    StartTime = Hook.new { @start = Time.now }
+    StopTime  = Hook.new { @stop  = Time.now }
+    PassFail  = Hook.new {|tc| $stdout.write(tc[:pass] ? "\x1b[32m=\x1b[0m" : "\x1b[31m#\x1b[0m")}
+
+    Summary   = Hook.new do |cases|
+      puts "\nFinished #{cases.size} tests" <<
+        " in #{(@stop - @start).round 10} seconds" <<
+        " with #{(cases.reject{|c|c[:pass]}).size} failures"
+    end
+
+    Failures  = Hook.new do |cases|
+      cases.reject {|c|c[:pass]}.each do |f|
+        puts "  #{Module===f[:obj] ? "#{f[:obj]}::" : "#{f[:obj].class}#"}#{f[:msg]}" <<
+          "#{?(+[*f[:args]]*', '+?) if f[:args]} " << (f.has_key?(:value) ? "#=> #{f[:value]}" : "raised unhandled #{f[:xptn].class}")
+      end
+    end
+  end
+end
+

data/lib/lax/task.rb

@@ -0,0 +1,36 @@
+require 'rake'
+module Lax
+  class Task
+    include Rake::DSL
+    def initialize(opts = {})
+      dir = opts.delete(:dir) || :test
+      make_tasks dir, {
+        start:  Hook::StartTime,
+        after:  Hook::PassFail,
+        finish: Hook::StopTime + Hook::Summary + Hook::Failures
+      }.merge(opts)
+    end
+
+    private
+    def make_tasks(dir, opts)
+      namespace dir do
+        desc "[Lax] load all test files"
+        task load: make_groups(dir)
+        desc "[Lax] run all loaded tests"
+        task(:run) { Lax.test! opts }
+      end
+      desc "[Lax] load and run all tests"
+      task dir => ["#{dir}:load","#{dir}:run"]
+    end
+
+    def make_groups(dir)
+      FileList["#{dir}/**/*"].select {|f| File.directory? f}.map do |group|
+        name = group.sub(/^#{dir}\//,'').gsub(/\//,?:)
+        desc "[Lax] load files in #{group}"
+        task(name) { Dir["#{group}/*.rb"].each {|file| load file} }
+        [dir,name]*?:
+      end
+    end
+  end
+end
+

data/lib/lax/tree.rb

@@ -0,0 +1,60 @@
+module Lax
+  class Tree < Array
+    attr_reader :tc
+    def initialize(tc={})
+      @tc = Case.new.merge tc
+    end
+
+    def on(obj,&b)
+      where({obj: obj},&b)
+    end
+
+    def calling(msg,&b)
+      where({msg: msg},&b)
+    end
+
+    def with(*args,&b)
+      where({args: args},&b)
+    end
+
+    def with_block(blk=nil,&b)
+      blk  ? where({blk: blk},&b)   : where(blk: b)
+    end
+
+    def satisfies(cond=nil,&b)
+      cond ? where({cond: cond},&b) : where(cond: Lax.preproc(b))
+    end
+
+    def before(bef=nil,&b)
+      bef ? where({before: bef},&b) : where(before: b)
+    end
+
+    def after(aft=nil,&b)
+      aft ? where({after: aft},&b)  : where(after: b)
+    end
+
+    def raises(xptn=StandardError,&b)
+      where({xptn: xptn},&b)
+    end
+
+    def it
+      calling(:tap).with_block {}
+    end
+
+    def returns(v,&b)
+      satisfies ->(e){e==v}, &b
+    end
+
+    def where(h,&b)
+      t=Tree.new tc.merge h 
+      Lax.preproc(b)[t] if b
+      push(t).last
+    end
+
+    def leaves
+      any?? map(&:leaves).flatten : [tc]
+    end
+
+  end
+end
+

data/lib/lax/version.rb

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

data/lib/lax.rb

@@ -1,171 +1,35 @@
 require 'lax/version'
 module Lax
+  autoload :Case,   'lax/case'
+  autoload :Tree,   'lax/tree'
+  autoload :Hook,   'lax/hook'
+  autoload :Task,   'lax/task'
+
   class << self
     @@cases = []
     def test(c={},&b)
-      @@cases += Tree.new(c).tap(&b).leaves
-    end
-
-    def go(runner_opts={})
-      Runner.new(@@cases, runner_opts).go
-    end
-  end
-
-  class Case < Hash
-    def run
-      self[:before] and self[:before][self]
-      self[:pass] = begin
-        self[:cond][self[:value]=self[:obj].__send__(self[:msg],*self[:args],&self[:blk])]
-      rescue self[:xptn] => e
-        true
-      rescue => e
-        self[:xptn] = e
-        false
-      end
-      self[:after] and self[:after][self]
-    end
-  end
-
-  class Tree < Array
-    attr_reader :tc
-    def initialize(tc={})
-      @tc = Case.new.merge tc
-    end
-
-    def on(obj,&b)
-      where({obj: obj},&b)
-    end
-
-    def calling(msg,&b)
-      where({msg: msg},&b)
-    end
-
-    def with(*args,&b)
-      where({args: args},&b)
-    end
-
-    def with_block(blk=nil,&b)
-      blk  ? where({blk: blk},&b)   : where(blk: b)
-    end
-
-    def satisfies(cond=nil,&b)
-      cond ? where({cond: cond},&b) : where(cond: b)
-    end
-
-    def before(bef=nil,&b)
-      bef ? where({before: bef},&b) : where(before: b)
-    end
-
-    def after(aft=nil,&b)
-      aft ? where({after: aft},&b)  : where(after: b)
-    end
-
-    def raises(xptn=StandardError,&b)
-      where({xptn: xptn},&b)
-    end
-
-    def it
-      calling(:tap).with_block {}
-    end
-
-    def returns(v,&b)
-      satisfies ->(e){e==v}, &b
-    end
-
-    def where(h)
-      g=Tree.new tc.merge h 
-      yield g if block_given?
-      push(g).last
-    end
-
-    def leaves
-      any?? map(&:leaves).flatten : [tc]
-    end
-  end
-
-  # Runner for test cases. Handles callbacks, concurrency, etc.
-  class Runner
-    attr_reader :cases
-    # Takes an array of test cases and an optional hash of options.
-    def initialize(cases, opts={})
-      @cases, @opts = cases, {threads: 1}.merge(opts)
+      preproc(b)[t=Tree.new(c)]
+      t.leaves.tap {|cs|@@cases+=cs}
     end
 
-    def go
-      @opts[:start][self] if @opts[:start]
-      todo = cases.dup
-      (1..@opts[:threads]).map do
-        Thread.new {run todo.shift while todo.any?}
-      end.each &:join
-      @opts[:finish][self] if @opts[:finish]
-      self
-    end
-
-    private
-    def run(c)
-      @opts[:before][c] if @opts[:before]
-      c.run
-      @opts[:after][c] if @opts[:after]
-    end
-  end
-
-  class Hook < Proc
-    def <<(cb); Hook.new {|e| self[cb[e]]}    end
-    def +(cb);  Hook.new {|e| self[e]; cb[e]} end
-
-    StartTime = Hook.new do |rn|
-      rn.extend(Module.new {attr_accessor :start, :stop}).start = Time.now
-    end
-
-    StopTime  = Hook.new {|rn| rn.stop = Time.now }
-
-    SimpleOut = Hook.new {|tc| $stdout.write(tc[:pass] ? "\x1b[32m=\x1b[0m" : "\x1b[31m#\x1b[0m")}
-
-    Summary   = Hook.new do |rn|
-      puts "\nFinished #{(cs=rn.cases).size} tests" <<
-        " in #{(rn.stop - rn.start).round 10} seconds" <<
-        " with #{(cs.reject{|c|c[:pass]}).size} failures"
-    end
-
-    FailList  = Hook.new do |rn|
-      rn.cases.reject {|c|c[:pass]}.each do |f|
-        puts "  #{Module===f[:obj] ? "#{f[:obj]}::" : "#{f[:obj].class}#"}#{f[:msg]}" <<
-          "#{?(+[*f[:args]]*', '+?) if f[:args]} " << (f.has_key?(:value) ? "#=> #{f[:value]}" : "raised unhandled #{f[:xptn].class}")
+    def test!(opts={})
+      cases = opts[:cases] || @@cases
+      call opts[:start], cases
+      cases.each do |c|
+        call opts[:before], c
+        c.test
+        call opts[:after], c
       end
-    end
-  end
-
-  class Task
-    include Rake::DSL
-    def initialize(opts = {})
-      dir = opts.delete(:dir) || :test
-      runner_opts = {
-          start:  Hook::StartTime,
-          after:  Hook::SimpleOut,
-          finish: Hook::StopTime + Hook::Summary + Hook::FailList
-      }.merge opts
-      make_tasks dir, runner_opts
+      call opts[:finish], cases
+      cases
     end
 
-    private
-    def make_tasks(dir, runner_opts)
-      namespace dir do
-        desc "[Lax] load all test files"
-        task load: make_groups(dir)
-        desc "[Lax] run all loaded tests"
-        task(:run) { Lax.go runner_opts }
-      end
-      desc "[Lax] load and run all tests"
-      task dir => ["#{dir}:load","#{dir}:run"]
+    def call(p, *as)
+      p[*as] if p
     end
 
-    def make_groups(dir)
-      FileList["#{dir}/**/*"].select {|f| File.directory? f}.map do |group|
-        name = group.sub(/^#{dir}\//,'').gsub(/\//,?:)
-        desc "[Lax] load files in #{group}"
-        task(name) { Dir["#{group}/*.rb"].each {|file| load file} }
-        [dir,name]*?:
-      end
+    def preproc(p)
+      p.parameters.any?? p : ->(o) { o.instance_exec &p }
     end
   end
 end

data/rakefile

@@ -1,5 +1,4 @@
 $LOAD_PATH << File.expand_path('../lib', __FILE__)
-require 'rake'
 require 'lax'
 
 Lax::Task.new

data/test/case/cases.rb

@@ -1,14 +1,5 @@
-class TestCases
-  def a_number
-    rand(0..100)
-  end
-  def an_exception
-    QWERTY.uiop[]
-  end
-end
-
-Lax.test(obj: TestCases.new) {|assert|
-  assert.calling(:a_number).satisfies {|n| Fixnum===n}
-  assert.calling(:an_exception).raises
+Lax.test {|assert|
+  assert.on(rand(0..100)).it.satisfies {|n| Fixnum===n}
+  assert.on(->{QWERTY.uiop[]}).calling(:call).raises
 }
 

data/test/case/control.rb

@@ -6,26 +6,24 @@ Lax.test(obj: 1) {|that|
   }
 }
 
-Lax.test { |assert|
-  assert.calling(:/).on(1).with(0).raises ZeroDivisionError
-  assert.returns(1) { |assert_equal_to_one|
-    assert_equal_to_one.on(0).calling(:+).with 1
-    assert_equal_to_one.on(1) {|identity_on_one|
-      identity_on_one.calling(:* ).with 1
-      identity_on_one.calling(:**).with 2
-      identity_on_one.calling(:+ ).with 0
+Lax.test {
+  calling(:/).on(1).with(0).raises ZeroDivisionError
+  returns(1) {
+    on(0).calling(:+).with 1
+    on(1) {
+      calling(:* ).with 1
+      calling(:**).with 2
+      calling(:+ ).with 0
     }
   }
 }
 
-Lax.test(msg: :object_id) {|id|
-  id.satisfies(->(v){Fixnum===v}) {|_|
-    _.on 1
-    _.on 'asdf'
-    _.on String
-    _.on Lax
-    _.calling(:size).on([1,2,3])
-  }
+Lax.test(msg: :object_id, cond: ->(v){Fixnum===v}) {
+  on 1
+  on 'asdf'
+  on String
+  on Lax
+  calling(:size).on([1,2,3])
 }
 
 Lax.test(obj: 222) {|that|

data/test/unit/implicit_receiver.rb

@@ -0,0 +1,5 @@
+Lax.test {
+  on(2) { calling(:+) { with(3) { satisfies {odd?} } } }
+  on(2).calling(:+).with(3).satisfies &:odd?
+}
+

data/test/unit/test.rb

@@ -6,4 +6,3 @@ Lax.test(obj: 'asdf') {|test_that|
   test_that.satisfies {|n| n=='ASDF'}.calling(:upcase)
 }
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lax
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies: []
-description: A testing framework that tries to stay out of your way.
+description: A lightweight testing framework that is not the boss of you.
 email: feivel@sdf.org
 executables: []
 extensions: []
@@ -20,14 +20,18 @@ files:
 - lax.gemspec
 - lib/lax.rb
 - lib/lax/version.rb
+- lib/lax/task.rb
+- lib/lax/case.rb
+- lib/lax/tree.rb
+- lib/lax/hook.rb
 - README.md
 - LICENSE
 - rakefile
 - test/case/control.rb
 - test/case/cases.rb
+- test/unit/implicit_receiver.rb
 - test/unit/callbacks.rb
 - test/unit/test.rb
-- test/unit/thread.rb
 homepage: http://github.com/gwentacle/lax
 licenses:
 - MIT/X11
@@ -52,11 +56,11 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A more forgiving testing framework.
+summary: An insouciant smidgen of a testing framework.
 test_files:
 - rakefile
 - test/case/control.rb
 - test/case/cases.rb
+- test/unit/implicit_receiver.rb
 - test/unit/callbacks.rb
 - test/unit/test.rb
-- test/unit/thread.rb

data/test/unit/thread.rb

@@ -1,14 +0,0 @@
-before = proc {sleep 0.01}
-cases = Lax::Tree.new(Lax::Case.new).tap {|tree|
-  1.upto(100) do |n|
-    tree.on(n).it.returns n
-  end
-}.leaves
-
-Lax.test(obj: Lax::Runner.new(cases, threads: 100, before: before)) {|that|
-  that.calling(:go).satisfies {|runner|
-    runner.cases.size == 100 and
-    runner.cases.all? {|c| c[:pass]}
-  }
-}
-