inversion 1.0.0 → 1.3.1

data/lib/inversion/template/codetag.rb

@@ -1,7 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'ripper'
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 # The base class for Inversion tags that parse the body section of the tag using
@@ -52,7 +54,7 @@ class Inversion::Template::CodeTag < Inversion::Template::Tag
 					"invalid char in pattern: #{m[0].inspect}"
 			end
 
-			buf = '^'
+			buf = String.new( '^' )
 			pattern.scan( /(?:\w+|\$\(|[()\[\]\{\}?*+\.]+)/ ) do |tok|
 				case tok
 				when /\w/
@@ -100,6 +102,15 @@ class Inversion::Template::CodeTag < Inversion::Template::Tag
 	end
 
 
+	### Declarative that forces a tag to inherit existing patterns from
+	### its parent, rather than replacing them.  Afterwards, you can use
+	### +tag_pattern+ regularly, appending to the list.
+	def self::inherit_tag_patterns
+		raise ScriptError, "Patterns already exist for this tag." if defined?( @tag_patterns )
+		@tag_patterns = self.superclass.tag_patterns
+	end
+
+
 	#################################################################
 	###	I N S T A N C E   M E T H O D S
 	#################################################################

data/lib/inversion/template/commenttag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 require 'inversion/template/containertag'
 

data/lib/inversion/template/configtag.rb

@@ -1,8 +1,11 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'yaml'
+
 require 'inversion/mixins'
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 
@@ -34,7 +37,12 @@ class Inversion::Template::ConfigTag < Inversion::Template::Tag
 		raise Inversion::ParseError, 'Empty config settings' if
 			body.nil? || body.strip.empty?
 
-		opts = YAML.load( body )
+		opts = if defined?( SafeYAML ) then
+				YAML.load( body, safe: true )
+			else
+				YAML.load( body )
+			end
+
 		@options = symbolify_keys( opts )
 
 		super

data/lib/inversion/template/containertag.rb

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
-require 'inversion' unless defined?( Inversion )
 require 'inversion/template' unless defined?( Inversion::Template )
 
 # A mixin for a tag that allows it to contain other nodes.

data/lib/inversion/template/defaulttag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/codetag'
 
 # Inversion 'default' tag.
@@ -64,7 +66,7 @@ class Inversion::Template::DefaultTag < Inversion::Template::CodeTag
 		super
 
 		# Add an identifier for the tag name
-		self.identifiers << self.name.untaint.to_sym
+		self.identifiers << self.name.to_sym
 	end
 
 

data/lib/inversion/template/elsetag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 

data/lib/inversion/template/elsiftag.rb

@@ -1,10 +1,11 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/attrtag'
 require 'inversion/template/commenttag'
-require 'inversion/template/iftag' unless
-	defined?( Inversion::Template::IfTag )
+require 'inversion/template/iftag'
 
 
 # Inversion 'elsif' tag.
@@ -24,7 +25,31 @@ require 'inversion/template/iftag' unless
 #
 class Inversion::Template::ElsifTag < Inversion::Template::AttrTag
 
-	# Inherits AttrTag's tag patterns
+	# Inherit AttrTag's tag patterns first.
+	inherit_tag_patterns
+
+	# Append a 'not' tag matcher.
+	# <?elsif ! foo ?>, <?elsif !foo ?>
+	#
+	tag_pattern '$(op) sp* $(ident)' do |tag, match|
+		op = match.string( 1 )
+		raise Inversion::ParseError, "expected '!', got %p instead" % [ op ] unless op == '!'
+
+		tag.send( :log ).debug "  Identifier is: %p (inverted)" % [ match.string(2) ]
+		tag.name = match.string( 2 ).to_sym
+		tag.inverted = true
+	end
+
+
+	### Create a new ElsifTag.
+	def initialize( body, linenum=nil, colnum=nil )
+		@inverted = false
+		super
+	end
+
+	# Invert the tag's renderstate if created with the 'not' operator.
+	attr_accessor :inverted
+
 
 	### Parsing callback -- check to be sure the node tree can have an
 	### 'elsif' tag appended to it (i.e., it has an opening 'if' tag).
@@ -46,19 +71,23 @@ class Inversion::Template::ElsifTag < Inversion::Template::AttrTag
 	end
 
 
-	### Always remder as an empty string.
+	### Always render as an empty string.
 	def render( * )
 		nil
 	end
 
 
-	### Toggle rendering for the iftag's container if rendering hasn't yet been
+	### Toggle rendering for the elsiftag's container if rendering hasn't yet been
 	### toggled.
 	def before_rendering( renderstate )
+
+		evaluated_state = self.evaluate( renderstate )
+		evaluated_state = ! evaluated_state if self.inverted
+
 		if renderstate.tag_data[ :rendering_was_enabled ]
 			self.log.debug "Rendering was previously enabled; disabling"
 			renderstate.disable_rendering
-		elsif self.evaluate( renderstate )
+		elsif evaluated_state
 			self.log.debug "Rendering was previously disabled, and condition is true; enabling"
 			renderstate.tag_data[ :rendering_was_enabled ] = true
 			renderstate.enable_rendering

data/lib/inversion/template/endtag.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
-require 'inversion' unless defined?( Inversion )
 require 'inversion/template' unless defined?( Inversion::Template )
-require 'inversion/template/tag' unless defined?( Inversion::Template::Tag )
+require 'inversion/template/tag'
 
 # Closing tag class
 class Inversion::Template::EndTag < Inversion::Template::Tag

data/lib/inversion/template/escapetag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/attrtag'
 
 # Inversion escaping tag.

data/lib/inversion/template/fortag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/codetag'
 require 'inversion/template/containertag'
 
@@ -34,8 +36,8 @@ class Inversion::Template::ForTag < Inversion::Template::CodeTag
 		raise Inversion::ParseError, "invalid keyword: expected 'in', got %p for %p" %
 			[ match.string(2), tag.body ] unless match.string(2) == 'in'
 
-		tag.block_args << match.string( 1 ).untaint.to_sym
-		tag.identifiers << match.string( 3 ).untaint.to_sym
+		tag.block_args << match.string( 1 ).to_sym
+		tag.identifiers << match.string( 3 ).to_sym
 
 		tag.enumerator = match.string( 3 )
 		tag.enumerator << match.string( 4 ) if match.string( 4 )
@@ -48,8 +50,8 @@ class Inversion::Template::ForTag < Inversion::Template::CodeTag
 		raise Inversion::ParseError, "invalid keyword: expected 'in', got %p for %p" %
 			[ match.string(2), tag.body ] unless match.string(2) == 'in'
 
-		tag.block_args += match.string( 1 ).untaint.split(/,\s?/).map( &:to_sym )
-		tag.identifiers << match.string( 3 ).untaint.to_sym
+		tag.block_args += match.string( 1 ).split(/,\s?/).map( &:to_sym )
+		tag.identifiers << match.string( 3 ).to_sym
 
 		tag.enumerator = match.string( 3 )
 		tag.enumerator << match.string( 4 ) if match.string( 4 )
@@ -84,16 +86,20 @@ class Inversion::Template::ForTag < Inversion::Template::CodeTag
 		lvalue = state.eval( self.enumerator ) or return nil
 		lvalue = lvalue.each unless lvalue.respond_to?( :next )
 
-		# self.log.debug "Rendering %p via block args: %p" % [ lvalue, self.block_args ]
+		self.log.debug "Rendering %p via block args: %p" % [ lvalue, self.block_args ]
 
 		# Loop will exit as soon as the Enumerator runs out of elements
 		loop do
 			args = lvalue.next
-			args = [ args ] unless args.is_a?( Array )
 
 			# Turn the block arguments into an overrides hash by zipping up
 			# the arguments names and values
-			overrides = Hash[ self.block_args.zip(args) ]
+			overrides = if self.block_args.size > 1
+					args = [ args ] unless args.is_a?( Array )
+					Hash[ self.block_args.zip(args) ]
+				else
+					{ self.block_args.first => args }
+				end
 
 			# Overlay the block args from the 'for' over the template attributes and render
 			# each subnode

data/lib/inversion/template/fragmenttag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 require 'inversion/template/containertag'
 

data/lib/inversion/template/iftag.rb

@@ -1,7 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'inversion/mixins'
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/attrtag'
 require 'inversion/template/containertag'
 
@@ -18,28 +20,55 @@ require 'inversion/template/containertag'
 class Inversion::Template::IfTag < Inversion::Template::AttrTag
 	include Inversion::Template::ContainerTag
 
-	# Inherits AttrTag's tag patterns
+	# Inherit AttrTag's tag patterns first.
+	inherit_tag_patterns
+
+	# Append a 'not' tag matcher.
+	# <?if ! foo ?>, <?if !foo ?>
+	#
+	tag_pattern '$(op) sp* $(ident)' do |tag, match|
+		op = match.string( 1 )
+		raise Inversion::ParseError, "expected '!', got %p instead" % [ op ] unless op == '!'
+
+		tag.send( :log ).debug "  Identifier is: %p (inverted)" % [ match.string(2) ]
+		tag.name = match.string( 2 ).to_sym
+		tag.inverted = true
+	end
+
+
+	### Create a new IfTag.
+	def initialize( body, linenum=nil, colnum=nil )
+		@inverted = false
+		super
+	end
+
+	# Invert the tag's renderstate if created with the 'not' operator.
+	attr_accessor :inverted
+
 
 	### 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 )
+	def render( renderstate )
+
+		evaluated_state = self.evaluate( renderstate )
+		evaluated_state = ! evaluated_state if self.inverted
 
 		# Start out with rendering enabled if the tag body evaluates trueishly
-		if self.evaluate( state )
+		if evaluated_state
 			self.log.debug "Initial state was TRUE; enabling rendering"
-			state.enable_rendering
+			renderstate.enable_rendering
 		else
 			self.log.debug "Initial state was FALSE; disabling rendering"
-			state.disable_rendering
+			renderstate.disable_rendering
 		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
+		renderstate.with_tag_data( rendering_was_enabled: renderstate.rendering_enabled? ) do
 			super
 		end
 
-		state.enable_rendering
+		renderstate.enable_rendering
 		return nil
 	end
 

data/lib/inversion/template/importtag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 # Inversion import tag.
@@ -19,7 +21,7 @@ class Inversion::Template::ImportTag < Inversion::Template::Tag
 	### Ruby identifier.
 	def initialize( body, linenum=nil, colnum=nil )
 		super
-		@attributes = body.split( /\s*,\s*/ ).collect {|name| name.untaint.strip.to_sym }
+		@attributes = body.split( /\s*,\s*/ ).collect {|name| name.strip.to_sym }
 	end
 
 

data/lib/inversion/template/includetag.rb

@@ -1,8 +1,10 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'pathname'
 require 'inversion/mixins'
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 

data/lib/inversion/template/node.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'loggability'

data/lib/inversion/template/pptag.rb

@@ -1,7 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'pp'
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/calltag'
 
 # Inversion object inspection tag.
@@ -19,7 +21,7 @@ class Inversion::Template::PpTag < Inversion::Template::CallTag
 	### and return them.
 	def render( render_state )
 		raw = super
-		buf = ''
+		buf = String.new( '' )
 		PP.pp( raw, buf )
 		return self.escape( buf.chomp, render_state )
 	end

data/lib/inversion/template/publishtag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 require 'inversion/template/containertag'
 

data/lib/inversion/template/rescuetag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 

data/lib/inversion/template/subscribetag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 # Inversion subscription tag.

data/lib/inversion/template/tag.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'loggability'
 
-require 'inversion' unless defined?( Inversion )
 require 'inversion/template' unless defined?( Inversion::Template )
 
 require 'inversion/template/node'
@@ -66,7 +66,7 @@ class Inversion::Template::Tag < Inversion::Template::Node
 		tags = {}
 
 		Gem.find_files( TAG_PLUGIN_PATTERN ).each do |tagfile|
-			tagname = tagfile[ %r{/(\w+?)_?tag\.rb$}, 1 ].untaint
+			tagname = tagfile[ %r{/(\w+?)_?tag\.rb$}, 1 ]
 			next unless tagname
 
 			self.load( tagfile )
@@ -121,7 +121,7 @@ class Inversion::Template::Tag < Inversion::Template::Node
 	### Create a new Inversion::Template::Tag from the specified +tagname+ and +body+.
 	def self::create( tagname, body, linenum=nil, colnum=nil )
 		tagname =~ /^(\w+)$/i or raise ArgumentError, "invalid tag name %p" % [ tagname ]
-		tagtype = $1.downcase.untaint
+		tagtype = $1.downcase
 
 		unless tagclass = self.types[ tagtype.to_sym ]
 			Inversion.log.warn "Unknown tag type %p; registered: %p" %