inversion 0.3.0 → 0.4.0

data.tar.gz.sig

@@ -1 +1 @@
-g��2M&��"�"�����iP��_i4��HRh ^/d���ld m�i�����&2��
+X�v?�Ђf�ڛ����\.K<1����ž>-��!�����C�q�*7��+f��#���܀�sw���҂�Q�

data/History.rdoc

@@ -1,3 +1,14 @@
+== v0.4.0 [2011-10-05] Michael Granger <ged@FaerieMUD.org>
+
+Reworked render toggling so the before/after rendering hooks are
+called immediately before and after the node *would* have been
+rendered. This further cleans up the conditional logic, and causes
+the if/elsif/else tags to behave like you'd expect: the nodes they
+demark aren't even touched if rendering is disabled.
+
+Adjusted the other tags to account for the change.
+
+
 == v0.3.0 [2011-10-05] Michael Granger <ged@FaerieMUD.org>
 
 - Fix require loop in if/elsif tags

data/Rakefile

@@ -43,7 +43,7 @@ end
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
 # Ensure the specs pass before checking in
-task 'hg:precheckin' => :spec
+task 'hg:precheckin' => [:check_history, :spec]
 
 if Rake::Task.task_defined?( '.gemtest' )
 	Rake::Task['.gemtest'].clear

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	require 'inversion/monkeypatches'
 
 	# Library version constant
-	VERSION = '0.3.0'
+	VERSION = '0.4.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: cde501e6764c $
+	REVISION = %q$Revision: 5b1e645db600 $
 
 	#
 	# Logging

data/lib/inversion/renderstate.rb

@@ -190,29 +190,32 @@ class Inversion::RenderState
 	### object either doesn't respond to #render or #renders as itself.
 	def <<( node )
 		self.log.debug "Appending a %p to %p" % [ node.class, self ]
-		self.destination << self.make_node_comment( node ) if self.options[:debugging_comments]
 		original_node = node
-		previous_node = nil
-
-		begin
-			# Allow render to be delegated to subobjects
-			while node.respond_to?( :render ) && node != previous_node
-				self.log.debug "    delegated rendering to: %p" % [ node ]
-				previous_node = node
-				node = node.render( self )
-			end
+		original_node.before_rendering( self )
+
+		if self.rendering_enabled?
+			self.destination << self.make_node_comment( node ) if self.options[:debugging_comments]
+			previous_node = nil
+
+			begin
+				# Allow render to be delegated to subobjects
+				while node.respond_to?( :render ) && node != previous_node
+					self.log.debug "    delegated rendering to: %p" % [ node ]
+					previous_node = node
+					node = node.render( self )
+				end
 
-			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 ]
+			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 )
 			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 )
 		end
 
+		original_node.after_rendering( self )
 		return self
 	end
 

data/lib/inversion/template.rb

@@ -175,15 +175,8 @@ class Inversion::Template
 		self.log.info "rendering template 0x%08x" % [ self.object_id/2 ]
 		state = Inversion::RenderState.new( parentstate, self.attributes, self.options, &block )
 
-		# Pre-render hook
-		self.walk_tree {|node| node.before_rendering(state) }
-
 		# self.log.debug "  rendering node tree: %p" % [ @node_tree ]
 		self.walk_tree {|node| state << node }
-
-		# Post-render hook
-		self.walk_tree {|node| node.after_rendering(state) }
-
 		self.log.info "  done rendering template 0x%08x: %0.4fs" %
 			[ self.object_id/2, state.time_elapsed ]
 

data/lib/inversion/template/elsetag.rb

@@ -59,9 +59,15 @@ class Inversion::Template::ElseTag < Inversion::Template::Tag
 	end
 
 
+	### Always remder as an empty string.
+	def render( * )
+		nil
+	end
+
+
 	### Toggle rendering for the iftag's container if rendering hasn't yet been
 	### toggled.
-	def render( renderstate )
+	def before_rendering( renderstate )
 		if renderstate.tag_data[ :rendering_was_enabled ]
 			self.log.debug "  rendering was previously enabled: disabling"
 			renderstate.disable_rendering

data/lib/inversion/template/elsiftag.rb

@@ -47,9 +47,15 @@ class Inversion::Template::ElsifTag < Inversion::Template::AttrTag
 	end
 
 
+	### Always remder as an empty string.
+	def render( * )
+		nil
+	end
+
+
 	### Toggle rendering for the iftag's container if rendering hasn't yet been
 	### toggled.
-	def render( renderstate )
+	def before_rendering( renderstate )
 		if renderstate.tag_data[ :rendering_was_enabled ]
 			self.log.debug "Rendering was previously enabled; disabling"
 			renderstate.disable_rendering

data/lib/inversion/template/iftag.rb

@@ -36,7 +36,7 @@ class Inversion::Template::IfTag < Inversion::Template::AttrTag
 
 		# 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
+		state.with_tag_data( rendering_was_enabled: state.rendering_enabled? ) do
 			super
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -49,11 +49,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70147534076140 !ruby/object:Gem::Requirement
+  requirement: &70307924560640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70147534076140
+  version_requirements: *70307924560640
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70147534075520 !ruby/object:Gem::Requirement
+  requirement: &70307924560080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *70147534075520
+  version_requirements: *70307924560080
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70147534074980 !ruby/object:Gem::Requirement
+  requirement: &70307924559340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70147534074980
+  version_requirements: *70307924559340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147534074360 !ruby/object:Gem::Requirement
+  requirement: &70307924558580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70147534074360
+  version_requirements: *70307924558580
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70147534073820 !ruby/object:Gem::Requirement
+  requirement: &70307924557980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70147534073820
+  version_requirements: *70307924557980
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70147534073200 !ruby/object:Gem::Requirement
+  requirement: &70307924557420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,10 +116,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70147534073200
+  version_requirements: *70307924557420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70147534072680 !ruby/object:Gem::Requirement
+  requirement: &70307924556780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +127,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70147534072680
+  version_requirements: *70307924556780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70147534072100 !ruby/object:Gem::Requirement
+  requirement: &70307924556160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70147534072100
+  version_requirements: *70307924556160
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70147534071140 !ruby/object:Gem::Requirement
+  requirement: &70307924555720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,10 +149,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *70147534071140
+  version_requirements: *70307924555720
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70147534069820 !ruby/object:Gem::Requirement
+  requirement: &70307924555160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -160,10 +160,10 @@ dependencies:
         version: 1.16.2
   type: :development
   prerelease: false
-  version_requirements: *70147534069820
+  version_requirements: *70307924555160
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70147534069240 !ruby/object:Gem::Requirement
+  requirement: &70307924554240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -171,10 +171,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70147534069240
+  version_requirements: *70307924554240
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70147534068660 !ruby/object:Gem::Requirement
+  requirement: &70307924553020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -182,10 +182,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70147534068660
+  version_requirements: *70307924553020
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70147534068080 !ruby/object:Gem::Requirement
+  requirement: &70307924552300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -193,7 +193,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70147534068080
+  version_requirements: *70307924552300
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
   of Control" principle to decouple