teepee 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a294c6b96522327fdf75b0afd53f86c4a61f251a
-  data.tar.gz: db69f9e7c0c3a2db1cd3309722bb14d9c0380a71
+  metadata.gz: 73ea8501f5483c1d6d076cda89359512734c380d
+  data.tar.gz: a7c354cba7562a7195a53a07d787a5e5842659a0
 SHA512:
-  metadata.gz: 33a3c32239038742f12abd80f0b36f26d94b9e70a821b96d55a792db3c1ca044a3e31813f6a45bc2ece05c10240b22f2de5000a3484cc46fb63d637ca7ba6007
-  data.tar.gz: c9ddbe44ac794e5d74ec803eca80a8f49f9c5c8e092cb4f73df65237f80262742d159b155338584ae1ea1983052917af956ede8aca4fc1cb7549465e60c9d7ef
+  metadata.gz: 7106f91a0bc17646ed1edd8548dbffaa77f51608203046856625abac731c09c64da694f5d2dfc1ca6b6776ccb25a8ddb83466d861452da798ba0436e47785132
+  data.tar.gz: 2391aa26ec4ba061cee4187650ac6489f4db34401b02e527506ea0966deeed723a22c527587077c59660576be101aa023804a97323619fa63dd15fcb67c5e68e

data/lib/teepee/command-parser.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- mode: Ruby -*-
 
-# Copyright © 2013-2015, Christopher Mark Gore,
+# Copyright © 2013-2016, Christopher Mark Gore,
 # Soli Deo Gloria,
 # All rights reserved.
 #
@@ -118,6 +118,110 @@ module Teepee
       when "superscript",
            "sup"
         @@commander.sup expressions
+      when "h1"
+        @@commander.h1 expressions
+      when "h2"
+        @@commander.h2 expressions
+      when "h3"
+        @@commander.h3 expressions
+      when "h4"
+        @@commander.h4 expressions
+      when "h5"
+        @@commander.h5 expressions
+      when "h6"
+        @@commander.h6 expressions
+      when "itemize",
+           "ul"
+        @@commander.itemize expressions
+      when "itemize-disc",
+           "ul-disc",
+           "itemize_disc",
+           "ul_disc",
+           "itemize-disk",
+           "ul-disk",
+           "itemize_disk",
+           "ul_disk"
+        @@commander.itemize_disc expressions
+      when "itemize-circle",
+           "ul-circle",
+           "itemize_circle",
+           "ul_circle"
+        @@commander.itemize_circle expressions
+      when "itemize-square",
+           "ul-square",
+           "itemize_square",
+           "ul_square"
+        @@commander.itemize_square expressions
+      when "itemize-none",
+           "ul-none",
+           "itemize_none",
+           "ul_none"
+        @@commander.itemize_none expressions
+      when "enumerate",
+           "ol"
+        @@commander.enumerate expressions
+      when "enumerate-numeric",
+           "enumerate_numeric",
+           "enumerate-1",
+           "ol-1",
+           "enumerate_1",
+           "ol_1"
+        @@commander.enumerate_numeric expressions
+      when "enumerate-uppercase",
+           "enumerate_uppercase",
+           "enumerate-upcase",
+           "enumerate_upcase",
+           "enumerate-A",
+           "ol-A",
+           "enumerate_A",
+           "ol_A"
+        @@commander.enumerate_uppercase expressions
+      when "enumerate-lowercase",
+           "enumerate_lowercase",
+           "enumerate-downcase",
+           "enumerate_downcase",
+           "enumerate-a",
+           "ol-a",
+           "enumerate_a",
+           "ol_a"
+        @@commander.enumerate_lowercase expressions
+      when "enumerate-roman-uppercase",
+           "enumerate_roman_uppercase",
+           "enumerate-roman-upcase",
+           "enumerate_roman_upcase",
+           "enumerate-I",
+           "ol-I",
+           "enumerate_I",
+           "ol_I"
+        @@commander.enumerate_roman_uppercase expressions
+      when "enumerate-roman-lowercase",
+           "enumerate_roman_lowercase",
+           "enumerate-roman-downcase",
+           "enumerate_roman_downcase",
+           "enumerate-i",
+           "ol-i",
+           "enumerate_i",
+           "ol_i"
+        @@commander.enumerate_roman_lowercase expressions
+      when "item",
+           "li"
+        @@commander.item expressions
+      when "table"
+        @@commander.table expressions
+      when "tr",
+           "table-row",
+           "table_row"
+        @@commander.table_row expressions
+      when "th",
+           "table-header",
+           "table_header"
+        @@commander.table_header expressions
+      when "td",
+           "table-data",
+           "table_data",
+           "table-cell",
+           "table_cell"
+        @@commander.table_data expressions
       when "user",
            "user-id",
            "user_id"

