eggshell 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22652cd993fb6ac6e6a33dc3c4c7e353b641855d
-  data.tar.gz: ff2e26329bf1d0bd98276fc3b452869cda808f3f
+  metadata.gz: fd2753240c406b052a69a3c8858a54de232db6d0
+  data.tar.gz: a9dc32169269a7098689daab365f566a514c8596
 SHA512:
-  metadata.gz: 9251fa6119cf73a511769635c727637c45eac801d275b7e762f9efa230cf581b34280ba258bc04e2595bf8305b84d50102af7fc321fbb203c6725da0f2b2639c
-  data.tar.gz: 808fb0b9fb4c8c0d1682b07e28ee8f06a62d7c5a680ee74a33904840c2741235c691bcc1630c8aef7230a30be89baa8a686d11efdfbcac9f377e332584ce8515
+  metadata.gz: 26ea82772d6c94e1ac78040338f6bbad8e9f2afe5be53506deb0cdc8a7bc106dd76e73ccf2373840c3f811c407458135fe5eb7691c204790c1ed254172c014f0
+  data.tar.gz: 676b738ace9f4ccc2358034a13b55110a6a101bc86731c6f082f867b25c9fc592996f35b116aa56e2d0b81bfcd068e73402bdaff21c780832dbf1bf4a6e081c7

data/lib/eggshell/block-handler.rb

@@ -83,6 +83,12 @@ module Eggshell::BlockHandler
 			RETRY
 		end
 	end
+	
+	# Useful for pipeline chains in the form `block-macro*-block`. This checks if
+	# the current block handler/type is equivalent to the block that's being pipelined.
+	def equal?(handler, type)
+		false
+	end
 
 	module Defaults
 		class NoOpHandler

data/lib/eggshell/bundles/basics.rb

@@ -269,7 +269,7 @@ module Eggshell::Bundles::Basic
 			if colgroup.length > 0
 				out[1].gsub!('%colgroup%', "<colgroup>\n\t#{colgroup.join("\n\t")}\n</colgroup>")
 			else
-				out[1].gsub("%colgroup%\n", '')
+				out[1].gsub!('%colgroup%', '')
 			end
 			
 			o_out << out.join("\n")
@@ -406,6 +406,10 @@ module Eggshell::Bundles::Basic
 				out << @eggshell.expand_all(order_stack.join("\n"))
 			end
 		end
+		
+		def equal?(handler, type)
+			self.class == handler.class && (type == 'ol' || type == 'ul')
+		end
 	end
 
 	class SectionBlocks
@@ -588,7 +592,7 @@ module Eggshell::Bundles::Basic
 				link, alt = args
 				link = '' if !link
 				alt = '' if !alt
-				
+
 				atts[akey]['src'] = link if link != ''
 				atts[akey]['alt'] = alt if alt != ''
 				tagname = 'img'
@@ -597,11 +601,7 @@ module Eggshell::Bundles::Basic
 				tagname = TAG_MAP[tag]
 			end
 
-			if tagopen
-				return "#{create_tag(tagname, atts)}#{text}</#{tagname}>"
-			else
-				return create_tag(tagname, atts, false)
-			end
+			return create_tag(tagname, atts, tagopen, text)
 		end
 	end
 

data/lib/eggshell/format-handler.rb

@@ -36,7 +36,7 @@ module Eggshell::FormatHandler
 			return [] if !arg_str || arg_str == ''
 			raw_args = arg_str.split(/(?<!\\)\|/)
 			args = []
-			args << raw_args.shift.split(/ ; /) if !no_direct
+			args += raw_args.shift.split(/ ; /) if !no_direct
 			map = {}
 			raw_args.each do |rarg|
 				k, v = rarg.split('=', 2)

data/lib/eggshell/processor.rb

@@ -428,9 +428,11 @@ module Eggshell
 				if unit.is_a?(String)
 					out << unit
 					last_line += 1
+					last_type = nil
 				elsif unit.is_a?(Eggshell::Line)
 					out << unit.to_s
 					last_line = unit.line_nameum
+					last_type = nil
 				elsif unit.is_a?(Array)
 					handler = unit[0] == :block ? @blocks_map[unit[1]] : @macros[unit[1]]
 					name = unit[1]
@@ -457,8 +459,7 @@ module Eggshell
 							# two cases:
 							# 1. this block is immediately tied to block-macro chain and is continuation of same type of block
 							# 2. part of block-macro chain but not same type, or immediately follows another block
-
-							if last_type == :macro && (lines_end - last_line == 1) && _name == name
+							if last_type == :macro && (lines_start - last_line <= 1) && _handler.equal?(handler, name)
 								lines.each do |line|
 									_lines << line
 								end
@@ -507,6 +508,7 @@ module Eggshell
 				elsif unit
 					_warn "not sure how to handle #{unit.class}"
 					_debug unit.inspect
+					last_type = nil
 				end
 			end
 
@@ -577,7 +579,8 @@ module Eggshell
 					quote = nil if tok == quote
 					buff[-1] += tok
 				elsif tok == '"' || tok == "'"
-					quote = tok if opened[-1]
+					# only open quote if there's whitespace or blank string preceeding it
+					quote = tok if opened[-1] && (!buff[-1] || buff[-1] == '' || buff[-1].match(/\s$/))
 					buff[-1] += tok
 				elsif @fmt_handlers[tok] && (!non_nesting[-1] || non_nesting.index(tok))
 					handler, closer, non_nest = @fmt_handlers[tok]
@@ -603,6 +606,7 @@ module Eggshell
 				bstr = buff.pop
 				buff[-1] += op + bstr
 				_warn "expand_formatting: unclosed #{op}, not doing anything: #{bstr}"
+				#_warn toks.inspect
 			end
 
 			buff.join('')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eggshell
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kaiser Shahid