inversion 0.1.1 → 0.2.0

data/ChangeLog

@@ -1,8 +1,137 @@
+2011-09-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.2.0 for changeset 9b57bc8611b2
+	[8f0b8b864b1a] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 896d23953a0a
+	[9b57bc8611b2] [v0.2.0]
+
+	* History.rdoc, lib/inversion.rb:
+	Bumped minor version, updated History for release.
+	[896d23953a0a]
+
+	* lib/inversion/renderstate.rb, lib/inversion/template/begintag.rb,
+	lib/inversion/template/elsetag.rb,
+	lib/inversion/template/elsiftag.rb,
+	lib/inversion/template/escapetag.rb,
+	lib/inversion/template/fortag.rb, lib/inversion/template/iftag.rb,
+	lib/inversion/template/importtag.rb,
+	lib/inversion/template/includetag.rb,
+	lib/inversion/template/textnode.rb,
+	lib/inversion/template/unlesstag.rb,
+	lib/inversion/template/yieldtag.rb,
+	spec/inversion/renderstate_spec.rb,
+	spec/inversion/template/begintag_spec.rb,
+	spec/inversion/template/yieldtag_spec.rb:
+	Refactoring, renaming 'RenderState#tag_state' to '#tag_data'.
+	- Made tags that inherit from containertag super to its #render where
+	possible.
+	- Move YieldTag's render state into RenderState#tag_data
+	- Comment fixes, spec naming consistency fixes
+	[5ec9728367d2]
+
+	* lib/inversion/exceptions.rb, lib/inversion/parser.rb,
+	lib/inversion/template.rb, lib/inversion/template/node.rb,
+	lib/inversion/template/parser.rb, spec/inversion/parser_spec.rb,
+	spec/inversion/template/elsetag_spec.rb,
+	spec/inversion/template/elsiftag_spec.rb,
+	spec/inversion/template/endtag_spec.rb,
+	spec/inversion/template/parser_spec.rb,
+	spec/inversion/template/rescuetag_spec.rb:
+	Rename Inversion::Template::Parser to Inversion::Parser.
+	[d0daee0bf3c6]
+
+2011-09-26  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt, lib/inversion/renderstate.rb,
+	lib/inversion/template.rb, lib/inversion/template/attrtag.rb,
+	lib/inversion/template/begintag.rb,
+	lib/inversion/template/conditionaltag.rb,
+	lib/inversion/template/containertag.rb,
+	lib/inversion/template/elsetag.rb,
+	lib/inversion/template/elsiftag.rb,
+	lib/inversion/template/fortag.rb, lib/inversion/template/iftag.rb,
+	lib/inversion/template/tag.rb, lib/inversion/template/unlesstag.rb,
+	spec/inversion/renderstate_spec.rb,
+	spec/inversion/template/attrtag_spec.rb,
+	spec/inversion/template/elsiftag_spec.rb,
+	spec/inversion/template/fortag_spec.rb,
+	spec/inversion/template/iftag_spec.rb,
+	spec/inversion/template/unlesstag_spec.rb:
+	Fixed conditional rendering inside of 'for' tags (fixes #2):
+	- Make the 'for' tag use the append operator of the RenderState
+	instead of accumulating rendered output itself
+	- Added a tag state to the RenderState that tags can use to keep per-
+	render state and pass messages to other tags.
+	- Added a render toggle for conditional render output
+	- Removed the ConditionalTag mixin, which is no longer necessary
+	- Move else/elsif tag logic into the tags themselves
+	[8a4bfb043423]
+
+	* spec/inversion/renderstate_spec.rb:
+	Organized renderstate specs by feature
+	[beb6e6ea06f4]
+
+	* lib/inversion/template/tag.rb, spec/inversion/template/tag_spec.rb:
+	Added a partial fix for the plugin loader so it won't load old
+	plugins. It's only partial because it will load renamed or removed
+	tags from older versions, but it won't ever result in clobbering or
+	redefining legitimate tags. (fixes #1)
+	[0eebd4b78d1a]
+
+2011-09-24  Michael Granger  <ged@FaerieMUD.org>
+
+	* experiments/if-in-for-mintest.rb:
+	Added a minimial test case for the if+for issue (refs #2)
+	[3e8a6b3cae2b]
+
+	* lib/inversion/template/configtag.rb,
+	spec/inversion/template/configtag_spec.rb:
+	Bugfix: Make the config tag set options while rendering, too.
+	[9636249a559e]
+
 2011-09-23  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.1.1 for changeset 3aed7786335c
+	[936ad3e2b5b7]
+
+	* .hgsigs:
+	Added signature for changeset d700486aff8c
+	[3aed7786335c] [v0.1.1]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump patch version for release.
+	[d700486aff8c]
+
+	* lib/inversion/renderstate.rb,
+	lib/inversion/template/subscribetag.rb,
+	spec/inversion/template/subscribetag_spec.rb:
+	Work around a bug in the 'subscribe' tag that caused templates to
+	accumulate published nodes.
+	[e745f77580bb]
+
+	* README.rdoc:
+	Move the tag list from the README to the wiki
+	[ddf55e389f5e]
+
+	* .hgtags:
+	Added tag v0.1.0 for changeset a1eb55ebf68a
+	[3c6b8c616671]
+
+	* .hgsigs:
+	Added signature for changeset 5bb3f4fad426
+	[a1eb55ebf68a] [v0.1.0]
+
+	* History.rdoc:
+	Updated the history file.
+	[5bb3f4fad426]
+
 	* lib/inversion.rb:
 	Bump minor version for new release.
-	[dbc96c7b052a] [tip]
+	[dbc96c7b052a]
 
 	* lib/inversion/template.rb, lib/inversion/template/tag.rb,
 	lib/inversion/template/timedeltatag.rb,
@@ -20,7 +149,7 @@
 
 	* manual/resources/css/manual.css, manual/resources/css/reset.css:
 	Fixing CSS font-face declarations; adding missing reset.css
-	[45f04400b244]
+	[45f04400b244] [github/master]
 
 	* .hgtags:
 	Added tag v0.0.4 for changeset 7a412b7ed72b
@@ -62,10 +191,6 @@
 	Avoid Pathname#expand_path in Inversion::Template.load [profiled]
 	[91cbb0c90b85]
 
-	* Rakefile:
-	Disable the .gemtest task that hoe defines without asking
-	[cf76def7d9cf]
-
 2011-09-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/inversion/template/elsiftag.rb:
@@ -76,6 +201,12 @@
 	Fix shadowed variable in BeginTag#handle_exception.
 	[8424ac44da4a]
 
+2011-09-21  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile:
+	Disable the .gemtest task that hoe defines without asking
+	[cf76def7d9cf]
+
 2011-08-17  Michael Granger  <ged@FaerieMUD.org>
 
 	* manual/resources/css/manual.css:
@@ -129,7 +260,7 @@
 	manual/src/gettingstarted.page, manual/src/index.page,
 	manual/src/tags.page, manual/src/templates.page:
 	Adding a manual
-	[e0193bdb57db] [github/master]
+	[e0193bdb57db]
 
 2011-08-15  Michael Granger  <ged@FaerieMUD.org>
 
@@ -472,16 +603,6 @@
 	* Merged with b822cc9b6ff2
 	[f46b1ff133cd]
 
-2011-07-05  Mahlon E. Smith  <mahlon@martini.nu>
-
-	* lib/inversion/template/pptag.rb, spec/inversion/mixins_spec.rb,
-	spec/inversion/template/pptag_spec.rb:
-	Heh, added the pp tag and mixin spec files back from changeset
-	5d244064e631. Whoops.
-	[b822cc9b6ff2]
-
-2011-07-06  Michael Granger  <ged@FaerieMUD.org>
-
 	* .hgignore, README.md, Rakefile, lib/inversion.rb,
 	lib/inversion/monkeypatches.rb, lib/inversion/renderstate.rb,
 	lib/inversion/template.rb, lib/inversion/template/attrtag.rb,
@@ -538,6 +659,14 @@
 	- Add SimpleCov coverage ()
 	[4d7a94c4cf02]
 
+2011-07-05  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/inversion/template/pptag.rb, spec/inversion/mixins_spec.rb,
+	spec/inversion/template/pptag_spec.rb:
+	Heh, added the pp tag and mixin spec files back from changeset
+	5d244064e631. Whoops.
+	[b822cc9b6ff2]
+
 2011-07-05  Michael Granger  <ged@FaerieMUD.org>
 
 	* Rakefile, lib/inversion/sinatra.rb, lib/inversion/tilt.rb,
@@ -925,14 +1054,6 @@
 	Merged with dc16cc877dfc, updated README
 	[0fdf3122bf7c]
 
-	* README.md, experiments/erb_scope_bleed.rb:
-	Fleshing out the README, adding scope-bleedover example
-	[f44b597af8bd]
-
-	* lib/inversion.rb:
-	Removing checked-in revision value
-	[773feca505b8]
-
 2011-04-06  Michael Granger  <ged@FaerieMUD.org>
 
 	* .irbrc, Rakefile, experiments/ripper_spike.rb, lib/inversion.rb,
@@ -961,6 +1082,10 @@
 	* Merging with b50fef00621b
 	[861b21a30656]
 
+	* lib/inversion.rb:
+	Clearing Revision tag
+	[cdacb5f98f93]
+
 2011-02-07  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/inversion/template.rb, lib/inversion/template/attr_tag.rb,
@@ -971,11 +1096,15 @@
 	Checkpoint, fleshing out Tags.
 	[4a4fc3f1dc14]
 
-2011-03-18  Michael Granger  <ged@FaerieMUD.org>
+2011-04-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.md, experiments/erb_scope_bleed.rb:
+	Fleshing out the README, adding scope-bleedover example
+	[f44b597af8bd]
 
 	* lib/inversion.rb:
-	Clearing Revision tag
-	[cdacb5f98f93]
+	Removing checked-in revision value
+	[773feca505b8]
 
 2011-02-07  Mahlon E. Smith  <mahlon@martini.nu>
 

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.2.0 [2011-09-27] Michael Granger <ged@FaerieMUD.org>
+
+- Bugfixes (#1, #2)
+- Renamed Inversion::Template::Parser to Inversion::Parser
+- Added RenderState#tag_state for tracking tag state on a
+  per-render basis.
+
+
 == v0.1.1 [2011-09-23] Michael Granger <ged@FaerieMUD.org>
 
 - Bugfix for the Subscribe tag.

data/Manifest.txt

@@ -8,6 +8,7 @@ lib/inversion.rb
 lib/inversion/exceptions.rb
 lib/inversion/mixins.rb
 lib/inversion/monkeypatches.rb
+lib/inversion/parser.rb
 lib/inversion/renderstate.rb
 lib/inversion/sinatra.rb
 lib/inversion/template.rb
@@ -16,7 +17,6 @@ lib/inversion/template/begintag.rb
 lib/inversion/template/calltag.rb
 lib/inversion/template/codetag.rb
 lib/inversion/template/commenttag.rb
-lib/inversion/template/conditionaltag.rb
 lib/inversion/template/configtag.rb
 lib/inversion/template/containertag.rb
 lib/inversion/template/defaulttag.rb
@@ -29,7 +29,6 @@ lib/inversion/template/iftag.rb
 lib/inversion/template/importtag.rb
 lib/inversion/template/includetag.rb
 lib/inversion/template/node.rb
-lib/inversion/template/parser.rb
 lib/inversion/template/pptag.rb
 lib/inversion/template/publishtag.rb
 lib/inversion/template/rescuetag.rb
@@ -45,6 +44,7 @@ lib/inversion/utils.rb
 spec/data/sinatra/hello.inversion
 spec/inversion/mixins_spec.rb
 spec/inversion/monkeypatches_spec.rb
+spec/inversion/parser_spec.rb
 spec/inversion/renderstate_spec.rb
 spec/inversion/sinatra_spec.rb
 spec/inversion/template/attrtag_spec.rb
@@ -64,7 +64,6 @@ spec/inversion/template/iftag_spec.rb
 spec/inversion/template/importtag_spec.rb
 spec/inversion/template/includetag_spec.rb
 spec/inversion/template/node_spec.rb
-spec/inversion/template/parser_spec.rb
 spec/inversion/template/pptag_spec.rb
 spec/inversion/template/publishtag_spec.rb
 spec/inversion/template/rescuetag_spec.rb

data/Rakefile

@@ -36,6 +36,7 @@ hoespec = Hoe.spec 'inversion' do
 	self.spec_extras[:licenses] = ["BSD"]
 	self.require_ruby_version( '>=1.9.2' )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
+	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
 
@@ -44,9 +45,6 @@ ENV['VERSION'] ||= hoespec.spec.version.to_s
 # Ensure the specs pass before checking in
 task 'hg:precheckin' => :spec
 
-# Rebuild the ChangeLog immediately before release (hoe hook)
-task :prerelease => 'ChangeLog'
-
 if Rake::Task.task_defined?( '.gemtest' )
 	Rake::Task['.gemtest'].clear
 	task '.gemtest' do

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	require 'inversion/monkeypatches'
 
 	# Library version constant
-	VERSION = '0.1.1'
+	VERSION = '0.2.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: d700486aff8c $
+	REVISION = %q$Revision: 896d23953a0a $
 
 	#
 	# Logging

data/lib/inversion/exceptions.rb

@@ -7,7 +7,7 @@ module Inversion
 	# A generic Inversion exception class
 	class Error < ::RuntimeError; end
 
-	# An exception class raised from the Inversion::Template::Parser when
+	# An exception class raised from the Inversion::Parser when
 	# a problem is encountered while parsing a template.
 	class ParseError < Inversion::Error; end
 

data/lib/inversion/{template/parser.rb → parser.rb}

@@ -10,7 +10,7 @@ require 'inversion/template/endtag'
 
 # This is the parser for Inversion templates. It takes template source and
 # returns a tree of Inversion::Template::Node objects (if parsing is successful).
-class Inversion::Template::Parser
+class Inversion::Parser
 	include Inversion::Loggable
 
 	# The pattern for matching a tag opening
@@ -39,7 +39,7 @@ class Inversion::Template::Parser
 	}
 
 
-	### Create a new Inversion::Template::Parser with the specified config +options+.
+	### Create a new Inversion::Parser with the specified config +options+.
 	def initialize( template, options={} )
 		@template = template
 		@options  = DEFAULT_OPTIONS.merge( options )
@@ -63,7 +63,7 @@ class Inversion::Template::Parser
 			inherited_state.template = @template
 			state = inherited_state
 		else
-			state = Inversion::Template::Parser::State.new( @template, self.options )
+			state = Inversion::Parser::State.new( @template, self.options )
 		end
 
 		self.log.debug "Starting parse of template source (%0.2fK, %s)" %
@@ -290,8 +290,8 @@ class Inversion::Template::Parser
 			return Inversion::Template.load( path, substate, self.options )
 		end
 
-	end # class Inversion::Template::Parser::State
+	end # class Inversion::Parser::State
 
-end # class Inversion::Template::Parser
+end # class Inversion::Parser
 
 

data/lib/inversion/renderstate.rb

@@ -31,10 +31,13 @@ class Inversion::RenderState
 		@block              = block
 		@default_errhandler = self.method( :default_error_handler )
 		@errhandler         = @default_errhandler
+		@rendering_enabled  = true
 
-		# The rendered output Array, and the stack of render destinations
+		# The rendered output Array, the stack of render destinations and
+		# tag states
 		@output             = []
 		@destinations       = [ @output ]
+		@tag_data          = [ {} ]
 
 		# Hash of subscribed Nodes, keyed by the subscription key as a Symbol
 		@subscriptions      = Hash.new {|hsh, k| hsh[k] = [] } # Auto-vivify
@@ -75,6 +78,12 @@ class Inversion::RenderState
 	end
 
 
+	### Return a Hash that tags can use to track state for the current render.
+	def tag_data
+		return @tag_data.last
+	end
+
+
 	### Evaluate the specified +code+ in the context of itself and
 	### return the result.
 	def eval( code )
@@ -98,6 +107,21 @@ class Inversion::RenderState
 	end
 
 
+	### Add an overlay to the current tag state Hash, yield to the provided block, then
+	### revert the tag state back to what it was prior to running the block.
+	def with_tag_data( newhash={} )
+		raise LocalJumpError, "no block given" unless block_given?
+		self.log.debug "Overriding tag state with: %p" % [ newhash ]
+
+		begin
+			@tag_data.push( @tag_data.last.merge(newhash) )
+			yield( self )
+		ensure
+			@tag_data.pop
+		end
+	end
+
+
 	### Override the state's render destination, call the block, then restore the original
 	### destination when the block returns.
 	def with_destination( new_destination )
@@ -174,10 +198,12 @@ class Inversion::RenderState
 				node = node.render( self )
 			end
 
-			self.log.debug "  adding a %p to the destination (%p)" %
-				[ node.class, self.destination.class ]
-			self.destination << node
-			self.log.debug "    just appended %p to %p" % [ node, self.destination ]
+			if self.rendering_enabled?
+				self.log.debug "  adding a %p to the destination (%p)" %
+					[ node.class, self.destination.class ]
+				self.destination << node
+				self.log.debug "    just appended %p to %p" % [ node, self.destination ]
+			end
 		rescue ::StandardError => err
 			self.log.debug "  handling a %p while rendering: %s" % [ err.class, err.message ]
 			self.destination << self.handle_render_error( original_node, err )
@@ -265,6 +291,30 @@ class Inversion::RenderState
 	end
 
 
+	### Return +true+ if rendered nodes are being saved for output.
+	def rendering_enabled?
+		return @rendering_enabled ? true : false
+	end
+
+
+	### Enable rendering, causing nodes to be appended to the rendered output.
+	def enable_rendering
+		@rendering_enabled = true
+	end
+
+
+	### Disable rendering, causing rendered nodes to be discarded instead of appended.
+	def disable_rendering
+		@rendering_enabled = false
+	end
+
+
+	### Toggle rendering, enabling it if it was disabled, and vice-versa.
+	def toggle_rendering
+		@rendering_enabled = !@rendering_enabled
+	end
+
+
 	### Return a human-readable representation of the object.
 	def inspect
 		return "#<%p:0x%08x containerstate: %s, attributes: %s, destination: %p>" % [