data/lib/teepee/commander.rb

@@ -63,8 +63,14 @@ module Teepee
       end
     end
 
-    def html_tag tag, expressions
-      "<#{tag}>" + expressions.map(&:to_html).join + "</#{tag}>"
+    def html_tag tag, expressions, attribs=nil
+      opening_tag = if attribs
+                      attribs_string = attribs.map {|k,v| %{"#{k}"="#{v}"}}.join " "
+                      "<#{tag} #{attribs_string}>"
+                    else
+                      "<#{tag}>"
+                    end
+      opening_tag + expressions.map(&:to_html).join + "</#{tag}>"
     end
 
     def tb_href target, string
@@ -184,6 +190,30 @@ module Teepee
       Math::E
     end
 
+    def enumerate expressions
+      html_tag :ol, expressions
+    end
+
+    def enumerate_numeric expressions
+      html_tag :ol, expressions, {type: "1"}
+    end
+
+    def enumerate_uppercase expressions
+      html_tag :ol, expressions, {type: "A"}
+    end
+
+    def enumerate_lowercase expressions
+      html_tag :ol, expressions, {type: "a"}
+    end
+
+    def enumerate_roman_uppercase expressions
+      html_tag :ol, expressions, {type: "I"}
+    end
+
+    def enumerate_roman_lowercase expressions
+      html_tag :ol, expressions, {type: "i"}
+    end
+
     def erf number
       ensure_numeric Math.erf number
     end
@@ -204,6 +234,30 @@ module Teepee
       ensure_numeric Math.gamma number
     end
 
+    def h1 expressions
+      html_tag :h1, expressions
+    end
+
+    def h2 expressions
+      html_tag :h2gg, expressions
+    end
+
+    def h3 expressions
+      html_tag :h3, expressions
+    end
+
+    def h4 expressions
+      html_tag :h4, expressions
+    end
+
+    def h5 expressions
+      html_tag :h5, expressions
+    end
+
+    def h6 expressions
+      html_tag :h6, expressions
+    end
+
     def i
       command_error "Complex numbers are not yet supported."
     end
@@ -212,6 +266,30 @@ module Teepee
       html_tag :i, expressions
     end
 
+    def item expressions
+      html_tag :li, expressions
+    end
+
+    def itemize expressions
+      html_tag :ul, expressions
+    end
+
+    def itemize_disc expressions
+      html_tag :ul, expressions, {style: "list-style-type:disc"}
+    end
+
+    def itemize_circle expressions
+      html_tag :ul, expressions, {style: "list-style-type:circle"}
+    end
+
+    def itemize_square expressions
+      html_tag :ul, expressions, {style: "list-style-type:square"}
+    end
+
+    def itemize_none expressions
+      html_tag :ul, expressions, {style: "list-style-type:none"}
+    end
+
     def hypot numbers
       ensure_numeric Math.sqrt numbers.map {|n| n**2}
     end
@@ -293,6 +371,22 @@ module Teepee
       html_tag :sup, expressions
     end
 
+    def table expressions
+      html_tag :table, expressions
+    end
+
+    def table_data expressions
+      html_tag :td, expressions
+    end
+
+    def table_header expressions
+      html_tag :th, expressions
+    end
+
+    def table_row expressions
+      html_tag :tr, expressions
+    end
+
     def tag_id id
       id_command_handler id, :Tag
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teepee
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Christopher Mark Gore