teepee 0.7.16 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa225694c765a835dbef542d87979689945f8463
-  data.tar.gz: c978538afe91da61ef07b46ac465cd9f625058bb
+  metadata.gz: 73e4c9f9bfdf81a27259d00bfc83506d5296d091
+  data.tar.gz: ca33965c5c377195817a023ab06a86ba385f071a
 SHA512:
-  metadata.gz: e35a6b75e3fa7f7d740e222f7f7bafc522b367f4f106d287c1d817b6314d55dc95d9de0b91fffac8a8cfdd7828abca9e6573567cc4a0c9f38d264ce8d52b830d
-  data.tar.gz: a4231720f0a1c40ce65d8dc1defb05b44b960e498ec9c23a3fd6c913827d27af4959de63c8dab0ab5693603b03a7626350d61f089bbe364cf710e2d3b5640fb9
+  metadata.gz: abd50f42a45619391afa669e159abcbca1c4764950cd610e0aa473cae5c92e9b74b85593af3def0439d470b2ae621c74a9b2945de7480ce4332c9cce1b22ab4d
+  data.tar.gz: 2bb367a3e121cf795af6f830d7f836a21f87a15cb5664a5a9883e3ab22cfffa67b50757ab8932ab724b5682ab700a95762fb86a8b8cee62eee47af5f2c24b0c5

data/lib/teepee/command-parser.rb

@@ -278,6 +278,17 @@ module Teepee
         @@commander./ *numbers_from_expressions
       when "%"
         @@commander.% *numbers_from_expressions
+      when "+%"
+        @@commander.add_percentage *numbers_from_expressions
+      when "-%"
+        @@commander.subtract_percentage *numbers_from_expressions
+      when "%t",
+           "%total"
+        @@commander.percent_total *numbers_from_expressions
+      when "mod",
+           "modulus",
+           "modulo"
+        @@commander.mod *numbers_from_expressions
       when "^", "**"
         @@commander.** *numbers_from_expressions
       when "sin", "cos", "tan",
@@ -310,6 +321,16 @@ module Teepee
         @@commander.ldexp fraction, exponent
       when "hypot"
         @@commander.hypot numbers_from_expressions
+      when "true"
+        @@commander.true_constant
+      when "false"
+        @@commander.false_constant
+      when "not"
+        @@commander.boolean_not first_word_token
+      when "and"
+        @@commander.boolean_and expressions
+      when "or"
+        @@commander.boolean_or expressions
       else
         command_error "unknown command #{command.to_html}"
       end

data/lib/teepee/commander.rb

@@ -71,6 +71,14 @@ module Teepee
       end
     end
 
