teepee 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de392b0bbaf4c52d34a7549e43cb3c2fe62f8039
-  data.tar.gz: 403695f81168571cec10f8be68722542ee9192d2
+  metadata.gz: 80d3b41e120755474c7f5f07bb933f931ea346f5
+  data.tar.gz: 4509080cb66640a3ca8da2520f500a316bdc2e4b
 SHA512:
-  metadata.gz: 7b4d7176aec8026f58ed5be0703827fbe30c6197f0d7eb90a65709ade6043c80e2b46a1a01245be1ccf548bb97026aeaa03e939a73d8fc1991c97981caa50bca
-  data.tar.gz: f7b25f39125f07e409aaa3fa50c781be8abc515ea322a6959cca830bf170f313fbd58b4911792079718de7423ff99806ec78c9c58538435bbfaaf090df7f7e37
+  metadata.gz: 12212ac9b8c23ee02a13861614b4fc51e8eb0c083b9380af8a01a590826381a40353decc127212b6d61a3b38d555c491ba4c881d932d101044572afe40a0a24b
+  data.tar.gz: d62c4c44f2b2b097b326578818088811c560382f5824acd9b9fd29e1ac7085306b025d45eac7af101009a244d946f35dede5e19ae02ef8f5213c73552bf7816c

data/lib/teepee/command-parser.rb

@@ -396,6 +396,8 @@ module Teepee
         @@commander.unless_operator expressions
       when "do"
         @@commander.do_operator expressions
+      when "cond"
+        @@commander.cond_operator expressions
       else
         command_error "unknown command #{command.to_html}"
       end
@@ -451,9 +453,7 @@ module Teepee
           return [CommandParser.new(command, []), rest]
         end
         while rest.length > 0
-          if rest.first.is_a? WordToken
-            expressions << rest.shift
-          elsif rest.first.is_a? WhitespaceToken
+          if rest.first.is_a? WordToken or rest.first.is_a? WhitespaceToken or rest.first.is_a? PipeToken
             expressions << rest.shift
           elsif rest.first.is_a? BackslashToken
             result, rest = CommandParser.parse(rest)

data/lib/teepee/commander.rb

@@ -144,6 +144,10 @@ module Teepee
       expression.to_s == "false"
     end
 
+    def pipe? expression
+      expression.is_a? PipeToken
+    end
+
     #----------------------------------------------------------------------------
 
     def + *numbers
@@ -313,6 +317,15 @@ module Teepee
       html_tag :br, nil
     end
 
+    def cond_operator expressions
+      conditional, _, form, *rest = strip expressions
+      if true_constant? conditional
+        form
+      elsif not rest.empty?
+        cond_operator rest
+      end
+    end
+
     def cos angle
       ensure_numeric Math.cos angle
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teepee
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Christopher Mark Gore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport