anatomy 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b81de7167093f764f76de074673b0406c0a145
-  data.tar.gz: 9241871b3e4413c4d572ca8be55c2e0a20daaa73
+  metadata.gz: 7b1b191c8d7af232bda5851a16c767b38cd07df3
+  data.tar.gz: b9d1d3a88e065dfb0b6fd33f6b2be71c0b26968d
 SHA512:
-  metadata.gz: 496652092f8fb963635e6344e874295abaee45ada6f2ae8670e5a11cc1fab19ce737453d4ab2d17f58cbe4e2d912a5fe82a6908ccbe7f3df6dfa0001f69bbfd8
-  data.tar.gz: b20bf712ea70ad5c9b1a509294737c1aae33ad260c6f5f5206298a269e4e2ec39301e2297817e40e2f4128930ee09ddc39a5e6fc06b74ec31d932a0e3ed23c34
+  metadata.gz: abb520c5072e23523b3ed92f8c4ab7d5ebd2291b3669810be2fd240dc8cf539c42016fb9c34dacc1f7815ce2a97918b44a422edf37fb2d012579b6bbcf52f6b2
+  data.tar.gz: 0421b480c9e6e726f945d80000be971c8f5e6ddcd16009c3a22848185f4d3bc4513e36508de4a262f15f78237307dab7e453a86d2aa7142e6d4bf6a24709c01e

data/lib/anatomy/base.ay

@@ -66,11 +66,11 @@ def(section(title, *tag-names, content)):
   decode(title(title, *tag-names), content)
 
 def(include-section(path)):
-  Atomy CodeLoader require(path) doc
+  Atomy CodeLoader load(path) doc
 
 def(include-sections(path)):
   Dir glob(path) collect [s]:
-    Atomy CodeLoader require(s) doc
+    Atomy CodeLoader load(s) doc
 
 def(target-element(tag-name, display = nil)):
   data CollectElement new(

data/lib/anatomy/processor.ay

@@ -12,11 +12,18 @@ resolve = require("anatomy/stages/resolve")
 html = require("anatomy/renderers/html")
 
 def(load(input)):
-  mod = Atomy CodeLoader require(input)
+  puts(i"#{input}: loading")
+  mod = Atomy CodeLoader load(input)
 
   part = mod doc
+
+  puts(i"#{input}: traversing")
   traversed = traverse over(part)
+
+  puts(i"#{input}: collecting")
   collected = collect over(traversed)
+
+  puts(i"#{input}: resolving")
   resolved = resolve over(collected)
 
   resolved
@@ -30,4 +37,5 @@ def(process(input, renderer, output = ".")):
   unless(Dir exists?(output)):
     Dir mkdir(output)
 
+  puts(i"#{input}: rendering")
   renderer render(part, output)

data/lib/anatomy/renderers/html.ay

@@ -239,7 +239,12 @@ def(toc-leaf(current-part, part)):
         part parts collect &.(Self toc-leaf(current-part, _))
 
 
-def(render(part, out = ".")):
+def(render(part, out = ".", done = Set new)):
+  when(done include?(part)):
+    return
+
+  done << part
+
   tags-file = i"#{Dir tmpdir}/#{part top tag name}-tags.js"
 
   unless(part parent):
@@ -252,7 +257,7 @@ def(render(part, out = ".")):
   part js-additions << tags-file
 
   -- call this early so the template can register its own assets/etc
-  template = render-part-template(part, out)
+  template = render-part-template(part, out, done)
 
   class =
     if(part style properties empty?)
@@ -296,15 +301,15 @@ def(render(part, out = ".")):
   unless(part parent):
     copy-all-assets(part, out)
 
-def(render-part-template(part, out = ".")):
-  (part template || Self) template-for(part, out)
+def(render-part-template(part, out = ".", done = Set new)):
+  (part template || Self) template-for(part, out, done)
 
 def(all-part-assets(part)):
-  assets = part assets to-a
+  assets = Set new(part assets)
 
-  assets += part css-additions to-a
+  assets += part css-additions
 
-  assets += part js-additions to-a
+  assets += part js-additions
 
   part parts collect [sub]:
     assets += all-part-assets(sub)
@@ -321,7 +326,7 @@ def(search-js-additions):
       File expand-path("../js/search.js", __FILE__)
     ])
 
-def(template-for(part, out)):
+def(template-for(part, out, done)):
   part css-additions << File expand-path("../css/anatomy.css", __FILE__)
   part css-additions << File expand-path("../css/highlight.css", __FILE__)
 
@@ -330,7 +335,7 @@ def(template-for(part, out)):
   <div(#page):
     <div(#main):
       <div(#content):
-        render-part(part, out)
+        render-part(part, out, done)
 
     <div(.search):
       <form(action = "javascript:void(0)"):
@@ -352,14 +357,14 @@ def(template-for(part, out)):
           part top parts collect [p]:
             toc-leaf(part, p)
 
-def(render-part(part, out = ".")):
+def(render-part(part, out = ".", done = Set new)):
   <div(.section, id = i"section_#{part tag name}"):
     over(part body)
 
     if(part split-sections? && !(part inlined?))
       then:
         part parts collect [sub]:
-          render(sub, out)
+          render(sub, out, done)
 
         when(part toc?):
           <ol(.toc, #table-of-contents):
@@ -367,7 +372,7 @@ def(render-part(part, out = ".")):
               toc-leaf(part, sub)
       else:
         part parts collect [sub]:
-          render-part(sub, out)
+          render-part(sub, out, done)
 
 def(sync-asset-to(path, outdir)):
   if(File directory?(path))

data/lib/anatomy/version.rb

@@ -1,3 +1,3 @@
 module Anatomy
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: anatomy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomy
-  prerelease: false
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: puma
-  prerelease: false
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -40,13 +40,13 @@ dependencies:
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: broomhlda
-  prerelease: false
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -54,13 +54,13 @@ dependencies:
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -68,13 +68,13 @@ dependencies:
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: anatomy
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Anatomy documentation system