inversion 0.1.0 → 0.1.1

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.1.1 [2011-09-23] Michael Granger <ged@FaerieMUD.org>
+
+- Bugfix for the Subscribe tag.
+
+
 == v0.1.0 [2011-09-23] Michael Granger <ged@FaerieMUD.org>
 
 - Added template reloading via Inversion::Template#changed?

data/README.rdoc

@@ -75,39 +75,6 @@ one. The resulting template object will be set as the body of the layout templat
 when the enclosing template is rendered. Templates can be nested this way as deeply as you like.
 
 
-=== Tags To Implement
-
-* <?prettyprint «attr/methodchain» ?>
-
-* <?render «attr/methodchain» AS «identifier» IN «template path» ?>
-
-
-=== Tags Implemented
-
-* <?attr?>
-* <?call?>
-* <?comment?>…<?end?>
-* <?for obj, i in attr.each_with_index ?>
-  <?end?>
-* <?config
-	  escaping: 'html'
-	  ignore_unknown_tags: false
-  ?>
-* <?include other_template.tmpl ?>
-* <?escape obj.some_method ?>
-* <?urlencode obj.some_method ?>
-* <?pp obj ?>
-* <?if obj.some_method ?>…<?elsif otherobj.some_method ?>…<?else?>…<?end?>
-* <?unless obj.some_method ?>..<?end ?>
-* <?import attrname ?>
-* <?publish identifier ?>...<?end publish ?>
-* <?subscribe identifier ?>
-* <?timedelta obj.time_method ?>
-* <?yield ?>
-* <?default attribute to value ?>
-* <?begin ?>…<?rescue ?>…<?end?>
-
-
 == References
 
 * Inversion of Control: http://en.wikipedia.org/wiki/Inversion_of_control

data/lib/inversion.rb

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

data/lib/inversion/renderstate.rb

@@ -196,9 +196,12 @@ class Inversion::RenderState
 	### Publish the given +nodes+ to all subscribers to the specified +key+.
 	def publish( key, *nodes )
 		key = key.to_sym
+		self.log.debug "[0x%016x] Publishing %p nodes: %p" % [ self.object_id * 2, key, nodes ]
 
 		self.containerstate.publish( key, *nodes ) if self.containerstate
 		self.subscriptions[ key ].each do |subscriber|
+			self.log.debug "  sending %d nodes to subscriber: %p (a %p)" %
+				[ nodes.length, subscriber, subscriber.class ]
 			subscriber.publish( *nodes )
 		end
 	end

data/lib/inversion/template/subscribetag.rb

@@ -51,10 +51,17 @@ class Inversion::Template::SubscribeTag < Inversion::Template::Tag
 	# The name of the key the nodes will be published under
 	attr_reader :key
 
+	# The tag's default value if nothing matching its key is published
+	attr_reader :default
+
+	# The content publish to the tag so far during the current render
+	attr_reader :content
+
 
 	### Tell the +renderstate+ that this tag is interested in nodes that are published with
 	### its key.
 	def before_rendering( renderstate )
+		@content.clear
 		renderstate.subscribe( self.key, self )
 	end
 
@@ -68,6 +75,7 @@ class Inversion::Template::SubscribeTag < Inversion::Template::Tag
 	### Pub/sub callback. Called from the RenderState when a PublishTag publishes +nodes+
 	### with the same key as the current tag.
 	def publish( *nodes )
+		self.log.debug "Adding published nodes %p to %p" % [ nodes, @content ]
 		@content.push( *nodes )
 	end
 
@@ -84,5 +92,17 @@ class Inversion::Template::SubscribeTag < Inversion::Template::Tag
 		end
 	end
 
+
+	### Return a representation of the object in a String suitable for debugging.
+	def inspect
+		return "#<%p:0x%016x key: %s, default: %p, content: %p>" % [
+			self.class,
+			self.object_id * 2,
+			self.key,
+			self.default,
+			self.content,
+		]
+	end
+
 end # class Inversion::Template::SubscribeTag
 

data/spec/inversion/template/subscribetag_spec.rb

@@ -55,6 +55,17 @@ describe Inversion::Template::SubscribeTag do
 		template = Inversion::Template.new( "<?subscribe not_here || default value! ?>" )
 		template.render.should == "default value!"
 	end
+
+	it "doesn't retain published nodes across renders" do
+		template = Inversion::Template.new( '--<?subscribe stylesheets ?>--<?attr subtemplate ?>' )
+		subtemplate = Inversion::Template.new( '<?publish stylesheets ?>a style<?end?>(subtemplate)' )
+
+		template.subtemplate = subtemplate
+
+		template.render.should == '--a style--(subtemplate)'
+		template.render.should == '--a style--(subtemplate)'
+	end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -49,11 +49,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-09-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &2153364080 !ruby/object:Gem::Requirement
+  requirement: &2165958340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153364080
+  version_requirements: *2165958340
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &2153363380 !ruby/object:Gem::Requirement
+  requirement: &2165957540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2153363380
+  version_requirements: *2165957540
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &2153362780 !ruby/object:Gem::Requirement
+  requirement: &2165956880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *2153362780
+  version_requirements: *2165956880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153362080 !ruby/object:Gem::Requirement
+  requirement: &2165956120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153362080
+  version_requirements: *2165956120
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2153350520 !ruby/object:Gem::Requirement
+  requirement: &2165955380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2153350520
+  version_requirements: *2165955380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153349840 !ruby/object:Gem::Requirement
+  requirement: &2165954620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,10 +116,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *2153349840
+  version_requirements: *2165954620
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153349080 !ruby/object:Gem::Requirement
+  requirement: &2165953860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +127,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153349080
+  version_requirements: *2165953860
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153348500 !ruby/object:Gem::Requirement
+  requirement: &2165953100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *2153348500
+  version_requirements: *2165953100
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &2153347960 !ruby/object:Gem::Requirement
+  requirement: &2165952460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,10 +149,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *2153347960
+  version_requirements: *2165952460
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2153347420 !ruby/object:Gem::Requirement
+  requirement: &2165951760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -160,10 +160,10 @@ dependencies:
         version: 1.16.2
   type: :development
   prerelease: false
-  version_requirements: *2153347420
+  version_requirements: *2165951760
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153346780 !ruby/object:Gem::Requirement
+  requirement: &2165951060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -171,10 +171,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153346780
+  version_requirements: *2165951060
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &2153346060 !ruby/object:Gem::Requirement
+  requirement: &2165950460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -182,10 +182,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153346060
+  version_requirements: *2165950460
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2153345500 !ruby/object:Gem::Requirement
+  requirement: &2165949880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -193,7 +193,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *2153345500
+  version_requirements: *2165949880
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
   of Control" principle to decouple