eggshell 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2753240c406b052a69a3c8858a54de232db6d0
-  data.tar.gz: a9dc32169269a7098689daab365f566a514c8596
+  metadata.gz: e8f0c6e2c0d46c6a179f5ec5b92860f89191cb49
+  data.tar.gz: 6a2796788c613161da16ea59f2fbee7e3287e116
 SHA512:
-  metadata.gz: 26ea82772d6c94e1ac78040338f6bbad8e9f2afe5be53506deb0cdc8a7bc106dd76e73ccf2373840c3f811c407458135fe5eb7691c204790c1ed254172c014f0
-  data.tar.gz: 676b738ace9f4ccc2358034a13b55110a6a101bc86731c6f082f867b25c9fc592996f35b116aa56e2d0b81bfcd068e73402bdaff21c780832dbf1bf4a6e081c7
+  metadata.gz: 0c0c82ea72213e521a12dba7aa595f3ccedb7dee48141df53c30ffae2fb49de2afc5eba567a1fb608fbdd844316aacb03c547145aa3d1d5082343d27541a11de
+  data.tar.gz: 36468590248a2d9c2d4638915166e56985d59ba989c00f3934dd88089705a6f85a7b80d6af39fd1f5f92df340f69b17e6d2906bf3449951d5288d0aba2e588c0

data/bin/eggshell

@@ -59,5 +59,6 @@ end
 # @todo parse any additional opts via command line or local project?
 
 $eggshell._info("PROCESSING #{f}")
-output = $eggshell.process(IO.readlines(f))
+# @todo check opts for encoding, default to utf-8
+output = $eggshell.process(IO.readlines(f, {:encoding => 'utf-8'}))
 puts output

data/lib/eggshell.rb

@@ -29,6 +29,10 @@ module Eggshell
 			Line.new(line, @tab_str, @indent_lvl, @line_num, raw)
 		end
 		
+		def match(regex)
+			@line.match(regex)
+		end
+		
 		attr_reader :line, :tab_str, :indent_lvl, :line_num
 	end
 
@@ -57,6 +61,8 @@ module Eggshell
 end
 
 require_relative './eggshell/expression-evaluator.rb'
+require_relative './eggshell/expression-evaluator/lexer.rb'
+require_relative './eggshell/stream.rb'
 require_relative './eggshell/format-handler.rb'
 require_relative './eggshell/block-handler.rb'
 require_relative './eggshell/macro-handler.rb'

data/lib/eggshell/block-handler.rb

@@ -187,6 +187,26 @@ module Eggshell::BlockHandler
 			end
 			buff.join()
 		end
+		
+		# Given an attribute string in the form `key1="value" key2="value"` and a map containing
+		# new attribute keys, either append to attribute string or inject values into an existing
+		# attribute.
+		# @param String attribs
+		# @param Hash map
+		# @param Boolean escape If true (default), calls {@see html_escape()} on each value.
+		def inject_attribs(attribs, map = {}, escape = true)
+			map.each do |key, val|
+				key = key.to_s if key.is_a?(Symbol)
+				olen = attribs.length
+				match = attribs.match(/#{key}=(['"])([^'"]*)(['"])/)
+				if !match
+					attribs += " #{key}='#{escape ? html_escape(val) : val}'"
+				else
+					attribs = attribs.gsub(match[0], "#{key}='#{match[2]} #{escape ? html_escape(val) : val}'")
+				end
+			end
+			attribs
+		end
 
 		def css_string(map)
 			css = []

data/lib/eggshell/bundles/basic-functions.rb

@@ -0,0 +1,31 @@
+# Standard functions to perform basic operations for common objects.
+module Eggshell::Bundles::BasicFunctions
+	def self.length(obj)
+		if obj.respond_to?(:length)
+			obj.length
+		else
+			nil
+		end
+	end
+
+	def self.str_match(haystack, needle)
+	end
+
+	def self.str_split(str, delim, limit = nil)
+	end
+
+	def self.arr_push(arr, *items)
+	end
+	
+	def self.arr_pop(arr)
+	end
+	
+	def self.arr_delete(arr, index)
+	end
+
+	def self.map_push(map, key, val)
+	end
+
+	def self.map_delete(map, key)
+	end
+end

data/lib/eggshell/bundles/basics.rb

@@ -13,11 +13,13 @@ module Eggshell::Bundles::Basic
 		
 		CoreMacros.new.set_processor(proc, opts)
 		ControlLoopMacros.new.set_processor(proc, opts)
+		DataLoaderMacro.new.set_processor(proc, opts)
 		
 		BasicFormatHandlers.new.set_processor(proc, opts)
 
 		#proc.register_functions('', StdFunctions::FUNC_NAMES)
-		proc.register_functions('sprintf', Kernel)
+		proc.register_functions(Kernel, 'sprintf')
+		proc.register_functions(Eggshell::Bundles::BasicFunctions, 'length,str_match,str_split,arr_push,arr_pop,arr_delete,map_put,map_delete')
 	end
 
 	class TextBlocks
@@ -106,6 +108,7 @@ module Eggshell::Bundles::Basic
 			if type == 'html_pass' || type == 'html_block'
 				out << @eggshell.expand_expr(lines.join("\n"))
 			else
+				# @todo if pre starts with blank line, remove it
 				tagname = type == 'bq' ? 'blockquote' : type
 				args = [] if !args
 				bp = get_block_params(type, args[0])
@@ -163,7 +166,7 @@ module Eggshell::Bundles::Basic
 
 		def can_handle(line)
 			if !@block_type
-				if line.match(/^(table[(.]?|\||\|>|\/)/) || line.match(SPECIAL_DEF)
+				if line.match(/^(table[(.]?|\||\|>|\/|!@)/) || line.match(SPECIAL_DEF)
 					@block_type = 'table'
 					return BH::COLLECT
 				end
@@ -172,7 +175,7 @@ module Eggshell::Bundles::Basic
 		end
 
 		def continue_with(line)
-			if line.match(/^(\||\|>|\/)/) || line.match(SPECIAL_DEF)
+			if line.match(/^(\||\|>|\/|!@)/) || line.match(SPECIAL_DEF)
 				return BH::COLLECT
 			end
 			return BH::RETRY
@@ -212,13 +215,16 @@ module Eggshell::Bundles::Basic
 						caption[:attributes] = parse_args(atts, true)[0]
 					else
 						atts = parse_args(atts, true)[0]
-						puts atts.inspect
 						colgroup << create_tag('col', attrib_string(atts), false)
 					end
 				elsif line[0] == '/' && rc == 0
 					cols = line[1..line.length].split('|')
 					out << "<thead><tr class='#{bp['head.class']}'>"
 					cols.each do |col|
+						col = col.strip
+						if col == '' && bp['emptycell']
+							col = bp['emptycell']
+						end
 						out << "\t#{fmt_cell(col, true, ccount)}"
 						ccount += 1
 					end
@@ -229,14 +235,29 @@ module Eggshell::Bundles::Basic
 					cols = line[1..line.length].split('|')
 					out << "<tfoot><tr class='#{bp['foot.class']}'>"
 					cols.each do |col|
+						col = col.strip
+						if col == '' && bp['emptycell']
+							col = bp['emptycell']
+						end
 						out << "\t#{fmt_cell(col, true, ccount)}"
 						ccount += 1
 					end
 					out << '</tr></tfoot>'
 					break
-				elsif line[0] == DELIM1 || line[0..1] == DELIM2
+				elsif line[0] == DELIM1 || line[0..1] == DELIM2 || line[0..1] == CELL_ATTR_START
 					out << '<tbody>' if rc == 0
 					idx = 1
+					rattribs = ''
+					
+					if line[0..1] == CELL_ATTR_START
+						# @todo look for delim instead of '@!'?
+						rt = line.index(CELL_ATTR_END)
+						if rt
+							rattribs = line[2...rt]
+							line = line[rt+CELL_ATTR_END.length..line.length]
+						end
+					end
+
 					sep = /(?<!\\)\|/
 					if line[1] == '>'
 						idx = 2
@@ -245,8 +266,14 @@ module Eggshell::Bundles::Basic
 					cols = line[idx..line.length].split(sep)
 					@eggshell.vars[T_ROW] = rc
 					rclass = row_classes[rc % row_classes.length]
-					out << "<tr class='tr-row-#{rc} #{rclass}'>"
+					rattribs = inject_attribs(rattribs, {:class=>"tr-row-#{rc} #{rclass}"})
+
+					out << "<tr #{rattribs}>"
 					cols.each do |col|
+						col = col.strip
+						if col == '' && bp['emptycell']
+							col = bp['emptycell']
+						end
 						out << "\t#{fmt_cell(col, false, ccount)}"
 						ccount += 1
 					end
@@ -291,13 +318,7 @@ module Eggshell::Bundles::Basic
 			end
 
 			# inject column position via class
-			olen = attribs.length
-			match = attribs.match(/class=(['"])([^'"]*)(['"])/)
-			if !match
-				attribs += " class='td-col-#{colnum}'"
-			else
-				attribs = attribs.gsub(match[0], "class='#{match[2]} td-col-#{colnum}'")
-			end
+			attribs = inject_attribs(attribs, {:class=>"td-col-#{colnum}"})
 
 			buff << "<#{tag} #{attribs}>"
 			cclass = 
@@ -361,12 +382,12 @@ module Eggshell::Bundles::Basic
 				last = nil
 				first_type = nil
 
-				if lines[0] && !lines[0].line.match(/[-#]/)
+				if lines[0] && !lines[0].match(/[-#]/)
 					line = lines.shift
 				end
 
 				lines.each do |line_obj|
-					line = line_obj.line
+					line = line_obj.is_a?(Eggshell::Line) ? line_obj.line : line_obj
 					indent = line_obj.indent_lvl
 					ltype = line[0] == '-' ? 'ul' : 'ol'
 					line = line[1..line.length].strip
@@ -626,7 +647,7 @@ module Eggshell::Bundles::Basic
 			opts = {} if !opts
 			@opts = opts
 			@eggshell = proc
-			@eggshell.add_macro_handler(self, '=', '!', 'process', 'capture', 'raw', 'pipe')
+			@eggshell.add_macro_handler(self, '=', 'var', '!', 'process', 'capture', 'raw', 'pipe')
 			@eggshell.add_macro_handler(self, 'include') if !@opts['macro.include.off']
 			@vars = @eggshell.vars
 
@@ -643,7 +664,7 @@ module Eggshell::Bundles::Basic
 		end
 
 		def process(name, args, lines, out, call_depth = 0)
-			if name == '='
+			if name == '=' || name == 'var'
 				# @todo expand args[0]?
 				if args[0]
 					val = nil
@@ -702,21 +723,8 @@ module Eggshell::Bundles::Basic
 			paths.each do |inc|
 				inc = inc.line if inc.is_a?(Eggshell::Line)
 				inc = @eggshell.expand_expr(inc.strip)
-				checks = []
-				if inc[0] != '/'
-					@vars[:include_paths].each do |root|
-						checks << "#{root}/#{inc}"
-					end
-					# @todo if :include_root, expand path and check that it's under the root, otherwise, sandbox
-				else
-					# sandboxed root include
-					if @eggshell.vars[:include_root]
-						checks << "#{@vars[:include_root]}#{inc}"
-					else
-						checks << inc
-					end
-				end
-				checks.each do |inc|
+
+				CoreMacros.make_include_paths(inc, @vars).each do |inc|
 					if File.exists?(inc)
 						lines = IO.readlines(inc, $/, opts)
 						@vars[:include_stack] << inc
@@ -735,6 +743,26 @@ module Eggshell::Bundles::Basic
 				end
 			end
 		end
+		
+		def self.make_include_paths(inc, opts)
+			checks = []
+			if inc[0] != '/'
+				if opts[:include_paths]
+					opts[:include_paths].each do |root|
+						checks << "#{root}/#{inc}"
+					end
+					# @todo if :include_root, expand path and check that it's under the root, otherwise, sandbox
+				end
+			else
+				# sandboxed root include
+				if opts[:include_root]
+					checks << "#{opts[:include_root]}#{inc}"
+				else
+					checks << inc
+				end
+			end
+			checks
+		end
 	end
 	
 	# Provides iteration and conditional functionality.
@@ -782,6 +810,18 @@ module Eggshell::Bundles::Basic
 			@state = []
 			# @todo set loop limits from opts or defaults
 		end
+		
+		def chain_type(name)
+			if name == 'if'
+				return [MH::CHAIN_START, name]
+			elsif name == 'elsif'
+				return [MH::CHAIN_CONTINUE, 'if']
+			elsif name == 'else'
+				return [MH::CHAIN_END, 'if']
+			end
+			
+			[MH::CHAIN_NONE, nil]
+		end
 
 		def process(name, args, lines, out, call_depth = 0)
 			macname = name.to_sym
@@ -816,6 +856,10 @@ module Eggshell::Bundles::Basic
 					st[:counter] = p0['counter'] || 'counter'
 
 					if st[:iter].is_a?(Array)
+						if st[:iter][0].is_a?(Symbol)
+							st[:iter] = @eggshell.expr_eval(st[:iter])
+						end
+
 						st[:start] = 0 if !st[:start]
 						st[:stop] = st[:iter].length - 1 if !st[:stop]
 						st[:step] = 1 if !st[:step]
@@ -840,12 +884,13 @@ module Eggshell::Bundles::Basic
 							@eggshell.vars[st[:counter]] = i1
 							val = i2
 						else
-							val = i1
+							val = st[:iter][i1]
 							@eggshell.vars[st[:counter]] = counter
 						end
 
 						# inject value into :item -- if it's an expression, evaluate first
-						@eggshell.vars[st[:item]] = val.is_a?(Array) && val[0].is_a?(Symbol) ? @eggshell.expr_eval(val) : val
+						iter_item = val.is_a?(Array) && val[0].is_a?(Symbol) ? @eggshell.expr_eval(val) : val
+						@eggshell.vars[st[:item]] = iter_item
 
 						# if doing raw, pass through block lines with variable expansion. preserve object type (e.g. Line or String);
 						# sub-macros will get passed collector var as output to assemble().
@@ -900,7 +945,7 @@ module Eggshell::Bundles::Basic
 				end
 
 				last_action = st[:last_action]
-				st[:last_action] = macname.to_sym
+				st[:last_action] = macname
 
 				# @todo more checks (e.g. no elsif after else, no multiple else, etc.)
 				if !st[:if] || (macname != :else && !cond)
@@ -910,8 +955,9 @@ module Eggshell::Bundles::Basic
 
 				if macname != :else
 					if !st[:cond_eval]
-						cond_struct = Eggshell::ExpressionEvaluator.struct(cond)
-						st[:cond_eval] = @eggshell.expr_eval(cond_struct)
+						#cond_struct = Eggshell::ExpressionEvaluator.struct(cond)
+						st[:cond_eval] = @eggshell.expr_eval(cond)
+						#puts "#{cond.inspect} => #{st[:cond_eval]}"
 					end
 				else
 					st[:cond_eval] = true
@@ -939,7 +985,7 @@ module Eggshell::Bundles::Basic
 				end
 			elsif macname == :next
 				lvl = p0 || 1
-				i = depth - 1
+				i = call_depth - 1
 
 				# set breaks at each found loop until # of levels reached
 				while i >= 0
@@ -956,5 +1002,112 @@ module Eggshell::Bundles::Basic
 		end
 	end
 	
+	# Allows you to parse and load various data formats into a variable. Data loaders
+	# are registered through class methods.
+	#
+	# Usage:
+	#
+	# pre.
+	# @dataload('json', 'varname') {/
+	# {"jsonkey": value}
+	# /}
+	# \
+	# @dataload('yaml', 'varname', 'include_file')
+	#
+	# If a file is specified for inclusion, it will be restricted to any path constraints
+	# defined by the `@include` macro.
+	class DataLoaderMacro
+		include MH
+		
+		module Loader
+			def parse(content)
+			end
+			
+			def parse_io(io)
+				parse(io.read)
+			end
+		end
+		
+		class JsonLoader
+			include Loader
+			
+			def parse(content)
+				JSON.load(content.is_a?(Array) ? content.join(' ') : content)
+			end
+		end
+		
+		class YamlLoader
+			include Loader
+			
+			def parse(content)
+				YAML.load(content.is_a?(Array) ? content.join("\n") : content)
+			end
+		end
+
+		@@handlers = {}
+
+		# Adds a data loading handler. If it's a class, should accept a null constructor.
+		def self.add_loader(type, handler)
+			@@handlers[type] = handler
+		end
+		
+		def set_processor(proc, opts = nil)
+			opts = {} if !opts
+			@opts = opts
+			@eggshell = proc
+			@eggshell.add_macro_handler(self, 'dataload')
+			@vars = @eggshell.vars
+
+			@handlers = {}
+			@@handlers.each do |type, handler|
+				if handler.is_a?(Class)
+					@handlers[type] = handler.new
+				else
+					@handlers[type] = handler
+				end
+			end
+		end
+		
+		def collection_type(macro)
+			MH::COLLECT_RAW_MACRO
+		end
+		
+		def process(name, args, lines, out, call_depth = 0)
+			type = args[0]
+			varname = args[1]
+			src = args[2]
+			if !varname
+				@eggshell._warn("@dataload: no varname specified for #{type}")
+				return
+			end
+
+			handler = @handlers[type]
+			if !handler
+				@eggshell._warn("@dataload: no handler specified for #{type}")
+				return
+			end
+
+			# @todo support external protocols (e.g. http)?
+			if src
+				paths = CoreMacros.make_include_paths(src, @eggshell.vars)
+				paths.each do |path|
+					if File.exists?(path)
+						@eggshell.vars[varname] = handler.parse_io(File.new(path))
+						break
+					end
+				end
+			else
+				raw = lines.join("\n")
+				@eggshell.vars[varname] = handler.parse(raw)
+			end
+		end
+	end
+	
 	include Eggshell::Bundles::Bundle
-end
+end
+
+require 'json'
+require_relative './basic-functions.rb'
+
+Eggshell::Bundles::Basic::DataLoaderMacro.add_loader('json', Eggshell::Bundles::Basic::DataLoaderMacro::JsonLoader.new)
+Eggshell::Bundles::Basic::DataLoaderMacro.add_loader('yaml', Eggshell::Bundles::Basic::DataLoaderMacro::YamlLoader.new)