teepee 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2091fbdcf89abb71108a72003d0e556cc0ae859c
-  data.tar.gz: 851d783a735722e9cf6eac53f62803ae677ec0a7
+  metadata.gz: 4cf1667f856da637023b09ff20bea473e2a7afb5
+  data.tar.gz: 71a0186abc1b1adf0addcd8e56fdef6a88455b67
 SHA512:
-  metadata.gz: e733f41d8acc60cb5a1481701314e44bd2a1dc9c978e4649228dd0bbe49aa1d7df8266ed04a4f4b1baa879581ff658fbfee2cc42113eaef29c188c16506c80ae
-  data.tar.gz: 118aa06480c8c2a6d4c7b0d27fda745fc9cc290ab1b76533c6502be1f29be5663d85f9de2c37598bb733c7dcfc253287ddefe94ba48256475180024b2e5beff7
+  metadata.gz: d1947fa3ce5f652143f62689cd98c2c552af27d3539f4dc8dba878f26c81e6e0dfdef030c7b66ed04e495b20fb4864d6a47c50b63f9394b2832bb2aadc1cf363
+  data.tar.gz: 0fb35c12ad54e037c4e4605cf190ebd1c59aeed99332ecfbc5ba1fc8a9c1efe4eccca0aedeb4ce0c51cf835309a01338093d14dc9ab0cc46fb7ba038fdf8787b

data/lib/teepee/command-parser.rb

@@ -46,9 +46,11 @@ require 'teepee/actionable-commander'
 
 module Teepee
   class CommandParser < ParserNode
+    attr_accessor :parser
     attr_reader :command, :expressions
 
-    def initialize(command, expressions)
+    def initialize(parser, command, expressions)
+      @parser = parser
       raise ArgumentError if not command.is_a? WordToken
       @command = command
       raise ArgumentError if not expressions.is_a? Array
@@ -67,7 +69,8 @@ module Teepee
     end
 
     def to_html
-      if @@commander.variables.include? command.word
+      @@commander.parser = @parser
+      if @parser.variables.include? command.word
         @@commander.get_operator command.word
       else
         builtins
@@ -472,7 +475,8 @@ module Teepee
       @@action_view = nil
       @@controller = nil
 
-      def parse(tokens)
+      def parse(parser, tokens)
+        @parser = parser
         expressions = []
         rest = tokens
         backslash, command, left_brace = rest.shift(3)
@@ -481,23 +485,23 @@ module Teepee
         raise ParseError if not command.is_a? WordToken
         if not left_brace.is_a? LeftBraceToken # A command with no interior.
           rest.unshift left_brace if not left_brace.is_a? WhitespaceToken
-          return [CommandParser.new(command, []), rest]
+          return [CommandParser.new(parser, command, []), rest]
         end
         while rest.length > 0
           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)
+            result, rest = CommandParser.parse(parser, rest)
             expressions << result
           elsif rest.first.is_a? RightBraceToken
             right_brace = rest.shift
-            return [CommandParser.new(command, expressions), rest]
+            return [CommandParser.new(parser, command, expressions), rest]
           else
             raise ParseError
           end
         end
         if right_brace.nil? # Allow a forgotten final right brace.
-          return [CommandParser.new(command, expressions), rest]
+          return [CommandParser.new(parser, command, expressions), rest]
         end
       end
 

data/lib/teepee/commander.rb

@@ -37,11 +37,10 @@
 
 module Teepee
   class Commander
-    attr_reader :variables
+    attr_accessor :parser
 
     def initialize params
       # We don't use the params in the base class, but might in derived classes.
-      @variables = Hash.new
     end
 
     def valid_uri? uri
@@ -380,12 +379,12 @@ module Teepee
 
     def define expressions
       variable, _, value = expressions
-      @variables[variable.to_html] = value
+      @parser.variables[variable.to_html] = value
       value.to_html
     end
 
     def defined? variables
-      if Set.new(variables.map(&:to_html)).subset? Set.new(@variables.keys)
+      if Set.new(variables.map(&:to_html)).subset? Set.new(@parser.variables.keys)
         true_constant
       else
         false_constant
@@ -475,7 +474,7 @@ module Teepee
     end
 
     def get_operator variable
-      @variables[variable.to_html].to_html
+      @parser.variables[variable.to_html].to_html
     end
 
     def greater_than numbers
@@ -814,7 +813,7 @@ module Teepee
 
     def undefine expressions
       expressions.each do |expression|
-        @variables.delete expression.to_html
+        @parser.variables.delete expression.to_html
       end
       ""
     end

data/lib/teepee/paragraph-parser.rb

@@ -49,7 +49,8 @@ module Teepee
   class ParagraphParser < ParserNode
     attr_reader :expressions, :tokens
 
-    def initialize(tokens)
+    def initialize(parser, tokens)
+      @parser = parser
       raise ArgumentError if not tokens.is_a? Array
       tokens.each {|token| raise ArgumentError if not token.kind_of? ParserNode}
       @tokens = tokens
@@ -65,7 +66,7 @@ module Teepee
         elsif rest.first.is_a? WhitespaceToken
           @expressions << rest.shift
         elsif rest.first.is_a? BackslashToken
-          command, rest = CommandParser.parse(rest)
+          command, rest = CommandParser.parse(@parser, rest)
           @expressions << command
         else
           return self

data/lib/teepee/parser.rb

@@ -53,6 +53,7 @@ require 'teepee/paragraph-parser'
 
 module Teepee
   class Parser < ParserNode
+    attr_accessor :variables
     attr_reader :paragraphs, :split_tokens, :text, :tokenizer
 
     def tokens
@@ -60,6 +61,7 @@ module Teepee
     end
 
     def initialize(text)
+      @variables = Hash.new
       @text = text
       @tokenizer = Tokenizer.new text
       parse
@@ -67,7 +69,7 @@ module Teepee
 
     def parse
       @split_tokens = tokens.split {|token| token.class == EmptyNewlinesToken}
-      @paragraphs = @split_tokens.map {|split_tokens| ParagraphParser.new split_tokens}
+      @paragraphs = @split_tokens.map {|split_tokens| ParagraphParser.new(self, split_tokens)}
     end
 
     def to_html

metadata

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