schizm 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e8c08c6fae1921d928b0a261c986b5269f7b70
-  data.tar.gz: 678157a87f4a822b764f05eee862fd20376b73dd
+  metadata.gz: 74bc927ef6f3af9381ef7897d35b00d805927aa8
+  data.tar.gz: 08908c377f6f0868cdeb479a80e3847d252c6ef8
 SHA512:
-  metadata.gz: da65af9a87b9e16ad0092902aaaca1a85cf440fa7db0b90e197b104dca6aa9405f1ca79cdfc296039096942580306d85f2db7bc9b4babac0fd356d3cd8f2e49e
-  data.tar.gz: 2e7dabf97b5dab2883123eb49d47cc2cd86b9e10009ecae501c35125a487d9b89e3df299392bc87f96e13ff2b0469cf7f834d1b2f05b78aac7087c1566e258f3
+  metadata.gz: c2bac1ac664e4c772e1a313d5f0eb718cd689fe3f388fd44874f87916daf098789dbb5b2fc7be7ee8a8f8de0b0692d7134a4d9042030ef808afae52331f63338
+  data.tar.gz: 76e248942d8ee1806ad00897cde958c003b94031c0e583a79a4e06b72ab45aa3734b74d1a37405526e956ea662e8c55433c83d9f4acc9a3b1a5d97cc848d0f9d

data/lib/schizm/chunk.rb

@@ -34,8 +34,8 @@ module Schizm
 # Structure to resolve chunks of source code.
 class Chunk
 
-  def initialize where, label
-    @where = String.new where
+  def initialize filename, label
+    @filename = String.new filename
     @label = String.new label
     @share = Env.var[:share] if Env.var? :share
     @target = nil
@@ -44,7 +44,7 @@ class Chunk
     @params = Hash.new
   end
 
-  attr_reader :where
+  attr_reader :filename
   attr_reader :label
   attr_accessor :share
   attr_accessor :target
@@ -65,12 +65,12 @@ class Chunk
     return true
   end
 
-  # Hash organizing active chunks by +@where+ and +@label+.
+  # Hash organizing active chunks by +@filename+ and +@label+.
   @@hash =
-    Hash.new do |hash, where|
-    hash[where] =
+    Hash.new do |hash, filename|
+    hash[filename] =
       Hash.new do |hash, label|
-      hash[label] = Chunk.new where, label
+      hash[label] = Chunk.new filename, label
       end
     end
 
@@ -81,7 +81,7 @@ class Chunk
 
   # Hash iteration interface.
   def self.each
-    @@hash.each do |where, hash|
+    @@hash.each do |filename, hash|
       hash.each do |label, chunk|
         yield chunk
       end
@@ -102,7 +102,7 @@ class Chunk
   def find label
     Chunk.each do |chunk|
       if chunk.label == label and
-        (chunk.where == @where or chunk.share?)
+        (chunk.filename == @filename or chunk.share?)
         return chunk
       end
     end

data/lib/schizm/env.rb

@@ -449,8 +449,8 @@ SASS
     doc_root = var[:output_doc]
     src_root = var[:output_src]
     zrc_globs = []
-    zrc_globs.push File.join(zrc_root, "*.zrc")
-    zrc_globs.push File.join(zrc_root, "*/*.zrc")
+    zrc_globs.push File.join(zrc_root, "*.zm")
+    zrc_globs.push File.join(zrc_root, "*/*.zm")
     zrc_paths = Dir.glob zrc_globs
     raise "No input files." if zrc_paths.empty?
     delete doc_root if var? :clean_doc
@@ -458,16 +458,16 @@ SASS
     blaze doc_root
     blaze src_root
     zrc_paths.each do |path|
-      where = path_from zrc_root, path
-      where = File.join doc_root, where.chomp(".zrc").concat(".html")
+      filename = path_from zrc_root, path
+      filename = File.join doc_root, filename.chomp(".zm").concat(".html")
       input = File.read path
