inversion 0.10.2 → 0.11.0

data/ChangeLog

@@ -1,10 +1,36 @@
+2012-07-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* 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]
+
+	* lib/inversion/mixins.rb:
+	Don't try to deep copy Encoding objects, either
+	[424709b51350]
+
+2012-06-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.10.2 for changeset 043b32a2d9a6
+	[5b926937058b]
+
+	* .hgsigs:
+	Added signature for changeset 7236fd2ac3fb
+	[043b32a2d9a6] [v0.10.2]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump the patch version, update history.
+	[7236fd2ac3fb]
+
 2012-06-27  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/inversion/mixins.rb, lib/inversion/template.rb,
 	spec/inversion/mixins_spec.rb:
 	Add Modules/Classes to the immediate object list when deep copying.
 	Don't needlessly deep_copy the node tree on template duplication.
-	[fb0ab0db2042] [tip]
+	[fb0ab0db2042]
 
 2012-06-22  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.11.0 [2012-07-06] Michael Granger <ged@FaerieMUD.org>
+
+- Automatically transcode output according to the registered encoding
+  if the template is created with one
+
+
 == v0.10.2 [2012-06-27] Mahlon E. Smith  <mahlon@martini.nu>
 
 - Bugfix: Don't dup Classes and Modules in template attributes.

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.10.2'
+	VERSION = '0.11.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 7236fd2ac3fb $
+	REVISION = %q$Revision: 92d48ef3085e $
 
 
 	### Get the Inversion version.

data/lib/inversion/mixins.rb

@@ -212,7 +212,7 @@ module Inversion
 			return obj if obj.class.name == 'RSpec::Mocks::Mock'
 
 			return case obj
-				when NilClass, Numeric, TrueClass, FalseClass, Symbol, Module
+				when NilClass, Numeric, TrueClass, FalseClass, Symbol, Module, Encoding
 					obj
 
 				when Array

data/lib/inversion/renderstate.rb

@@ -264,6 +264,7 @@ class Inversion::RenderState
 		if self.rendering_enabled?
 			self.destination << self.make_node_comment( node ) if self.options[:debugging_comments]
 			previous_node = nil
+			enc = self.options[:encoding] || Encoding.default_internal
 
 			begin
 				# Allow render to be delegated to subobjects
@@ -273,8 +274,8 @@ class Inversion::RenderState
 					node = node.render( self )
 				end
 
-				# self.log.debug "  adding a %p to the destination (%p)" %
-				# 	[ node.class, self.destination.class ]
+				# self.log.debug "  adding a %p (%p; encoding: %s) to the destination (%p)" %
+				#	[ node.class, node, node.respond_to?(:encoding) ? node.encoding : 'n/a', self.destination.class ]
 				self.destination << node
 				# self.log.debug "    just appended %p to %p" % [ node, self.destination ]
 			rescue ::StandardError => err
@@ -290,7 +291,14 @@ class Inversion::RenderState
 
 	### Turn the rendered node structure into the final rendered String.
 	def to_s
-		return @output.flatten.map( &:to_s ).join
+		strings = @output.flatten.map( &:to_s )
+
+		if enc = self.options[ :encoding ]
+			self.log.debug "Encoding rendered template parts to %s" % [ enc ]
+			strings.map! {|str| str.encode(enc) }
+		end
+
+		return strings.join
 	end
 
 

data/lib/inversion/template.rb

@@ -116,9 +116,8 @@ class Inversion::Template
 		end
 
 		# We trust files read from disk
-		encoding = opts.delete( :encoding )
-		source = if encoding
-				tmpl.read( encoding: encoding )
+		source = if opts.key?( :encoding )
+				tmpl.read( encoding: opts[:encoding] )
 			else
 				tmpl.read
 			end

data/spec/inversion/renderstate_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env rspec -cfd -b
+# encoding: utf-8
 # vim: set noet nosta sw=4 ts=4 :
 
 BEGIN {
@@ -383,5 +384,24 @@ describe Inversion::RenderState do
 
 	end
 
+
+	describe "encoding support" do
+
+		it "transcodes attribute values if the template's encoding is set" do
+			attributes = {
+				good_doggie: "Стрелка".encode('koi8-u'),
+				little:      "arrow".encode('us-ascii')
+			}
+
+			state = Inversion::RenderState.new( attributes, encoding: 'utf-8' )
+
+			state << Inversion::Template::AttrTag.new( 'good_doggie' )
+			state << Inversion::Template::AttrTag.new( 'little' )
+
+			state.to_s.encoding.should be( Encoding::UTF_8 )
+		end
+
+	end
+
 end
 

metadata

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