anatomy 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65f9cfc15e7f07a0e2e51d3fedcd4a542c7d0ee
-  data.tar.gz: d41bb523a2641917155d777e28780acdf7f72cea
+  metadata.gz: 251772338d62c79967219e209665cee35093d54d
+  data.tar.gz: eadb122b153f4a9b2224868513e412b091282413
 SHA512:
-  metadata.gz: a00d11deb9931bcaaf0baf710ed662c062ffa31eef0b3cfa0500b66cb0b0e5386f98c601814b2b59d53af7e3f255d794f9755c363f65f6946749d02a53adc5f5
-  data.tar.gz: b2586444f0b97f1c37f588bac4b11d0d56a6bcaf9d56e052a595649772fb8b3774aefa18f43522bef7bb0c1c3e5414479eb437532f48787b08acf9e2fe912b1f
+  metadata.gz: de01700a0b61645b1ef728b1d223d0b319d4a446486d3fb02b3175188f6caf33a8e18329c42df6eacec3fea75a2340fef9d6603325b0e8bf69a05cee68f0778c
+  data.tar.gz: 3df0a6a0898c8989613531ba3054686fbcadfab89a2b1876f2e838cb9fa4c7e67b2abb9c49870fa4713bb277447f6aa93ebdc935c38496596453ec1480095769

data/lib/anatomy/base.ay

@@ -9,6 +9,11 @@ collect = require("anatomy/stages/collect")
 
 hl = require("hl")
 
+def(template(mod)):
+  data MetaBlock new(
+    [part]:
+      part template = mod)
+
 def(title(content, tag-name = data sanitize(content), *extra-tag-names)):
   data MetaBlock new(
     [part]:

data/lib/anatomy/data.ay

@@ -66,6 +66,9 @@ data(
     -- css files to add
     @css-additions = Set new
 
+    -- template to use when rendering html
+    @template = nil
+
     -- omit children from table of contents
     @omit-children-from-table-of-contents? = false))
 

data/lib/anatomy/renderers/html.ay

@@ -8,6 +8,8 @@ require("fileutils")
 use(require("anatomy/html"))
 data = require("anatomy/data")
 
+in-reference? = dynamic(false)
+in-sidebar? = dynamic(false)
 
 fn(tag-url(t)):
   t target match:
@@ -20,97 +22,91 @@ fn(tag-url(t)):
     .url(x):
       x
 
-def(over(i & data Itemization)):
-  i elements collect [name, body]:
-    <dl:
-      [ <dt: over(name)
-        <dd: over(body)
-      ]
-def(over(l & data List)):
-  <ul:
-    l elements collect [body]:
-      <li: over(body)
-def(over(l & data OrderedList)):
-  <ol:
-    l elements collect [body]:
-      <li: over(body)
-def(over(p & data Paragraph)):
-  <p: over(p content)
-def(over(b & data Block)):
-  b style match:
+fn(block-style(style, content)):
+  style match:
     .tt:
-      <pre: over(b content)
+      <pre: over(content)
 
     .verbatim:
-      <pre(.verbatim): over(b content)
+      <pre(.verbatim): over(content)
 
     .class(*classes):
-      <div(class = classes join(" ")): over(b content)
+      <div(class = classes join(" ")): over(content)
+
+    .classed(style, *classes):
+      h = block-style(style, content)
+      h attributes["class"] = classes join(" ")
+      h
+
+    .unordered-list:
+      <ul: over(content)
+
+    .list-item:
+      <li: over(content)
 
     .header(depth):
-      <"h#{depth}": over(b content)
+      <"h#{depth}": over(content)
 
     .inset:
-      <div(style = "margin: 0 2em 1em"): over(b content)
+      <div(style = "margin: 0 2em 1em"): over(content)
 
     .centered:
-      <div(style = "text-align: center"): over(b content)
+      <div(style = "text-align: center"): over(content)
 
     .margin-note:
-      <blockquote: over(b content)
+      <blockquote: over(content)
 
     nil:
-      <div: over(b content)
+      <div: over(content)
 
-in-reference? = dynamic(false)
-in-sidebar? = dynamic(false)
-
-def(over(t & data Target)):
-  <a(name = t name): nil
-def(over(p & data Reference)):
-  if(p tag)
-    then:
-      <a(href = tag-url(p tag)):
-        with(in-reference? = true):
-          over(p content)
-    else:
-      <a(.undefined): over(p content)
-def(over(r & data ResolveElement)):
-  error(.did-not-resolve(r))
-def(over(e & data Element)):
-  e style match:
+fn(element-style(style, content)):
+  style match:
     .italic:
-      <em: over(e content)
+      <em: over(content)
 
     .bold:
-      <strong: over(e content)
+      <strong: over(content)
 
     .tt:
-      <code: over(e content)
+      <code: over(content)
 
     .superscript:
-      <sup: over(e content)
+      <sup: over(content)
 
     .subscript:
-      <sub: over(e content)
+      <sub: over(content)
 
     .smaller:
-      <span(style = "font-size: 80%"): over(e content)
+      <span(style = "font-size: 80%"): over(content)
 
     .larger:
-      <span(style = "font-size: 120%"): over(e content)
+      <span(style = "font-size: 120%"): over(content)
 
     .strike:
-      <span(style = "text-decoration: line-through"): over(e content)
+      <span(style = "text-decoration: line-through"): over(content)
 
     .class(*classes):
-      <span(class = classes join(" ")): over(e content)
+      <span(class = classes join(" ")): over(content)
+
+    .classed(style, *classes):
+      h = element-style(style, content)
+      h attributes["class"] = classes join(" ")
+      h
+
+    .button:
+      <button: over(content)
 
     .hyperlink(url):
-      <a(href = url): over(e content)
+      <a(href = url): over(content)
 
     .image(file):
