eggshell 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d381930fd686eeb75503e121d00b86720a29440
-  data.tar.gz: edd613b6221cf1af94b7253698191181ee3b0ed6
+  metadata.gz: 9169e6a1f27f0985214179e92840cee5f1a265b2
+  data.tar.gz: 0a481dda76b622003c1e3506fc82a9bc05cf6993
 SHA512:
-  metadata.gz: fa442f2e0bb011ff8e70c437b6953f5861a200124509dc82bf77faa1c6c0205bff900cad37cd02569cb1738b99a3875055a7e896c78944b9af4d4fb2018a62c6
-  data.tar.gz: 63d4368671e260d6a9a4a126bd6d32a15aa7e79d678f8fce9799efadbb06fed7af020c56c2fd2e2e67d9f7f21393cc2ebc1b547679c13e3372bfdd6699693e26
+  metadata.gz: 5089ec5885195c71ca2b3806696817dd50d97e5f2abd70ec07468fd23d536d1e9de66ef6c9cb13b9b41469daac8bd4e548973a43cde996f8574e3c27570b5ad5
+  data.tar.gz: 4f0b184e3f38f569dcfec07e9f9979cb7c59e32bc7357804e674e935cfa06237a76a4e926675c5f4a02fcb9bd5561e399c5ba6a2d74e1c7eb3b7eaa38a55e102

data/lib/eggshell.rb

@@ -71,6 +71,7 @@ module Eggshell
 			@blocks = @context.blocks
 			@block_params = @context.block_params
 			@expr_cache = @context.expr_cache
+			@ee = Eggshell::ExpressionEvaluator.new(@vars, @funcs)
 
 			@noop_macro = Eggshell::MacroHandler::Defaults::NoOpHandler.new
 			@noop_block = Eggshell::BlockHandler::Defaults::NoOpHandler.new
@@ -102,13 +103,7 @@ module Eggshell
 		# @param Array func_names If `func_key` only refers to a namespace but the handler
 		# needs to only handle a subset of functions, supply the list of function names here.
 		def register_functions(func_key, handler, func_names = nil)
-			if !func_key.index(':') && func_names.is_a?(Array)
-				func_names.each do |fname|
-					@funcs[func_key+func_name] = handler
-				end
-			else
-				@funcs[func_key] = handler
-			end
+			@ee.register_functions(func_key, handler, func_names)
 		end
 
 		def _error(msg)

data/lib/eggshell/expression-evaluator.rb

@@ -1,23 +1,5 @@
-# Parses and evaluates statements (expressions).
-#
-# pre.
-# # simple expression
-# 1 + 5
-# 1 < (5 + 8) || 3 * 4 > 2
-# 
-# # arrays and maps
-# [1, 2, 3]
-# [1, [2, 3], 4]
-# {'key': 'val', 'another': 'val2', 'num': 8.2}
-# [1, {'key': 'val'}]
-# {'arr': [1, 2, 3]}
-# 
-# # variables set via @var macro
-# var.name + 5
-#
-# # function calls
-# fn1(arg1, "arg2", 3) + fn2({}, [])
-# /pre
+# Parses and evaluates statements (expressions). Can be used statically or
+# as an instance.
 module Eggshell;end
 class Eggshell::ExpressionEvaluator
 	REGEX_EXPR_PLACEHOLDERS = /(\\|\$\[|\$\{|\]|\}|\+|\-|>|<|=|\s+|\(|\)|\*|\/`)/
@@ -98,6 +80,47 @@ class Eggshell::ExpressionEvaluator
 		end
 	end
 	
+	def initialize(vars = nil, funcs = nil)
+		@vars = vars || {}
+		@funcs = funcs || {}
+		@cache = {}
+	end
+	
+	# Registers a function for embedded expressions. Functions are grouped into namespaces,
+	# and a handler can be assigned to handle all function calls within that namespace, or
+	# a specific set of functions within the namespace. The root namespace is a blank string.
+	#
+	# @param String func_key In the form `ns` or `ns:func_name`. For functions in the 
+	# root namespace, do `:func_name`.
+	# @param Object handler
+	# @param Array func_names If `func_key` only refers to a namespace but the handler
+	# needs to only handle a subset of functions, supply the list of function names here.
+	def register_functions(func_key, handler, func_names = nil)
+		if !func_key.index(':') && func_names.is_a?(Array)
+			func_names.each do |fname|
+				@funcs[func_key+func_name] = handler
+			end
+		else
+			@funcs[func_key] = handler
+		end
+	end
+
+	attr_reader :vars, :funcs
+	
+	def parse(statement, cache = true)
+		parsed = @cache[statement]
+		return parsed if cache && parsed
+		
+		parsed = self.class.struct(statement)
+		@cache[statement] = parsed if cache
+		return parsed
+	end
+
+	def evaluate(statement, cache = true)
+		parsed = parse(statement, cache)
+		return self.class.expr_eval(parsed, @vars, @funcs)
+	end
+
 	# Normalizes a term.
 	# @param Object term If `String`, attempts to infer type (either `Fixnum`, `Float`, or `[:var, varname]`)
 	# @param Boolean preserve_str If true and input is string but not number, return string literal.
@@ -859,4 +882,8 @@ class Eggshell::ExpressionEvaluator
 end
 
 $errs_write = 10
-$errs_write_indent = 10
+$errs_write_indent = 10
+
+ee = Eggshell::ExpressionEvaluator.new
+ee.vars['hello'] = 1
+puts ee.evaluate("hello + 1")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eggshell
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Kaiser Shahid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies: []
 description: From fast and basic HTML to complex decouments and more, Eggshell aims
   to provide you with all the document generation power you need through simple markup.