inversion 0.1.1 → 0.2.0

data/lib/inversion/template.rb

@@ -27,11 +27,13 @@ class Inversion::Template
 
 
 	# Load subordinate classes
-	require 'inversion/template/parser'
+	require 'inversion/parser'
 	require 'inversion/template/node'
 	require 'inversion/template/tag'
 	require 'inversion/renderstate'
 
+	# Alias to maintain backward compatibility with <0.2.0 code
+	Parser = Inversion::Parser
 
 	# Valid actions for 'on_render_error'
 	VALID_ERROR_ACTIONS = [
@@ -116,7 +118,7 @@ class Inversion::Template
 		end
 
 		@source       = source
-		@parser       = Inversion::Template::Parser.new( self, opts )
+		@parser       = Inversion::Parser.new( self, opts )
 		@node_tree    = [] # Parser expects this to always be an Array
 		@init_options = opts
 		@options      = nil
@@ -176,7 +178,7 @@ class Inversion::Template
 		# Pre-render hook
 		self.walk_tree {|node| node.before_rendering(state) }
 
-		self.log.debug "  rendering node tree: %p" % [ @node_tree ]
+		# self.log.debug "  rendering node tree: %p" % [ @node_tree ]
 		self.walk_tree {|node| state << node }
 
 		# Post-render hook

data/lib/inversion/template/attrtag.rb

@@ -77,12 +77,26 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 	attr_accessor :methodchain
 
 
-	### Render the tag attributes of the specified +render_state+ and return them.
-	def render( render_state )
-		self.log.debug "Rendering %p with state: %p" % [ self, render_state ]
+	### Render the tag attributes of the specified +renderstate+ and return them.
+	def render( renderstate )
+		self.log.debug "Rendering %p with state: %p" % [ self, renderstate ]
 
+		# Evaluate the tag body and return either false value
+		value = self.evaluate( renderstate ) or return value
+
+		# Apply the format if there is one
+		if self.format
+			return self.format % value
+		else
+			return value
+		end
+	end
+
+
+	### Evaluate the body of the tag in the context of +renderstate+ and return the results.
+	def evaluate( renderstate )
 		value     = nil
-		attribute = render_state.attributes[ self.name.to_sym ]
+		attribute = renderstate.attributes[ self.name.to_sym ]
 		self.log.debug "  initial attribute: %p" % [ attribute ]
 
 		# Evaluate the method chain (if there is one) against the attribute
@@ -95,14 +109,7 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 		end
 		self.log.debug "  evaluated value: %p" % [ value ]
 
-		return value unless value
-
-		# Apply the format if there is one
-		if self.format
-			return self.format % value
-		else
-			return value
-		end
+		return value
 	end
 
 

data/lib/inversion/template/begintag.rb

@@ -4,7 +4,6 @@
 require 'inversion/mixins'
 require 'inversion/template/attrtag'
 require 'inversion/template/containertag'
-require 'inversion/template/conditionaltag'
 require 'inversion/template/rescuetag'
 
 
@@ -85,7 +84,7 @@ class Inversion::Template::BeginTag < Inversion::Template::Tag
 		state.with_destination( output ) do
 			state.with_error_handler( errhandler ) do
 				catch( :stop_rendering ) do
-					self.render_subnodes( state )
+					super
 				end
 				self.log.debug "  leaving the error-handler block"
 			end

data/lib/inversion/template/configtag.rb

@@ -51,10 +51,16 @@ class Inversion::Template::ConfigTag < Inversion::Template::Tag
 
 
 	### Override the options in the +parsestate+ when the config is appended to
-	### tree.
+	### the tree.
 	def before_appending( parsestate )
 		parsestate.options.merge!( self.options )
 	end
 
+
+	### Override the options in the +renderstate+ when the config is rendered.
+	def before_rendering( renderstate )
+		renderstate.options.merge!( self.options )
+	end
+
 end # class Inversion::Template::ConfigTag
 

data/lib/inversion/template/containertag.rb

@@ -33,11 +33,16 @@ module Inversion::Template::ContainerTag
 	alias_method :container?, :is_container?
 
 
+	### Default render method for containertags; rendering each of its subnodes and 
+	### don't render anything for the container itself.
+	def render( renderstate )
+		self.render_subnodes( renderstate )
+	end
+
+
 	### Append the container's subnodes to the +renderstate+.
 	def render_subnodes( renderstate )
-		self.subnodes.each do |node|
-			renderstate << node
-		end
+		self.subnodes.each {|node| renderstate << node }
 	end
 
 end # module Inversion::Template::ContainerTag

data/lib/inversion/template/elsetag.rb

@@ -58,5 +58,21 @@ class Inversion::Template::ElseTag < Inversion::Template::Tag
 		raise Inversion::ParseError, "orphaned '%s' tag" % [ self.tagname.downcase ] unless condtag
 	end
 
+
+	### Toggle rendering for the iftag's container if rendering hasn't yet been
+	### toggled.
+	def render( renderstate )
+		if renderstate.tag_data[ :rendering_was_enabled ]
+			self.log.debug "  rendering was previously enabled: disabling"
+			renderstate.disable_rendering
+		else
+			self.log.debug "  rendering was previously disabled: enabling"
+			renderstate.tag_data[ :rendering_was_enabled ] = true
+			renderstate.enable_rendering
+		end
+
+		return nil
+	end
+
 end # class Inversion::Template::ElseTag
 

data/lib/inversion/template/elsiftag.rb

@@ -45,5 +45,21 @@ class Inversion::Template::ElsifTag < Inversion::Template::AttrTag
 		end
 	end
 
+
+	### Toggle rendering for the iftag's container if rendering hasn't yet been
+	### toggled.
+	def render( renderstate )
+		if renderstate.tag_data[ :rendering_was_enabled ]
+			self.log.debug "Rendering was previously enabled; disabling"
+			renderstate.disable_rendering
+		elsif self.evaluate( renderstate )
+			self.log.debug "Rendering was previously disabled, and condition is true; enabling"
+			renderstate.tag_data[ :rendering_was_enabled ] = true
+			renderstate.enable_rendering
+		end
+
+		return nil
+	end
+
 end # class Inversion::Template::ElsifTag
 

data/lib/inversion/template/escapetag.rb

@@ -19,7 +19,7 @@ class Inversion::Template::EscapeTag < Inversion::Template::AttrTag
 	### Render the method chains against the attributes of the specified +render_state+
 	### and return them.
 	def render( render_state )
-		result = self.escape( super, render_state )
+		return self.escape( super, render_state )
 	end
 
 end # class Inversion::Template::EscapeTag

data/lib/inversion/template/fortag.rb

@@ -82,7 +82,6 @@ class Inversion::Template::ForTag < Inversion::Template::CodeTag
 	### Iterate over the enumerator in +state+ and render the tag's
 	### contents for each iteration.
 	def render( state )
-		result = []
 		lvalue = state.eval( self.enumerator ) or return nil
 
 		self.log.debug "Rendering %p via block args: %p" % [ lvalue, self.block_args ]
@@ -95,13 +94,11 @@ class Inversion::Template::ForTag < Inversion::Template::CodeTag
 			# Overlay the block args from the 'for' over the template attributes and render 
 			# each subnode
 			state.with_attributes( overrides ) do
-				self.subnodes.each do |node|
-					result << node.render( state )
-				end
+				super
 			end
 		end
 
-		return result.join
+		return nil
 	end
 
 

data/lib/inversion/template/iftag.rb

@@ -4,7 +4,6 @@
 require 'inversion/mixins'
 require 'inversion/template/attrtag'
 require 'inversion/template/containertag'
-require 'inversion/template/conditionaltag'
 require 'inversion/template/elsiftag'
 require 'inversion/template/elsetag'
 
@@ -20,50 +19,33 @@ require 'inversion/template/elsetag'
 #
 class Inversion::Template::IfTag < Inversion::Template::AttrTag
 	include Inversion::Loggable,
-	        Inversion::Template::ContainerTag,
-	        Inversion::Template::ConditionalTag
+	        Inversion::Template::ContainerTag
 
 	# Inherits AttrTag's tag patterns
 
 	### Render the tag's contents if the condition is true, or any else or elsif sections
 	### if the condition isn't true.
 	def render( state )
-		self.enable_rendering if super
-		self.render_subnodes( state )
-		return nil
-	end
-
-
-	### Render the tag's subnodes according to the tag's logical state.
-	def render_subnodes( renderstate )
-		self.log.debug "Rendering subnodes. Rendering initially %s" %
-			[ self.rendering_enabled? ? "enabled" : "disabled" ]
-
-		# walk the subtree, modifying the logic flags for else and elsif tags,
-		# and rendering nodes if rendering is enabled
-		self.subnodes.each do |node|
-			case node
-			when Inversion::Template::ElsifTag
-				self.log.debug "  logic switch: %p..." % [ node ]
-				if !self.rendering_was_enabled? && node.render( renderstate )
-					self.enable_rendering
-				else
-					self.disable_rendering
-				end
 
-			when Inversion::Template::ElseTag
-				self.log.debug "  logic switch: %p..." % [ node ]
-				if !self.rendering_was_enabled?
-					self.enable_rendering
-				else
-					self.disable_rendering
-				end
+		# Start out with rendering enabled if the tag body evaluates trueishly
+		if self.evaluate( state )
+			self.log.debug "Initial state was TRUE; enabling rendering"
+			state.enable_rendering
+		else
+			self.log.debug "Initial state was FALSE; disabling rendering"
+			state.disable_rendering
+		end
 
-			else
-				renderstate << node if self.rendering_enabled?
-			end
+		# Set the tag state to track whether or not rendering has been enabled during the
+		# 'if' for an 'else' or 'elsif' tag.
+		state.with_tag_data( :rendering_was_enabled => state.rendering_enabled? ) do
+			super
 		end
+
+		state.enable_rendering
+		return nil
 	end
 
+
 end # class Inversion::Template::IfTag
 

data/lib/inversion/template/importtag.rb

@@ -34,7 +34,8 @@ class Inversion::Template::ImportTag < Inversion::Template::Tag
 	### Merge the inherited renderstate into the current template's +renderstate+.
 	def render( renderstate )
 		if (( cstate = renderstate.containerstate ))
-			self.log.debug "Importing inherited attributes: %p from %p" % [ @attributes, cstate.attributes ]
+			self.log.debug "Importing inherited attributes: %p from %p" %
+				[ @attributes, cstate.attributes ]
 
 			# Pick out the attributes that are being imported
 			inherited_attrs = @attributes.inject( {} ) do |attrs, key|

data/lib/inversion/template/includetag.rb

@@ -43,6 +43,8 @@ class Inversion::Template::IncludeTag < Inversion::Template::Tag
 	end
 
 
+	### Parser callback -- append the nodes from the included template onto the
+	### tree of the including template.
 	def after_appending( parsestate )
 		parsestate.append_tree( @included_template.node_tree )
 	end

data/lib/inversion/template/node.rb

@@ -5,7 +5,7 @@ require 'inversion/mixins'
 require 'inversion/template' unless defined?( Inversion::Template )
 
 # Inversion template node base class. Template text is parsed by the
-# Inversion::Template::Parser into nodes, and appended to a tree
+# Inversion::Parser into nodes, and appended to a tree
 # that is later walked when the template is rendered.
 # 
 # This class is abstract; it just defines the API that other nodes

data/lib/inversion/template/tag.rb

@@ -41,6 +41,7 @@ class Inversion::Template::Tag < Inversion::Template::Node
 	def self::inherited( subclass )
 		# Inversion.log.debug "%p inherited from %p" % [ subclass, self ]
 		Inversion::Template::Tag.derivatives << subclass 
+		Inversion.log.debug "Loaded tag type %p" % [ subclass ]
 		super
 	end
 
@@ -58,8 +59,8 @@ class Inversion::Template::Tag < Inversion::Template::Node
 
 		Gem.find_files( TAG_PLUGIN_PATTERN ).each do |tagfile|
 			tagname = tagfile[ %r{/(\w+)tag\.rb$}, 1 ].untaint
+			next unless tagname
 
-			Inversion.log.debug "Loading tag type %p from %p" % [ tagname, tagfile ]
 			self.load( tagfile )
 
 			# Inversion.log.debug "Looking for class for %p tag" % [ tagname ]
@@ -93,7 +94,9 @@ class Inversion::Template::Tag < Inversion::Template::Node
 
 	### Safely load the specified +tagfile+.
 	def self::load( tagfile )
-		require( tagfile )
+		tagrequire = tagfile[ %r{inversion/template/\w+tag} ] or
+			raise "tag file %p doesn't look like a tag plugin" % [ tagfile ]
+		require( tagrequire )
 	rescue => err
 		Inversion.log.error "%s while loading tag plugin %p: %s" %
 			[ err.class.name, tagfile, err.message ]

data/lib/inversion/template/textnode.rb

@@ -3,8 +3,7 @@
 
 require 'inversion/template/node'
 
-# Inversion text node class -- static content in templates between tags are contained
-# in a text node.
+# Inversion text node class -- container for static content in templates between tags.
 class Inversion::Template::TextNode < Inversion::Template::Node
 	include Inversion::Loggable
 

data/lib/inversion/template/unlesstag.rb

@@ -4,7 +4,6 @@
 require 'inversion/mixins'
 require 'inversion/template/attrtag'
 require 'inversion/template/containertag'
-require 'inversion/template/conditionaltag'
 require 'inversion/template/elsetag'
 
 
@@ -20,40 +19,31 @@ require 'inversion/template/elsetag'
 #
 class Inversion::Template::UnlessTag < Inversion::Template::AttrTag
 	include Inversion::Loggable,
-	        Inversion::Template::ContainerTag,
-	        Inversion::Template::ConditionalTag
+	        Inversion::Template::ContainerTag
 
 	# Inherits AttrTag's tag patterns
 
 	### Render the tag's contents if the condition is true, or any else or elsif sections
 	### if the condition isn't true.
 	def render( state )
-		self.enable_rendering unless super
-		self.render_subnodes( state )
 
-		return state
-	end
+		# Start out with rendering *disabled* if the tag body evaluates trueishly
+		if self.evaluate( state )
+			self.log.debug "Initial state was TRUE; disabling rendering"
+			state.disable_rendering
+		else
+			self.log.debug "Initial state was FALSE; enabling rendering"
+			state.enable_rendering
+		end
 
-	### Render the tag's subnodes according to the tag's logical state.
-	def render_subnodes( renderstate )
-		self.log.debug "Rendering subnodes. Rendering initially %s" %
-			[ self.rendering_enabled? ? "enabled" : "disabled" ]
-
-		# walk the subtree, modifying the logic flags for else and elsif tags,
-		# and rendering nodes if rendering is enabled
-		self.subnodes.each do |node|
-			if node.is_a?( Inversion::Template::ElseTag )
-				self.log.debug "  logic switch: %p..." % [ node ]
-				if !self.rendering_was_enabled?
-					self.enable_rendering
-				else
-					self.disable_rendering
-				end
-
-			else
-				renderstate << node if self.rendering_enabled?
-			end
+		# Set the tag state to track whether or not rendering has been enabled during the
+		# 'unless' for an 'else' tag.
+		state.with_tag_data( :rendering_was_enabled => state.rendering_enabled? ) do
+			self.render_subnodes( state )
 		end
+
+		state.enable_rendering
+		return nil
 	end
 
 end # class Inversion::Template::UnlessTag

data/lib/inversion/template/yieldtag.rb

@@ -19,12 +19,6 @@ class Inversion::Template::YieldTag < Inversion::Template::Tag
 	include Inversion::Loggable
 
 
-	### Set up a YieldTag's instance variables.
-	def initialize( * )
-		@block_value = nil
-	end
-
-
 	######
 	public
 	######
@@ -34,7 +28,7 @@ class Inversion::Template::YieldTag < Inversion::Template::Tag
 	def before_rendering( renderstate )
 		if renderstate.block
 			self.log.debug "Yielding to %p before rendering." % [ renderstate.block ]
-			@block_value = renderstate.block.call( renderstate ) 
+			renderstate.tag_data[ self ] = renderstate.block.call( renderstate ) 
 			self.log.debug "  render block returned: %p" % [ @block_value ]
 		end
 	end
@@ -44,8 +38,9 @@ class Inversion::Template::YieldTag < Inversion::Template::Tag
 	### #before_rendering (if there was a block).
 	def render( renderstate )
 		self.log.debug "Rendering as block return value: %p" % [ @block_value ]
-		return @block_value
+		return renderstate.tag_data[ self ]
 	end
 
+
 end # class Inversion::Template::YieldTag