nydp-html 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0c8d4046e86547b06be324cebae246e9bdda8e1
-  data.tar.gz: 5ac6ebfc0110f70a4baa746dd27de924911b7787
+  metadata.gz: 99b857483d711fd8feba7b0d9e074f0661201d3c
+  data.tar.gz: da7407f42604da72d680079a24d1a4698bd7bf9c
 SHA512:
-  metadata.gz: 0e08743b4f68407c88565abd23c037ada2b08ed9c632cb07906975ac8405e81f602e4d4245fc61d42cb78f625ef4686845c52e8f6da87c00d67265b16978ddcd
-  data.tar.gz: 0e01bedfb632144d879584cecb7f4f3ed23dbbe17c430b9b80e5bc5d66c360bfa6d781a368a81883be2c141b752149414de68cdfa5b6eed5d30157c8cb3ffbaa
+  metadata.gz: 4c616362e5206cac57a1363cfef7f6c145bcb12da16ffcbd9eb38b296fe51a246df7fa5d0453c3b33f2e3bd9440ab7a4f8de3e3e23bb56ccf65afd04f7e4b9ce
+  data.tar.gz: 0e144d603a24da5ea0b7a32eaca597be15e291c4859eda624ddf9e5b1860e5f06aabcb0f264f244b9ef92c575910793c0e78ff2dee1ead4bbf1d1b7ca942116e

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

@@ -20,7 +20,7 @@
   (fn (piece)
       (if (isa 'string piece)
           piece
-          (let key (j "--l--" (seq) "--r--")
+          (let key (j "hsf:" (seq) ":hsf")
             (hash-set hsh key `(interpolate ,piece))
             (j esc sep key sep esc)))))
 
@@ -101,27 +101,28 @@
 
 (def as-tag-attrs (attrs)
   (let hsh (or attrs (hash))
-    (joinstr ""
-             (map (fn (k) " ~|k|='~(joinstr " " hsh.,k)'")
-                  (hash-keys hsh)))))
+    (j:map (fn (k) " ~|k|='~(joinstr " " hsh.,k)'")
+       (hash-keys hsh))))
 
 (def html-tag/ (name attrs) "<~|name|~(as-tag-attrs attrs)/>")
 (def html-tag (name attrs . content)
   (let formatted (map default-format content)
-    "<~|name|~(as-tag-attrs attrs)>~(apply joinstr "" formatted)</~|name|>"))
+    "<~|name|~(as-tag-attrs attrs)>~(j 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)))
 
 (def build-html-tag-fn (tagname attrs)
-  `(curry html-tag ',tagname ,(if attrs `(brace-list ,@attrs))))
+  (if (string-match tagname ".+/$")
+      `(curry html-tag/ ,(string-replace "/$" "" tagname) ,(if attrs `(brace-list ,@attrs)))
+      `(curry html-tag ,tagname ,(if attrs `(brace-list ,@attrs)))))
 
 (def html-percent-syntax (tagname attrs)
   (if (caris 'dot-syntax tagname)
       (let dot-params (cdr tagname)
-        (build-html-tag-fn (car dot-params)
+        (build-html-tag-fn (to-string:car dot-params)
                            (+ `(class ,(joinstr " " (cdr dot-params))) attrs)))
-      (build-html-tag-fn tagname attrs)))
+      (build-html-tag-fn (to-string tagname) attrs)))
 
 (mac percent-syntax names
   (html-percent-syntax (cadr names) nil))
@@ -129,5 +130,5 @@
 (define-prefix-list-macro "^%.+" vars expr
   ; allows (%a(href "/fr/index") "click" name)
   ; as shortcut for (html-tag "a" { href "/fr/index" } "click " name)
-  (let tag-name (car:parse:joinstr "" (cdr:string-split vars))
+  (let tag-name (car:parse:j:cdr:string-split vars)
     (html-percent-syntax tag-name expr)))

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

@@ -43,6 +43,20 @@
                          "</li>\n  <li>item " (interpolate (assign counter (+ counter 1)))
                          "</li>\n</ul>\n"))
 
+         ("compile a string with interpolations inside embedded textile to an instruction to generate haml"
+          (pre-compile '(render-as-haml "%h1 HEADER
+
+:textile
+  * a is ~a
+  * b is ~b
+  * c is ~(c 3)
+"))
+
+          (string-pieces "<h1>HEADER</h1>\n<ul>\n\t<li>a is " (interpolate a)
+                         "</li>\n\t<li>b is " (interpolate b)
+                         "</li>\n\t<li>c is " (interpolate (c 3))
+                         "</li>\n</ul>\n"))
+
          ("compile a function invocation to render as haml"
           (pre-compile '(render-as-haml a))
           (haml-to-html a))

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

@@ -20,6 +20,10 @@
    (%p "hello, world")
    "<p>hello, world</p>")
 
+  ("generates a self-closing html tag"
+   (%br/)
+   "<br/>")
+
   ("generates nested html tags"
    (%p "hello " (%b "you") " over " (%i "there"))
    "<p>hello <b>you</b> over <i>there</i></p>")
@@ -38,13 +42,21 @@
 
   ("does not insert empty 'brace-list for no attributes"
    (pre-compile '(%p foo))
-   ((curry html-tag (quote p) nil) foo)))
+   ((curry html-tag "p" nil) foo)))
 
 (examples-for prefix-list
   ("generates a simple html tag with attributes"
     (%a(href "/fr/index") "click here")
     "<a href='/fr/index'>click here</a>")
 
+  ("generates a self-closing html tag with attributes"
+    (%img/(src "/smile.png"))
+    "<img src='/smile.png'/>")
+
+  ("generates a self-closing html tag with attributes and classes"
+    (%img/.round(src "/smile.png"))
+    "<img class='round' src='/smile.png'/>")
+
   ("generates nested html tags with attributes"
    (%p(class 'important)
       "read this and "

data/lib/nydp/html.rb

@@ -4,6 +4,7 @@ require "nydp"
 require "nydp/literal"
 require "nydp/builtin"
 require "nydp/html/version"
+require "haml/filters/textile"
 
 module Nydp
   module Html

data/lib/nydp/html/version.rb

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

data/nydp-html.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency             'nydp',    ['~> 0.1', '>= 0.1.13']
   spec.add_dependency             'haml',    '~> 4.0'
+  spec.add_dependency             'haml-contrib'
   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.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: haml-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement