qed 2.4.0 → 2.5.0

data/lib/qed/session.rb

@@ -1,11 +1,8 @@
 module QED
 
   #require 'qed/config'
-  require 'qed/applique'
   require 'qed/demo'
 
-  # = Runtime Session
-  #
   # The Session class encapsulates a set of demonstrations 
   # and the procedure for looping through them and running
   # each in turn.
@@ -33,17 +30,6 @@ module QED
       @mode   = options[:mode]
       @trace  = options[:trace]  || false
       @format = options[:format] || :dotprogress
-
-      #options.each do |k,v|
-      #  __send__("#{k}=", v) if v
-      #end
-
-      @applique = create_applique
-    end
-
-    #
-    def applique
-      @applique
     end
 
     # Top-level configuration.
@@ -66,14 +52,9 @@ module QED
       )
     end
 
-    #
-    #def scope
-    #  @scope ||= Scope.new
-    #end
-
-    # TODO: switch order of applique and file.
+    # Returns an Array of Demo instances.
     def demos
-      @demos ||= files.map{ |file| Demo.new(file, applique, :mode=>mode) }
+      @demos ||= files.map{ |file| Demo.new(file, :mode=>mode) }
     end
 
     #
@@ -85,13 +66,11 @@ module QED
     def run
       #profile.before_session(self)
       reporter.before_session(self)
-      #demos.each do |demo|
-      #  script = Demo.new(demo, report)
       demos.each do |demo|
         demo.run(*observers)
-        #pid = fork { script.run(*observers) }
+        #pid = fork { demo.run(*observers) }
         #Process.detach(pid)
-       end
+      end
       reporter.after_session(self)
       #profile.after_session(self)
     end
@@ -103,43 +82,6 @@ module QED
     #  end
     #end
 
-    # TODO: associate scripts to there applique ?
-    def create_applique
-      applique = Applique.new
-      #eval "include QED::DomainLanguage", TOPLEVEL_BINDING
-      applique_scripts.each do |file|
-        #next if @loadlist.include?(file)
-        #case File.extname(file)
-        #when '.rb'
-          # since scope is just TOPLEVEL now
-          #require(file)
-          applique.module_eval(File.read(file), file)
-          #eval(File.read(file), scope.__binding__, file)  # TODO: for each script!? Nay.
-        #else
-        #  Script.new(file, scope).run
-        #end
-        #@loadlist << file
-      end
-      applique
-    end
-
-    # SCM: reverse order of applique so topmost directory comes first
-    def applique_scripts
-      locs = []
-      files.each do |file|
-        Dir.ascend(File.dirname(file)) do |path|
-          break if path == Dir.pwd
-          dir = File.join(path, 'applique')
-          if File.directory?(dir)
-            locs << dir
-          end
-        end
-      end
-      envs = locs.reverse.map{ |loc| Dir[File.join(loc,'**/*.rb')] }
-      envs.flatten.compact.uniq
-    end
-
   end#class Session
 
 end#module QED
-

data/lib/qedoc/document.rb

@@ -1,7 +1,6 @@
 require 'erb'
 require 'fileutils'
-require 'tilt'
-require 'nokogiri'
+#require 'nokogiri'
 
 module QED
 
@@ -46,8 +45,10 @@ module QED
     # Demo files.
     def demo_files
       @demo_files ||= (
-        glob = paths.map{ |f| File.directory?(f) ? Dir["#{f}/**/*"] : Dir[f] }.flatten
-        glob = glob.select do |f|
+        glob = paths.map do |f|
+          File.directory?(f) ? Dir[File.join(f,'**/*')] : Dir[f]
+        end
+        glob = glob.flatten.select do |f|
           File.file?(f) && f !~ /fixtures\/|helpers\// && f !~ /\.rb$/
         end
         glob.sort
@@ -81,18 +82,18 @@ module QED
         #iotext = strio.string
         #strio.close
 
-        #ext = File.extname(file)
-        #txt = File.read(file)
+        ext = File.extname(file)
+        txt = File.read(file)
 
-        #if ext == '.qed'
-        #  ext = file_type(txt)
-        #end
+        if ext == '.qed'
+          ext = file_type(txt)
+        end
 
-        text = Tilt.new(file).render
-        html = Nokogiri::HTML(text)
-        body = html.css("body")
+        #text = Tilt.new(file).render
+        #html = Nokogiri::HTML(text)
+        #body = html.css("body")
 
-=begin
+        text = ""
         case ext
         #when '.qed'
         #  require_qedoc
@@ -100,17 +101,17 @@ module QED
         #  text << markup.to_html
         when '.rd', '.rdoc'
           require_rdoc
-          markup = RDoc::Markup::ToHtml.new
-          text << markup.convert(txt)
+          require_qedoc
+          markup = Markup.new(txt)
+          text << markup.to_html
           #text << markup.convert(iotext, formatter)
         when '.md', '.markdown'
           require_rdiscount
           markdown = RDiscount.new(txt)
           text << markdown.to_html
         end
-=end
 
-        output << "#{body}\n"
+        output << "#{text}\n"
       end
 
       temp = Template.new(template, output, title, css)
@@ -155,24 +156,24 @@ module QED
   private
 
     #
-    #def file_type(text)
-    #  rdoc = text.index(/^\=/)
-    #  markdown = text.index(/^\#/)
-    #  if markdown && rdoc
-    #    rdoc < markdown ? '.rdoc' : '.markdown'
-    #  elsif rdoc
-    #    '.rdoc'
-    #  elsif markdown
-    #    '.markdown'
-    #  else  # fallback to rdoc
-    #    '.rdoc'
-    #  end
-    #end
+    def file_type(text)
+      rdoc = text.index(/^\=/)
+      markdown = text.index(/^\#/)
+      if markdown && rdoc
+        rdoc < markdown ? '.rdoc' : '.markdown'
+      elsif rdoc
+        '.rdoc'
+      elsif markdown
+        '.markdown'
+      else  # fallback to rdoc
+        '.rdoc'
+      end
+    end
 
     #
     def require_qedoc
-      @require_rdoc ||= (
-        require 'qed/document/markup'
+      @require_qedoc ||= (
+        require 'qedoc/document/markup'
         true
       )
     end

data/lib/qedoc/document/markup.rb

@@ -1,53 +1,58 @@
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_html'
+require 'rdoc/markup'
+require 'rdoc/markup/to_html'
 
 module QED
-class Document
-
-  # = QED Document Markup
-  #
-  # QED Document Markup is based on RDoc's SimpleMarkup format but adds
-  # some additional features.
-  #
-  # * `[no-spaces]` produces <code>[no-space]</code>.
-  #
-  class Markup
-
-    def initialize(text, options={})
-      @text = text
-    end
 
-    def to_html
-      parser.convert(@text, formatter)
-    end
+  class Document
 
-    def parser
-      @parser ||= (
-        p = SM::SimpleMarkup.new
-        #p.add_word_pair("{", "}", :STRIKE)
-        #p.add_html("no", :STRIKE)
-        #p.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
-        p.add_special(/\`(\S+?)\`/, :CODE)
-        p
-      )
-    end
+    # = QED Document Markup
+    #
+    # QED Document Markup is based on RDoc's SimpleMarkup format but adds
+    # some additional features.
+    #
+    # * `[no-spaces]` produces <code>[no-space]</code>.
+    #
+    # FIXME: Can't get `brackets` to work.
+    class Markup
 
-    def formatter
-      @formatter ||= (
-        f = ToHTML.new
-        #f.add_tag(:STRIKE, "<strike>", "</strike>")
-        f
-      )
-    end
+      def initialize(text, options={})
+        @text = text
+      end
+
+      def to_html
+        parser.convert(@text, formatter)
+      end
 
-    # Formatter
-    class ToHTML < SM::ToHtml
-      def handle_special_CODE(special)
-        "<code>" + special.text.sub('`','').chomp('`') + "</code>"
+      def parser
+        @parser ||= (
+          m = RDoc::Markup.new
+          #p.add_word_pair("{", "}", :STRIKE)
+          #p.add_html("no", :STRIKE)
+          #p.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+          #m.add_word_pair('`', '`', :CODE)
+          m.add_special(/\`(\b.*?)\`/, :CODE)
+          m
+        )
       end
+
+      def formatter
+        @formatter ||= (
+          f = ToHTML.new
+          #f.add_tag(:STRIKE, "<strike>", "</strike>")
+          f.add_tag(:CODE, "<code>", "</code>")
+          f
+        )
+      end
+
+      # Formatter
+      class ToHTML < RDoc::Markup::ToHtml
+        def handle_special_CODE(special)
+          "<code>" + special.text.sub('`','').chomp('`') + "</code>"
+        end
+      end
+
     end
 
   end
 
 end
-end

data/lib/qedoc/document/template.rhtml

@@ -7,60 +7,60 @@
   <style>
     #container{ margin: 0 auto; width: 800px; }
 
-    /* Debug borders */
+    /* Debug borders */
     /* p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { border: 1px solid red; } */
-
-    body { font-size: 14px; line-height: 20px; margin: 1em 5% 1em 5%; font-family: Verdana, Arial, Helvetica, sans-serif; }
-    a { color: #336; text-decoration: underline; }
-    a:visited { color: #334; }
-    em { font-style: italic; }
-    strong { font-weight: bold; }
-    tt { color: navy; }
-
-    h1, h2, h3, h4, h5, h6 { color: #223; margin-top: 1.2em; margin-bottom: 0.5em; line-height: 1.3; }
+
+    body { font-size: 14px; line-height: 20px; margin: 1em 5% 1em 5%; font-family: Verdana, Arial, Helvetica, sans-serif; }
+    a { color: #336; text-decoration: underline; }
+    a:visited { color: #334; }
+    em { font-style: italic; }
+    strong { font-weight: bold; }
+    tt { color: navy; }
+
+    h1, h2, h3, h4, h5, h6 { color: #223; margin-top: 1.2em; margin-bottom: 0.5em; line-height: 1.3; }
     h1 { border-bottom: 2px solid silver; }
-    h2 { border-bottom: 2px solid silver; padding-top: 0.5em; }
+    h2 { border-bottom: 2px solid silver; padding-top: 0.5em; }
 
-    hr { color: #ccc; margin-top: 1.6em; }
+    hr { color: #ccc; margin-top: 1.6em; }
 
-    p { color: #222; text-align: justify; margin-top: 0.5em; margin-bottom: 0.5em; line-height: 1.4em; }
+    p { color: #222; text-align: justify; margin-top: 0.5em; margin-bottom: 0.5em; line-height: 1.4em; }
 
     /* pre { padding: 10; margin: 0; font-family: monospace; font-size: 0.9em; } */
 
     pre.pass { color: green; }
     pre.fail { color: red; }
     pre.error { color: red; font-weight: bold; }
-
-    span#author { color: #527bbd; font-weight: bold; font-size: 1.1em; }
+
+    span#author { color: #527bbd; font-weight: bold; font-size: 1.1em; }
     span#email { }
     span#revision { }
-
+
     div#footer { font-size: small; border-top: 2px solid silver; padding-top: 0.5em; margin-top: 4.0em; }
     div#footer-text { float: left; padding-bottom: 0.5em; }
-    div#footer-badges { float: right; padding-bottom: 0.5em; }
+    div#footer-badges { float: right; padding-bottom: 0.5em; }
 
     /* Block element content. */
-    div.content { padding: 0; }
+    div.content { padding: 0; }
 
-    /* Block element titles. */
-    h1.title { font-weight: bold; text-align: left; font-size: 3em; margin-top: 1.0em; margin-bottom: 0.5em; }
+    /* Block element titles. */
+    h1.title { font-weight: bold; text-align: left; font-size: 3em; margin-top: 1.0em; margin-bottom: 0.5em; }
 
-    /* Block element titles. */
-    div.title, caption.title { font-weight: bold; text-align: left; margin-top: 1.0em; margin-bottom: 0.5em; }
-    div.title + * { margin-top: 0; }
-    td div.title:first-child { margin-top: 0.0em; }
-    div.content div.title:first-child { margin-top: 0.0em; }
-    div.content + div.title { margin-top: 0.0em; }
-    div.sidebarblock > div.content { background: #ffffee; border: 1px solid silver; padding: 0.5em; }
+    /* Block element titles. */
+    div.title, caption.title { font-weight: bold; text-align: left; margin-top: 1.0em; margin-bottom: 0.5em; }
+    div.title + * { margin-top: 0; }
+    td div.title:first-child { margin-top: 0.0em; }
+    div.content div.title:first-child { margin-top: 0.0em; }
+    div.content + div.title { margin-top: 0.0em; }
+    div.sidebarblock > div.content { background: #ffffee; border: 1px solid silver; padding: 0.5em; }
 
-    img { border-style: none; }
+    img { border-style: none; }
 
-    dl { margin-top: 0.8em; margin-bottom: 0.8em; }
-    dt { margin-top: 0.5em; margin-bottom: 0; font-style: italic; }
-    dd > *:first-child { margin-top: 0; }
-    ul, ol { list-style-position: outside; }
+    dl { margin-top: 0.8em; margin-bottom: 0.8em; }
+    dt { margin-top: 0.5em; margin-bottom: 0; font-style: italic; }
+    dd > *:first-child { margin-top: 0; }
+    ul, ol { list-style-position: outside; }
 
-    thead { font-weight: bold; }
+    thead { font-weight: bold; }
     tfoot { font-weight: bold; }
 
     *{margin:0;padding:0;}

data/meta/data.rb

@@ -1,29 +1,27 @@
-Object.__send__(:remove_const, :VERSION) if Object.const_defined?(:VERSION)      # becuase Ruby 1.8~ gets in the way
-
 module QED
 
-  def self.__DIR__
-    File.dirname(__FILE__)
-  end
+  DIRECTORY = File.dirname(__FILE__)
 
-  def self.gemfile
-    @gemfile ||= (
+  def self.package
+    @package ||= (
       require 'yaml'
-      YAML.load(File.new(__DIR__ + '/gemfile'))
+      YAML.load(File.new(DIRECTORY + '/package'))
     )
   end
 
   def self.profile
     @profile ||= (
       require 'yaml'
-      YAML.load(File.new(__DIR__ + '/profile'))
+      YAML.load(File.new(DIRECTORY + '/profile'))
     )
   end
 
   def self.const_missing(name)
     key = name.to_s.downcase
-    gemfile[key] || profile[key] || super(name)
+    package[key] || profile[key] || super(name)
   end
 
 end
 
+# becuase Ruby 1.8~ gets in the way
+Object.__send__(:remove_const, :VERSION) if Object.const_defined?(:VERSION)