teepee 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5621c224c2cf88afc6e8255db65a795bb67e287a
-  data.tar.gz: 039f0d499d960ea6cc81462b12c66642f548194f
+  metadata.gz: 7ef1d6f0a4ef80b10920bad0277d6f9f10b57795
+  data.tar.gz: 3c9eff8a1f75e84544a6bdca7151985ea669612d
 SHA512:
-  metadata.gz: 404af32e1c4429de14ab3dc5d134ba9e56f29901f2a9c102e8f24dbc7f624ad86b3e43ad1e8066aac7dcf9067d8b1fbc870b8e22f0b3d2784c33f61dde594e4a
-  data.tar.gz: 375810968ff7321f701620e5e9e82a2f90392fd8536ad1e97a5728993958f9ac51d2c9637feb0d35810afdcdd7936f4e3157a52a59c53af648144efb44a9e69a
+  metadata.gz: 5137fa7ef23f957db297abd29072304c7489bb2b0cad438c66aec6d57d869a482ca445e9832e8e13fdbc298bbede55e698f0e1cdc933aa6780c3839e8c8fd0d2
+  data.tar.gz: 5e472f615093a5a354fd14850af44edfedbbfece1d75d6936f68a12c3d2677d81335514fd86504b223ddd938c392fc15318582d8001782d84a39330dcc4a3bf8

data/lib/teepee/command-parser.rb

@@ -372,6 +372,18 @@ module Teepee
         @@commander.boolean_xor expressions
       when "xnor"
         @@commander.boolean_xnor expressions
+      when "<"
+        @@commander.less_than *numbers_from_expressions
+      when "<="
+        @@commander.less_than_or_equal *numbers_from_expressions
+      when ">"
+        @@commander.greater_than *numbers_from_expressions
+      when ">="
+        @@commander.greater_than_or_equal *numbers_from_expressions
+      when "="
+        @@commander.equal *numbers_from_expressions
+      when "!="
+        @@commander.not_equal *numbers_from_expressions
       when "if"
         @@commander.if_operator expressions
       when "do"

data/lib/teepee/commander.rb

@@ -61,6 +61,10 @@ module Teepee
       command_error "The command #{command} is not yet implemented."
     end
 
+    def numeric? *numbers
+      numbers.all? {|number| number.kind_of? Numeric}
+    end
+
     def ensure_numeric number
       if number.kind_of? Complex
         command_error "Complex numbers are not yet supported."
@@ -181,22 +185,18 @@ module Teepee
     end
 
     def % *numbers
-      ensure_numeric numbers
       numbers.inject { |base, percent| base*percent/100.0 }
     end
 
     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
 
@@ -246,10 +246,10 @@ module Teepee
 
     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
+        true_constant
+      elsif false_constant? expressions.first
+        false_constant
+      elsif true_constant? expressions.first or expressions.first.kind_of? WhitespaceToken
         boolean_and expressions[1..-1]
       else
         command_error "Not a boolean value #{expressions.first}"
@@ -265,10 +265,10 @@ module Teepee
     end
 
     def boolean_not expression
-      if expression.to_s == "true"
-        "false"
-      elsif expression.to_s == "false"
-        "true"
+      if true_constant? expression
+        false_constant
+      elsif false_constant? expression
+        true_constant
       else
         command_error "Not a boolean value"
       end
@@ -276,10 +276,10 @@ module Teepee
 
     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
+        false_constant
+      elsif true_constant? expressions.first
+        true_constant
+      elsif false_constant? expressions.first or expressions.first.kind_of? WhitespaceToken
         boolean_or expressions[1..-1]
       else
         command_error "Not a boolean value"
@@ -297,17 +297,17 @@ module Teepee
       # 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"
+        false_constant
       else
         any_trues = false
         expressions.each do |expression|
-          if expression.to_s == "true"
+          if true_constant? expression
             if any_trues
-              return "false"
+              return false_constant
             else
               any_trues = true
             end
-          elsif expression.to_s == "false"
+          elsif false_constant? expression
             # do nothing
           elsif expression.kind_of? WhitespaceToken
             # do nothing
@@ -351,6 +351,16 @@ module Teepee
       Math::E
     end
 
+    def equal *numbers
+      if numbers.empty?
+        true_constant
+      elsif numbers.length == 1
+        true_constant
+      else
+        numbers[0] == numbers[1] and equal *numbers.rest
+      end
+    end
+
     def enumerate expressions
       html_tag :ol, expressions
     end
@@ -399,6 +409,26 @@ module Teepee
       ensure_numeric Math.gamma number
     end
 
+    def greater_than *numbers
+      if numbers.empty?
+        true_constant
+      elsif numbers.length == 1
+        true_constant
+      else
+        numbers[0] > numbers[1] and greater_than *numbers.rest
+      end
+    end
+
+    def greater_than_or_equal *numbers
+      if numbers.empty?
+        true_constant
+      elsif numbers.length == 1
+        true_constant
+      else
+        numbers[0] >= numbers[1] and greater_than_or_equal *numbers.rest
+      end
+    end
+
     def h1 expressions
       html_tag :h1, expressions
     end
@@ -504,6 +534,26 @@ module Teepee
       "["
     end
 
+    def less_than *numbers
+      if numbers.empty?
+        true_constant
+      elsif numbers.length == 1
+        true_constant
+      else
+        numbers[0] < numbers[1] and less_than *numbers.rest
+      end
+    end
+
+    def less_than_or_equal *numbers
+      if numbers.empty?
+        true_constant
+      elsif numbers.length == 1
+        true_constant
+      else
+        numbers[0] <= numbers[1] and less_than_or_equal *numbers.rest
+      end
+    end
+
     def lgamma n
       ensure_numeric Math::lgamma(n).first
     end
@@ -559,6 +609,16 @@ module Teepee
       "&nbsp;" * count
     end
 
+    def not_equal *numbers
+      if numbers.empty?
+        true_constant
+      elsif numbers.length == 1
+        true_constant
+      else
+        numbers[0] != numbers[1] and equal *numbers.rest
+      end
+    end
+
     def note_id id
       id_command_handler id, :Note
     end

metadata

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