anatomy 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd164380607baf3afe9c067472e0031083fed64
-  data.tar.gz: 6d495bd0291c600e20615e2b07cfa91bc7e86da5
+  metadata.gz: f7fe0292092b1f5f8c4b8faf016842ba82284e0d
+  data.tar.gz: 67f1f1bda845a392804d273699d8b3dbe452f574
 SHA512:
-  metadata.gz: 968bba17c98053fc513f12ea285f654a1c5b0a6df10249986943e39b64936f9373bde69e10bd0db77e7a5c8b5ac59b59cf3752d42457a1260edee114bded5dbc
-  data.tar.gz: 49998d10fe5426aa5954d905159065ab45c04368648497d820b1b54892ab465b9b4b5747d3e8fda1d97403fffce637b2e4a563babc15260146ca2f78340a8a21
+  metadata.gz: 72d6808da8d14a041d969b1b3f351372a757c09e4e2c55bf40e548020805c12020b5752f8509ee8e1b8fa4dcb0256535596c428200a0a5310672efb63da68c59
+  data.tar.gz: fc57e898e578ebfcc39f1b5eee4d49e50b67d4512d9ba78c026ef0b466497edbf2deff1b28f60c7338c5dee8251e63ea74d4e9f2460b35b462acdd60663ff625

data/lib/anatomy/data.ay

