nydp-html 0.0.6.1 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d9b6d6f103aae16c3822178b8f9f38e8ba410f
-  data.tar.gz: 3f6ba06cf97d197d19a4022df6b285e3322e47ea
+  metadata.gz: 66713483a3c6c9f3fd592499c322a9fb608cd5bb
+  data.tar.gz: 69a7ddf8287f948918187e36ed5c6ed413c57d7e
 SHA512:
-  metadata.gz: 42df76213c6aa2f6e26c5c3a36d5e1dd9397189c27d87555d61a770fc0d4ad4f6e0227c44a4a23487e480510a09d32ea6bb2db133dc22b565906e3451e656d01
-  data.tar.gz: 261fcd6fecc87b1dc084a04f49da98aca40f4a6b695070b7ed67d0d9759adf0db188a852b8c727101a0144bc2eafdf207de390ff37fe3a191ea49c853982c5d4
+  metadata.gz: 213f6cb41c604eef0f6f27c87de4715ad3a337a84012040f731145db805de389b6e5510f4f3fff06edec76c014324530bef36dbe60317428ad57c5fe482130a2
+  data.tar.gz: 638f23055de03498f840bb9683eb57924c9a840e08ebd2b584aa0458425a62a528a9c5ad16c09c4012dd1b9f3dd8ed4f5e4a07705ad8c6983f929b2fa17deb0b

data/README.md

@@ -62,6 +62,35 @@ interpolations, don't be inhibited:
 
 ```
 
+`'nydp-html` also provides haml-like expressions in lisp. Here are some examples from the spec:
+
+```lisp
+   (%p "hello, world")
+   "<p>hello, world</p>"
+
+   (%p "hello " (%b "you") " over " (%i "there"))
+   "<p>hello <b>you</b> over <i>there</i></p>"
+
+   (%p "hello " (%b.thick "you") " over " (%i "there"))
+   "<p>hello <b class='thick'>you</b> over <i>there</i></p>"
+```
+
+here's a slightly more intricate example:
+
+```lisp
+(%tr (map λd(%th.calendar-column d)
+          '(mon tue wed thu fri sat sun)))
+"<tr>
+  <th class='calendar-column'>mon</th>
+  <th class='calendar-column'>tue</th>
+  <th class='calendar-column'>wed</th>
+  <th class='calendar-column'>thu</th>
+  <th class='calendar-column'>fri</th>
+  <th class='calendar-column'>sat</th>
+  <th class='calendar-column'>sun</th>
+</tr>"
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/nydp-html/fork )

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

@@ -16,3 +16,35 @@
            ("returns an anchor tag"
             (link-to "click here!" "/other-page.html" { class "turbo" })
             "<a href='/other-page.html' class='turbo'>click here!</a>"))))
+
+(examples-for percent-syntax
+  ("generates a simple html tag"
+   (%p "hello, world")
+   "<p>hello, world</p>")
+
+  ("generates nested html tags"
+   (%p "hello " (%b "you") " over " (%i "there"))
+   "<p>hello <b>you</b> over <i>there</i></p>")
+
+  ("generates html tags with classnames"
+   (%p "hello " (%b.thick "you") " over " (%i "there"))
+   "<p>hello <b class='thick'>you</b> over <i>there</i></p>"))
+
+(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 nested html tags with attributes"
+   (%p(class 'important)
+      "read this and "
+      (%a(href "/fr/index") "click here")
+      "!")
+    "<p class='important'>read this and <a href='/fr/index'>click here</a>!</p>")
+
+  ("generates nested html tags with classnames and other attributes"
+   (%p(class 'important)
+      "read this and "
+      (%a.wow(href "/fr/index") "click here")
+      "!")
+    "<p class='important'>read this and <a class='wow' href='/fr/index'>click here</a>!</p>"))

data/lib/lisp/to-html.nydp

@@ -62,4 +62,24 @@
 (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 img (src)                (html-tag/ "img" { src src }))
-(def link-to (txt path attrs) (html-tag "a" (hash-merge { href path } attrs) txt))
+(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 (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)
+                           (+ `(class ,(joinstr " " (cdr dot-params))) attrs)))
+      (build-html-tag-fn tagname attrs)))
+
+(mac percent-syntax names
+  (html-percent-syntax (cadr names) nil))
+
+(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))
+    (html-percent-syntax tag-name expr)))

data/lib/nydp/html/version.rb

@@ -1,5 +1,5 @@
 module Nydp
   module Html
-    VERSION = "0.0.6.1"
+    VERSION = "0.0.7"
   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'
+  spec.add_dependency             'nydp',    '~> 0.1.4'
   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.6.1
+  version: 0.0.7
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement