nydp-html 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe785a4c0d281f715707c1e447ee9aff63378b7
-  data.tar.gz: 457052e4687cf673789cbf8ff35b0c1be17a03d4
+  metadata.gz: af0f3578b42d4d0ceae6736a7682f63ea1618880
+  data.tar.gz: 55d79621b9c68dfca3b95ccc6ae20b5aba5d0fca
 SHA512:
-  metadata.gz: 7bce3993bf2d5cfa2e63b02084843b7f5df1d456b3733133afbe96614c8f902413ee76d82c1a2441c3d30a4fe0f2801eb357886fbd7fbc84aeb97a0f0342607f
-  data.tar.gz: 4835a0b63d77e3df682fdb70d90a1ec4b4d41cd9768b4044999c1deb122c886f50745778afac9e18cf31c0bed16f27b2143efe4fb8d45e7c78e36ce82843bfcd
+  metadata.gz: 06c2ffce91f11385f2599149b2a53089b3594bbe0396d3a7c1fafa2e34da0e2f9616c297d699466227d8dfe82a473b7ea50db3bd5526d6a30480f13a3ccc5176
+  data.tar.gz: 0fe492d9454d1e0f0ee6d831ddba5cdd9fcdda9b0ab9b0fbbe6c36e57a023a0cc34d54c9525005d26cbf41bcd634dc63bb4c7d4c5f36bb9bc1c67093077a44d5

data/lib/lisp/html-020-help.nydp

@@ -25,7 +25,7 @@
       "list with ~(len thing) elements, first is a ~(helpful/type:car thing)"
       (with (mytype (helpful/type thing)
              mykeys (hash-keys thing))
-            "~(pp thing) is a ~|mytype|~(helpful/keys thing)")))
+            "is a ~|mytype|~(helpful/keys thing)")))
 
 (def helpful/index ()
   ; return the names and types of all the things that are documented
@@ -42,13 +42,20 @@
                   (map λi(apply dox-show-info i)
                        infos)))))
 
+(def helpful/show-examples (name examples)
+  (if examples
+      (%div.helpful-examples
+            (%h2 "Examples for "
+                 (%span.example-name name))
+            (map λk(map λx(%pre.helpful-example
+                                (dox-show-one-example name x))
+                        k)
+                 examples))))
+
 (def helpful/examples (name)
   ; finds examples that have been defined for the given 'name
-  (let examples (dox-examples name)
-    (if examples
-        (joinstr "\n"
-                 (map (curry dox-show-examples name)
-                      examples)))))
+  (helpful/show-examples name
+                         (dox-examples name)))
 
 (mac help (thing)
   ; returns helpful information about the thing

data/lib/lisp/tests/help-examples.nydp

@@ -4,23 +4,37 @@
   (+ 2 foo))
 
 (examples-for test-example-f
-  ("adds two"
+  ("adds two to 99"
    (test-example-f 99)
-   101))
+   101)
+
+  ("adds two and two"
+   (test-example-f 2)
+   4))
+
+;; do this again to try confuse helpful/examples
+(examples-for test-example-f
+  ("adds two to 45"
+   (test-example-f 45)
+   47)
+
+  ("adds two and seven"
+   (test-example-f 7)
+   9))
 
 (examples-for help
   ("describes its argument when it's a number"
    help:22
-   "<pre class='helpful'>22 : 22 is a number\n\n</pre>")
+   "<pre class='helpful'>22 : is a number\n\n</pre>")
 
   ("describes its argument when it's a string"
    (help "hello world")
-   "<pre class='helpful'>\"hello world\" : \"hello world\" is a string\n\n</pre>")
+   "<pre class='helpful'>\"hello world\" : is a string\n\n</pre>")
 
   ("describes its argument when it's a hash"
    (let paris { a 1 b 2 c { x 9 y 8 z 7 } }
      (help paris))
-   "<pre class='helpful'>paris : {a=>1, b=>2, c=>{x=>9, y=>8, z=>7}} is a hash<div class='keyhelp'><div class='key'>a</div>-&gt;<div class='keyvalue'>number</div></div><div class='keyhelp'><div class='key'>b</div>-&gt;<div class='keyvalue'>number</div></div><div class='keyhelp'><div class='key'>c</div>-&gt;<div class='keyvalue'>hash</div></div>
+   "<pre class='helpful'>paris : is a hash<div class='keyhelp'><div class='key'>a</div>-&gt;<div class='keyvalue'>number</div></div><div class='keyhelp'><div class='key'>b</div>-&gt;<div class='keyvalue'>number</div></div><div class='keyhelp'><div class='key'>c</div>-&gt;<div class='keyvalue'>hash</div></div>
 
 </pre>")
 
@@ -38,18 +52,40 @@ source
     (+ 2 foo))
 
 
+<div class='helpful-examples'><h2>Examples for <span class='example-name'>test-example-f</span></h2><pre class='helpful-example'>test-example-f adds two to 45
+
+example  :
+
+(test-example-f 45)
+
+returns : 47
+
+--------------------------------
+</pre><pre class='helpful-example'>test-example-f adds two and seven
+
+example  :
+
+(test-example-f 7)
+
+returns : 9
 
-Examples for test-example-f
-==================
+--------------------------------
+</pre><pre class='helpful-example'>test-example-f adds two to 99
 
-test-example-f adds two
+example  :
 
-running  :
 (test-example-f 99)
 
-produces : 101
+returns : 101
 
 --------------------------------
+</pre><pre class='helpful-example'>test-example-f adds two and two
+
+example  :
 
+(test-example-f 2)
 
-</pre>"))
+returns : 4
+
+--------------------------------
+</pre></div></pre>"))

data/lib/nydp/html/version.rb

@@ -1,5 +1,5 @@
 module Nydp
   module Html
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp-html
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler