anatomy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b1866167079bd12d6c8a8b88e0e5bc1fef6e3e6
-  data.tar.gz: 8f9c538fef7531f68821d1738274ec3a894c0ff1
+  metadata.gz: 4e757a65ff4fed2d3f03bb130eb79d72a468c427
+  data.tar.gz: 3dc6b84202c1d4e651c0cc4dd613835c9594284c
 SHA512:
-  metadata.gz: 7f7e76d01f543a073fa21c3e2da7f6f529bd0d0c6ef541a8142688aaa273f56ec6dc08b064352df348caa114873482298642b11c455d5ff3dd0762bbf828984b
-  data.tar.gz: de3384e79962ddee5a707b373629361a34bd276abb2f199440a3284d7038a2965557378d3d1475f06e8e92648245a6f68763287b77958a67ea5ba4a36c75a780
+  metadata.gz: 18e5b6316e4be8867d4fe8facffacb915480ce7f1c5b80593c18f37cf0cab9c140cfc879daf0190d72891f5f32c6cccd2f6c7bd8e30696ba042744eb361d641f
+  data.tar.gz: 550a07ef905b7ee07bce55a9506520a25f777d17800475d1c97ebadd156aac6998d5594e10c2152e0ce2d1e6ead49373bd64c5a65ac1bcbdb591c1e3c01ac8a0

data/lib/anatomy/data.ay

@@ -81,6 +81,17 @@ def(Part set-local-tag(name, target = nil, display = nil)):
 
 def(Part toc?): style properties include?(.toc)
 
+def(Part section-label):
+  if(@parent)
+    then:
+      parent-label = @parent section-label
+      self-index = (@parent parts index(self) + 1)
+
+      if(parent-label empty?)
+        then: i"#{self-index}"
+        else: i"#{parent-label}.#{self-index}"
+    else: ""
+
 def(Part inspect): i"#<Part: '#{@tag name}'>"
 
 -- search in order:

data/lib/anatomy/renderers/html.ay

@@ -8,8 +8,10 @@ require("fileutils")
 use(require("anatomy/html"))
 data = require("anatomy/data")
 
-in-reference? = dynamic(false)
-in-sidebar? = dynamic(false)
+omit-aux-var? = dynamic(false)
+
+def(omit-aux?):
+  omit-aux-var?
 
 fn(tag-url(t)):
   t target match:
@@ -141,7 +143,7 @@ fn(element-style(style, content)):
       <script(async = true, defer = true, src = url) {}
 
     .aux:
-      unless(^(in-reference?) || ^(in-sidebar?)):
+      unless(^(omit-aux?)):
         over(content)
 
     .newline:
@@ -180,7 +182,7 @@ def(over(p & data Reference)):
   if(p tag)
     then:
       <a(href = tag-url(p tag)):
-        with(in-reference? = true):
+        with(omit-aux? = true):
           over(p content)
     else:
       <a(.undefined): over(p content)
@@ -246,6 +248,8 @@ def(render(part, out = ".")):
     File open(i"#{out}/public/tags.js", "w") [f]:
       f write(i"var SEARCH_TAGS = #{tags to-json};")
 
+    copy-all-assets(part, out)
+
   -- call this early so the template can register its own assets/etc
   template = render-part-template(part, out)
 
@@ -290,10 +294,28 @@ def(render(part, out = ".")):
             ")
       })
 
+  -- now that everything's generated, copy all recorded assets over (note that
+  -- templates may register their own assets)
+  unless(part parent):
+    copy-all-assets(part, out)
+
 def(render-part-template(part, out = ".")):
-  copy-part-assets(part, out)
   (part template || Self) template-for(part, out)
 
+def(all-part-assets(part)):
+  assets = part assets to-a
+
+  assets += part css-additions to-a
+
+  part parts collect [sub]:
+    assets += all-part-assets(sub)
+
+  assets
+
+def(copy-all-assets(part, out)):
+  all-part-assets(part) each [a]:
+    sync-asset-to(a, out)
+
 def(template-for(part, out)):
   <div(#page):
     <div(#main):
@@ -310,7 +332,7 @@ def(template-for(part, out)):
 
         <ul(.search-results) {}
 
-    with(in-sidebar? = true):
+    with(omit-aux? = true):
       <div(#sidebar):
         <h2:
           <a(href = url(part top)):
@@ -336,15 +358,20 @@ 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})
+def(sync-asset-to(path, outdir)):
+  if(File directory?(path))
+    then:
+      subdir = File join(outdir, File basename(path))
 
-  part css-additions each [a]:
-    FileUtils cp_r(a, out)
+      Dir entries(path) each [entry]:
+        when((entry != ".") && (entry != "..")):
+          sync-asset-to(File join(path, entry), subdir)
+
+    else:
+      FileUtils mkdir_p(outdir)
+      FileUtils cp(path, File join(outdir, File basename(path)))
 
 def(search-tags(p)):
   tags = [
@@ -390,15 +417,16 @@ def(search-tags(p)):
   tags
 
 def(all-css-additions(p)):
-  assets =
-    p css-additions to-a collect [file]:
-      File basename(file)
+  all-assets = Set new
+
+  p css-additions each [file]:
+    all-assets << File basename(file)
 
-  assets += p css-url-additions to-a
+  all-assets += p css-url-additions
 
   p parts each [sub]:
     -- exclude parts that have their own page
     unless(top(sub) == sub):
-      assets += all-css-additions(sub)
+      all-assets += all-css-additions(sub)
 
-  assets
+  all-assets

data/lib/anatomy/stages/meta.ay

@@ -53,6 +53,10 @@ def(pass(a & Array, part, body = part body)):
 def(pass(p & data Part, part, body = part body)):
   part parts << p
   p parent = part
+
+  unless(p template):
+    p template = part template
+
   part body freeze
   nil
 

data/lib/anatomy/version.rb

@@ -1,3 +1,3 @@
 module Anatomy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: anatomy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomy
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -26,12 +26,12 @@ dependencies:
         version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: broomhlda
-  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:
@@ -40,12 +40,12 @@ dependencies:
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: json_pure
-  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:
@@ -54,12 +54,12 @@ dependencies:
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
-  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:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: anatomy
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Anatomy documentation system