-      Parse.hash[where] =
-      Parse.page_elems where, input
+      Parse.hash[filename] =
+      Parse.page_elems filename, input
     end
     unless Env.var? :only_src
-      Parse.hash.each do |where, parse|
-        blaze where
-        write where, <<PARSE
+      Parse.hash.each do |filename, parse|
+        blaze filename
+        write filename, <<PARSE
 ---
 layout: schizm
 author: "#{author}"
@@ -482,8 +482,8 @@ PARSE
     unless Env.var? :only_doc
       Chunk.each do |chunk|
         if chunk.target?
-          blaze where = File.join(src_root, chunk.target)
-          write where, chunk
+          blaze filename = File.join(src_root, chunk.target)
+          write filename, chunk
         end
       end
     end

data/lib/schizm/markup.rb

@@ -41,23 +41,28 @@ class Markup
   attr_accessor :attrs
   attr_accessor :elems
 
+  # Attribute accessor.
   def [] key
     return @attrs[key]
   end
 
+  # Attribute accessor.
   def []= key, value
     return @attrs[key] = value
   end
 
+  # Attribute +name+ or +nil+ if +name+ does not exist.
   def get_attr name
     return @attrs[name] if @attrs.has_key? name
     return nil
   end
 
+  # Wrapper for +@attrs.has_key?+.
   def has_attr? name 
     return @attrs.has_key? name
   end
 
+  # Add attributes from hash +pairs+.
   def add_attrs pairs
     pairs.each do |key, value|
       @attrs[key] = value 
@@ -65,6 +70,7 @@ class Markup
     return self
   end
 
+  # Add element(s).
   def << param
     case param
     when nil
@@ -85,10 +91,12 @@ class Markup
     return self
   end
 
+  # Wrapper for +self << param+.
   def add_elems param
     return self << param
   end
 
+  # Wrapper for +@elems.last+.
   def last
     return @elems.last
   end

data/lib/schizm/parse.rb

@@ -38,8 +38,8 @@ module Parse
 
   # Markup hash.
   @@hash =
-    Hash.new do |hash, where|
-    hash[where] = Markup.new
+    Hash.new do |hash, filename|
+    hash[filename] = Markup.new
     end
 
   # Markup hash accessor.
@@ -49,8 +49,8 @@ module Parse
 
   # Link hash.
   @@links =
-    Hash.new do |hash, where|
-    hash[where] =
+    Hash.new do |hash, filename|
+    hash[filename] =
       Hash.new do |hash, entry|
       hash[entry] = Hash.new
       end
@@ -61,14 +61,16 @@ module Parse
     return @@links
   end
 
+  # Image hash.
   @@images =
-    Hash.new do |hash, where|
-    hash[where] =
+    Hash.new do |hash, filename|
+    hash[filename] =
       Hash.new do |hash, entry|
       hash[entry] = Hash.new
       end
     end
 
+  # Image hash accessor.
   def self.images
     return @@images
   end
@@ -84,22 +86,24 @@ module Parse
     end
   end
 
+  # Chunk reference.
   class ChunkRef
-    def initialize where, label
-      @where = where
+    def initialize filename, label
+      @filename = filename
       @label = label
     end
     def to_s
       Chunk.each do |chunk|
         if chunk.label == @label and
-          (chunk.where == @where or chunk.share?)
-          return "#{Env.docs_path(@where)}\##{chunk.id(1)}"
+          (chunk.filename == @filename or chunk.share?)
+          return "#{Env.docs_path(@filename)}\##{chunk.id(1)}"
         end
       end
       return ""
     end
   end
 
+  # Block reference.
   class BlockRef
     def initialize chunk, index
       @chunk = chunk
@@ -108,11 +112,12 @@ module Parse
     def to_s
       return "" if @index < 1
       return "" if @index > @chunk.blocks.size
-      return "#{Env.docs_path(@chunk.where)}\##{@chunk.id(@index)}"
+      return "#{Env.docs_path(@chunk.filename)}\##{@chunk.id(@index)}"
     end
   end
 
-  def self.line_elems where, input
+  # Parse line elements.
+  def self.line_elems filename, input
     elems = Markup.new
     sscan = StringScanner.new input.strip
     max_glyph = nil
@@ -156,18 +161,18 @@ module Parse
         end
         Markup.new("a")
         .add_attrs(attrs)
-        .add_elems(line_elems(where, text))
+        .add_elems(line_elems(filename, text))
       when sscan.skip(LINK_REF_BRACKS)
         text =
         name = String.new(sscan[1]).unescape("]")
         name = String.new(sscan[2]).unescape("]") if sscan[2]
         attrs = Hash.new
         attrs["target"] = "_blank"
-        attrs["title"] = HashAttr.new @@links[where][name], "title"
-        attrs["href"] = HashAttr.new @@links[where][name], "href"
+        attrs["title"] = HashAttr.new @@links[filename][name], "title"
+        attrs["href"] = HashAttr.new @@links[filename][name], "href"
         Markup.new("a")
         .add_attrs(attrs)
-        .add_elems(line_elems(where, text))
+        .add_elems(line_elems(filename, text))
       when sscan.skip(CENTER_MATH)
         Markup.new("script")
         .add_attrs(CENTER_MATH_ATTRS)
@@ -178,7 +183,7 @@ module Parse
         .add_elems(String.new(sscan[1]).slim)
       when sscan.skip(INLINE_EMPH)
         depth = sscan[1].size
-        inner = line_elems(where, sscan[2])
+        inner = line_elems(filename, sscan[2])
         case
         when depth <= 1
           Markup.new("em").add_elems(inner)
@@ -192,13 +197,13 @@ module Parse
         Markup.new("code")
         .add_elems(String.new(sscan[1]).unescape("`").html)
       when sscan.skip(INLINE_SUP)
-        Markup.new("sup").add_elems(line_elems(where, sscan[1]))
+        Markup.new("sup").add_elems(line_elems(filename, sscan[1]))
       when sscan.skip(INLINE_SUB)
-        Markup.new("sub").add_elems(line_elems(where, sscan[1]))
+        Markup.new("sub").add_elems(line_elems(filename, sscan[1]))
       when sscan.skip(INLINE_INS)
-        Markup.new("ins").add_elems(line_elems(where, sscan[1]))
+        Markup.new("ins").add_elems(line_elems(filename, sscan[1]))
       when sscan.skip(INLINE_DEL)
-        Markup.new("del").add_elems(line_elems(where, sscan[1]))
+        Markup.new("del").add_elems(line_elems(filename, sscan[1]))
       when max_glyph_match.call
         max_glyph[1]
       when sscan.skip(/\w+|\S/)
@@ -208,7 +213,8 @@ module Parse
     return elems
   end
 
-  def self.page_elems where, input
+  # Parse page elements.
+  def self.page_elems filename, input
     elems = Markup.new
     sscan = StringScanner.new(
             String.new(input)
@@ -232,7 +238,7 @@ module Parse
           when 4 then "h4"
           when 5 then "h5"
           when 6 then "h6"
-          end).add_elems(line_elems(where, text))
+          end).add_elems(line_elems(filename, text))
       when sscan.skip(HEADING_SETEXT)
         type = String.new sscan[2]
         text = String.new sscan[1]
@@ -243,15 +249,15 @@ module Parse
           when "-" then "h2"
           end).add_attrs("id" => slug)
               .add_attrs("class" => "title")
-              .add_elems(line_elems(where, text))
+              .add_elems(line_elems(filename, text))
       when sscan.skip(LINK_DEF)
         name = String.new(sscan[1]).unescape("]")
         sscan2 = StringScanner.new(sscan[2])
         until sscan2.eos?
           case
