nydp-html 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b38d1b4cc305721e7e5a8ee1c7e83da29c51d19
-  data.tar.gz: dbb6da3799767c0270f844f5b97ad3d697aadada
+  metadata.gz: 85b8b871b325a09e1ed4092544af3205820e3185
+  data.tar.gz: 0138daad46a200840138859679f2a2b2d7987c8d
 SHA512:
-  metadata.gz: 6939e44a5e15545d2d6bc16f1dca194b0a1f29d04177daf250e62fc00081750b557db348f947034910f269939e4537354548ce96b93067b9659193e8b2529705
-  data.tar.gz: 19da1d02f551ce33703e55908834cdf7a29a3ffc4abbabd5f6a0c0e312e7452dcee4110e35340e3590caa1cddc9d76e4af4724e8ef0d01ee64d26d75893e8b05
+  metadata.gz: 7e5afdc1dfd90171a94ef3e0e7bcc66e4d44bc076cdbfccb7358cb03fd0025a9576a575a8df6110b50c7813bf2f14ed92444d66123dcf41400e9a828b11663a0
+  data.tar.gz: 864f724f996c71ec0f0a61f7b486cbcb87bd86002d0ddd1fd14c7de8fed1363c9dbb116e8e08b3dead3102f92a0756fe01648830ffe2a4ccc8d4d8737db41057

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

@@ -23,13 +23,13 @@ Also provides percent-syntax for concise html-generation in nydp, for example
                (splot (or (hash-get hsh part)
                           part)))))
 
