teepee 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e4c9f9bfdf81a27259d00bfc83506d5296d091
-  data.tar.gz: ca33965c5c377195817a023ab06a86ba385f071a
+  metadata.gz: 6c45396e7f2b0a6b960ef62bff80936d88406519
+  data.tar.gz: fbb58e98d5718551c823017d6343230999a09312
 SHA512:
-  metadata.gz: abd50f42a45619391afa669e159abcbca1c4764950cd610e0aa473cae5c92e9b74b85593af3def0439d470b2ae621c74a9b2945de7480ce4332c9cce1b22ab4d
-  data.tar.gz: 2bb367a3e121cf795af6f830d7f836a21f87a15cb5664a5a9883e3ab22cfffa67b50757ab8932ab724b5682ab700a95762fb86a8b8cee62eee47af5f2c24b0c5
+  metadata.gz: f87f75931f26ddc9704a44f5498fe103fd6e228dd7e1af8e2e8f2aab84c77d1d1233b45822f1a434750ce0fd4dc7a7eb0b3f603884142d297b648b441cd3b7da
+  data.tar.gz: cf674f0a047d5bbcd517ebf4a76881887cfd95d6fd92fed816ba04256c64094846f4101275e39e52cb5433f4ee3d06eaaf95623646f40978ef94e72b66fda058

data/lib/teepee/command-parser.rb

@@ -64,7 +64,9 @@ module Teepee
 
     def to_html
       case command.word
-      when "backslash", "bslash"
+      when "backslash",
+           "bslash",
+           "-/"
         @@commander.backslash
       when "left-brace",
            "left_brace",
@@ -73,7 +75,8 @@ module Teepee
            "opening-brace",
            "opening_brace",
            "openingbrace",
-           "obrace"
+           "obrace",
+           "-["
         @@commander.left_brace
       when "right-brace",
            "right_brace",
@@ -82,10 +85,11 @@ module Teepee
            "closing-brace",
            "closing_brace",
            "closingbrace",
-           "cbrace"
+           "cbrace",
+           "]-"
         @@commander.right_brace
       when "_"
-        @@commander.nbsp
+        @@commander.nbsp optional_number_from_expression
       when "space"
         @@commander.space
       when "br", "newline"
@@ -331,6 +335,14 @@ module Teepee
         @@commander.boolean_and expressions
       when "or"
         @@commander.boolean_or expressions
+      when "nand"
+        @@commander.boolean_nand expressions
+      when "nor"
+        @@commander.boolean_nor expressions
+      when "xor"
+        @@commander.boolean_xor expressions
+      when "xnor"
+        @@commander.boolean_xnor expressions
       else
         command_error "unknown command #{command.to_html}"
       end
@@ -363,6 +375,12 @@ module Teepee
       numbers_from_expressions.first
     end
 
+    def optional_number_from_expression
+      if not expressions.empty?
+        number_from_expression
+      end
+    end
+
     class << self
       @@commander = Commander.new
       @@action_view = nil

data/lib/teepee/commander.rb

@@ -240,6 +240,14 @@ module Teepee
       end
     end
 
+    def boolean_nand expressions
+      boolean_not boolean_and expressions
+    end
+
+    def boolean_nor expressions
+      boolean_not boolean_or expressions
+    end
+
     def boolean_not expression
       if expression.to_s == "true"
         "false"
@@ -262,6 +270,39 @@ module Teepee
       end
     end
 
+    def boolean_xnor expressions
+      boolean_not boolean_xor expressions
+    end
+
+    def boolean_xor expressions
+      # There are two schools of thought as to what a multi-variable XOR is.
+      # 1. Chained XORs, giving a parity check.
+      # 2. 'Exclusively' one true for ALL inputs.
+      # I'm going with the second: one and only one true, the rest false.
+      # It seems therefore that the zero-argument version should be false then.
+      if expressions.empty?
+        "false"
+      else
+        any_trues = false
+        expressions.each do |expression|
+          if expression.to_s == "true"
+            if any_trues
+              return "false"
+            else
+              any_trues = true
+            end
+          elsif expression.to_s == "false"
+            # do nothing
+          elsif expression.kind_of? WhitespaceToken
+            # do nothing
+          else
+            return command_error "Not a boolean value"
+          end
+        end
+        return any_trues.to_s
+      end
+    end
+
     def br
       html_tag :br, nil
     end
@@ -466,8 +507,9 @@ module Teepee
       ensure_numeric numbers.reduce :%
     end
 
-    def nbsp
-      " "
+    def nbsp count
+      count = 1 unless count and count.kind_of? Numeric and count > 0
+      " " * count
     end
 
     def note_id id

metadata

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