@@ -67,6 +67,9 @@ data(
     @css-additions = Set new
     @css-url-additions = Set new
 
+    -- js files to add (array since order matters)
+    @js-additions = []
+
     -- template to use when rendering html
     @template = nil
 
@@ -99,6 +102,9 @@ def(Part section-label):
 
 def(Part inspect): i"#<Part: '#{@tag name}'>"
 
+def(Part template):
+  @template || (@parent && @parent template)
+
 -- search in order:
 -- 1. local hidden tags
 -- 2. local tags

data/lib/anatomy/processor.ay

@@ -30,11 +30,4 @@ def(process(input, renderer, output = ".")):
   unless(Dir exists?(output)):
     Dir mkdir(output)
 
-  unless(Dir exists?(output + "/public")):
-    Dir mkdir(output + "/public")
-
-  FileUtils cp-r(
-    File expand-path("../../../public", __FILE__) + "/."
-    output + "/public")
-
   renderer render(part, output)

data/lib/anatomy/renderers/html.ay

@@ -241,14 +241,16 @@ def(toc-leaf(current-part, part)):
 
 
 def(render(part, out = ".")):
+  tags-file = i"#{Dir tmpdir}/#{part top tag name}-tags.js"
+
   unless(part parent):
     tags = search-tags(part) collect [t, d, u]:
       [t, d to-s, u]
 
-    File open(i"#{out}/public/tags.js", "w") [f]:
+    File open(tags-file, "w") [f]:
       f write(i"var SEARCH_TAGS = #{tags to-json};")
 
-    copy-all-assets(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)
@@ -266,19 +268,12 @@ def(render(part, out = ".")):
           <meta("http-equiv" = "Content-Type", content = "text/html; charset=UTF-8")
           <title: StrippedTags new(over(part title))
 
-          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") {}
-          <script(type = "text/javascript", src = "public/main.js") {}
-
           when(part mobile-optimized?):
             <meta(name = "viewport", content = "width=device-width, initial-scale=1")
 
+          all-js-additions(part) collect [addition]:
+            <script(type = "text/javascript", src = addition) {}
+
           all-css-additions(part) collect [addition]:
             <link(type = "text/css", rel = "stylesheet", href = addition)
 
@@ -310,6 +305,8 @@ def(all-part-assets(part)):
 
   assets += part css-additions to-a
 
+  assets += part js-additions to-a
+
   part parts collect [sub]:
     assets += all-part-assets(sub)
 
@@ -319,7 +316,17 @@ def(copy-all-assets(part, out)):
   all-part-assets(part) each [a]:
     sync-asset-to(a, out)
 
+def(search-js-additions):
+  [ File expand-path("../js/jquery.js", __FILE__)
+    File expand-path("../js/search.js", __FILE__)
+  ]
+
 def(template-for(part, out)):
+  part css-additions << File expand-path("../css/anatomy.css", __FILE__)
+  part css-additions << File expand-path("../css/highlight.css", __FILE__)
+
+  part js-additions += search-js-additions
+
   <div(#page):
     <div(#main):
       <div(#content):
@@ -436,3 +443,16 @@ def(all-css-additions(p)):
       all-assets += all-css-additions(sub)
 
   all-assets
+
+def(all-js-additions(p)):
+  all-assets = []
+
+  p js-additions each [file]:
+    all-assets << File basename(file)
+
+  p parts each [sub]:
+    -- exclude parts that have their own page
+    unless(top(sub) == sub):
+      all-assets += all-js-additions(sub)
+
+  all-assets

data/lib/anatomy/renderers/js/search.js

@@ -0,0 +1,39 @@
+function bindSearch() {
+  $("#search").keyup(function() {
+    $(".search-results").empty();
+
+    if (!$("#search").val().length) {
+      $(".search-results").hide();
+      return;
+    }
+
+    var q = $("#search").val().toLowerCase(),
+        matches = [];
+
+    $.each(SEARCH_TAGS, function(i, t){
+      var k = t[0].toLowerCase(),
+          n = t[1],
+          url = t[2],
+          item = "<li>" + n + "</li>";
+
+      if (k.indexOf(q) == -1 || matches.indexOf(url) != -1)
+        return;
+
+      matches.push(url);
+
+      if (k == q)
+        $(".search-results").prepend(item);
+      else
+        $(".search-results").append(item);
+    });
+
+    if (matches.length == 0)
+      $(".search-results").hide();
+    else
+      $(".search-results").show();
+  });
+}
+
+$(function() {
+  bindSearch();
+});

data/{public/main.js → lib/anatomy/slides-js/slides.js}

@@ -8,11 +8,6 @@ var X_OFFSET = 50,
     SLIDE_HEIGHT;
 
 $(function(){
-  bindSearch();
-
-  if (!$(".slides").length)
-    return;
-
   SLIDE_WIDTH = $(".slide").outerWidth();
   SLIDE_HEIGHT = $(".slide").outerHeight();
 
@@ -106,43 +101,6 @@ function bindTouch() {
   });
 }
 
-function bindSearch() {
-  $("#search").keyup(function(){
-    $(".search-results").empty();
-
-    if (!$("#search").val().length) {
-      $(".search-results").hide();
-      return;
-    }
-
-    var q = $("#search").val().toLowerCase(),
-        matches = [];
-
-    console.log(q, SEARCH_TAGS);
-    $.each(SEARCH_TAGS, function(i, t){
-      var k = t[0].toLowerCase(),
-          n = t[1],
-          url = t[2],
-          item = "<li>" + n + "</li>";
-
-      if (k.indexOf(q) == -1 || matches.indexOf(url) != -1)
-        return;
-
-      matches.push(url);
-
-      if (k == q)
-        $(".search-results").prepend(item);
-      else
-        $(".search-results").append(item);
-    });
-
-    if (matches.length == 0)
-      $(".search-results").hide();
-    else
-      $(".search-results").show();
-  });
-}
-
 function moveX(diff) {
   animating = true;
   position -= diff;

data/lib/anatomy/slides.ay

@@ -6,6 +6,9 @@ data = require("anatomy/data")
 def(slides):
   data MetaBlock new(
     [part]:
+      part js-additions << File expand-path("../slides-js/jquery.hotkeys.js")
+      part js-additions << File expand-path("../slides-js/slides.js")
+
       part style properties << .slides)
 
 

data/lib/anatomy/stages/meta.ay

@@ -53,10 +53,6 @@ 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.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: anatomy
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-21 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
+  name: atomy
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: broomhlda
   type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+  name: broomhlda
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: json_pure
   type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+  name: json_pure
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+  name: rake
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+  type: :development
 description: "\n    A document authoring system inspired by Scribble.\n  "
 email:
 - suraci.alex@gmail.com
@@ -84,20 +84,21 @@ files:
 - lib/anatomy/html.ay
 - lib/anatomy/language/parser.ay
 - lib/anatomy/processor.ay
+- lib/anatomy/renderers/css/anatomy.css
+- lib/anatomy/renderers/css/highlight.css
 - lib/anatomy/renderers/html.ay
+- lib/anatomy/renderers/js/jquery.js
+- lib/anatomy/renderers/js/search.js
 - lib/anatomy/ruby.ay
 - lib/anatomy/server.ay
+- lib/anatomy/slides-js/jquery.hotkeys.js
+- lib/anatomy/slides-js/slides.js
 - lib/anatomy/slides.ay
 - lib/anatomy/stages/collect.ay
 - lib/anatomy/stages/meta.ay
 - lib/anatomy/stages/resolve.ay
 - lib/anatomy/stages/traverse.ay
 - lib/anatomy/version.rb
-- public/anatomy.css
-- public/highlight.css
-- public/jquery.hotkeys.js
-- public/jquery.js
-- public/main.js
 homepage: https://vito.github.io/atomy
 licenses:
 - Apache-2.0