-(def html-split-fn (seq sep hsh esc)
+(def html-split-fn (seq sep hsh escapef)
   (fn (piece)
       (if (isa 'string piece)
           piece
           (let key (j "hsf:" (seq) ":hsf")
             (hash-set hsh key `(interpolate ,piece))
-            (j esc sep key sep esc)))))
+            (escapef:j sep key sep)))))
 
 (def html-process-parts (parts converter)
   (with (hsh  (hash)
@@ -59,7 +59,7 @@ Also provides percent-syntax for concise html-generation in nydp, for example
          arg
          (and (pair? arg)
               (eq? 'string-pieces (car arg)))
-         (html-build-interpolator (cdr arg) { method x1 esc "" })
+         (html-build-interpolator (cdr arg) { method x1 esc x1 })
          arg))
 
 (mac render-as-haml (arg)
@@ -73,9 +73,11 @@ Also provides percent-syntax for concise html-generation in nydp, for example
          (haml-to-html arg)
          (and (pair? arg)
               (eq? 'string-pieces (car arg)))
-         (html-build-interpolator (cdr arg) { method haml-to-html esc "" })
+         (html-build-interpolator (cdr arg) { method haml-to-html esc x1 })
          `(haml-to-html ,arg)))
 
+(def notextile-esc (txt) "<notextile>~|txt|</notextile>")
+
 (mac render-as-textile (arg)
      ; produces code to convert 'arg to html using a textile interpreter
      ; for example:
@@ -87,7 +89,7 @@ Also provides percent-syntax for concise html-generation in nydp, for example
          (textile-to-html arg)
          (and (pair? arg)
               (eq?   'string-pieces (car arg)))
-         (html-build-interpolator (cdr arg) { method textile-to-html esc "==" })
+         (html-build-interpolator (cdr arg) { method textile-to-html esc notextile-esc })
          `(textile-to-html ,arg)))
 
 (def to-css-rule (prop val) (joinstr "" prop ":" val ";"))
@@ -147,3 +149,14 @@ Also provides percent-syntax for concise html-generation in nydp, for example
 
 (dox-add-doc 'textile-to-html 'def '("assumes 'arg is a string in Textile format, converts to html and returns the result") '(arg))
 (dox-add-doc 'haml-to-html    'def '("assumes 'arg is a string in HAML format, converts to html and returns the result"   ) '(arg))
+
+(def to-url-params (hsh)
+  (joinstr "&" (map λk(joinstr "=" k hsh.,k) (hash-keys hsh))))
+
+(def to-url (base params)
+  (joinstr "?" (reject !present? (list base (to-url-params params)))))
+
+(def hesc (txt)
+  (string-replace ">" "&gt;"
+    (string-replace "<" "&lt;"
+      (string-replace "&" "&amp;" txt))))

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

@@ -0,0 +1,20 @@
+(examples-for hesc
+  ("escapes <"
+   (hesc "x < y")
+   "x &lt; y")
+
+  ("escapes >"
+   (hesc "x > y")
+   "x &gt; y")
+
+  ("escapes &"
+   (hesc "x && y")
+   "x &amp;&amp; y")
+
+  ("escapes < & >"
+   (hesc "<script>alert('x && y')</script>")
+   "&lt;script&gt;alert('x &amp;&amp; y')&lt;/script&gt;")
+
+  ("not very cleverly re-escapes escaped entities"
+   (hesc "&lt;p&gt;hello Jack &amp; Jill")
+   "&amp;lt;p&amp;gt;hello Jack &amp;amp; Jill"))

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

@@ -2,7 +2,7 @@
   ("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 "" })
+                              esc x1 })
    (string-pieces "<HEADER-1>" (interpolate (foo 1 2 3)) "</HEADER-1>")))
 
 (examples-for render-as-html

data/lib/lisp/tests/percent-encode-examples.nydp

@@ -0,0 +1,24 @@
+(examples-for percent-encode
+  ("escapes space"
+   (percent-encode "x y")
+   "x%20y")
+
+  ("escapes <>"
+   (percent-encode "x<y>")
+   "x%3Cy%3E")
+
+  ("escapes []"
+   (percent-encode "x[y]")
+   "x%5By%5D")
+
+  ("escapes %"
+   (percent-encode "%50")
+   "%2550")
+
+  ("does not escape -"
+   (percent-encode "a-b")
+   "a-b")
+
+  ("escapes a bunch of stuff in the same string"
+   (percent-encode "x[y?]=a&b%c")
+   "x%5By%3F%5D=a&b%25c"))

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

@@ -72,8 +72,26 @@ para
 
           "<h1>HEADER</h1>\n<p>1 and 2 and 6</p>\n<ul>\n\t<li>item 1</li>\n\t<li>item 2</li>\n\t<li>item 3</li>\n</ul>")
 
-         ("render a string with interpolations to html"
+         ("render a string with no interpolations to html"
           (with (a "hello, world") (render-as-textile a))
 
           "<p>hello, world</p>")
-))
+
+         ("render a string containing only a single interpolation"
+          (with (π 3.14 r 12) (render-as-textile "~(* (* r r) π)"))
+
+          "452.16")
+
+         ("render a longer multi-line string with some lines containing only a single interpolation"
+          (with (π 3.14 r 12) (render-as-textile "Start
+
+~(* (* r r) π)
+
+==-*-==
+
+~(* 2 (* r r) π)
+
+end
+"))
+
+          "<p>Start</p>\n452.16<p>-*-</p>\n904.32<p>end</p>")))

data/lib/lisp/tests/to-url-examples.nydp

@@ -0,0 +1,8 @@
+(examples-for to-url
+  ("parameter-free url"
+   (to-url "http://www.conandalton.net")
+   "http://www.conandalton.net")
+
+  ("append simple params"
+   (to-url "http://example.com" { x 42 y 65536 })
+   "http://example.com?x=42&y=65536"))

data/lib/nydp/html.rb

@@ -28,13 +28,26 @@ module Nydp
       end
 
       def setup ns
-        Symbol.mk("textile-to-html",  ns).assign(Nydp::Html::TextileToHtml.new)
-        Symbol.mk("haml-to-html",     ns).assign(Nydp::Html::HamlToHtml.new)
+        Symbol.mk("textile-to-html",  ns).assign(Nydp::Html::TextileToHtml.instance)
+        Symbol.mk("haml-to-html",     ns).assign(Nydp::Html::HamlToHtml.instance)
+        Symbol.mk("percent-encode",   ns).assign(Nydp::Html::PercentEncode.instance)
+      end
+    end
+
+    class PercentEncode
+      include Nydp::Builtin::Base, Singleton
+
+      def invoke_2 vm, arg
+        vm.push_arg Nydp::StringAtom.new percent_encode arg.to_s
+      end
+
+      def percent_encode s
+        s.gsub('%', '%25').gsub(/[ \n"\?.<>\\^_`{\|}~\[\]]/) { |x| "%%%2X" % x.ord }
       end
     end
 
     class HamlToHtml
-      include Nydp::Builtin::Base
+      include Nydp::Builtin::Base, Singleton
       def normalise_indentation txt
         lines = txt.split(/\n/).select { |line| line.strip != "" }
         return txt if lines.length == 0
@@ -64,7 +77,7 @@ module Nydp
     end
 
     class TextileToHtml
-      include Nydp::Builtin::Base
+      include Nydp::Builtin::Base, Singleton
       def builtin_invoke vm, args
         src = args.car.to_s
         rc = RedCloth.new(src)

data/lib/nydp/html/version.rb

@@ -1,5 +1,5 @@
 module Nydp
   module Html
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp-html
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,9 +140,12 @@ files:
 - lib/lisp/html-020-help.nydp
 - lib/lisp/tests/haml-tests.nydp
 - lib/lisp/tests/help-examples.nydp
+- lib/lisp/tests/hesc-examples.nydp
 - lib/lisp/tests/html-examples.nydp
 - lib/lisp/tests/html-tag-tests.nydp
+- lib/lisp/tests/percent-encode-examples.nydp
 - lib/lisp/tests/textile-tests.nydp
+- lib/lisp/tests/to-url-examples.nydp
 - lib/nydp/html.rb
 - lib/nydp/html/version.rb
 - nydp-html.gemspec