qed 2.0.0 → 2.1.0

data/HISTORY

@@ -1,6 +1,18 @@
 = RELEASE HISTORY
 
-== 10.03.04 / 2010-03-04
+== 2.1.0 / 2010-04-07
+
+QED documents are now run in the TOPLEVEL context, rather
+than in a subclass of Scope. This ensures code runs as
+one would expect it too in the wild.
+
+Changes:
+
+* Scope.new redirect to TOPLEVEL.
+* DomainLanguage module is added to include into TOPLEVEL.
+
+
+== 2.0.0 / 2010-03-04
 
 This is a major new release of QED. All demonstration documents
 are now converted to HTML via Tilt (http://github.com/tilt) before

data/lib/qed.rb

@@ -1,5 +1,5 @@
 module QED
-  VERSION="2.0.0"  #:till: VERSION="<%= version %>"
+  VERSION="2.1.0"  #:till: VERSION="<%= version %>"
 end
 
 require 'qed/session'

data/lib/qed/evaluator.rb

@@ -7,7 +7,7 @@ module QED
   # = Demo Script Evaluator
   #
   #--
-  # TODO: Currently the Evaluator class uses #travserse to work
+  # TODO: Currently the Evaluator class uses #traverse to work
   # thru the HTML document and trigger events accordingly. This
   # works well enough for simple HTML documents --the kind produced
   # by typical wiki-markup formats. However, for complex HTML it

data/lib/qed/scope.rb

@@ -3,16 +3,12 @@ module QED
   require 'ae'
   require 'qed/advice'
 
-  #--
-  # TODO: Replace Scope for TOPLEVEL?
-  #++
-  class Scope
+  # This module provides the QED syntax (domain specific language)
+  # used to build QED documents.
 
-    include Advisable
+  module DomainLanguage
 
-    def __binding__
-      @__binding__ ||= binding
-    end
+    include Advisable
 
     # Table-based steps.
     #--
@@ -71,7 +67,36 @@ module QED
     #
     #end
 
+    def __binding__
+      @__binding__ ||= binding
+    end
+
+  end
+
+  # Scope is the context in which QED documents are run.
+  # Note, that Scope is now a facade over the TOPLEVEL.
+
+  class Scope
+
+    # Reroutes Scope instance to TOPLEVEL.
+    def self.new
+      @self ||= (
+        TOPLEVEL_BINDING.eval("include QED::DomainLanguage")
+        TOPLEVEL_BINDING.eval('self')
+      )
+    end
+
+    #include DomainLanguage
+
+    #def initialize
+    #  @__binding__ = binding
+    #end
+
+    #def __binding__
+    #  @__binding__
+    #end
   end
 
 end
 
+

data/lib/qed/script.rb

@@ -8,7 +8,7 @@ module QED
   require 'qed/evaluator'
 
   #Assertion   = AE::Assertion
-#  Expectation = Assertor
+  #Expectation = Assertor
 
   # = Script
   #

data/meta/version

@@ -1 +1 @@
-2.0.0
+2.1.0

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Thomas Sawyer <transfire@gmail.com>