nydp-html 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0f3578b42d4d0ceae6736a7682f63ea1618880
-  data.tar.gz: 55d79621b9c68dfca3b95ccc6ae20b5aba5d0fca
+  metadata.gz: c0c8d4046e86547b06be324cebae246e9bdda8e1
+  data.tar.gz: 5ac6ebfc0110f70a4baa746dd27de924911b7787
 SHA512:
-  metadata.gz: 06c2ffce91f11385f2599149b2a53089b3594bbe0396d3a7c1fafa2e34da0e2f9616c297d699466227d8dfe82a473b7ea50db3bd5526d6a30480f13a3ccc5176
-  data.tar.gz: 0fe492d9454d1e0f0ee6d831ddba5cdd9fcdda9b0ab9b0fbbe6c36e57a023a0cc34d54c9525005d26cbf41bcd634dc63bb4c7d4c5f36bb9bc1c67093077a44d5
+  metadata.gz: 0e08743b4f68407c88565abd23c037ada2b08ed9c632cb07906975ac8405e81f602e4d4245fc61d42cb78f625ef4686845c52e8f6da87c00d67265b16978ddcd
+  data.tar.gz: 0e01bedfb632144d879584cecb7f4f3ed23dbbe17c430b9b80e5bc5d66c360bfa6d781a368a81883be2c141b752149414de68cdfa5b6eed5d30157c8cb3ffbaa

data/lib/lisp/html-010-tools.nydp

@@ -1,20 +1,59 @@
-(def interpolate (arg) arg)
+(def default-format (arg)
+  ; override this to ensure values are formatted
+  ; as you desire it. By default, this returns its
+  ; argument unchanged
+  arg)
 
-(def html-process-parts (parts converter)
-  (let separator (random-string 20)
-       (string-split (converter.method (joinstr "~(just converter.esc)~(just separator)~(just converter.esc)"
-                                               parts))
-                     separator)))
+(def interpolate (arg)
+  ; override this to provide error handling, logging,
+  ; profiling, or whatever it is you might desire.
+  ; by default, this delegates to 'default-format
+  (default-format arg))
+
+(def html-resplit (parts hsh)
+  (accum splot
+         (each part parts
+               (splot (or (hash-get hsh part)
+                          part)))))
+
+(def html-split-fn (seq sep hsh esc)
+  (fn (piece)
+      (if (isa 'string piece)
+          piece
+          (let key (j "--l--" (seq) "--r--")
+            (hash-set hsh key `(interpolate ,piece))
+            (j esc sep key sep esc)))))
 
-(def html-interpolatify-arg (tuple)
-     (if (cadr tuple)
-         `(interpolate ,(cadr tuple))
-         nil))
+(def html-process-parts (parts converter)
+  (with (hsh  (hash)
+         sep  (random-string 12))
+        (html-resplit (string-split (converter.method
+                                               (j:map (html-split-fn (seqf 0) sep hsh converter.esc)
+                                                  parts))
+                                    sep)
+                      hsh)))
 
 (def html-build-interpolator (pieces converter)
-     (let tuples (pairs pieces)
-          `(string-pieces ,@(apply + (zip (html-process-parts (map car tuples) converter)
-                                          (map html-interpolatify-arg tuples))))))
+  `(string-pieces ,@(html-process-parts pieces converter)))
+
+(mac render-as-html (arg)
+     ; produce code to convert 'arg to html using a null interpreter.
+     ; in other words, assume input is already html. Normally, we would
+     ; just return the argument, but it's useful to take advantage of the fact that
+     ; each interpolation ~(foo) is replaced with ~(interpolate (foo)), and
+     ; you may override 'interpolate for your own nefarious purposes.
+     ;
+     ; for example:
+     ;
+     ; (render-as-html "<p>hello world</p>")            ;=> "<p>hello world</p>"
+     ; (render-as-html (get-some-text-from 'somewhere)) ;=> (x1 (get-some-text-from 'somewhere))
+     ; (render-as-html "<p>hello ~|name|</p>")          ;=>  (string-pieces "<p>hello" (interpolate name) "<p>")
+     (if (isa 'string arg)
+         arg
+         (and (pair? arg)
+              (eq? 'string-pieces (car arg)))
+         (html-build-interpolator (cdr arg) { method x1 esc "" })
+         arg))
 
 (mac render-as-haml (arg)
      ; produce code to convert 'arg to html using a haml interpreter
@@ -22,7 +61,7 @@
      ;
      ; (render-as-haml "%p hello world")                ;=> "<p>hello world</p>"
      ; (render-as-haml (get-some-text-from 'somewhere)) ;=> (haml-to-html (get-some-text-from 'somewhere))
-     ; (render-as-haml "%p hello ~name")                ;=>  (string-pieces "<p>hello" name "<p>")
+     ; (render-as-haml "%p hello ~name")                ;=>  (string-pieces "<p>hello" (interpolate name) "<p>")
      (if (isa 'string arg)
          (haml-to-html arg)
          (and (pair? arg)
@@ -36,7 +75,7 @@
      ;
      ; (render-as-textile "hello world")                   ;=>  "<p>hello world</p>"
      ; (render-as-textile (get-some-text-from 'somewhere)) ;=>  (textile-to-html (get-some-text-from 'somewhere))
-     ; (render-as-textile "hello ~name")                   ;=> (string-pieces "<p>hello" name "<p>")
+     ; (render-as-textile "hello ~name")                   ;=> (string-pieces "<p>hello" (interpolate name) "<p>")
      (if (isa 'string arg)
          (textile-to-html arg)
          (and (pair? arg)
@@ -67,7 +106,9 @@
                   (hash-keys hsh)))))
 
 (def html-tag/ (name attrs) "<~|name|~(as-tag-attrs attrs)/>")
-(def html-tag (name attrs . content) "<~|name|~(as-tag-attrs attrs)>~(apply joinstr "" content)</~|name|>")
+(def html-tag (name attrs . content)
+  (let formatted (map default-format content)
+    "<~|name|~(as-tag-attrs attrs)>~(apply joinstr "" formatted)</~|name|>"))
 (def img (src)                (html-tag/ "img" { src src }))
 (def link-to (txt path attrs) (html-tag "a" (hash-merge { href path } (or attrs (hash))) txt))
 (def html-tag-fn (name attrs) (fn content (apply html-tag name attrs content)))

data/lib/lisp/tests/haml-tests.nydp

@@ -41,7 +41,7 @@
                          "</p>\n<ul>\n  <li>item " (interpolate (assign counter (+ counter 1)))
                          "</li>\n  <li>item " (interpolate (assign counter (+ counter 1)))
                          "</li>\n  <li>item " (interpolate (assign counter (+ counter 1)))
-                         "</li>\n</ul>\n" nil))
+                         "</li>\n</ul>\n"))
 
          ("compile a function invocation to render as haml"
           (pre-compile '(render-as-haml a))
@@ -92,6 +92,17 @@
   <li>item 2</li>
   <li>item 3</li>
 </ul>
+")
+
+         ("render correctly even when HAML re-orders attributes"
+          (with (a 'big b 'little c "http://link")
+                (render-as-haml "
+%a(href='~|c|' class='~|a|' alt='~|b|')
+  %img(src='~|c|' alt='~|b|' title='~|a|')
+"))
+          "<a alt='little' class='big' href='http://link'>
+  <img alt='little' src='http://link' title='big'>
+</a>
 ")
 
          ("render a string with nested haml to html"

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

@@ -0,0 +1,32 @@
+(examples-for html-build-interpolator
+  ("takes out all the non-string bits, concatenates, converts to html, then splices in all the bits again"
+   (html-build-interpolator (list "<h1>" '(foo 1 2 3) "</h1>")
+                            { method (curry string-replace "h1" "HEADER-1")
+                              esc "" })
+   (string-pieces "<HEADER-1>" (interpolate (foo 1 2 3)) "</HEADER-1>")))
+
+(examples-for render-as-html
+  ("return the same string if there are no interpolations"
+   (pre-compile '(render-as-html "<p>hello, nydp</p>"))
+   "<p>hello, nydp</p>")
+
+  ("return the same thing if there are no interpolations"
+   (pre-compile '(render-as-html (foo bar yobo)))
+   (foo bar yobo))
+
+  ("compile a string with interpolations to an instruction to generate haml"
+   (pre-compile '(render-as-html "<h1>HEADER</h1>
+<p>~a and ~b and ~(c 3)</p>
+<ul>
+  <li>item ~(assign counter (+ counter 1))</li>
+  <li>item ~(assign counter (+ counter 1))</li>
+  <li>item ~(assign counter (+ counter 1))</li>
+</ul>
+"))
+
+   (string-pieces "<h1>HEADER</h1>\n<p>"
+                  (interpolate a) " and " (interpolate b) " and " (interpolate (c 3))
+                  "</p>\n<ul>\n  <li>item " (interpolate (assign counter (+ counter 1)))
+                  "</li>\n  <li>item " (interpolate (assign counter (+ counter 1)))
+                  "</li>\n  <li>item " (interpolate (assign counter (+ counter 1)))
+                  "</li>\n</ul>\n")))

data/lib/lisp/tests/textile-tests.nydp

@@ -34,7 +34,7 @@ paragraph text
                          "</p>\n<ul>\n\t<li>item " (interpolate (assign counter (+ counter 1)))
                          "</li>\n\t<li>item " (interpolate (assign counter (+ counter 1)))
                          "</li>\n\t<li>item " (interpolate (assign counter (+ counter 1)))
-                         "</li>\n</ul>" nil))
+                         "</li>\n</ul>"))
 
          ("compile a function invocation to render as textile"
           (pre-compile '(render-as-textile a))

data/lib/nydp/html/version.rb

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

data/nydp-html.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 2.9'
   spec.add_development_dependency 'rspec_numbering_formatter'
 
-  spec.add_dependency             'nydp',    ['~> 0.1', '>= 0.1.7']
+  spec.add_dependency             'nydp',    ['~> 0.1', '>= 0.1.13']
   spec.add_dependency             'haml',    '~> 4.0'
   spec.add_dependency             'RedCloth'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp-html
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.13
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +132,7 @@ files:
 - lib/lisp/html-020-help.nydp
 - lib/lisp/tests/haml-tests.nydp
 - lib/lisp/tests/help-examples.nydp
+- lib/lisp/tests/html-examples.nydp
 - lib/lisp/tests/html-tag-tests.nydp
 - lib/lisp/tests/textile-tests.nydp
 - lib/nydp/html.rb