teepee 0.12.11 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecf663db7d98476598a43fc1a2f56555ccdc76ee
-  data.tar.gz: 29fe97871b75e502cb0c01196cdb1f0762efe180
+  metadata.gz: 42fae0e05a81b055eff93f9792ca84f040d9ea1a
+  data.tar.gz: 099f7492b8b97be7aa1c48257f0b646b71923ec1
 SHA512:
-  metadata.gz: 168e130a4d794f1f906e7ad6996b650d4771167748e10f8797bc736d65b383ddac85a6a7c961f40b187abeeb15f98b61d9a9d0d418536f45ebab8fd6bc47eb04
-  data.tar.gz: f2af3dff36c80878129014eee1302592e3714961beaedf415bd570267eb15385c9519b953ff12193f8014069b1234803c4d03af624508b9d5d13502d5027c6af
+  metadata.gz: 3050382db418cdb90fd951a6abfadfe0cca28ea7b5393cc54681d50b2247a69c7002158001ea2efebb08929ce06e455443c79ccf297fb4d95968e04acdd6c4c7
+  data.tar.gz: 918acc5ca1a16a90ce520e0aac23d68ba86043d0cc26ff98e437801811786d3cb45134edda35bec21cf084be6a1c290957b98750bf719eade9697ab0b535ceb8

data/lib/teepee.rb

@@ -43,6 +43,18 @@ require 'monkey-patch'
 
 include ERB::Util
 
+class Float
+  def to_number
+    self
+  end
+end
+
+class Integer
+  def to_number
+    self
+  end
+end
+
 require 'teepee/constants'
 require 'teepee/errors'
 require 'teepee/parser-node'

data/lib/teepee/command-parser.rb

@@ -62,6 +62,10 @@ module Teepee
       %{<span style="color: red">[#{message}]</span>}
     end
 
+    def to_number
+      to_html.to_number
+    end
+
     def to_html
       case command.word
       when "backslash",
@@ -116,7 +120,7 @@ module Teepee
       when "dollar"
         @@commander.dollar
       when "_"
-        @@commander.nbsp optional_number_from_expression
+        @@commander.nbsp optional_first_word_token
       when "space"
         @@commander.space
       when "br", "newline"
@@ -302,67 +306,67 @@ module Teepee
       when "e"
         @@commander.e
       when "+"
-        @@commander.+ *numbers_from_expressions
+        @@commander.+ word_tokens
       when "-"
-        @@commander.- *numbers_from_expressions
+        @@commander.- word_tokens
       when "*"
-        @@commander.* *numbers_from_expressions
+        @@commander.* word_tokens
       when "/",
            "÷"
-        @@commander./ *numbers_from_expressions
+        @@commander./ word_tokens
       when "%"
-        @@commander.% *numbers_from_expressions
+        @@commander.% word_tokens
       when "+%"
-        @@commander.add_percentage *numbers_from_expressions
+        @@commander.add_percentage word_tokens
       when "-%"
-        @@commander.subtract_percentage *numbers_from_expressions
+        @@commander.subtract_percentage word_tokens
       when "%t",
            "%total"
-        @@commander.percent_total *numbers_from_expressions
+        @@commander.percent_total word_tokens
       when "floor"
-        @@commander.floor number_from_expression
+        @@commander.floor first_word_token
       when "ceil",
            "ciel",
            "ceiling"
-        @@commander.ceiling number_from_expression
+        @@commander.ceiling first_word_token
       when "round"
-        @@commander.round *numbers_from_expressions
+        @@commander.round *word_tokens
       when "mod",
            "modulus",
            "modulo"
-        @@commander.mod *numbers_from_expressions
+        @@commander.mod word_tokens
       when "^", "**"
-        @@commander.** *numbers_from_expressions
+        @@commander.** word_tokens
       when "sin", "cos", "tan",
         "asin", "acos", "atan",
         "sinh", "cosh", "tanh",
         "asinh", "acosh", "atanh",
         "erf", "erfc",
         "gamma", "log10", "sqrt"
-        @@commander.send command.word.to_sym, number_from_expression
+        @@commander.send command.word.to_sym, first_word_token
       when "d2r",
            "deg->rad",
            "degrees->radians"
-        @@commander.degrees2radians number_from_expression
+        @@commander.degrees2radians first_word_token
       when "r2d",
            "rad->deg",
            "radians->degrees"
-        @@commander.radians2degrees number_from_expression
+        @@commander.radians2degrees first_word_token
       when "lgamma"
-        @@commander.lgamma number_from_expression
+        @@commander.lgamma first_word_token
       when "ld",
            "log2"
-        @@commander.ld number_from_expression
+        @@commander.ld first_word_token
       when "ln"
-        @@commander.ln number_from_expression
+        @@commander.ln first_word_token
       when "log"
-        base, number = numbers_from_expressions
+        base, number = word_tokens
         @@commander.log base, number
       when "ldexp"
-        fraction, exponent = numbers_from_expressions
+        fraction, exponent = word_tokens
         @@commander.ldexp fraction, exponent
       when "hypot"
-        @@commander.hypot numbers_from_expressions
+        @@commander.hypot word_tokens
       when "true"
         @@commander.true_constant
       when "false"
@@ -382,20 +386,20 @@ module Teepee
       when "xnor"
         @@commander.boolean_xnor expressions
       when "<"
-        @@commander.less_than *numbers_from_expressions
+        @@commander.less_than word_tokens
       when "<=",
            "≤"
-        @@commander.less_than_or_equal *numbers_from_expressions
+        @@commander.less_than_or_equal word_tokens
       when ">"
-        @@commander.greater_than *numbers_from_expressions
+        @@commander.greater_than word_tokens
       when ">=",
            "≥"
-        @@commander.greater_than_or_equal *numbers_from_expressions
+        @@commander.greater_than_or_equal word_tokens
       when "="
-        @@commander.equal *numbers_from_expressions
+        @@commander.equal word_tokens
       when "!=",
            "≠"
-        @@commander.not_equal *numbers_from_expressions
+        @@commander.not_equal word_tokens
       when "if"
         @@commander.if_operator expressions
       when "when"
@@ -416,6 +420,10 @@ module Teepee
         @@commander.cond_operator expressions
       when "case"
         @@commander.case_operator expressions
+      when "get"
+        @@commander.get_operator first_word_token
+      when "set"
+        @@commander.set_operator expressions
       else
         command_error "unknown command #{command.to_html}"
       end
@@ -429,29 +437,16 @@ module Teepee
       %{<a href="#{TB_COM}/#{target}">#{string}</a>}
     end
 
-    def first_word_token
-      expressions.select {|expr| expr.is_a? WordToken}.first
-    end
-
-    def numbers_from_expressions
-      expressions
-        .map do |number|
-          begin
-            Float(number.to_html)
-          rescue ArgumentError
-            nil
-          end
-        end.reject &:nil?
+    def word_tokens
+      expressions.reject {|expr| expr.is_a? WhitespaceToken}
     end
 
-    def number_from_expression
-      numbers_from_expressions.first
+    def first_word_token
+      word_tokens.first
     end
 
-    def optional_number_from_expression
-      if not expressions.empty?
-        number_from_expression
-      end
+    def optional_first_word_token
+      first_word_token if not expressions.empty?
     end
 
     class << self

data/lib/teepee/commander.rb

@@ -37,6 +37,10 @@
 
 module Teepee
   class Commander
+    def initialize
+      @variables = Hash.new
+    end
+
     def valid_uri? uri
       (!! (u = URI.parse(uri))) and not u.scheme.nil?
     rescue URI::InvalidURIError
@@ -148,13 +152,26 @@ module Teepee
       expression.is_a? PipeToken
     end
 
+    def number_from_word word
+      begin
+        word.to_number
+      rescue ArgumentError, NoMethodError
+        nil
+      end
+    end
+
+    def to_numbers words
+      words.map {|word| number_from_word word}.reject &:nil?
+    end
+
     #----------------------------------------------------------------------------
 
-    def + *numbers
-      ensure_numeric numbers.inject 0, :+
+    def + numbers
+      ensure_numeric to_numbers(numbers).inject 0, :+
     end
 
-    def - *numbers
+    def - numbers
+      numbers = to_numbers numbers
       if numbers.length == 1
         ensure_numeric -numbers.first
       else
@@ -162,11 +179,12 @@ module Teepee
       end
     end
 
-    def * *numbers
-      ensure_numeric numbers.inject 1, :*
+    def * numbers
+      ensure_numeric to_numbers(numbers).inject 1, :*
     end
 
-    def / *numbers
+    def / numbers
+      numbers = to_numbers numbers
       if numbers.length == 1
         ensure_numeric 1 / numbers.first
       else
@@ -174,48 +192,48 @@ module Teepee
       end
     end
 
-    def ** *numbers
-      ensure_numeric numbers.reduce :**
+    def ** numbers
+      ensure_numeric to_numbers(numbers).reduce :**
     end
 
-    def % *numbers
-      numbers.inject { |base, percent| base*percent/100.0 }
+    def % numbers
+      to_numbers(numbers).inject { |base, percent| base*percent/100.0 }
     end
 
-    def add_percentage *numbers
-      numbers.inject {|base, percent| base * (1+percent/100.0) }
+    def add_percentage numbers
+      to_numbers(numbers).inject {|base, percent| base * (1+percent/100.0) }
     end
 
-    def subtract_percentage *numbers
-      numbers.inject {|base, percent| base * (1-percent/100.0) }
+    def subtract_percentage numbers
+      to_numbers(numbers).inject {|base, percent| base * (1-percent/100.0) }
     end
 
-    def percent_total *numbers
-      numbers.inject {|total, part| Float(part)/Float(total)*100.0 }
+    def percent_total numbers
+      to_numbers(numbers).inject {|total, part| Float(part)/Float(total)*100.0 }
     end
 
-    def acos number
-      ensure_numeric Math.acos number
+    def acos angle
+      ensure_numeric Math.acos angle.to_number
     end
 
-    def acosh number
-      ensure_numeric Math.acosh number
+    def acosh angle
+      ensure_numeric Math.acosh angle.to_number
     end
 
-    def asin number
-      ensure_numeric Math.asin number
+    def asin angle
+      ensure_numeric Math.asin angle.to_number
     end
 
-    def asinh number
-      ensure_numeric Math.asinh number
+    def asinh angle
+      ensure_numeric Math.asinh angle.to_number
     end
 
-    def atan number
-      ensure_numeric Math.atan number
+    def atan angle
+      ensure_numeric Math.atan angle.to_number
     end
 
-    def atanh number
-      ensure_numeric Math.atanh number
+    def atanh angle
+      ensure_numeric Math.atanh angle.to_number
     end
 
     def b expressions
@@ -238,72 +256,72 @@ module Teepee
       id_command_handler id, :Folder, "folder", "folders", "folders/bookmarks_inline", "bookmarks"
     end
 
-    def boolean_and expressions
-      if expressions.empty?
+    def boolean_and booleans
+      if booleans.empty?
         true_constant
-      elsif false_constant? expressions.first
+      elsif false_constant? booleans.first
         false_constant
-      elsif true_constant? expressions.first or expressions.first.kind_of? WhitespaceToken
-        boolean_and expressions[1..-1]
+      elsif true_constant? booleans.first or booleans.first.kind_of? WhitespaceToken
+        boolean_and booleans[1..-1]
       else
-        command_error "Not a boolean value #{expressions.first}"
+        command_error "Not a boolean value #{booleans.first}"
       end
     end
 
-    def boolean_nand expressions
-      boolean_not boolean_and expressions
+    def boolean_nand booleans
+      boolean_not boolean_and booleans
     end
 
-    def boolean_nor expressions
-      boolean_not boolean_or expressions
+    def boolean_nor booleans
+      boolean_not boolean_or booleans
     end
 
-    def boolean_not expression
-      if true_constant? expression
+    def boolean_not boolean
+      if true_constant? boolean
         false_constant
-      elsif false_constant? expression
+      elsif false_constant? boolean
         true_constant
       else
         command_error "Not a boolean value"
       end
     end
 
-    def boolean_or expressions
-      if expressions.empty?
+    def boolean_or booleans
+      if booleans.empty?
         false_constant
-      elsif true_constant? expressions.first
+      elsif true_constant? booleans.first
         true_constant
-      elsif false_constant? expressions.first or expressions.first.kind_of? WhitespaceToken
-        boolean_or expressions[1..-1]
+      elsif false_constant? booleans.first or booleans.first.kind_of? WhitespaceToken
+        boolean_or booleans[1..-1]
       else
         command_error "Not a boolean value"
       end
     end
 
-    def boolean_xnor expressions
-      boolean_not boolean_xor expressions
+    def boolean_xnor booleans
+      boolean_not boolean_xor booleans
     end
 
-    def boolean_xor expressions
+    def boolean_xor booleans
       # 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?
+      if booleans.empty?
         false_constant
       else
         any_trues = false
-        expressions.each do |expression|
-          if true_constant? expression
+        booleans.each do |boolean|
+          if true_constant? boolean
             if any_trues
               return false_constant
             else
               any_trues = true
             end
-          elsif false_constant? expression
+          elsif false_constant? boolean
             # do nothing
-          elsif expression.kind_of? WhitespaceToken
+          elsif boolean.kind_of? WhitespaceToken
             # do nothing
           else
             return command_error "Not a boolean value"
@@ -322,7 +340,7 @@ module Teepee
       if value and not rest.empty?
         def cond_helper value, expressions
           test_value, _, form, *rest = strip expressions
-          if equal value, test_value
+          if equal [value, test_value]
             form
           elsif not rest.empty?
             cond_helper value, rest
@@ -333,7 +351,7 @@ module Teepee
     end
 
     def ceiling number
-      ensure_numeric number.ceil
+      ensure_numeric number.to_number.ceil
     end
 
     def comment expressions
@@ -350,15 +368,15 @@ module Teepee
     end
 
     def cos angle
-      ensure_numeric Math.cos angle
+      ensure_numeric Math.cos angle.to_number
     end
 
-    def cosh number
-      ensure_numeric Math.cosh number
+    def cosh angle
+      ensure_numeric Math.cosh angle.to_number
     end
 
     def degrees2radians degrees
-      ensure_numeric degrees * Math::PI / 180.0
+      ensure_numeric degrees.to_number * Math::PI / 180.0
     end
 
     def del expressions
@@ -373,13 +391,13 @@ module Teepee
       Math::E
     end
 
-    def equal *expressions
+    def equal expressions
       if expressions.empty?
         true_constant
       elsif expressions.length == 1
         true_constant
       else
-        expressions[0].to_s == expressions[1].to_s and equal *expressions.rest
+        expressions[0].to_s == expressions[1].to_s and equal expressions.rest
       end
     end
 
@@ -408,11 +426,11 @@ module Teepee
     end
 
     def erf number
-      ensure_numeric Math.erf number
+      ensure_numeric Math.erf number.to_number
     end
 
     def erfc number
-      ensure_numeric Math.erfc number
+      ensure_numeric Math.erfc number.to_number
     end
 
     def false_constant
@@ -420,7 +438,7 @@ module Teepee
     end
 
     def floor number
-      ensure_numeric number.floor
+      ensure_numeric number.to_number.floor
     end
 
     def folder_id id
@@ -432,26 +450,30 @@ module Teepee
     end
 
     def gamma number
-      ensure_numeric Math.gamma number
+      ensure_numeric Math.gamma number.to_number
+    end
+
+    def get_operator variable
+      @variables[variable.to_s]
     end
 
-    def greater_than *numbers
+    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
+        numbers[0].to_number > numbers[1].to_number and greater_than numbers.rest
       end
     end
 
-    def greater_than_or_equal *numbers
+    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
+        numbers[0].to_number >= numbers[1].to_number and greater_than_or_equal numbers.rest
       end
     end
 
@@ -537,19 +559,19 @@ module Teepee
     end
 
     def hypot numbers
-      ensure_numeric Math.sqrt numbers.map {|n| n**2}
+      ensure_numeric Math.sqrt to_numbers(numbers).map {|n| n**2}
     end
 
     def keyword_id id
       id_command_handler id, :Keyword
     end
 
-    def ld n
-      ensure_numeric Math.log2 n
+    def ld number
+      ensure_numeric Math.log2 number.to_number
     end
 
     def ldexp fraction, exponent
-      ensure_numeric Math.ldexp fraction, exponent
+      ensure_numeric Math.ldexp fraction.to_number, exponent.to_number
     end
 
     def left_brace
@@ -560,28 +582,28 @@ module Teepee
       "["
     end
 
-    def less_than *numbers
+    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
+        numbers[0].to_number < numbers[1].to_number and less_than numbers.rest
       end
     end
 
-    def less_than_or_equal *numbers
+    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
+        numbers[0].to_number <= numbers[1].to_number and less_than_or_equal numbers.rest
       end
     end
 
-    def lgamma n
-      ensure_numeric Math::lgamma(n).first
+    def lgamma number
+      ensure_numeric Math::lgamma(number.to_number).first
     end
 
     def link expressions
@@ -601,20 +623,20 @@ module Teepee
     end
 
     def ln number
-      ensure_numeric Math.log number
+      ensure_numeric Math.log number.to_number
     end
 
     def log base, number
       if number.nil?
         number, base = base, number
-        ensure_numeric Math.log10 number # default to log base 10
+        ensure_numeric Math.log10 number.to_number # default to log base 10
       else
-        ensure_numeric Math.log number, base
+        ensure_numeric Math.log number.to_number, base.to_number
       end
     end
 
     def log10 number
-      ensure_numeric Math.log10 number
+      ensure_numeric Math.log10 number.to_number
     end
 
     def mailto email_address
@@ -626,22 +648,25 @@ module Teepee
       end
     end
 
-    def mod *numbers
-      ensure_numeric numbers.reduce :%
+    def mod numbers
+      ensure_numeric to_numbers(numbers).reduce :%
     end
 
     def nbsp count
-      count = 1 unless count and count.kind_of? Numeric and count > 0
-      "&nbsp;" * count
+      if count and count.to_number and count.to_number > 0
+        "&nbsp;" * count.to_number
+      else
+        "&nbsp;"
+      end
     end
 
-    def not_equal *numbers
+    def not_equal numbers
       if numbers.empty?
         true_constant
       elsif numbers.length == 1
         true_constant
       else
-        numbers[0] != numbers[1] and equal *numbers.rest
+        numbers[0].to_number != numbers[1].to_number and equal numbers.rest
       end
     end
 
@@ -658,15 +683,15 @@ module Teepee
     end
 
     def prog1_operator expressions
-      expressions.first
+      expressions.map(&:to_html).first
     end
 
     def progn_operator expressions
-      expressions.last
+      expressions.map(&:to_html).last
     end
 
     def radians2degrees radians
-      ensure_numeric(radians * 180.0 / Math::PI)
+      ensure_numeric(radians.to_number * 180.0 / Math::PI)
     end
 
     def right_brace
@@ -678,19 +703,24 @@ module Teepee
     end
 
     def round number, precision = nil, *_
-      if precision.nil?
-        ensure_numeric number.round
+      if precision.nil? or precision.to_number.nil?
+        ensure_numeric number.to_number.round
       else
-        ensure_numeric number.round precision
+        ensure_numeric number.to_number.round precision.to_number
       end
     end
 
+    def set_operator expressions
+      variable, _, value = expressions
+      @variables[variable.to_s] = value
+    end
+
     def sin angle
-      ensure_numeric Math.sin angle
+      ensure_numeric Math.sin angle.to_number
     end
 
-    def sinh number
-      ensure_numeric Math.sinh number
+    def sinh angle
+      ensure_numeric Math.sinh angle.to_number
     end
 
     def small expressions
@@ -702,7 +732,7 @@ module Teepee
     end
 
     def sqrt number
-      ensure_numeric Math.sqrt number
+      ensure_numeric Math.sqrt number.to_number
     end
 
     def space
@@ -742,11 +772,11 @@ module Teepee
     end
 
     def tan angle
-      ensure_numeric Math.tan angle
+      ensure_numeric Math.tan angle.to_number
     end
 
-    def tanh number
-      ensure_numeric Math.tanh number
+    def tanh angle
+      ensure_numeric Math.tanh angle.to_number
     end
 
     def true_constant

data/lib/teepee/parser-node.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.
 #
@@ -37,5 +37,8 @@
 
 module Teepee
   class ParserNode
+    def to_html
+      "" # You probably want to override this.
+    end
   end
 end

data/lib/teepee/string-token.rb

@@ -61,6 +61,10 @@ module Teepee
       @text
     end
 
+    def to_number
+      Float(to_html)
+    end
+
     class << self
       def full_match_regex
         self::FULL_MATCH_REGEX # Define this in a child class.

metadata

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