-      <img(src = file, alt = over(e content))
+      <img(src = file, alt = over(content))
+
+    .image(file, width):
+      <img(src = file, alt = over(content), width = width)
+
+    .font-awesome(*classes):
+      <i(class = (["fa"] + classes) join(" ")): over(content)
 
     .svg(file):
       <object(data = file, type = "image/svg+xml", width = "100%", height = "100%"):
@@ -124,8 +120,41 @@ def(over(e & data Element)):
 
     .aux:
       unless(^(in-reference?) || ^(in-sidebar?)):
-        over(e content)
+        over(content)
+
+def(over(i & data Itemization)):
+  i elements collect [name, body]:
+    <dl:
+      [ <dt: over(name)
+        <dd: over(body)
+      ]
+def(over(l & data OrderedList)):
+  <ol:
+    l elements collect [body]:
+      <li: over(body)
+def(over(l & data List)):
+  <ul:
+    l elements collect [body]:
+      <li: over(body)
+def(over(p & data Paragraph)):
+  <p: over(p content)
+def(over(b & data Block)):
+  block-style(b style, b content)
 
+def(over(t & data Target)):
+  <a(name = t name): nil
+def(over(p & data Reference)):
+  if(p tag)
+    then:
+      <a(href = tag-url(p tag)):
+        with(in-reference? = true):
+          over(p content)
+    else:
+      <a(.undefined): over(p content)
+def(over(r & data ResolveElement)):
+  error(.did-not-resolve(r))
+def(over(e & data Element)):
+  element-style(e style, e content)
 def(over(nil)): nil
 def(over(s & String)): s
 def(over(a & Array)):
@@ -196,8 +225,12 @@ def(render(part, out = ".")):
         <head:
           <meta("http-equiv" = "Content-Type", content = "text/html; charset=UTF-8")
           <title: StrippedTags new(over(part title))
-          <link(type = "text/css", rel = "stylesheet", href = "public/anatomy.css")
-          <link(type = "text/css", rel = "stylesheet", href = "public/highlight.css")
+
+          unless(part template):
+            [ <link(type = "text/css", rel = "stylesheet", href = "public/anatomy.css")
+              <link(type = "text/css", rel = "stylesheet", href = "public/highlight.css")
+            ]
+
           <script(type = "text/javascript", src = "public/jquery.js") {}
           <script(type = "text/javascript", src = "public/jquery.hotkeys.js") {}
           <script(type = "text/javascript", src = "public/tags.js") {}
@@ -207,29 +240,7 @@ def(render(part, out = ".")):
             <link(type = "text/css", rel = "stylesheet", href = File basename(addition))
 
         <body(class = class):
-          <div(#main):
-            <div(#content):
-              render-part(part, out)
-
-          <div(.search):
-            <form(action = "javascript:void(0)"):
-              <input(
-                  type = "text"
-                  placeholder = "Search&hellip;"
-                  autocomplete = "off"
-                  #search)
-
-            <ul(.search-results) {}
-
-          with(in-sidebar? = true):
-            <div(#sidebar):
-              <h2:
-                <a(href = url(part top)):
-                  over(part top title)
-
-              <ol(.toc):
-                part top parts collect [p]:
-                  toc-leaf(part, p)
+          render-part-template(part, out)
 
           when(analytics-id = ENV["ANALYTICS_ID"]):
             <script: UnescapedString new(i"
@@ -243,13 +254,37 @@ def(render(part, out = ".")):
             ")
       })
 
-def(render-part(part, out = ".", depth = 1)):
-  part assets each [a]:
-    FileUtils cp(a, out)
+def(render-part-template(part, out = ".")):
+  copy-part-assets(part, out)
+  (part template || Self) template-for(part, out)
 
-  part css-additions each [a]:
-    FileUtils cp(a, out)
+def(template-for(part, out)):
+  <div(#page):
+    <div(#main):
+      <div(#content):
+        render-part(part, out)
+
+    <div(.search):
+      <form(action = "javascript:void(0)"):
+        <input(
+            type = "text"
+            placeholder = "Search&hellip;"
+            autocomplete = "off"
+            #search)
+
+        <ul(.search-results) {}
+
+    with(in-sidebar? = true):
+      <div(#sidebar):
+        <h2:
+          <a(href = url(part top)):
+            over(part top title)
 
+        <ol(.toc):
+          part top parts collect [p]:
+            toc-leaf(part, p)
+
+def(render-part(part, out = ".", depth = 1)):
   <div(.section, id = i"section_#{part tag name}"):
     <"h#{depth}"(.section_header):
       <a(name = part tag name) {}
@@ -265,8 +300,15 @@ def(render-part(part, out = ".", depth = 1)):
             toc-leaf(part, sub)
       else:
         part parts collect [sub]:
+          copy-part-assets(sub, out)
           render-part(sub, out, depth + 1)
 
+def(copy-part-assets(part, out)):
+  part assets each [a]:
+    FileUtils cp_r(a, out, #{.remove_destination -> true})
+
+  part css-additions each [a]:
+    FileUtils cp_r(a, out)
 
 def(search-tags(p)):
   tags = [

data/lib/anatomy/stages/meta.ay

@@ -32,6 +32,9 @@ fn(add-content-to(str & String, body)):
     []:
       close-paragraph(body)
 
+fn(add-content-to(nil, body)):
+  nil
+
 fn(add-content-to(x, body)):
   ensure-paragraph(body)
   body last content << x

data/lib/anatomy/version.rb

@@ -1,3 +1,3 @@
 module Anatomy
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,66 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: anatomy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: atomy
-  prerelease: false
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: broomhlda
-  prerelease: false
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: json_pure
-  prerelease: false
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rake
-  prerelease: false
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: anatomy
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Anatomy documentation system