Dex 0.4.1 → 0.4.2

data/lib/Dex/testing.rb

@@ -0,0 +1,59 @@
+
+
+module Kernel
+
+  private
+
+  def current_dex
+    dex = if instance_variable_defined?(:@dex)
+            @dex
+          end
+    dex || Dex
+  end
+
+  def rollback sequel = nil
+    (sequel || current_dex ).db.transaction(:rollback=>:always) {
+      yield
+    }
+  end
+
+  def rollback! sequel = nil
+    (sequel || current_dex ).table.delete
+    yield
+  end
+
+  def new_dex db = nil
+    @new_dex ||= Class.new { include Dex::DSL }
+    dex = @new_dex.new
+    
+    if db
+      dex.db(db[':'] ? db : File.join("/tmp", db) )
+    end
+
+    dex
+  end
+
+  def new_exception name = nil
+    @excep_counter ||= 0
+    name ||= "Error: #{(@excep_counter+=1)}"
+    err = nil
+    begin
+      raise ArgumentError, name
+    rescue Object => e
+      err = e
+    end
+    err
+  end
+
+  def insert_exceptions n 
+    rollback! {
+      ids = []
+      errs = [0,1,2].map { |i| 
+        ids << current_dex.insert(e=except)
+        e
+      }
+      yield ids, errs
+    }
+  end
+
+end # === Kernel

data/lib/Dex/version.rb

@@ -1,3 +1,3 @@
 class Dex
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/libs/main.rb

@@ -19,45 +19,16 @@ require 'Bacon_Colored'
 require 'pry'
 require 'Exit_0'
 require 'Dex'
+require 'Dex/testing'
 
 Dex.db "/tmp/dex.db"
 
 def dex
-  Dex
-end
-
-def new_dex db = nil
-  @t ||= Class.new { include Dex::DSL }
-  dex = @t.new
-  if db
-    dex.db(db[':'] ? db : File.join("/tmp", db) )
-  end
-
-  dex
+  @dex ||= Dex
 end
 
 def except name = nil
-  @counter ||= 0
-  name ||= "Error: #{(@counter+=1)}"
-  err = nil
-  begin
-      raise ArgumentError, name
-  rescue Object => e
-    err = e
-  end
-  err
-end
-
-def rollback sequel = nil
-  (sequel || dex).db.transaction(:rollback=>:always) {
-    yield
-  }
-end
-
-def rollback!
-  # Dex.db.rollback(:rollback=>:always) {
-  dex.table.delete
-  yield
+  new_exception name
 end
 
 def bin cmd = ""
@@ -72,15 +43,8 @@ def bin cmd = ""
   o
 end
 
-def insert_excepts n 
-  rollback! {
-    ids = []
-    errs = [0,1,2].map { |i| 
-      ids << Dex.insert(e=except)
-      e
-    }
-    yield ids, errs
-  }
+def insert_excepts n, &blok
+  insert_exceptions( n, &blok )
 end
 
 def last dex

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dex
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -219,6 +219,7 @@ files:
 - bin/Dex
 - db.db
 - lib/Dex.rb
+- lib/Dex/testing.rb
 - lib/Dex/version.rb
 - spec/Dex.rb
 - spec/bin.rb