inversion 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3abf2d4030db2c2d5c772d68dcd717ede7fa6855
-  data.tar.gz: ae7a4178935ef854e28ca3d35cb67c2e08be061e
+  metadata.gz: ee01a480a807741a298355b17197ed2f27e95331
+  data.tar.gz: 4a7cb73e31268fa057178f347ace82ac1424d185
 SHA512:
-  metadata.gz: 0c859f59041d2d7f3226dcb32eb3efdbcbbc13fe88437345aa51379698dd26448b6f0e1e9d83ad42dd8d6a253f5f54499ab7f48a08dfc6ae421a71cfd12acb2e
-  data.tar.gz: 7412d7af509f67477c45858427e5e152aefc095884c4e3044914407584763535a04f89b211b1573cd7a79cf88d871a4d7ea002b5405cc3d4c79b21066b9e63a6
+  metadata.gz: 17b2389918625d5ca52bdc85266d2f5b2e5dba57eb1f13ed89d3645c614095ed1ffb329174cfd8ed8ea909248ca479fa8f6f4e48d0fcc85a1f62913205096ae0
+  data.tar.gz: fd494f03728ff030c95589eb40fdc67ce7332d14dd9ee176343e343c7b1925e9f91d304eeeccb7ab74b550c7f00c54167b2b35cf47f6361530a470a3fb243113

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-SMrr68�O���\Pu���8P��e*n
j(����F��&���Iƭ5q`fX��,JG{Տ�c�5*4�d�a�S�8):c�I-�~4�mU#��x!��΅����.��<E�8E1�W�� J~��BL���movU�gqB�!����*��T�rV�:����[�t��I�E�8S��!�ÿ?un��1��T�z/����rm�dT,�@ٓ���̍��qDW"�gZ4a��̈/��b�M�A�;�!�m�Yj
+���`}����l�?ڨ5��\h��\��N����dj뮷4�@Q#�z��}c���ygfU��8e+�Fn�d��.Ҵ����v�<�Q��D�H�Y�N%� �f�=}����i탞��/���8����
���t
+;&u�ШrIE�|�N��L����=�>}u���:��SCBW�J�t�؏x�b�A%���uu��v3a�\��.軧�B#�蚶�!�໯�ϻۤ��Ѩ��)A,؅��CnՉ2Z(�^V� 

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.12.2 [2013-06-19] Michael Granger <ged@FaerieMUD.org>
+
+- Fix propagation of config tags into subtemplates (fixes #1)
+- Use replacement in transcoding instead of raising encoding errors
+
+
 == v0.12.1 [2013-03-05] Michael Granger <ged@FaerieMUD.org>
 
 A bunch of optimization and inspect-encoding fixes.

data/Manifest.txt

@@ -41,6 +41,7 @@ lib/inversion/template/uriencodetag.rb
 lib/inversion/template/yieldtag.rb
 lib/inversion/tilt.rb
 spec/data/sinatra/hello.inversion
+spec/data/unknown-tag.tmpl
 spec/inversion/mixins_spec.rb
 spec/inversion/monkeypatches_spec.rb
 spec/inversion/parser_spec.rb

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	warn ">>> Inversion requires Ruby 1.9.2 or later. <<<" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.12.1'
+	VERSION = '0.12.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 4bc01301cf22 $
+	REVISION = %q$Revision: 0444a00c5e64 $
 
 
 	### Get the Inversion version.

data/lib/inversion/monkeypatches.rb

@@ -4,7 +4,7 @@
 require 'inversion' unless defined?( Inversion )
 require 'ripper'
 
-# Monkeypatch mixin to expose the 'tokens' instance variable of 
+# Monkeypatch mixin to expose the 'tokens' instance variable of
 # Ripper::TokenPattern::MatchData. Included in Ripper::TokenPattern::MatchData.
 module Inversion::RipperAdditions
 

data/lib/inversion/parser.rb

@@ -97,7 +97,7 @@ class Inversion::Parser
 			end
 
 			# self.log.debug "  found a tag at offset: %d (%p) (line %d, col %d)" %
-			# 	[ start_pos, abbrevstring(match[0]), linenum, colnum ]
+			#     [ start_pos, abbrevstring(match[0]), linenum, colnum ]
 
 			# If there were characters between the end of the last match and
 			# the beginning of the tag, create a text node with them
@@ -108,7 +108,7 @@ class Inversion::Parser
 			end
 
 			# self.log.debug "  creating tag with tagname: %p, body: %p" %
-			# 	[ match[:tagname], match[:body] ]
+			#    [ match[:tagname], match[:body] ]
 
 			tag = Inversion::Template::Tag.create( match[:tagname], match[:body], linenum, colnum )
 			if tag.nil?
@@ -167,7 +167,7 @@ class Inversion::Parser
 	class State
 		extend Loggability
 
-		# 
+		# Write logs to the Inversion logger
 		log_to :inversion
 
 		### Create a new State object

data/lib/inversion/renderstate.rb

@@ -67,7 +67,7 @@ class Inversion::RenderState
 
 
 	### Create a new RenderState. If the template is being rendered inside another one, the
-	### containing template's RenderState will be passed as the +containerstate+. The 
+	### containing template's RenderState will be passed as the +containerstate+. The
 	### +initial_attributes+ will be deep-copied, and the +options+ will be merged with
 	### Inversion::Template::DEFAULT_CONFIG. The +block+ is stored for use by
 	### template nodes.
@@ -257,8 +257,8 @@ class Inversion::RenderState
 	end
 
 
-	### Append operator -- add an node to the final rendered output. If the +node+ renders 
-	### as an object that itself responds to the #render method, #render will be called and 
+	### Append operator -- add an node to the final rendered output. If the +node+ renders
+	### as an object that itself responds to the #render method, #render will be called and
 	### the return value will be appended instead. This will continue until the returned
 	### object either doesn't respond to #render or #renders as itself.
 	def <<( node )
@@ -300,7 +300,7 @@ class Inversion::RenderState
 
 		if enc = self.options[ :encoding ]
 			self.log.debug "Encoding rendered template parts to %s" % [ enc ]
-			strings.map! {|str| str.encode(enc) }
+			strings.map! {|str| str.encode(enc, invalid: :replace, undef: :replace) }
 		end
 
 		return strings.join
@@ -315,7 +315,7 @@ class Inversion::RenderState
 		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 ]
