inversion 0.2.0 → 0.3.0

data/History.rdoc

@@ -1,3 +1,10 @@
+== v0.3.0 [2011-10-05] Michael Granger <ged@FaerieMUD.org>
+
+- Fix require loop in if/elsif tags
+- Fixing a problem with HTML escaping of objects other than Strings
+- Added render timing (Inversion::RenderState#time_elapsed)
+
+
 == v0.2.0 [2011-09-27] Michael Granger <ged@FaerieMUD.org>
 
 - Bugfixes (#1, #2)

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	require 'inversion/monkeypatches'
 
 	# Library version constant
-	VERSION = '0.2.0'
+	VERSION = '0.3.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 896d23953a0a $
+	REVISION = %q$Revision: cde501e6764c $
 
 	#
 	# Logging

data/lib/inversion/mixins.rb

@@ -224,7 +224,7 @@ module Inversion
 
 		### Escape the given +output+ using HTML entity-encoding.
 		def escape_html( output )
-			return output.
+			return output.to_s.
 				gsub( /&/, '&' ).
 				gsub( /</, '&lt;' ).
 				gsub( />/, '&gt;' )

data/lib/inversion/renderstate.rb

@@ -25,6 +25,7 @@ class Inversion::RenderState
 		self.log.debug "Creating a render state with attributes: %p" %
 			[ initial_attributes ]
 
+		@start_time         = Time.now
 		@containerstate     = containerstate
 		@options            = Inversion::Template::DEFAULT_CONFIG.merge( options )
 		@attributes         = [ deep_copy(initial_attributes) ]
@@ -70,6 +71,9 @@ class Inversion::RenderState
 	# The default error handler
 	attr_reader :default_errhandler
 
+	# The Time the object was created
+	attr_reader :start_time
+
 
 	### Return the hash of attributes that are currently in effect in the
 	### rendering state.
@@ -315,6 +319,13 @@ class Inversion::RenderState
 	end
 
 
+	### Return the number of floting-point seconds that have passed since the
+	### object was created. Used to time renders.
+	def time_elapsed
+		return Time.now - self.start_time
+	end
+
+
 	### Return a human-readable representation of the object.
 	def inspect
 		return "#<%p:0x%08x containerstate: %s, attributes: %s, destination: %p>" % [

data/lib/inversion/template.rb

@@ -184,7 +184,9 @@ class Inversion::Template
 		# Post-render hook
 		self.walk_tree {|node| node.after_rendering(state) }
 
-		self.log.info "  done rendering template 0x%08x" % [ self.object_id/2 ]
+		self.log.info "  done rendering template 0x%08x: %0.4fs" %
+			[ self.object_id/2, state.time_elapsed ]
+
 		return state.to_s
 	end
 	alias_method :to_s, :render

data/lib/inversion/template/elsiftag.rb

@@ -2,8 +2,9 @@
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'inversion/template/attrtag'
-require 'inversion/template/iftag' unless defined?( Inversion::Template::IfTag )
 require 'inversion/template/commenttag'
+require 'inversion/template/iftag' unless
+	defined?( Inversion::Template::IfTag )
 
 
 # Inversion 'elsif' tag.

data/lib/inversion/template/iftag.rb

@@ -4,8 +4,6 @@
 require 'inversion/mixins'
 require 'inversion/template/attrtag'
 require 'inversion/template/containertag'
-require 'inversion/template/elsiftag'
-require 'inversion/template/elsetag'
 
 # Inversion 'if' tag.
 #

data/spec/inversion/renderstate_spec.rb

@@ -177,6 +177,7 @@ describe Inversion::RenderState do
 
 	end
 
+
 	describe "render destinations" do
 
 		it "can override the render destination for the duration of a block" do
@@ -364,5 +365,19 @@ describe Inversion::RenderState do
 
 	end
 
+
+	describe "render timing" do
+
+		before( :each ) do
+			@state = Inversion::RenderState.new
+		end
+
+
+		it "knows how many floating-point seconds have passed since it was created" do
+			@state.time_elapsed.should be_a( Float )
+		end
+
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -49,22 +49,22 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-09-27 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70311260655740 !ruby/object:Gem::Requirement
+  requirement: &70147534076140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70311260655740
+  version_requirements: *70147534076140
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70311260655280 !ruby/object:Gem::Requirement
+  requirement: &70147534075520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *70311260655280
+  version_requirements: *70147534075520
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70311260654860 !ruby/object:Gem::Requirement
+  requirement: &70147534074980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70311260654860
+  version_requirements: *70147534074980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70311260654400 !ruby/object:Gem::Requirement
+  requirement: &70147534074360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70311260654400
+  version_requirements: *70147534074360
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70311260653980 !ruby/object:Gem::Requirement
+  requirement: &70147534073820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70311260653980
+  version_requirements: *70147534073820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70311260653560 !ruby/object:Gem::Requirement
+  requirement: &70147534073200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,10 +116,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70311260653560
+  version_requirements: *70147534073200
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70311260653140 !ruby/object:Gem::Requirement
+  requirement: &70147534072680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +127,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70311260653140
+  version_requirements: *70147534072680
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70311260652720 !ruby/object:Gem::Requirement
+  requirement: &70147534072100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70311260652720
+  version_requirements: *70147534072100
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70311260652300 !ruby/object:Gem::Requirement
+  requirement: &70147534071140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,10 +149,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *70311260652300
+  version_requirements: *70147534071140
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70311260651860 !ruby/object:Gem::Requirement
+  requirement: &70147534069820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -160,10 +160,10 @@ dependencies:
         version: 1.16.2
   type: :development
   prerelease: false
-  version_requirements: *70311260651860
+  version_requirements: *70147534069820
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70311260651440 !ruby/object:Gem::Requirement
+  requirement: &70147534069240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -171,10 +171,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70311260651440
+  version_requirements: *70147534069240
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70311260651020 !ruby/object:Gem::Requirement
+  requirement: &70147534068660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -182,10 +182,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70311260651020
+  version_requirements: *70147534068660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70311260650600 !ruby/object:Gem::Requirement
+  requirement: &70147534068080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -193,7 +193,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70311260650600
+  version_requirements: *70147534068080
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
   of Control" principle to decouple