+    def ensure_boolean boolean
+      if boolean.to_s == "true" or boolean.to_s == "false"
+        boolean
+      else
+        command_error "Non-boolean value."
+      end
+    end
+
     def html_tag tag, expressions, attribs=nil
       opening_tag = if attribs
                       attribs_string = attribs.map {|k,v| %{#{k}="#{v}"}}.join " "
@@ -89,7 +97,7 @@ module Teepee
       if expressions.nil?
         opening_tag
       else
-        opening_tag + expressions.map(&:to_html).join + "</#{tag}>"
+        opening_tag + expressions.map(&:to_html).join.strip + "</#{tag}>"
       end
     end
 
@@ -108,10 +116,28 @@ module Teepee
       elsif not id.to_s =~ /\A[0-9]+\z/
         command_error "#{singular}_id: error: invalid #{singular} ID specified"
       else
-        tb_href "/#{plural}/#{id.to_s}/#{view}", "#{klass.to_s} ##{id.to_s}"
+        tb_href "#{plural}/#{id.to_s}/#{view}", "#{klass.to_s} ##{id.to_s}"
       end
     end
 
+    def left_strip expressions
+      while expressions.first.kind_of? WhitespaceToken
+        expressions.shift
+      end
+      expressions
+    end
+
+    def right_strip expressions
+      while expressions.last.kind_of? WhitespaceToken
+        expressions.pop
+      end
+      expressions
+    end
+
+    def strip expressions
+      left_strip right_strip expressions
+    end
+
     #----------------------------------------------------------------------------
 
     def + *numbers
@@ -138,12 +164,28 @@ module Teepee
       end
     end
 
+    def ** *numbers
+      ensure_numeric numbers.reduce :**
+    end
+
     def % *numbers
-      ensure_numeric numbers.reduce :%
+      ensure_numeric numbers
+      numbers.inject { |base, percent| base*percent/100.0 }
     end
 
-    def ** *numbers
-      ensure_numeric numbers.reduce :**
+    def add_percentage *numbers
+      ensure_numeric numbers
+      numbers.inject {|base, percent| base * (1+percent/100.0) }
+    end
+
+    def subtract_percentage *numbers
+      ensure_numeric numbers
+      numbers.inject {|base, percent| base * (1-percent/100.0) }
+    end
+
+    def percent_total *numbers
+      ensure_numeric numbers
+      numbers.inject {|total, part| Float(part)/Float(total)*100.0 }
     end
 
     def acos number
@@ -186,6 +228,40 @@ module Teepee
       id_command_handler id, :Folder, "folder", "folders", "folders/bookmarks_inline", "bookmarks"
     end
 
+    def boolean_and expressions
+      if expressions.empty?
+        "true"
+      elsif expressions.first.to_s == "false"
+        "false"
+      elsif expressions.first.to_s == "true" or expressions.first.kind_of? WhitespaceToken
+        boolean_and expressions[1..-1]
+      else
+        command_error "Not a boolean value #{expressions.first}"
+      end
+    end
+
+    def boolean_not expression
+      if expression.to_s == "true"
+        "false"
+      elsif expression.to_s == "false"
+        "true"
+      else
+        command_error "Not a boolean value"
+      end
+    end
+
+    def boolean_or expressions
+      if expressions.empty?
+        "false"
+      elsif expressions.first.to_s == "true"
+        "true"
+      elsif expressions.first.to_s == "false" or expressions.first.kind_of? WhitespaceToken
+        boolean_or expressions[1..-1]
+      else
+        command_error "Not a boolean value"
+      end
+    end
+
     def br
       html_tag :br, nil
     end
@@ -242,6 +318,10 @@ module Teepee
       ensure_numeric Math.erfc number
     end
 
+    def false_constant
+      "false"
+    end
+
     def folder_id id
       id_command_handler id, :Folder
     end
@@ -259,7 +339,7 @@ module Teepee
     end
 
     def h2 expressions
-      html_tag :h2gg, expressions
+      html_tag :h2, expressions
     end
 
     def h3 expressions
@@ -283,6 +363,7 @@ module Teepee
     end
 
     def image expressions
+      expressions = strip expressions
       uri, *alt_text = expressions
       uri = ERB::Util.html_escape uri.to_s
       if not valid_uri? uri
@@ -291,7 +372,7 @@ module Teepee
         if alt_text.empty?
           html_tag :img, nil, {src: uri}
         else
-          html_tag :img, nil, {src: uri, alt: alt_text}
+          html_tag :img, nil, {src: uri, alt: alt_text.map(&:to_s).join.strip}
         end
       end
     end
@@ -349,6 +430,7 @@ module Teepee
     end
 
     def link expressions
+      expressions = strip expressions
       uri, *desc = expressions
       uri = ERB::Util.html_escape uri.to_s
       if not valid_uri? uri
@@ -380,6 +462,10 @@ module Teepee
       ensure_numeric Math.log10 number
     end
 
+    def mod *numbers
+      ensure_numeric numbers.reduce :%
+    end
+
     def nbsp
       "&nbsp;"
     end
@@ -456,6 +542,10 @@ module Teepee
       ensure_numeric Math.tanh number
     end
 
+    def true_constant
+      "true"
+    end
+
     def tt expressions
       html_tag :tt, expressions
     end

metadata

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