+			#     [ nodes.length, subscriber, subscriber.class ]
 			subscriber.publish( *nodes )
 		end
 		self.published_nodes[ key ].concat( nodes )
@@ -362,7 +362,7 @@ class Inversion::RenderState
 	end
 
 
-	### Default exception handler: Handle an +exception+ while rendering +node+ according to the 
+	### Default exception handler: Handle an +exception+ while rendering +node+ according to the
 	### behavior specified by the `on_render_error` option. Returns the string which should be
 	### appended to the output, if any.
 	def default_error_handler( state, node, exception )

data/lib/inversion/template.rb

@@ -50,16 +50,18 @@ class Inversion::Template
 
 	### Default config values
 	DEFAULT_CONFIG = {
+		# Loading/parsing options
 		:ignore_unknown_tags => true,
 		:template_paths      => [],
+		:stat_delay          => 0,
 
+		# Rendering options
 		:on_render_error     => :comment,
 		:debugging_comments  => false,
 		:comment_start       => '<!-- ',
 		:comment_end         => ' -->',
 		:escape_format       => :html,
 		:strip_tag_lines     => true,
-		:stat_delay          => 0
 	}.freeze
 
 
@@ -211,7 +213,10 @@ class Inversion::Template
 	### template is being rendered inside another template).
 	def render( parentstate=nil, &block )
 		self.log.info "rendering template 0x%08x" % [ self.object_id/2 ]
-		state = Inversion::RenderState.new( parentstate, self.attributes, self.options, &block )
+		opts = self.options
+		opts.merge!( parentstate.options ) if parentstate
+
+		state = Inversion::RenderState.new( parentstate, self.attributes, opts, &block )
 
 		# self.log.debug "  rendering node tree: %p" % [ @node_tree ]
 		self.walk_tree {|node| state << node }

data/lib/inversion/template/codetag.rb

@@ -11,12 +11,12 @@ require 'inversion/template/tag'
 # tokens to match, and a block for handling tag instances that match the pattern.
 #
 #    class Inversion::Template::MyTag < Inversion::Template::CodeTag