-          when sscan2.skip(/'((?:[^\\']*(?:\\.)*)*)'/u) then @@links[where][name]["title"] = sscan2[1]
-          when sscan2.skip(/"((?:[^\\"]*(?:\\.)*)*)"/u) then @@links[where][name]["title"] = sscan2[1]
-          when sscan2.skip(/\p{Graph}+/u) then @@links[where][name]["href"] = sscan2[0]
+          when sscan2.skip(/'((?:[^\\']*(?:\\.)*)*)'/u) then @@links[filename][name]["title"] = sscan2[1]
+          when sscan2.skip(/"((?:[^\\"]*(?:\\.)*)*)"/u) then @@links[filename][name]["title"] = sscan2[1]
+          when sscan2.skip(/\p{Graph}+/u) then @@links[filename][name]["href"] = sscan2[0]
           when sscan2.skip(/\p{Space}+/u) then nil
           end
         end
@@ -261,9 +267,9 @@ module Parse
         sscan2 = StringScanner.new(sscan[2])
         until sscan2.eos?
           case
-          when sscan2.skip(/w=(\d+)/u) then @@images[where][name]["width"] = sscan2[1]
-          when sscan2.skip(/h=(\d+)/u) then @@images[where][name]["height"] = sscan2[1]
-          when sscan2.skip(/\p{Graph}+/u) then @@images[where][name]["src"] = sscan2[0]
+          when sscan2.skip(/w=(\d+)/u) then @@images[filename][name]["width"] = sscan2[1]
+          when sscan2.skip(/h=(\d+)/u) then @@images[filename][name]["height"] = sscan2[1]
+          when sscan2.skip(/\p{Graph}+/u) then @@images[filename][name]["src"] = sscan2[0]
           when sscan2.skip(/\p{Space}+/u) then nil
           end
         end
@@ -288,13 +294,13 @@ module Parse
         name = String.new(sscan[2]).unescape("]") if sscan[2]
         attrs = Hash.new
         attrs["alt"] = text
-        attrs["src"] = HashAttr.new @@images[where][name], "src"
-        attrs["width"] = HashAttr.new @@images[where][name], "width"
-        attrs["height"] = HashAttr.new @@images[where][name], "height"
+        attrs["src"] = HashAttr.new @@images[filename][name], "src"
+        attrs["width"] = HashAttr.new @@images[filename][name], "width"
+        attrs["height"] = HashAttr.new @@images[filename][name], "height"
         Markup.new("img").add_attrs(attrs)
       when sscan.skip(/^#{CHUNK_LABEL}/u)
         div = nil
-        chunk = Chunk.hash[where][String.new(sscan[1]).unescape("]")]
+        chunk = Chunk.hash[filename][String.new(sscan[1]).unescape("]")]
         case
         when sscan.skip(/[ ]*->[ ]*(.*?)\n/u)
           chunk.target = sscan[1].strip
@@ -323,12 +329,12 @@ module Parse
               .add_elems([
                 Markup.new("div")
                 .add_attrs("class" => "the-chunk")
-                .add_elems(line_elems(where, chunk.label)),
+                .add_elems(line_elems(filename, chunk.label)),
                 case
                 when label
                   Markup.new("div")
                   .add_attrs("class" => "the-block")
-                  .add_elems(line_elems(where, label))
+                  .add_elems(line_elems(filename, label))
                 else nil
                 end
               ]),
@@ -342,7 +348,7 @@ module Parse
             ]),
             Markup.new("div")
             .add_attrs("class" => "panel-body")
-            .add_elems(Markup.new("pre").add_elems(highlight(where, block, HICPP)))
+            .add_elems(Markup.new("pre").add_elems(highlight(filename, block, HICPP)))
           ])
         end
         div
@@ -357,7 +363,7 @@ module Parse
           .add_elems(
             Markup.new("span")
             .add_attrs("class" => "genericons-neue genericons-neue-info")),
-          page_elems(where, text)
+          page_elems(filename, text)
         ])
       when sscan.skip(ENTER_ALERT)
         text = sscan.scan_until END_INDENT
@@ -370,7 +376,7 @@ module Parse
           .add_elems(
             Markup.new("span")
             .add_attrs("class" => "genericons-neue genericons-neue-notice")),
-          page_elems(where, text)
+          page_elems(filename, text)
         ])
       when sscan.skip(ENTER_BUG)
         text = sscan.scan_until END_INDENT
@@ -383,19 +389,19 @@ module Parse
           .add_elems(
             Markup.new("span")
             .add_attrs("class" => "genericons-neue genericons-neue-bug")),
-          page_elems(where, text)
+          page_elems(filename, text)
         ])
       when sscan.skip(ENTER_QUOTE)
         text = sscan.scan_until END_INDENT
         text = String.new(text).erase INDENT
         Markup.new("blockquote")
-              .add_elems(page_elems(where, text))
+              .add_elems(page_elems(filename, text))
       when (sscan.match? ENTER_OLIST)
         list = Markup.new "ol"
         while sscan.skip ENTER_OLIST
           text = sscan.scan_until END_INDENT
           text = String.new(text).erase INDENT
-          item = Markup.new("li").add_elems(page_elems(where, text))
+          item = Markup.new("li").add_elems(page_elems(filename, text))
           list.add_elems item
           sscan.skip EMPTY_LINES
         end
@@ -405,7 +411,7 @@ module Parse
         while sscan.skip ENTER_ULIST
           text = sscan.scan_until END_INDENT
           text = String.new(text).erase INDENT
-          item = Markup.new("li").add_elems(page_elems(where, text))
+          item = Markup.new("li").add_elems(page_elems(filename, text))
           list.add_elems item
           sscan.skip EMPTY_LINES
         end
@@ -420,7 +426,7 @@ module Parse
           item = Markup.new("li")
           item.add_attrs("class" => "li-todo") if type[0] == " "
           item.add_attrs("class" => "li-done") if type[0] != " "
-          item.add_elems page_elems(where, text)
+          item.add_elems page_elems(filename, text)
           list.add_elems item
           sscan.skip EMPTY_LINES
         end
@@ -431,8 +437,8 @@ module Parse
           term = sscan[1]
           text = sscan.scan_until END_INDENT
           text = String.new(text).erase INDENT
-          list.add_elems(Markup.new("dt").add_elems(line_elems(where, term)))
-          list.add_elems(Markup.new("dd").add_elems(page_elems(where, text)))
+          list.add_elems(Markup.new("dt").add_elems(line_elems(filename, term)))
+          list.add_elems(Markup.new("dd").add_elems(page_elems(filename, text)))
           sscan.skip EMPTY_LINES
         end
         list
@@ -446,13 +452,14 @@ module Parse
       when sscan.match?(ENTER_TEXT)
         text = sscan.scan_until END_SIMPLE
         text = String.new(text).erase EOB_MARKER
-        Markup.new("p").add_elems(line_elems(where, text))
+        Markup.new("p").add_elems(line_elems(filename, text))
       end)
     end
     return elems
   end
 
-  def self.highlight where, input, table
+  # Highlight source.
+  def self.highlight filename, input, table
     elems = Markup.new
     sscan = StringScanner.new input
     until sscan.eos?
@@ -465,8 +472,8 @@ module Parse
         elems.add_elems(
           Markup.new("a")
           .add_attrs("class" => "chunk")
-          .add_attrs("href" => ChunkRef.new(where, label))
-          .add_elems(line_elems(where, label)))
+          .add_attrs("href" => ChunkRef.new(filename, label))
+          .add_elems(line_elems(filename, label)))
         next
       end
       table.each do |entry|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schizm
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - M. Grady Saunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: mgradysaunders@gmail.com