inversion 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b08253199cda04327e19141aefe596941482be
-  data.tar.gz: 002f96158f9dbbe89ea1671c9d1abc827b80b55b
+  metadata.gz: 6745a33cc02610b46025e012922f4e510eb14825
+  data.tar.gz: 1fe0babb88461e808d34f82391aaf38b23328061
 SHA512:
-  metadata.gz: b2c1e583e7d92c0e18f47f977fd0ffb3948af841d2446dd1029026f9b7ad593c0ca36a235235a0f30ad2e26ee7bddb8b197a5490cabb4b79ba71eebc9f06b934
-  data.tar.gz: dd13d3317c1423bbd94c26bf2a031652981fa04536d98dad094354e10b6596428560246f2e24bb11e3e7e063d84412f405e37c37ac46018993d107f4aa0cd565
+  metadata.gz: 9412182ee80045940434ab81977cd1d879e42bd7d7e8c884e73aa0af154c67dcf384dca970dd91e8f492fc98be0b1f6d2153dc4ccd0afa20a7bb5f223e630e92
+  data.tar.gz: 3b3eeabfbe0a1a6eed93d13fe9db06af2c60d7a99bb55e216cbb6a039aca72579a86bce059d5746c583bcddbf821c51087553b5d7a6c5bd7813c2bc98a814c44

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.17.2 [2015-01-22] Michael Granger <ged@FaerieMUD.org>
+
+- Fix a bug with the fragment tag.
+
+Fragments will now propagate to the container template when they're
+added by inner templates.
+
+
 == v0.17.1 [2015-01-15] Michael Granger <ged@FaerieMUD.org>
 
 Re-push to fix a misbuilt gem.

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	warn ">>> Inversion requires Ruby 2.0.0 or later. <<<" if RUBY_VERSION < '2.0.0'
 
 	# Library version constant
-	VERSION = '0.17.1'
+	VERSION = '0.17.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 0d5760c23bc9 $
+	REVISION = %q$Revision: 25c7ea1fcb58 $
 
 
 	### Get the Inversion version.

data/lib/inversion/renderstate.rb

@@ -344,6 +344,7 @@ class Inversion::RenderState
 	### Add one or more rendered +nodes+ to the state as a reusable fragment associated
 	### with the specified +name+.
 	def add_fragment( name, *nodes )
+		self.log.debug "Adding a %s fragment with %d nodes." % [ name, nodes.size ]
 		nodes.flatten!
 		self.fragments[ name.to_sym ] = nodes
 		self.scope.__fragments__[ name.to_sym ] = nodes
@@ -352,6 +353,7 @@ class Inversion::RenderState
 
 	### Return the current fragments Hash rendered as Strings.
 	def rendered_fragments
+		self.log.debug "Rendering fragments: %p." % [ self.fragments.keys ]
 		return self.fragments.each_with_object( {} ) do |(key, nodes), accum|
 			accum[ key ] = self.stringify_nodes( nodes )
 		end

data/lib/inversion/template.rb

@@ -338,7 +338,7 @@ class Inversion::Template
 	### Render the template, optionally passing a render state (if, for example, the
 	### template is being rendered inside another template).
 	def render( parentstate=nil, &block )
-		self.log.info "rendering template 0x%08x" % [ self.object_id/2 ]
+		self.log.info "rendering template %#x" % [ self.object_id/2 ]
 		opts = self.options
 		opts.merge!( parentstate.options ) if parentstate
 
@@ -348,10 +348,14 @@ class Inversion::Template
 
 		# self.log.debug "  rendering node tree: %p" % [ @node_tree ]
 		self.walk_tree {|node| state << node }
-		self.log.info "  done rendering template 0x%08x: %0.4fs" %
+		self.log.info "  done rendering template %#x: %0.4fs" %
 			[ self.object_id/2, state.time_elapsed ]
 
-		self.fragments.replace( state.rendered_fragments )
+		if parentstate
+			parentstate.fragments.merge!( state.fragments )
+		else
+			self.fragments.replace( state.rendered_fragments )
+		end
 
 		return state.to_s
 	end

data/lib/inversion/template/fragmenttag.rb

@@ -45,11 +45,11 @@ class Inversion::Template::FragmentTag < Inversion::Template::Tag
 		rendered_nodes = []
 		renderstate.with_destination( rendered_nodes ) do
 			sn = self.render_subnodes( renderstate )
-			self.log.debug "  subnodes are: %p" % [ sn ]
+			# self.log.debug "  subnodes are: %p" % [ sn ]
 			sn
 		end
 
-		self.log.debug "  rendered nodes are: %p" % [ rendered_nodes ]
+		# self.log.debug "  rendered nodes are: %p" % [ rendered_nodes ]
 		renderstate.add_fragment( self.key, rendered_nodes )
 
 		return nil

data/spec/inversion/template/fragmenttag_spec.rb

@@ -36,5 +36,22 @@ describe Inversion::Template::FragmentTag do
 		expect( tmpl.fragments[:subject] ).to eq( "Order #2121bf8c4" )
 	end
 
+
+	it "propagates fragments to the outermost template when they're nested" do
+		inner_tmpl = Inversion::Template.new(
+			'<?fragment subject ?>Order #<?attr order_number ?><?end?>-- <?attr subject ?> --'
+		)
+		outer_tmpl = Inversion::Template.new(
+			'<?attr content ?>'
+		)
+
+		inner_tmpl.order_number = '2121bf8c4'
+		outer_tmpl.content = inner_tmpl
+		output = outer_tmpl.render
+
+		expect( output ).to eq( "-- Order #2121bf8c4 --" )
+		expect( outer_tmpl.fragments[:subject] ).to eq( "Order #2121bf8c4" )
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Michael Granger
@@ -31,7 +31,7 @@ cert_chain:
   c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
   ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability

metadata.gz.sig

@@ -1,2 +1,2 @@
-V�f�ʡ~	U��k�jɖS��~c͚�C�6�zP#9�my�H%ʆ��-�M��J���w�dXw���vh&���;i0���di��z��L8�]?tl�ofT�
-�0�h.�t)yl�Bʬ3���6��D�&&��0���O%��ȥ�d�L�)�7������A�VA��/"�v���zAo��n[Θ��W�jEx�;"���B�`�̇�M��lq��/U�|���xM���$�&����y�r��l�#��v�
+���^(����\Q
+!�ݚw���$��L��lN�Z��}Y:4�㻐5��6�}^���ݎs��B:��ˑ��7t�Z��2�sb��[Ÿ��Xp�?ft&��6�=a�俓��M�puPa#"�d�a��GӘG�ꠔλ�.���{����Y0��OP_�mYvb�zV��M}���p%�NwA������a�fڵK��������j�<`�E��\Sґc50A�W��d%�V�[@�:`v����A��j�H����'