-#    
+#
 #        # Match a tag that looks like: <?my "string of stuff" ?>
 #        tag_pattern 'tstring_beg $(tstring_content) tstring_end' do |tag, match|
 #            tag.string = match.string( 1 )
 #        end
-#    
+#
 #    end
 #
 # The tokens in the +tag_pattern+ are Ruby token names used by the parser. If you're creating
@@ -90,8 +90,10 @@ class Inversion::Template::CodeTag < Inversion::Template::Tag
 
 
 	### Declare a +token_pattern+ for tag bodies along with a +callback+ that will
-	### be called when a tag matching the pattern is instantiated.
-	def self::tag_pattern( token_pattern, &callback ) #:yield: 
+	### be called when a tag matching the pattern is instantiated. The +callback+ will
+	### be called with the tag instance, and the MatchData object that resulted from
+	### matching the input, and should set up the yielded +tag+ object appropriately.
+	def self::tag_pattern( token_pattern, &callback ) #:yield: tag, match_data
 		pattern = TokenPattern.compile( token_pattern )
 		@tag_patterns = [] unless defined?( @tag_patterns )
 		@tag_patterns << [ pattern, callback ]

data/lib/inversion/template/commenttag.rb

@@ -30,7 +30,7 @@ class Inversion::Template::CommentTag < Inversion::Template::Tag
 	end
 
 
-	### Render the tag as the body of a comment, suitable for template 
+	### Render the tag as the body of a comment, suitable for template
 	### debugging.
 	def as_comment_body
 		firstnode, lastnode = self.subnodes.first, self.subnodes.last

data/lib/inversion/template/containertag.rb

@@ -33,7 +33,7 @@ module Inversion::Template::ContainerTag
 	alias_method :container?, :is_container?
 
 
-	### Default render method for containertags; rendering each of its subnodes and 
+	### Default render method for containertags; rendering each of its subnodes and
 	### don't render anything for the container itself.
 	def render( renderstate )
 		self.render_subnodes( renderstate )

data/lib/inversion/template/elsetag.rb

@@ -6,7 +6,7 @@ require 'inversion/template/tag'
 
 # Inversion 'else' tag.
 #
-# This tag adds a logical switch to an IfTag. If the IfTag's condition was false, 
+# This tag adds a logical switch to an IfTag. If the IfTag's condition was false,
 # start rendering.
 #
 # == Syntax
@@ -38,7 +38,7 @@ class Inversion::Template::ElseTag < Inversion::Template::Tag
 			case node
 
 			# If there was a previous 'if' or 'unless', the else belongs to it. Also
-			# allow it to be appended to a 'comment' section so you can comment out an 
+			# allow it to be appended to a 'comment' section so you can comment out an
 			# else clause
 			when Inversion::Template::IfTag,
 			     Inversion::Template::UnlessTag,

data/lib/inversion/template/elsiftag.rb

@@ -9,7 +9,7 @@ require 'inversion/template/iftag' unless
 
 # Inversion 'elsif' tag.
 #
-# This tag adds a conditional logical switch to an IfTag. If the IfTag's condition was false, 
+# This tag adds a conditional logical switch to an IfTag. If the IfTag's condition was false,
 # but the attribute or methodchain of the elsif is true, start rendering.
 #
 # == Syntax

data/lib/inversion/template/fortag.rb

@@ -95,7 +95,7 @@ class Inversion::Template::ForTag < Inversion::Template::CodeTag
 			# the arguments names and values
 			overrides = Hash[ self.block_args.zip(args) ]
 
-			# Overlay the block args from the 'for' over the template attributes and render 
+			# Overlay the block args from the 'for' over the template attributes and render
 			# each subnode
 			state.with_attributes( overrides ) do
 				super

data/lib/inversion/template/node.rb

@@ -9,7 +9,7 @@ require 'inversion/template' unless defined?( Inversion::Template )
 # Inversion template node base class. Template text is parsed by the
 # Inversion::Parser into nodes, and appended to a tree
 # that is later walked when the template is rendered.
-# 
+#
 # This class is abstract; it just defines the API that other nodes
 # are expected to implement.
 class Inversion::Template::Node

data/lib/inversion/template/tag.rb

@@ -11,7 +11,7 @@ require 'inversion/mixins'
 
 # Inversion template tag node base class. Represents a directive in a template
 # that defines behavior and/or state.
-# 
+#
 # This class supports the RubyGems plugin API: to provide one or more Inversion tags
 # in a gem of your own, put them into a directory named 'inversion/template' and
 # name the files <tt><tagname>tag.rb</tt> and the classes <tagname.capitalize>Tag.

data/lib/inversion/template/uriencodetag.rb

@@ -16,7 +16,7 @@ require 'inversion/template/attrtag'
 class Inversion::Template::UriencodeTag < Inversion::Template::AttrTag
 
 	# Unreserved characters from section 2.3 of RFC 3986
- 	# ALPHA / DIGIT / "-" / "." / "_" / "~"
+	# ALPHA / DIGIT / "-" / "." / "_" / "~"
 	DEFAULT_ENCODED_CHARACTERS = /[^\w\-\.~]/
 
 	### Render the method chains against the attributes of the specified +render_state+

data/lib/inversion/template/yieldtag.rb

@@ -26,7 +26,7 @@ class Inversion::Template::YieldTag < Inversion::Template::Tag
 	def before_rendering( renderstate )
 		if renderstate.block
 			self.log.debug "Yielding to %p before rendering." % [ renderstate.block ]
-			renderstate.tag_data[ self ] = renderstate.block.call( renderstate ) 
+			renderstate.tag_data[ self ] = renderstate.block.call( renderstate )
 			self.log.debug "  render block returned: %p" % [ @block_value ]
 		end
 	end

data/spec/data/unknown-tag.tmpl

@@ -0,0 +1,5 @@
+<!-- $Id$ -->
+<?unknown This is an unknown tag type ?>
+<?comment Some stuff. ?>
+Stuff
+<?end comment ?>

data/spec/inversion/renderstate_spec.rb

@@ -158,7 +158,7 @@ describe Inversion::RenderState do
 	describe "context-aware tag state" do
 
 		before( :each ) do
-			@renderstate = Inversion::RenderState.new 
+			@renderstate = Inversion::RenderState.new
 		end
 
 		it "provides a mechanism for storing tag state for the current render" do
@@ -412,6 +412,23 @@ describe Inversion::RenderState do
 			state.to_s.encoding.should be( Encoding::UTF_8 )
 		end
 
+		it "replaces characters with undefined conversions instead of raising an encoding error" do
+			bogus = "this character doesn't translate: \xc3 "
+			bogus.force_encoding( 'binary' )
+
+			attributes = {
+				bogus: bogus,
+				okay:  "this stuff will transcode fine"
+			}
+
+			state = Inversion::RenderState.new( attributes, encoding: 'utf-8' )
+
+			state << Inversion::Template::AttrTag.new( 'okay' )
+			state << Inversion::Template::AttrTag.new( 'bogus' )
+
+			state.to_s.encoding.should be( Encoding::UTF_8 )
+		end
+
 	end
 
 end

data/spec/inversion/template/begintag_spec.rb

@@ -105,7 +105,7 @@ describe Inversion::Template::BeginTag do
 
 	context "with a single rescue clause with an exception type" do
 		before( :each ) do
-			
+
 			@tag = Inversion::Template::BeginTag.new( ' ' )
 
 			@attrtag = Inversion::Template::AttrTag.new( 'foo.baz' )

data/spec/inversion/template/configtag_spec.rb

@@ -18,9 +18,11 @@ describe Inversion::Template::ConfigTag do
 
 	before( :all ) do
 		setup_logging( :fatal )
+		Inversion::Template.template_paths << 'spec/data'
 	end
 
 	after( :all ) do
+		Inversion::Template.template_paths.delete( 'spec/data' )
 		reset_logging()
 	end
 
@@ -46,24 +48,26 @@ describe Inversion::Template::ConfigTag do
             comment_end: "*/"
 		YAML
 		tag = Inversion::Template::ConfigTag.new( yaml )
-		tag.options.should == {
+
+		expect( tag.options ).to eq({
 			:on_render_error    => 'propagate',
 			:debugging_comments => true,
 			:comment_start      => '/*',
 			:comment_end        => '*/'
-		}
+		})
 	end
 
 	# <?config { comment_start: "/*", comment_end: "*/" } ?>
 	it "can contain multiple configuration settings using an inline hash" do
 		tag = Inversion::Template::ConfigTag.new( '{ comment_start: "/*", comment_end: "*/" }' )
