inversion 0.6.0 → 0.6.1

data/ChangeLog

@@ -1,8 +1,40 @@
+2012-03-16  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.6.1 for changeset e839621aac29
+	[63e1a917c7ad] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 1947a577fae1
+	[e839621aac29] [v0.6.1]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump the patch version and update History.
+	[1947a577fae1]
+
+2012-03-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* experiments/fivefish-profile1.graffle, experiments/fivefish-
+	profile2.graffle, experiments/fivefish-profile3.graffle, experiments
+	/fivefish-profile4.graffle, lib/inversion/renderstate.rb,
+	lib/inversion/template/attrtag.rb,
+	lib/inversion/template/importtag.rb:
+	Comment out some of the slowest debugging and add profile graphs.
+	[c0c5f6da6144]
+
 2012-03-13  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.6.0 for changeset c07de9868874
+	[fe598279830a]
+
+	* .hgsigs:
+	Added signature for changeset 2397134edcb3
+	[c07de9868874] [v0.6.0]
+
 	* History.rdoc, lib/inversion.rb:
 	Bump the minor version, update History.
-	[2397134edcb3] [tip]
+	[2397134edcb3]
 
 	* lib/inversion/template/fortag.rb, manual/src/tags.page,
 	spec/inversion/template/fortag_spec.rb:
@@ -13,14 +45,14 @@
 
 	* .rvm.gems, .rvmrc:
 	Update .rvm files
-	[6fb2d6971357] [github/master]
+	[6fb2d6971357]
 
 2012-03-05  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* lib/inversion/template.rb, spec/inversion/template_spec.rb:
 	Err, no. Lets try that again. 10,000 monkeys pounding away at
 	keyboards are responsible. Or maybe just one.
-	[7c42e6b20c11]
+	[7c42e6b20c11] [github/master]
 
 	* lib/inversion/template.rb, manual/src/templates.page,
 	spec/inversion/template_spec.rb:

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.6.1 [2012-03-16] Michael Granger <ged@FaerieMUD.org>
+
+- Commented out some of the more expensive debug logging for an order
+  of magnitude increase in render speed.
+
+
 == v0.6.0 [2012-03-13] Michael Granger <ged@FaerieMUD.org>
 
 - Fix a bug with "for" tag iteration over complex data structures

data/lib/inversion.rb

@@ -26,10 +26,10 @@ module Inversion
 	require 'inversion/monkeypatches'
 
 	# Library version constant
-	VERSION = '0.6.0'
+	VERSION = '0.6.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 2397134edcb3 $
+	REVISION = %q$Revision: 1947a577fae1 $
 
 	#
 	# Logging

data/lib/inversion/renderstate.rb

@@ -22,8 +22,8 @@ class Inversion::RenderState
 			containerstate = nil
 		end
 
-		self.log.debug "Creating a render state with attributes: %p" %
-			[ initial_attributes ]
+		# self.log.debug "Creating a render state with attributes: %p" %
+		#	[ initial_attributes ]
 
 		@start_time         = Time.now
 		@containerstate     = containerstate
@@ -189,7 +189,7 @@ class Inversion::RenderState
 	### 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 )
-		self.log.debug "Appending a %p to %p" % [ node.class, self ]
+		# self.log.debug "Appending a %p to %p" % [ node.class, self ]
 		original_node = node
 		original_node.before_rendering( self )
 
@@ -200,17 +200,17 @@ class Inversion::RenderState
 			begin
 				# Allow render to be delegated to subobjects
 				while node.respond_to?( :render ) && node != previous_node
-					self.log.debug "    delegated rendering to: %p" % [ node ]
+					# self.log.debug "    delegated rendering to: %p" % [ node ]
 					previous_node = node
 					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 to the destination (%p)" %
+				# 	[ node.class, self.destination.class ]
 				self.destination << node
-				self.log.debug "    just appended %p to %p" % [ node, self.destination ]
+				# self.log.debug "    just appended %p to %p" % [ node, self.destination ]
 			rescue ::StandardError => err
-				self.log.debug "  handling a %p while rendering: %s" % [ err.class, err.message ]
+				# self.log.debug "  handling a %p while rendering: %s" % [ err.class, err.message ]
 				self.destination << self.handle_render_error( original_node, err )
 			end
 		end
@@ -376,7 +376,7 @@ class Inversion::RenderState
 
 	### Recursively copy the specified +obj+ and return the result.
 	def deep_copy( obj )
-		Inversion.log.debug "Deep copying: %p" % [ obj ]
+		# Inversion.log.debug "Deep copying: %p" % [ obj ]
 
 		# Handle mocks during testing
 		return obj if obj.class.name == 'RSpec::Mocks::Mock'

data/lib/inversion/template/attrtag.rb

@@ -79,7 +79,7 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 
 	### Render the tag attributes of the specified +renderstate+ and return them.
 	def render( renderstate )
-		self.log.debug "Rendering %p with state: %p" % [ self, renderstate ]
+		# self.log.debug "Rendering %p with state: %p" % [ self, renderstate ]
 
 		# Evaluate the tag body and return either false value
 		value = self.evaluate( renderstate ) or return value
@@ -97,17 +97,17 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 	def evaluate( renderstate )
 		value     = nil
 		attribute = renderstate.attributes[ self.name.to_sym ]
-		self.log.debug "  initial attribute: %p" % [ attribute ]
+		# self.log.debug "  initial attribute: %p" % [ attribute ]
 
 		# Evaluate the method chain (if there is one) against the attribute
 		if self.methodchain
 			methodchain = "self" + self.methodchain
-			self.log.debug "  evaling methodchain: %p on: %p" % [ methodchain, attribute ]
+			# self.log.debug "  evaling methodchain: %p on: %p" % [ methodchain, attribute ]
 			value = attribute.instance_eval( methodchain )
 		else
 			value = attribute
 		end
-		self.log.debug "  evaluated value: %p" % [ value ]
+		# self.log.debug "  evaluated value: %p" % [ value ]
 
 		return value
 	end

data/lib/inversion/template/importtag.rb

@@ -34,8 +34,8 @@ class Inversion::Template::ImportTag < Inversion::Template::Tag
 	### Merge the inherited renderstate into the current template's +renderstate+.
 	def render( renderstate )
 		if (( cstate = renderstate.containerstate ))
-			self.log.debug "Importing inherited attributes: %p from %p" %
-				[ @attributes, cstate.attributes ]
+			# self.log.debug "Importing inherited attributes: %p from %p" %
+			#	[ @attributes, cstate.attributes ]
 
 			# Pick out the attributes that are being imported
 			inherited_attrs = @attributes.inject( {} ) do |attrs, key|
@@ -46,10 +46,10 @@ class Inversion::Template::ImportTag < Inversion::Template::Tag
 			# Merge, but overwrite unset values with inherited ones
 			renderstate.attributes.merge!( inherited_attrs ) do |key, oldval, newval|
 				if oldval.nil?
-					self.log.debug "Importing attribute %p: %p" % [ key, newval ]
+					# self.log.debug "Importing attribute %p: %p" % [ key, newval ]
 					newval
 				else
-					self.log.debug "Not importing attribute %p: already set to %p" % [ key, oldval ]
+					# self.log.debug "Not importing attribute %p: already set to %p" % [ key, oldval ]
 					oldval
 				end
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -37,11 +37,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70276480362560 !ruby/object:Gem::Requirement
+  requirement: &70264152436760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70276480362560
+  version_requirements: *70264152436760
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70276480378460 !ruby/object:Gem::Requirement
+  requirement: &70264152436060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *70276480378460
+  version_requirements: *70264152436060
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70276480377960 !ruby/object:Gem::Requirement
+  requirement: &70264152435540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70276480377960
+  version_requirements: *70264152435540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70276480377180 !ruby/object:Gem::Requirement
+  requirement: &70264152478140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70276480377180
+  version_requirements: *70264152478140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276480376360 !ruby/object:Gem::Requirement
+  requirement: &70264152477360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70276480376360
+  version_requirements: *70264152477360
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70276480375580 !ruby/object:Gem::Requirement
+  requirement: &70264152476740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70276480375580
+  version_requirements: *70264152476740
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70276480374200 !ruby/object:Gem::Requirement
+  requirement: &70264152475940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70276480374200
+  version_requirements: *70264152475940
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70276480373760 !ruby/object:Gem::Requirement
+  requirement: &70264152474980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70276480373760
+  version_requirements: *70264152474980
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70276480372880 !ruby/object:Gem::Requirement
+  requirement: &70264152474040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,21 +137,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70276480372880
-- !ruby/object:Gem::Dependency
-  name: hoe-manualgen
-  requirement: &70276480372420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: *70276480372420
+  version_requirements: *70264152474040
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70276480372000 !ruby/object:Gem::Requirement
+  requirement: &70264152472820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +148,10 @@ dependencies:
         version: '1.16'
   type: :development
   prerelease: false
-  version_requirements: *70276480372000
+  version_requirements: *70264152472820
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70276480371560 !ruby/object:Gem::Requirement
+  requirement: &70264152471760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +159,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70276480371560
+  version_requirements: *70264152471760
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70276480371140 !ruby/object:Gem::Requirement
+  requirement: &70264152471180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,29 +170,18 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70276480371140
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70276480370680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: *70276480370680
+  version_requirements: *70264152471180
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70276480221500 !ruby/object:Gem::Requirement
+  requirement: &70264152486800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *70276480221500
+  version_requirements: *70264152486800
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
   of Control"
 
@@ -219,9 +197,9 @@ executables:
 - inversion
 extensions: []
 extra_rdoc_files:
+- History.rdoc
 - Manifest.txt
 - README.rdoc
-- History.rdoc
 files:
 - ChangeLog
 - History.rdoc