inversion 0.8.0 → 0.9.0

data/ChangeLog

@@ -1,8 +1,103 @@
+2012-04-13  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* manual/src/tags.page:
+	Fix the include tag example in the manual.
+	[b5fcbae36ff2] [tip]
+
+2012-04-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc:
+	Update the README to Hoe 3 style.
+	[c13d2db3e0ce]
+
+	* lib/inversion/renderstate.rb:
+	Remove an old FIXME comment.
+	[21eecc7eafca]
+
+2012-04-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.8.0 for changeset 5d07557a543c
+	[57381a550306] [github/master]
+
+	* .hgsigs:
+	Added signature for changeset d461a2bf079d
+	[5d07557a543c] [v0.8.0]
+
+	* Manifest.txt, Rakefile:
+	Update the manifest.
+	[d461a2bf079d]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump the minor version, update history.
+	[2b5542ae6bf6]
+
+	* lib/inversion.rb, lib/inversion/logging.rb, lib/inversion/mixins.rb,
+	lib/inversion/utils.rb, spec/inversion/logging_spec.rb,
+	spec/lib/helpers.rb:
+	Move logging code out into a separate file.
+	[0c88a54d2811]
+
+	* lib/inversion/mixins.rb, lib/inversion/template/tag.rb:
+	Add MethodUtilities mixin for declaring singleton attrs
+	[3d40570d7aaf]
+
+2012-03-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc, lib/inversion/renderstate.rb,
+	lib/inversion/template.rb, lib/inversion/template/fortag.rb:
+	Comment out a bunch of slow debugging, update copyright date.
+	[0422221385f6]
+
+	* lib/inversion/renderstate.rb:
+	Handle RenderState::Scope#merge a little more gracefully.
+
+	Instead of trying to merge locals and then rescuing if the merged
+	object doesn't respond to __locals__, implement #to_hash so they're
+	able to be merged directly with a Hash.
+	[a9d68f668e05]
+
+2012-03-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.7.0 for changeset 33027d3d78c5
+	[46549d0c2f86]
+
+	* .hgsigs:
+	Added signature for changeset a202a2c01b18
+	[33027d3d78c5] [v0.7.0]
+
+	* .rvm.gems:
+	Updated the rvm gemset.
+	[a202a2c01b18]
+
+	* History.rdoc, lib/inversion.rb:
+	Bump the minor version, update history.
+	[92c2961cf986]
+
+	* Rakefile, experiments/renderstate-scope.rb,
+	lib/inversion/renderstate.rb, lib/inversion/template/attrtag.rb,
+	spec/inversion/renderstate_spec.rb,
+	spec/inversion/template/attrtag_spec.rb:
+	Switch to a looser eval strategy for rendering tag bodies.
+
+	The previous method relied on a stack of attributes Hashes in the
+	RenderState; the new method in effect wraps a Binding with a
+	method_missing for translating identifiers that look like locals
+	back into template attributes. This not only allows for template
+	attributes to be used as arguments to the methods called on other
+	attributes, but avoids sharing the Binding of the RenderState with
+	the tags rendered inside it.
+
+	Backwards-compatibility is also maintained via a few aliases and
+	shim methods.
+	[5340e6ffaac3]
+
 2012-03-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.6.1 for changeset e839621aac29
-	[63e1a917c7ad] [tip]
+	[63e1a917c7ad]
 
 	* .hgsigs:
 	Added signature for changeset 1947a577fae1
@@ -52,7 +147,7 @@
 	* 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] [github/master]
+	[7c42e6b20c11]
 
 	* lib/inversion/template.rb, manual/src/templates.page,
 	spec/inversion/template_spec.rb:

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.9.0 [2012-04-24] Michael Granger <ged@FaerieMUD.org>
+
+- Split the template path out from the config into a class instance variable.
+- Documentation update.
+
+
 == v0.8.0 [2012-04-01] Michael Granger <ged@FaerieMUD.org>
 
 - Optimization fixes

data/README.rdoc

@@ -1,6 +1,8 @@
 = inversion
 
-* http://deveiate.org/projects/Inversion
+home :: http://deveiate.org/projects/Inversion
+code :: http://repo.deveiate.org/Inversion
+github :: http://github.com/ged/inversion.git
 
 
 == Description

data/lib/inversion.rb

@@ -19,10 +19,10 @@ module Inversion
 	warn ">>> Inversion requires Ruby 1.9.2 or later. <<<" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.8.0'
+	VERSION = '0.9.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 2b5542ae6bf6 $
+	REVISION = %q$Revision: b208fa9154b1 $
 
 	require 'inversion/logging'
 	extend Inversion::Logging

data/lib/inversion/renderstate.rb

@@ -36,7 +36,6 @@ class Inversion::RenderState
 		### Return a copy of the receiving Scope merged with the given +values+,
 		### 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?
 			return Scope.new( @locals.merge(values) )
 		end
 

data/lib/inversion/template.rb

@@ -45,27 +45,39 @@ class Inversion::Template
 	### Default config values
 	DEFAULT_CONFIG = {
 		:ignore_unknown_tags => true,
+		:template_paths      => [],
+
 		:on_render_error     => :comment,
 		:debugging_comments  => false,
 		:comment_start       => '<!-- ',
 		:comment_end         => ' -->',
-		:template_paths      => [],
 		:escape_format       => :html,
 		:strip_tag_lines     => true,
 		:stat_delay          => 0
-	}
+	}.freeze
 
 
 	### Global config
 	@config = DEFAULT_CONFIG.dup
 	class << self; attr_accessor :config; end
 
+	# Global template search path
+	@template_paths = []
+	class << self; attr_accessor :template_paths; end
+
 
 	### Configure the templating system.
 	def self::configure( config )
-		return unless config
-		Inversion.log.debug "Merging config %p with current config %p" % [ config, self.config ]
-		self.config = self.config.merge( config )
+		if config
+			Inversion.log.debug "Merging config %p with current config %p" % [ config, self.config ]
+			merged_config = DEFAULT_CONFIG.merge( config )
+			self.template_paths = Array( merged_config.delete(:template_paths) )
+			self.config = merged_config
+		else
+			defaults = DEFAULT_CONFIG.dup
+			self.template_paths = defaults.delete( :template_paths )
+			self.config = defaults
+		end
 	end
 
 
@@ -80,7 +92,7 @@ class Inversion::Template
 
 		tmpl = nil
 		path = Pathname( path )
-		template_paths = Array( self.config[:template_paths] ) + [ Dir.pwd ]
+		template_paths = self.template_paths + [ Dir.pwd ]
 
 		# Unrestricted template location.
 		if path.absolute?

data/spec/inversion/template_spec.rb

@@ -195,7 +195,7 @@ describe Inversion::Template do
 	context "without template paths set" do
 
 		before( :each ) do
-			Inversion::Template.config[:template_paths].clear
+			Inversion::Template.template_paths.clear
 		end
 
 		it "instances can be loaded from an absolute path" do
@@ -215,11 +215,11 @@ describe Inversion::Template do
 	context "with template paths set" do
 
 		before( :each ) do
-			Inversion::Template.config[:template_paths] = [ '/tmp', '/fun' ]
+			Inversion::Template.template_paths = [ '/tmp', '/fun' ]
 		end
 
 		after( :each ) do
-			Inversion::Template.config[:template_paths].clear
+			Inversion::Template.template_paths.clear
 		end
 
 		it "instances can be loaded from an absolute path" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,11 +37,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70337034178000 !ruby/object:Gem::Requirement
+  requirement: &70266679150500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70337034178000
+  version_requirements: *70266679150500
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
-  requirement: &70337034177180 !ruby/object:Gem::Requirement
+  requirement: &70266679150000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,21 +60,21 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70337034177180
+  version_requirements: *70266679150000
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70337034192680 !ruby/object:Gem::Requirement
+  requirement: &70266679149420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70337034192680
+  version_requirements: *70266679149420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70337034191900 !ruby/object:Gem::Requirement
+  requirement: &70266679148880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70337034191900
+  version_requirements: *70266679148880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70337034191120 !ruby/object:Gem::Requirement
+  requirement: &70266679148440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70337034191120
+  version_requirements: *70266679148440
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70337034190160 !ruby/object:Gem::Requirement
+  requirement: &70266679147840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70337034190160
+  version_requirements: *70266679147840
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70337034189500 !ruby/object:Gem::Requirement
+  requirement: &70266679147360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70337034189500
+  version_requirements: *70266679147360
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70337034188740 !ruby/object:Gem::Requirement
+  requirement: &70266679146920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70337034188740
+  version_requirements: *70266679146920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70337034188120 !ruby/object:Gem::Requirement
+  requirement: &70266679146420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70337034188120
+  version_requirements: *70266679146420
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70337034187480 !ruby/object:Gem::Requirement
+  requirement: &70266679145640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: '1.16'
   type: :development
   prerelease: false
-  version_requirements: *70337034187480
+  version_requirements: *70266679145640
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70337034186680 !ruby/object:Gem::Requirement
+  requirement: &70266679160900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70337034186680
+  version_requirements: *70266679160900
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70337034186080 !ruby/object:Gem::Requirement
+  requirement: &70266679159920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +170,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70337034186080
+  version_requirements: *70266679159920
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70337034185360 !ruby/object:Gem::Requirement
+  requirement: &70266679159060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,7 +181,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70337034185360
+  version_requirements: *70266679159060
 description: ! 'Inversion is a templating system for Ruby. It uses the "Inversion
   of Control"