-		tag.options.should == { :comment_start => '/*', :comment_end => '*/' }
+		expect( tag.options ).to eq({ :comment_start => '/*', :comment_end => '*/' })
 	end
 
 	it "renders invisibly" do
 		tag = Inversion::Template::ConfigTag.new( 'comment_start: /*' )
 		state = Inversion::RenderState.new
-		tag.render( state ).should == nil
+
+		expect( tag.render(state) ).to be nil
 	end
 
 	it "raises an error on an empty body" do
@@ -94,7 +98,29 @@ describe Inversion::Template::ConfigTag do
 		something else
 		TEMPLATE
 		tmpl = Inversion::Template.new( source )
-		tmpl.render.should include( "<!-- If: { template.foo } -->" )
+
+		expect( tmpl.render ).to include( "<!-- If: { template.foo } -->" )
+	end
+
+	it "propagates options to subtemplates during parsing" do
+		source = <<-TEMPLATE
+		<?config ignore_unknown_tags: false ?>
+		<?include unknown-tag.tmpl ?>
+		TEMPLATE
+		expect {
+			Inversion::Template.new( source )
+		}.to raise_error( Inversion::ParseError, /unknown tag "unknown"/i )
+	end
+
+	it "propagates options to subtemplates during rendering" do
+		source = <<-TEMPLATE
+		<?config debugging_comments: true ?>
+		<?attr subtemplate ?>
+		TEMPLATE
+		tmpl = Inversion::Template.new( source )
+		tmpl.subtemplate = Inversion::Template.load( 'unknown-tag.tmpl' )
+
+		expect( tmpl.render ).to match( /commented out 1 nodes on line 3: some stuff/i )
 	end
 
 end

data/spec/inversion/template/textnode_spec.rb

@@ -76,7 +76,7 @@ describe Inversion::Template::TextNode do
 			expected_content = LONGER_CONTENT[0,40].dump
 			expected_content[-1,0] = '...'
 
-			@node.as_comment_body.should == 
+			@node.as_comment_body.should ==
 				%Q{Text (488 bytes): "\\t\\t<p>Lorem ipsum dolor sit amet, consect..."}
 		end
 

data/spec/lib/helpers.rb

@@ -26,6 +26,7 @@ end
 
 require 'rspec'
 require 'loggability'
+require 'loggability/spechelpers'
 
 require 'inversion'
 require 'spec/lib/constants'
@@ -45,31 +46,6 @@ module Inversion::SpecHelpers
 	end
 
 
-	### Reset the logging subsystem to its default state.
-	def reset_logging
-		Loggability.formatter = nil
-		Loggability.output_to( $stderr )
-		Loggability.level = :fatal
-	end
-
-
-	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=:fatal )
-
-		# Only do this when executing from a spec in TextMate
-		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			$stderr.puts "Setting up HTML logs."
-			logarray = []
-			Thread.current['logger-output'] = logarray
-			Loggability.output_to( logarray )
-			Loggability.format_as( :html )
-			Loggability.level = :debug
-		else
-			Loggability.level = level
-		end
-	end
-
-
 	### Create a string containing an XML Processing Instruction with the given +name+
 	### and +data+.
 	def create_pi( name, data )
@@ -83,9 +59,13 @@ end
 ### Mock with RSpec
 RSpec.configure do |c|
 	include Inversion::TestConstants
+	include Loggability::SpecHelpers
 
 	c.mock_with :rspec
+
 	c.include( Inversion::SpecHelpers )
+	c.include( Loggability::SpecHelpers )
+
 	c.filter_run_excluding( :ruby_1_9_only => true ) if
 		Inversion::SpecHelpers.vvec( RUBY_VERSION ) < Inversion::SpecHelpers.vvec('1.9.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Michael Granger
@@ -31,7 +31,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -302,6 +302,7 @@ files:
 - lib/inversion/template/yieldtag.rb
 - lib/inversion/tilt.rb
 - spec/data/sinatra/hello.inversion
+- spec/data/unknown-tag.tmpl
 - spec/inversion/mixins_spec.rb
 - spec/inversion/monkeypatches_spec.rb
 - spec/inversion/parser_spec.rb