inversion 0.9.0 → 0.10.0

data/ChangeLog

@@ -1,8 +1,27 @@
+2012-04-24  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.9.0 for changeset 27f082ef7985
+	[dd18f3255985] [tip]
+
+	* .hgsigs:
+	Added signature for changeset b208fa9154b1
+	[27f082ef7985] [v0.9.0]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump the minor version, update history.
+	[b208fa9154b1]
+
+	* lib/inversion/template.rb, spec/inversion/template_spec.rb:
+	Split the template path out from the config into a class instance
+	variable.
+	[34e2c59df5c7]
+
 2012-04-13  Mahlon E. Smith  <mahlon@martini.nu>
 
 	* manual/src/tags.page:
 	Fix the include tag example in the manual.
-	[b5fcbae36ff2] [tip]
+	[b5fcbae36ff2] [github/master]
 
 2012-04-02  Michael Granger  <ged@FaerieMUD.org>
 
@@ -18,7 +37,7 @@
 
 	* .hgtags:
 	Added tag v0.8.0 for changeset 5d07557a543c
-	[57381a550306] [github/master]
+	[57381a550306]
 
 	* .hgsigs:
 	Added signature for changeset d461a2bf079d

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.10.0 [2012-05-07] Michael Granger <ged@FaerieMUD.org>
+
+- Convert to Loggability for logging.
+
+
 == v0.9.0 [2012-04-24] Michael Granger <ged@FaerieMUD.org>
 
 - Split the template path out from the config into a class instance variable.

data/Manifest.txt

@@ -6,7 +6,6 @@ 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
@@ -42,7 +41,6 @@ lib/inversion/template/uriencodetag.rb
 lib/inversion/template/yieldtag.rb
 lib/inversion/tilt.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/Rakefile

@@ -20,7 +20,8 @@ hoespec = Hoe.spec 'inversion' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
-	self.dependency 'ripper',        '~> 1.0',  :development unless defined?( Encoding )
+	self.dependency 'loggability',   '~> 0.0'
+
 	self.dependency 'rdoc',          '~> 3.12', :development
 	self.dependency 'rspec',         '~> 2.8',  :development
 	self.dependency 'tilt',          '~> 1.3',  :development

data/bin/inversion

@@ -105,9 +105,11 @@ class Inversion::Command
 		@opts      = opts
 		@prompt    = self.class.prompt
 
-		# Configure Inversion's strictness and logging
-		Inversion.log.level = opts.debug ? Logger::DEBUG : Logger::ERROR
-		Inversion.log.formatter = Inversion::ColorLogFormatter.new( Inversion.log )
+		# Configure logging
+		Loggability.level = opts.debug ? :debug : :error
+		Loggability.format_with( :color ) if $stdin.tty?
+
+		# Configure Inversion's strictness
 		Inversion::Template.configure(
 			:ignore_unknown_tags => opts.ignore_unknown_tags,
 			:template_paths      => opts.path,

data/lib/inversion.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'loggability'
 
 # 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
@@ -15,17 +16,19 @@
 # :main: README.rdoc
 #
 module Inversion
+	extend Loggability
+
+	# Loggability API -- set up a log host for the Inversion library
+	log_as :inversion
+
 
 	warn ">>> Inversion requires Ruby 1.9.2 or later. <<<" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.9.0'
+	VERSION = '0.10.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: b208fa9154b1 $
-
-	require 'inversion/logging'
-	extend Inversion::Logging
+	REVISION = %q$Revision: 9d9c49d532be $
 
 
 	### Get the Inversion version.

data/lib/inversion/mixins.rb

@@ -1,87 +1,9 @@
 #!/usr/bin/env ruby
 # vim: set nosta noet ts=4 sw=4:
 
-require 'logger'
-
 
 module Inversion
 
-	# 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
-	#   end
-	#
-	module Loggable
-
-		### A logging proxy class that wraps calls to the logger into calls that include
-		### the name of the calling class.
-		class ClassNameProxy # :nodoc:
-
-			### Create a new proxy for the given +klass+.
-			def initialize( klass, force_debug=false )
-				@classname   = klass.name
-				@force_debug = force_debug
-			end
-
-			### Delegate debug messages to the global logger with the appropriate class name.
-			def debug( msg=nil, &block )
-				Inversion.logger.add( Logger::DEBUG, msg, @classname, &block )
-			end
-
-			### Delegate info messages to the global logger with the appropriate class name.
-			def info( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Inversion.logger.add( Logger::INFO, msg, @classname, &block )
-			end
-
-			### Delegate warn messages to the global logger with the appropriate class name.
-			def warn( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Inversion.logger.add( Logger::WARN, msg, @classname, &block )
-			end
-
-			### Delegate error messages to the global logger with the appropriate class name.
-			def error( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Inversion.logger.add( Logger::ERROR, msg, @classname, &block )
-			end
-
-			### Delegate fatal messages to the global logger with the appropriate class name.
-			def fatal( msg=nil, &block )
-				Inversion.logger.add( Logger::FATAL, msg, @classname, &block )
-			end
-
-		end # ClassNameProxy
-
-		#########
-		protected
-		#########
-
-		### Copy constructor -- clear the original's log proxy.
-		def initialize_copy( original )
-			@log_proxy = @log_debug_proxy = nil
-			super
-		end
-
-		### Return the proxied logger.
-		def log
-			@log_proxy ||= ClassNameProxy.new( self.class )
-		end
-
-		### Return a proxied "debug" logger that ignores other level specification.
-		def log_debug
-			@log_debug_proxy ||= ClassNameProxy.new( self.class, true )
-		end
-
-	end # module Loggable
-
-
 	# Hides your class's ::new method and adds a +pure_virtual+ method generator for
 	# defining API methods. If subclasses of your class don't provide implementations of
 	# "pure_virtual" methods, NotImplementedErrors will be raised if they are called.

data/lib/inversion/parser.rb

@@ -2,6 +2,8 @@
 # encoding: utf-8
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'loggability'
+
 require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/mixins'
 require 'inversion/template/textnode'
@@ -11,7 +13,11 @@ require 'inversion/template/endtag'
 # This is the parser for Inversion templates. It takes template source and
 # returns a tree of Inversion::Template::Node objects (if parsing is successful).
 class Inversion::Parser
-	include Inversion::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging through the Inversion module's logger
+	log_to :inversion
+
 
 	# The pattern for matching a tag opening
 	TAG_OPEN = /[\[<]\?/
@@ -157,7 +163,10 @@ class Inversion::Parser
 	# Parse state object class. State objects keep track of where in the parse tree
 	# new nodes should be appended, and manages inclusion.
 	class State
-		include Inversion::Loggable
+		extend Loggability
+
+		# 
+		log_to :inversion
 
 		### Create a new State object
 		def initialize( template, options={} )

data/lib/inversion/renderstate.rb

@@ -1,13 +1,16 @@
 #!/usr/bin/env ruby
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'loggability'
 require 'inversion' unless defined?( Inversion )
 
 
 # An object that provides an encapsulation of the template's state while it is rendering.
 class Inversion::RenderState
-	include Inversion::Loggable
+	extend Loggability
 
+	# Loggability API -- set up logging through the Inversion module's logger
+	log_to :inversion
 
 	# An encapsulation of the scope in which the bodies of tags evaluate. It's
 	# used to provide a controlled, isolated namespace which remains the same from
@@ -439,7 +442,7 @@ class Inversion::RenderState
 
 	### Recursively copy the specified +obj+ and return the result.
 	def deep_copy( obj )
-		# Inversion.log.debug "Deep copying: %p" % [ obj ]
+		# self.log.debug "Deep copying: %p" % [ obj ]
 
 		# Handle mocks during testing
 		return obj if obj.class.name == 'RSpec::Mocks::Mock'

data/lib/inversion/template.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'loggability'
 require 'pathname'
 require 'inversion' unless defined?( Inversion )
 
@@ -16,7 +17,10 @@ end
 # source and combining the resulting node tree with a set of attributes that
 # can be used to populate it when rendered.
 class Inversion::Template
-	include Inversion::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging through the Inversion module's logger
+	log_to :inversion
 
 	# Configurability support -- load template configuration from the 'templates' section
 	# of the config.

data/lib/inversion/template/begintag.rb

@@ -32,8 +32,7 @@ require 'inversion/template/rescuetag'
 #   <?end?>
 #
 class Inversion::Template::BeginTag < Inversion::Template::Tag
-	include Inversion::Loggable,
-	        Inversion::Template::ContainerTag
+	include Inversion::Template::ContainerTag
 
 
 	### Initialize a new BeginTag.

data/lib/inversion/template/codetag.rb

@@ -31,8 +31,7 @@ require 'inversion/template/tag'
 # :TODO: Finish the tag_pattern docs: placeholders, regex limitations, etc.
 #
 class Inversion::Template::CodeTag < Inversion::Template::Tag
-	include Inversion::Loggable,
-	        Inversion::AbstractClass
+	include Inversion::AbstractClass
 
 
 	### A subclass of Ripper::TokenPattern that binds matches to the beginning and

data/lib/inversion/template/commenttag.rb

@@ -17,8 +17,8 @@ require 'inversion/template/containertag'
 #   <?end comment ?>
 #
 class Inversion::Template::CommentTag < Inversion::Template::Tag
-	include Inversion::Loggable,
-			Inversion::Template::ContainerTag
+	include Inversion::Template::ContainerTag
+
 
 	######
 	public

data/lib/inversion/template/configtag.rb

@@ -26,8 +26,7 @@ require 'inversion/template/tag'
 #
 #
 class Inversion::Template::ConfigTag < Inversion::Template::Tag
-	include Inversion::Loggable,
-			Inversion::HashUtilities
+	include Inversion::HashUtilities
 
 
 	### Create a new ConfigTag with the specified +body+.

data/lib/inversion/template/elsetag.rb

@@ -18,8 +18,6 @@ require 'inversion/template/tag'
 #   <?end?>
 #
 class Inversion::Template::ElseTag < Inversion::Template::Tag
-	include Inversion::Loggable
-
 
 	### Overridden to default body to nothing, and raise an error if it has one.
 	def initialize( body='', linenum=nil, colnum=nil ) # :notnew:

data/lib/inversion/template/elsiftag.rb

@@ -23,7 +23,6 @@ require 'inversion/template/iftag' unless
 #   <?end?>
 #
 class Inversion::Template::ElsifTag < Inversion::Template::AttrTag
-	include Inversion::Loggable
 
 	# Inherits AttrTag's tag patterns
 

data/lib/inversion/template/endtag.rb

@@ -7,8 +7,6 @@ require 'inversion/template/tag' unless defined?( Inversion::Template::Tag )
 
 # Closing tag class
 class Inversion::Template::EndTag < Inversion::Template::Tag
-	include Inversion::Loggable
-
 
 	### Overridden to provide a default +body+.
 	def initialize( body='', linenum=nil, colnum=nil )

data/lib/inversion/template/fortag.rb

@@ -26,8 +26,7 @@ require 'inversion/template/containertag'
 #    <?end ?>
 #
 class Inversion::Template::ForTag < Inversion::Template::CodeTag
-	include Inversion::Loggable,
-			Inversion::Template::ContainerTag
+	include Inversion::Template::ContainerTag
 
 	# <?for var in attribute ?>
 	# <?for var in attribute.methodchain ?>

data/lib/inversion/template/iftag.rb

@@ -16,8 +16,7 @@ require 'inversion/template/containertag'
 #   <?if obj.method ?>...<?end?>
 #
 class Inversion::Template::IfTag < Inversion::Template::AttrTag
-	include Inversion::Loggable,
-	        Inversion::Template::ContainerTag
+	include Inversion::Template::ContainerTag
 
 	# Inherits AttrTag's tag patterns
 

data/lib/inversion/template/includetag.rb

@@ -17,8 +17,6 @@ require 'inversion/template/tag'
 #
 #
 class Inversion::Template::IncludeTag < Inversion::Template::Tag
-	include Inversion::Loggable
-
 
 	### Create a new IncludeTag with the specified +path+.
 	def initialize( path, linenum=nil, colnum=nil )

data/lib/inversion/template/node.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'loggability'
+
 require 'inversion/mixins'
 require 'inversion/template' unless defined?( Inversion::Template )
 
@@ -11,8 +13,12 @@ require 'inversion/template' unless defined?( Inversion::Template )
 # This class is abstract; it just defines the API that other nodes
 # are expected to implement.
 class Inversion::Template::Node
+	extend Loggability
 	include Inversion::AbstractClass
 
+	# Loggability API -- set up logging through the Inversion module's logger
+	log_to :inversion
+
 
 	### Create a new TextNode with the specified +source+.
 	def initialize( body, linenum=nil, colnum=nil )

data/lib/inversion/template/rescuetag.rb

@@ -9,7 +9,7 @@ require 'inversion/template/tag'
 # This tag adds a logical switch to a BeginTag. If rendering any of the BeginTag's nodes raises
 # an exception of the type specified by the RescueTag, the nodes following the RescueTag are
 # rendered instead.
-# 
+#
 # == Syntax
 #
 #   <?begin ?>
@@ -19,14 +19,12 @@ require 'inversion/template/tag'
 #   <?rescue DatabaseError => err ?>
 #       Oh no!! I can't talk to the database for some reason.  The
 #       error was as follows:
-#       
+#
 #           <?attr err.message ?>
-#       
+#
 #   <?end?>
 #
 class Inversion::Template::RescueTag < Inversion::Template::Tag
-	include Inversion::Loggable
-
 
 	### Overridden to default body to nothing, and raise an error if it has one.
 	def initialize( body='', linenum=nil, colnum=nil ) # :notnew: