inversion 0.11.0 → 0.11.1

data/ChangeLog

@@ -1,10 +1,29 @@
+2012-09-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc, Rakefile, Tags.rdoc, lib/inversion/template.rb,
+	lib/inversion/template/tag.rb, lib/inversion/tilt.rb:
+	Integrated the manual with regular API docs
+	[4c3cde09af11] [apidocs.patch, qbase, qtip, tip]
+
 2012-07-06  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.11.0 for changeset 8e7ee4f29874
+	[71c2a12d9df0] [qparent]
+
+	* .hgsigs:
+	Added signature for changeset 92d48ef3085e
+	[8e7ee4f29874] [v0.11.0]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump the minor version, update history.
+	[92d48ef3085e]
+
 	* lib/inversion/renderstate.rb, lib/inversion/template.rb,
 	spec/inversion/renderstate_spec.rb:
 	Transcode output according to the :encoding option if set on a
 	template
-	[2202c6ed520b] [tip]
+	[2202c6ed520b]
 
 	* lib/inversion/mixins.rb:
 	Don't try to deep copy Encoding objects, either
@@ -64,7 +83,7 @@
 
 	* .rvm.gems:
 	Bumping Loggability dependency for inheritance bugfix
-	[b65ce51ca6ee]
+	[b65ce51ca6ee] [github/master]
 
 2012-05-10  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.11.1 [2012-09-17] Michael Granger <ged@FaerieMUD.org>
+
+- [bugfix] Make subscriptions get nodes that were already published
+
+
 == v0.11.0 [2012-07-06] Michael Granger <ged@FaerieMUD.org>
 
 - Automatically transcode output according to the registered encoding

data/lib/inversion.rb

@@ -25,10 +25,10 @@ module Inversion
 	warn ">>> Inversion requires Ruby 1.9.2 or later. <<<" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.11.0'
+	VERSION = '0.11.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 92d48ef3085e $
+	REVISION = %q$Revision: cca3daa4a649 $
 
 
 	### Get the Inversion version.

data/lib/inversion/renderstate.rb

@@ -100,8 +100,10 @@ class Inversion::RenderState
 		@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
+		# Hash of subscribed Nodes and published data, keyed by the subscription key
+		# as a Symbol
+		@subscriptions      = Hash.new {|hsh, k| hsh[k] = [] } # Auto-vivify to an Array
+		@published_nodes    = Hash.new {|hsh, k| hsh[k] = [] }
 
 	end
 
@@ -122,6 +124,9 @@ class Inversion::RenderState
 	# Subscribe placeholders for publish/subscribe
 	attr_reader :subscriptions
 
+	# Published nodes, keyed by subscription
+	attr_reader :published_nodes
+
 	# The stack of rendered output destinations, most-recent last.
 	attr_reader :destinations
 
@@ -313,6 +318,7 @@ class Inversion::RenderState
 			# 	[ nodes.length, subscriber, subscriber.class ]
 			subscriber.publish( *nodes )
 		end
+		self.published_nodes[ key ].concat( nodes )
 	end
 	alias_method :publish_nodes, :publish
 
@@ -320,7 +326,14 @@ class Inversion::RenderState
 	### Subscribe the given +node+ to nodes published with the specified +key+.
 	def subscribe( key, node )
 		key = key.to_sym
+		self.log.debug "Adding subscription to %p nodes for %p" % [ key, node ]
 		self.subscriptions[ key ] << node
+		# self.log.debug "  now have subscriptions for: %p" % [ self.subscriptions.keys ]
+		if self.published_nodes.key?( key )
+			self.log.debug "    re-publishing %d %p nodes to late subscriber" %
+				[ self.published_nodes[key].length, key ]
+			node.publish( *self.published_nodes[key] )
+		end
 	end
 
 

data/lib/inversion/template/publishtag.rb

@@ -54,9 +54,12 @@ class Inversion::Template::PublishTag < Inversion::Template::Tag
 		self.log.debug "Publishing %d nodes as %s" % [ self.subnodes.length, self.key ]
 		rendered_nodes = []
 		renderstate.with_destination( rendered_nodes ) do
-			self.render_subnodes( renderstate )
+			sn = self.render_subnodes( renderstate )
+			self.log.debug "  subnodes are: %p" % [ sn ]
+			sn
 		end
 
+		self.log.debug "  rendered nodes are: %p" % [ rendered_nodes ]
 		renderstate.publish( self.key, *rendered_nodes ) unless rendered_nodes.empty?
 
 		return nil

data/spec/inversion/template/publishtag_spec.rb

@@ -41,7 +41,7 @@ describe Inversion::Template::PublishTag do
 	it "raises a parse error if the body isn't a simple attribute" do
 		expect {
 			Inversion::Template::PublishTag.new( 'a.non-identifier' )
-		}.should raise_exception( Inversion::ParseError, /malformed key/i )
+		}.to raise_exception( Inversion::ParseError, /malformed key/i )
 	end
 
 

data/spec/inversion/template/subscribetag_spec.rb

@@ -30,7 +30,7 @@ describe Inversion::Template::SubscribeTag do
 	it "raises a parse error if the key isn't a simple attribute" do
 		expect {
 			Inversion::Template::SubscribeTag.new( 'a.non-identifier' )
-		}.should raise_exception( Inversion::ParseError, /malformed subscribe/i )
+		}.to raise_exception( Inversion::ParseError, /malformed subscribe/i )
 	end
 
 	it "renders the nodes published by an immediate subtemplate with the same key" do
@@ -42,6 +42,15 @@ describe Inversion::Template::SubscribeTag do
 		template.render.should == '--a style--(subtemplate)'
 	end
 
+	it "renders nodes published by an immediate subtemplate that's rendered before it" do
+		template = Inversion::Template.new( '--<?attr subtemplate ?>--<?subscribe stylesheets ?>' )
+		subtemplate = Inversion::Template.new( '<?publish stylesheets ?>a style<?end?>(subtemplate)' )
+
+		template.subtemplate = subtemplate
+
+		template.render.should == '--(subtemplate)--a style'
+	end
+
 	it "doesn't render anything if there are no publications with its key" do
 		template = Inversion::Template.new( '--<?subscribe nostylesheets ?>--<?attr subtemplate ?>' )
 		subtemplate = Inversion::Template.new( '<?publish stylesheets ?>a style<?end?>(subtemplate)' )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability