inversion 0.9.0 → 0.10.0

data/lib/inversion/template/tag.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'loggability'
+
 require 'inversion' unless defined?( Inversion )
 require 'inversion/template' unless defined?( Inversion::Template )
 
@@ -14,10 +16,13 @@ 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
+	extend Loggability,
+	       Inversion::MethodUtilities
+	include Inversion::AbstractClass
+
 
+	# Loggability API -- set up logging through the Inversion module's logger
+	log_to :inversion
 
 	# The glob pattern for matching template tag plugins
 	TAG_PLUGIN_PATTERN = 'inversion/template/*tag.rb'

data/lib/inversion/template/textnode.rb

@@ -5,7 +5,6 @@ require 'inversion/template/node'
 
 # Inversion text node class -- container for static content in templates between tags.
 class Inversion::Template::TextNode < Inversion::Template::Node
-	include Inversion::Loggable
 
 	### Create a new TextNode with the specified +source+.
 	def initialize( body, linenum=nil, colnum=nil )

data/lib/inversion/template/unlesstag.rb

@@ -18,8 +18,7 @@ require 'inversion/template/elsetag'
 #   <?unless obj.method ?>...<?end?>
 #
 class Inversion::Template::UnlessTag < Inversion::Template::AttrTag
-	include Inversion::Loggable,
-	        Inversion::Template::ContainerTag
+	include Inversion::Template::ContainerTag
 
 	# Inherits AttrTag's tag patterns
 

data/lib/inversion/template/yieldtag.rb

@@ -14,10 +14,8 @@ require 'inversion/template/tag'
 # == Example
 #
 #   <?yield ?>
-# 
+#
 class Inversion::Template::YieldTag < Inversion::Template::Tag
-	include Inversion::Loggable
-
 
 	######
 	public

data/spec/inversion/mixins_spec.rb

@@ -18,40 +18,6 @@ require 'inversion/mixins'
 
 describe Inversion, "mixins" do
 
-	describe Inversion::Loggable do
-		before(:each) do
-			@logfile = StringIO.new('')
-			Inversion.logger = Logger.new( @logfile )
-
-			@test_class = Class.new do
-				include Inversion::Loggable
-
-				def log_test_message( level, msg )
-					self.log.send( level, msg )
-				end
-
-				def logdebug_test_message( msg )
-					self.log_debug.debug( msg )
-				end
-			end
-			@obj = @test_class.new
-		end
-
-
-		it "is able to output to the log via its #log method" do
-			@obj.log_test_message( :debug, "debugging message" )
-			@logfile.rewind
-			@logfile.read.should =~ /debugging message/
-		end
-
-		it "is able to output to the log via its #log_debug method" do
-			@obj.logdebug_test_message( "sexydrownwatch" )
-			@logfile.rewind
-			@logfile.read.should =~ /sexydrownwatch/
-		end
-	end
-
-
 	describe Inversion::HashUtilities do
 		it "includes a function for stringifying Hash keys" do
 			testhash = {

data/spec/inversion_spec.rb

@@ -17,14 +17,10 @@ require 'inversion'
 describe Inversion do
 
 	before( :all ) do
-		@original_logger = Inversion.default_logger
-		@original_log_formatter = Inversion.default_log_formatter
 		setup_logging( :fatal )
 	end
 
 	after( :each ) do
-		Inversion.default_logger = @original_logger
-		Inversion.default_log_formatter = @original_log_formatter
 		reset_logging()
 	end
 
@@ -44,52 +40,5 @@ describe Inversion do
 		end
 	end
 
-
-	describe " logging subsystem" do
-		before(:each) do
-			Inversion.reset_logger
-		end
-
-		after(:each) do
-			Inversion.reset_logger
-		end
-
-
-		it "knows if its default logger is replaced" do
-			Inversion.reset_logger
-			Inversion.should be_using_default_logger
-			Inversion.logger = Logger.new( $stderr )
-			Inversion.should_not be_using_default_logger
-		end
-
-		it "has the default logger instance after being reset" do
-			Inversion.logger.should equal( Inversion.default_logger )
-		end
-
-		it "has the default log formatter instance after being reset" do
-			Inversion.logger.formatter.should equal( Inversion.default_log_formatter )
-		end
-
-	end
-
-
-	describe " logging subsystem with new defaults" do
-		it "uses the new defaults when the logging subsystem is reset" do
-			logger = double( "dummy logger" )
-			formatter = double( "dummy logger" )
-
-			Inversion.default_logger = logger
-			Inversion.default_log_formatter = formatter
-
-			logger.should_receive( :formatter= ).with( formatter )
-			logger.should_receive( :level= ).with( Logger::WARN )
-
-			Inversion.reset_logger
-			Inversion.logger.should equal( logger )
-		end
-
-	end
-
-
 end
 

data/spec/lib/helpers.rb

@@ -25,78 +25,16 @@ if ENV['COVERAGE']
 end
 
 require 'rspec'
+require 'loggability'
 
 require 'inversion'
 require 'spec/lib/constants'
 
-### IRb.start_session, courtesy of Joel VanderWerf in [ruby-talk:42437].
-require 'irb'
-require 'irb/completion'
-
-
-module IRB # :nodoc:
-	def self.start_session( obj )
-		unless @__initialized
-			args = ARGV
-			ARGV.replace( ARGV.dup )
-			IRB.setup( nil )
-			ARGV.replace( args )
-			@__initialized = true
-		end
-
-		workspace = WorkSpace.new( obj )
-		irb = Irb.new( workspace )
-
-		@CONF[:IRB_RC].call( irb.context ) if @CONF[:IRB_RC]
-		@CONF[:MAIN_CONTEXT] = irb.context
-
-		begin
-			prevhandler = Signal.trap( 'INT' ) do
-				irb.signal_handle
-			end
-
-			catch( :IRB_EXIT ) do
-				irb.eval_input
-			end
-		ensure
-			Signal.trap( 'INT', prevhandler )
-		end
-
-	end
-end
-
 
 ### RSpec helper functions.
 module Inversion::SpecHelpers
 	include Inversion::TestConstants
 
-	class ArrayLogger
-		### Create a new ArrayLogger that will append content to +array+.
-		def initialize( array )
-			@array = array
-		end
-
-		### Write the specified +message+ to the array.
-		def write( message )
-			@array << message
-		end
-
-		### No-op -- this is here just so Logger doesn't complain
-		def close; end
-
-	end # class ArrayLogger
-
-
-	unless defined?( LEVEL )
-		LEVEL = {
-			:debug => Logger::DEBUG,
-			:info  => Logger::INFO,
-			:warn  => Logger::WARN,
-			:error => Logger::ERROR,
-			:fatal => Logger::FATAL,
-		  }
-	end
-
 	###############
 	module_function
 	###############
@@ -109,29 +47,25 @@ module Inversion::SpecHelpers
 
 	### Reset the logging subsystem to its default state.
 	def reset_logging
-		Inversion.reset_logger
+		Loggability.formatter = nil
+		Loggability.output_to( $stderr )
+		Loggability.level = :fatal
 	end
 
 
 	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=Logger::FATAL )
-
-		# Turn symbol-style level config into Logger's expected Fixnum level
-		if Inversion::Logging::LOG_LEVELS.key?( level.to_s )
-			level = Inversion::Logging::LOG_LEVELS[ level.to_s ]
-		end
-
-		logger = Logger.new( $stderr )
-		Inversion.logger = logger
-		Inversion.logger.level = level
+	def setup_logging( level=:fatal )
 
 		# Only do this when executing from a spec in TextMate
 		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			Thread.current['logger-output'] = []
-			logdevice = ArrayLogger.new( Thread.current['logger-output'] )
-			Inversion.logger = Logger.new( logdevice )
-			# Inversion.logger.level = level
-			Inversion.logger.formatter = Inversion::Logging::HtmlFormatter.new( logger )
+			$stderr.puts "Setting up HTML logs."
+			logarray = []
+			Thread.current['logger-output'] = logarray
+			Loggability.output_to( logarray )
+			Loggability.format_as( :html )
+			Loggability.level = :debug
+		else
+			Loggability.level = level
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,11 +37,27 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: loggability
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70266679150500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +65,15 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70266679150500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70266679150000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +81,15 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70266679150000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70266679149420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +97,15 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70266679149420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70266679148880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +113,15 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70266679148880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70266679148440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +129,15 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70266679148440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70266679147840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +145,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70266679147840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70266679147360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +161,15 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70266679147360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70266679146920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +177,15 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70266679146920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70266679146420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +193,15 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70266679146420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70266679145640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +209,15 @@ dependencies:
         version: '1.16'
   type: :development
   prerelease: false
-  version_requirements: *70266679145640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70266679160900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +225,15 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70266679160900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70266679159920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +241,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70266679159920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70266679159060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,7 +257,12 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70266679159060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
   of Control"
 
@@ -209,7 +290,6 @@ 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
@@ -245,7 +325,6 @@ files:
 - 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
@@ -309,7 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: inversion
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Inversion is a templating system for Ruby