inversion 0.7.0 → 0.8.0

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.8.0 [2012-04-01] Michael Granger <ged@FaerieMUD.org>
+
+- Optimization fixes
+- Fixed rendering flow control to not use a begin/rescue.
+
+
 == v0.7.0 [2012-03-29] Michael Granger <ged@FaerieMUD.org>
 
 - Switch to a much more flexible way to render tag bodies. This should

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 bin/inversion
 lib/inversion.rb
 lib/inversion/exceptions.rb
+lib/inversion/logging.rb
 lib/inversion/mixins.rb
 lib/inversion/monkeypatches.rb
 lib/inversion/parser.rb
@@ -40,8 +41,8 @@ lib/inversion/template/unlesstag.rb
 lib/inversion/template/uriencodetag.rb
 lib/inversion/template/yieldtag.rb
 lib/inversion/tilt.rb
-lib/inversion/utils.rb
 spec/data/sinatra/hello.inversion
+spec/inversion/logging_spec.rb
 spec/inversion/mixins_spec.rb
 spec/inversion/monkeypatches_spec.rb
 spec/inversion/parser_spec.rb

data/README.rdoc

@@ -118,7 +118,7 @@ and generate the API documentation.
 
 == License
 
-Copyright © 2011, Michael Granger and Mahlon E. Smith
+Copyright © 2011-2012, Michael Granger and Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -45,7 +45,7 @@ end
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
 # Ensure the specs pass before checking in
-task 'hg:precheckin' => [:check_history, :spec]
+task 'hg:precheckin' => [:check_history, :check_manifest, :spec]
 
 if Rake::Task.task_defined?( '.gemtest' )
 	Rake::Task['.gemtest'].clear

data/lib/inversion.rb

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 # vim: set noet nosta sw=4 ts=4 :
 
-require 'logger'
-
 
 # The Inversion templating system. This module provides the namespace for all the other
-# classes and modules, and contains the logging subsystem. A good place to start for 
-# documentation would be to check out the examples in the README, and then 
+# classes and modules, and contains the logging subsystem. A good place to start for
+# documentation would be to check out the examples in the README, and then
 # Inversion::Template for a list of tags, configuration options, etc.
 #
 # == Authors
@@ -20,69 +18,14 @@ module Inversion
 
 	warn ">>> Inversion requires Ruby 1.9.2 or later. <<<" if RUBY_VERSION < '1.9.2'
 
-	require 'inversion/exceptions'
-	require 'inversion/mixins'
-	require 'inversion/utils'
-	require 'inversion/monkeypatches'
-
 	# Library version constant
-	VERSION = '0.7.0'
+	VERSION = '0.8.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 92c2961cf986 $
-
-	#
-	# Logging
-	#
-
-	# Log levels
-	LOG_LEVELS = {
-		'debug' => Logger::DEBUG,
-		'info'  => Logger::INFO,
-		'warn'  => Logger::WARN,
-		'error' => Logger::ERROR,
-		'fatal' => Logger::FATAL,
-	}.freeze
-
-	# Log levels keyed by level
-	LOG_LEVEL_NAMES = LOG_LEVELS.invert.freeze
-
-	@default_logger = Logger.new( $stderr )
-	@default_logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
-
-	@default_log_formatter = Inversion::LogFormatter.new( @default_logger )
-	@default_logger.formatter = @default_log_formatter
-
-	@logger = @default_logger
-
+	REVISION = %q$Revision: 2b5542ae6bf6 $
 
-	class << self
-		# the log formatter that will be used when the logging subsystem is reset
-		attr_accessor :default_log_formatter
-
-		# the logger that will be used when the logging subsystem is reset
-		attr_accessor :default_logger
-
-		# the logger that's currently in effect
-		attr_accessor :logger
-		alias_method :log, :logger
-		alias_method :log=, :logger=
-	end
-
-
-	### Reset the global logger object to the default
-	def self::reset_logger
-		self.logger = self.default_logger
-		self.logger.level = Logger::WARN
-		self.logger.formatter = self.default_log_formatter
-	end
-
-
-	### Returns +true+ if the global logger has not been set to something other than
-	### the default one.
-	def self::using_default_logger?
-		return self.logger == self.default_logger
-	end
+	require 'inversion/logging'
+	extend Inversion::Logging
 
 
 	### Get the Inversion version.
@@ -92,6 +35,9 @@ module Inversion
 		return vstring
 	end
 
+	require 'inversion/exceptions'
+	require 'inversion/mixins'
+	require 'inversion/monkeypatches'
 	require 'inversion/template'
 
 end # module Inversion

data/lib/inversion/{utils.rb → logging.rb}

@@ -8,12 +8,64 @@ require 'inversion' unless defined?( Inversion )
 require 'inversion/mixins'
 
 
-module Inversion
+# A mixin that provides a top-level logging subsystem based on Logger.
+module Inversion::Logging
+
+	### Logging
+	# Log levels
+	LOG_LEVELS = {
+		'debug' => Logger::DEBUG,
+		'info'  => Logger::INFO,
+		'warn'  => Logger::WARN,
+		'error' => Logger::ERROR,
+		'fatal' => Logger::FATAL,
+	}.freeze
+	LOG_LEVEL_NAMES = LOG_LEVELS.invert.freeze
+
+
+	### Inclusion hook
+	def self::extended( mod )
+		super
+
+		class << mod
+			# the log formatter that will be used when the logging subsystem is reset
+			attr_accessor :default_log_formatter
+
+			# the logger that will be used when the logging subsystem is reset
+			attr_accessor :default_logger
+
+			# the logger that's currently in effect
+			attr_accessor :logger
+			alias_method :log, :logger
+			alias_method :log=, :logger=
+		end
+
+		mod.default_logger = mod.logger = Logger.new( $stderr )
+		mod.default_logger.level = case
+			when $DEBUG then Logger::DEBUG
+			when $VERBOSE then Logger::INFO
+			else Logger::WARN end
+		mod.default_log_formatter = Inversion::Logging::Formatter.new( mod.default_logger )
+	end
+
+
+	### Reset the global logger object to the default
+	def reset_logger
+		self.logger = self.default_logger
+		self.logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
+		self.logger.formatter = self.default_log_formatter
+	end
+
+
+	### Returns +true+ if the global logger has not been set to something other than
+	### the default one.
+	def using_default_logger?
+		return self.logger == self.default_logger
+	end
 
-	# :stopdoc:
 
 	# A alternate formatter for Logger instances.
-	class LogFormatter < Logger::Formatter
+	class Formatter < Logger::Formatter
 
 		# The format to output unless debugging is turned on
 		DEFAULT_FORMAT = "[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"
@@ -64,11 +116,11 @@ module Inversion
 				return self.format % args
 			end
 		end
-	end # class LogFormatter
+	end # class Formatter
 
 
 	# A ANSI-colorized formatter for Logger instances.
-	class ColorLogFormatter < Logger::Formatter
+	class ColorFormatter < Logger::Formatter
 
 		# Set some ANSI escape code constants (Shamelessly stolen from Perl's
 		# Term::ANSIColor by Russ Allbery <rra@stanford.edu> and Zenin <zenin@best.com>
@@ -173,12 +225,12 @@ module Inversion
 			return self.settings[ severity.downcase.to_sym ] % args
 		end
 
-	end # class LogFormatter
+	end # class Formatter
 
 
 	# An alternate formatter for Logger instances that outputs +div+ HTML
 	# fragments.
-	class HtmlLogFormatter < Logger::Formatter
+	class HtmlFormatter < Logger::Formatter
 		include ERB::Util  # for html_escape()
 
 		# The default HTML fragment that'll be used as the template for each log message.
@@ -229,7 +281,7 @@ module Inversion
 			return self.format % args
 		end
 
-	end # class HtmlLogFormatter
+	end # class HtmlFormatter
 
 end # module Inversion
 

data/lib/inversion/mixins.rb

@@ -6,12 +6,12 @@ require 'logger'
 
 module Inversion
 
-	# Add logging to a Inversion class. Including classes get #log and 
+	# Add logging to a Inversion class. Including classes get #log and
 	# #log_debug methods.
 	#
 	#   class MyClass
 	#       include Inversion::Loggable
-	#       
+	#
 	#       def a_method
 	#           self.log.debug "Doing a_method stuff..."
 	#       end
@@ -189,10 +189,10 @@ module Inversion
 
 
 	# A mixin that adds configurable escaping to a tag class.
-	# 
+	#
 	#   class MyTag < Inversion::Template::Tag
 	#       include Inversion::Escaping
-	#   
+	#
 	#       def render( renderstate )
 	#           val = self.get_rendered_value
 	#           return self.escape( val.to_s, renderstate )
@@ -232,5 +232,47 @@ module Inversion
 
 	end # Escaping
 
+
+	# A collection of methods for declaring other methods.
+	#
+	#   class MyClass
+	#       include Inversion::MethodUtilities
+	#
+	#       singleton_attr_accessor :types
+	#   end
+	#
+	#   MyClass.types = [ :pheno, :proto, :stereo ]
+	#
+	module MethodUtilities
+
+		### Creates instance variables and corresponding methods that return their
+		### values for each of the specified +symbols+ in the singleton of the
+		### declaring object (e.g., class instance variables and methods if declared
+		### in a Class).
+		def singleton_attr_reader( *symbols )
+			symbols.each do |sym|
+				singleton_class.__send__( :attr_reader, sym )
+			end
+		end
+
+		### Creates methods that allow assignment to the attributes of the singleton
+		### of the declaring object that correspond to the specified +symbols+.
+		def singleton_attr_writer( *symbols )
+			symbols.each do |sym|
+				singleton_class.__send__( :attr_writer, sym )
+			end
+		end
+
+		### Creates readers and writers that allow assignment to the attributes of
+		### the singleton of the declaring object that correspond to the specified
+		### +symbols+.
+		def singleton_attr_accessor( *symbols )
+			symbols.each do |sym|
+				singleton_class.__send__( :attr_accessor, sym )
+			end
+		end
+
+	end # module MethodUtilities
+
 end # module Inversion
 

data/lib/inversion/renderstate.rb

@@ -37,11 +37,7 @@ class Inversion::RenderState
 		### which can be either another Scope or a Hash.
 		def +( values )
 			# Have to do it this kludgy way because Scopes don't have #respond_to?
-			begin
-				return Scope.new( @locals.merge(values.__locals__) )
-			rescue ::NameError
-				return Scope.new( @locals.merge(values) )
-			end
+			return Scope.new( @locals.merge(values) )
 		end
 
 
@@ -49,6 +45,7 @@ class Inversion::RenderState
 		def __locals__
 			return @locals
 		end
+		alias_method :to_hash, :__locals__
 
 
 		#########
@@ -150,7 +147,7 @@ class Inversion::RenderState
 	### Evaluate the specified +code+ in the context of itself and
 	### return the result.
 	def eval( code )
-		self.log.debug "Evaling: %p" [ code ]
+		# self.log.debug "Evaling: %p" [ code ]
 		return self.scope.instance_eval( code )
 	end
 
@@ -165,7 +162,7 @@ class Inversion::RenderState
 	### restore the attributes to their original values.
 	def with_attributes( overrides )
 		raise LocalJumpError, "no block given" unless block_given?
-		self.log.debug "Overriding template attributes with: %p" % [ overrides ]
+		# self.log.debug "Overriding template attributes with: %p" % [ overrides ]
 
 		begin
 			newscope = self.scope + overrides
@@ -181,7 +178,7 @@ class Inversion::RenderState
 	### revert the tag state back to what it was prior to running the block.
 	def with_tag_data( newhash={} )
 		raise LocalJumpError, "no block given" unless block_given?
-		self.log.debug "Overriding tag state with: %p" % [ newhash ]
+		# self.log.debug "Overriding tag state with: %p" % [ newhash ]
 
 		begin
 			@tag_data.push( @tag_data.last.merge(newhash) )
@@ -196,13 +193,13 @@ class Inversion::RenderState
 	### destination when the block returns.
 	def with_destination( new_destination )
 		raise LocalJumpError, "no block given" unless block_given?
-		self.log.debug "Overriding render destination with: %p" % [ new_destination ]
+		# self.log.debug "Overriding render destination with: %p" % [ new_destination ]
 
 		begin
 			@destinations.push( new_destination )
 			yield
 		ensure
-			self.log.debug "  removing overridden render destination: %p" % [ @destinations.last ]
+			# self.log.debug "  removing overridden render destination: %p" % [ @destinations.last ]
 			@destinations.pop
 		end
 
@@ -296,12 +293,12 @@ class Inversion::RenderState
 	### Publish the given +nodes+ to all subscribers to the specified +key+.
 	def publish( key, *nodes )
 		key = key.to_sym
-		self.log.debug "[0x%016x] Publishing %p nodes: %p" % [ self.object_id * 2, key, nodes ]
+		# self.log.debug "[0x%016x] Publishing %p nodes: %p" % [ self.object_id * 2, key, nodes ]
 
 		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 ]
+			# self.log.debug "  sending %d nodes to subscriber: %p (a %p)" %
+			# 	[ nodes.length, subscriber, subscriber.class ]
 			subscriber.publish( *nodes )
 		end
 	end
@@ -432,7 +429,7 @@ class Inversion::RenderState
 	### Handle attribute methods.
 	def method_missing( sym, *args, &block )
 		return super unless sym.to_s =~ /^\w+$/
-		self.log.debug "mapping missing method call to tag local: %p" % [ sym ]
+		# self.log.debug "mapping missing method call to tag local: %p" % [ sym ]
 		return self.scope[ sym ]
 	end
 

data/lib/inversion/template.rb

@@ -117,7 +117,7 @@ class Inversion::Template
 	### Create a new Inversion:Template with the given +source+.
 	def initialize( source, parsestate=nil, opts={} )
 		if parsestate.is_a?( Hash )
-			self.log.debug "Shifting template options: %p" % [ parsestate ]
+			# self.log.debug "Shifting template options: %p" % [ parsestate ]
 			opts = parsestate
 			parsestate = nil
 		else

data/lib/inversion/template/fortag.rb

@@ -85,12 +85,12 @@ class Inversion::Template::ForTag < Inversion::Template::CodeTag
 		lvalue = state.eval( self.enumerator ) or return nil
 		lvalue = lvalue.each unless lvalue.respond_to?( :next )
 
-		self.log.debug "Rendering %p via block args: %p" % [ lvalue, self.block_args ]
+		# self.log.debug "Rendering %p via block args: %p" % [ lvalue, self.block_args ]
 
 		# Loop will exit as soon as the Enumerator runs out of elements
 		loop do
 			args = Array( lvalue.next )
-			self.log.debug "  iterated block args are: %p" % [ args ]
+			# self.log.debug "  iterated block args are: %p" % [ args ]
 
 			# Turn the block arguments into an overrides hash by zipping up
 			# the arguments names and values

data/lib/inversion/template/tag.rb

@@ -14,6 +14,7 @@ require 'inversion/mixins'
 # 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.
 class Inversion::Template::Tag < Inversion::Template::Node
+	extend Inversion::MethodUtilities
 	include Inversion::Loggable,
 	        Inversion::AbstractClass
 
@@ -26,21 +27,23 @@ class Inversion::Template::Tag < Inversion::Template::Node
 	### C L A S S   M E T H O D S
 	########################################################################
 
-	# The hash of loaded tag types
+	@derivatives = []
 	@types = nil
 
-	# Derivatives of this class
-	@derivatives = []
 
-	class << self
-		attr_reader :types, :derivatives
-	end
+	##
+	# The hash of loaded tag types, keyed by the tag name as a Symbol
+	singleton_attr_reader :types
+
+	##
+	# The Array of subclasses of this class
+	singleton_attr_reader :derivatives
 
 
 	### Inheritance hook -- keep track of loaded derivatives.
 	def self::inherited( subclass )
 		# Inversion.log.debug "%p inherited from %p" % [ subclass, self ]
-		Inversion::Template::Tag.derivatives << subclass 
+		Inversion::Template::Tag.derivatives << subclass
 		Inversion.log.debug "Loaded tag type %p" % [ subclass ]
 		super
 	end

data/spec/inversion/logging_spec.rb

@@ -0,0 +1,74 @@
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# encoding: utf-8
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+}
+
+require 'rspec'
+require 'stringio'
+
+require 'spec/lib/helpers'
+
+require 'inversion'
+require 'inversion/logging'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Inversion::Logging, "-extended module" do
+
+	before( :each ) do
+		@extended_module = Module.new do
+			extend Inversion::Logging
+		end
+	end
+
+	it "should have a default Logger" do
+		@extended_module.logger.should be_a( Logger )
+		@extended_module.default_logger.should equal( @extended_module.logger )
+	end
+
+	it "should know if its default logger is replaced" do
+		@extended_module.should be_using_default_logger
+		@extended_module.logger = Logger.new( $stderr )
+		@extended_module.should_not be_using_default_logger
+	end
+
+	it "has the default logger instance after being reset" do
+		@extended_module.reset_logger
+		@extended_module.logger.should equal( @extended_module.default_logger )
+	end
+
+	it "has the default log formatter instance after being reset" do
+		@extended_module.reset_logger
+		@extended_module.logger.formatter.should equal( @extended_module.default_log_formatter )
+	end
+
+
+	context "with new defaults" do
+
+		before( :each ) do
+			@sink = StringIO.new
+			@logger = Logger.new( @sink )
+			@formatter = Inversion::Logging::ColorFormatter.new( @logger )
+
+			@extended_module.default_logger = @logger
+			@extended_module.default_log_formatter = @formatter
+		end
+
+		it "uses the new defaults when the logging subsystem is reset" do
+			@extended_module.reset_logger
+			@extended_module.logger.should equal( @logger )
+		end
+
+	end
+
+
+end
+

data/spec/lib/helpers.rb

@@ -117,8 +117,8 @@ module Inversion::SpecHelpers
 	def setup_logging( level=Logger::FATAL )
 
 		# Turn symbol-style level config into Logger's expected Fixnum level
-		if Inversion::LOG_LEVELS.key?( level.to_s )
-			level = Inversion::LOG_LEVELS[ level.to_s ]
+		if Inversion::Logging::LOG_LEVELS.key?( level.to_s )
+			level = Inversion::Logging::LOG_LEVELS[ level.to_s ]
 		end
 
 		logger = Logger.new( $stderr )
@@ -131,7 +131,7 @@ module Inversion::SpecHelpers
 			logdevice = ArrayLogger.new( Thread.current['logger-output'] )
 			Inversion.logger = Logger.new( logdevice )
 			# Inversion.logger.level = level
-			Inversion.logger.formatter = Inversion::HtmlLogFormatter.new( logger )
+			Inversion.logger.formatter = Inversion::Logging::HtmlFormatter.new( logger )
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,11 +37,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70356568944040 !ruby/object:Gem::Requirement
+  requirement: &70337034178000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70356568944040
+  version_requirements: *70337034178000
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70356568943280 !ruby/object:Gem::Requirement
+  requirement: &70337034177180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70356568943280
+  version_requirements: *70337034177180
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70356568942000 !ruby/object:Gem::Requirement
+  requirement: &70337034192680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70356568942000
+  version_requirements: *70337034192680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70356568957180 !ruby/object:Gem::Requirement
+  requirement: &70337034191900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70356568957180
+  version_requirements: *70337034191900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70356568956420 !ruby/object:Gem::Requirement
+  requirement: &70337034191120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70356568956420
+  version_requirements: *70337034191120
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70356568955640 !ruby/object:Gem::Requirement
+  requirement: &70337034190160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70356568955640
+  version_requirements: *70337034190160
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70356568954760 !ruby/object:Gem::Requirement
+  requirement: &70337034189500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70356568954760
+  version_requirements: *70337034189500
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70356568954020 !ruby/object:Gem::Requirement
+  requirement: &70337034188740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70356568954020
+  version_requirements: *70337034188740
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70356568953240 !ruby/object:Gem::Requirement
+  requirement: &70337034188120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70356568953240
+  version_requirements: *70337034188120
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70356568952520 !ruby/object:Gem::Requirement
+  requirement: &70337034187480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.16'
   type: :development
   prerelease: false
-  version_requirements: *70356568952520
+  version_requirements: *70337034187480
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70356568951720 !ruby/object:Gem::Requirement
+  requirement: &70337034186680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70356568951720
+  version_requirements: *70337034186680
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70356568950980 !ruby/object:Gem::Requirement
+  requirement: &70337034186080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +170,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70356568950980
+  version_requirements: *70337034186080
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70356568950160 !ruby/object:Gem::Requirement
+  requirement: &70337034185360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,7 +181,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70356568950160
+  version_requirements: *70337034185360
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
   of Control"
 
@@ -209,6 +209,7 @@ files:
 - bin/inversion
 - lib/inversion.rb
 - lib/inversion/exceptions.rb
+- lib/inversion/logging.rb
 - lib/inversion/mixins.rb
 - lib/inversion/monkeypatches.rb
 - lib/inversion/parser.rb
@@ -243,8 +244,8 @@ files:
 - lib/inversion/template/uriencodetag.rb
 - lib/inversion/template/yieldtag.rb
 - lib/inversion/tilt.rb
-- lib/inversion/utils.rb
 - spec/data/sinatra/hello.inversion
+- spec/inversion/logging_spec.rb
 - spec/inversion/mixins_spec.rb
 - spec/inversion/monkeypatches_spec.rb
 - spec/inversion/parser_spec.rb