inversion 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4983f0e8917f4a40d760bc7f77214c2732d04bcb
-  data.tar.gz: 5fd44317d690978ea3ebca07c9a6fcd4b3623ee5
+  metadata.gz: a4433eb48f907f0b5861914eb3ec073bee86431b
+  data.tar.gz: 99143eca9a86f27e54488b9cbb5f8aa9d2cf9072
 SHA512:
-  metadata.gz: a6d6826555de328206231211b8d193fffe41854375c39eb25cf3dfb342d3412634c1e6de4d8dd850038246bee93e1ebc6a35cdd1f92ca18093baf87b00109ef6
-  data.tar.gz: 22eb288a86e2852b67ef94c097d9ecfc3ce26e85fb1ee58eeb964d1af481659a360856ddcc5a87a2e98f7faa1157bab1efa62b9b95a686ccb06022fcb309b408
+  metadata.gz: e4a08815c33455449aaf698a30012673674f912f6c05a57f6ac91b17d91a81b7816f0402074a0fe3ba4633f1dc19953f601ebe3830866106555afa2695d72cdc
+  data.tar.gz: 0cfbcfeab6c68c663c9e58c3832fe50a6ab803148d1c51dc7ba1cbcf821b01d3000164a1944086bf5f8ee241ea17db0e31209a7a1d12d8c8727e89e5b1ec27b5

data/Guide.rdoc

@@ -21,7 +21,7 @@ Finally, there are a number of {Annotated Examples}[rdoc-ref:Examples] that illu
 
 == License
 
-Copyright © 2011-2013, Michael Granger, Mahlon E. Smith
+Copyright © 2011-2015, Michael Granger, Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.16.0 [2015-01-14] Michael Granger <ged@FaerieMUD.org>
+
+Add support for loading templates from an alternate path
+via :template_paths option to Inversion::Template.load.
+
+
 == v0.15.0 [2014-11-24] Michael Granger <ged@FaerieMUD.org>
 
 Add a mechanism to allow tags to extend the template.

data/README.rdoc

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

data/Rakefile

@@ -40,7 +40,7 @@ hoespec = Hoe.spec 'inversion' do
 	self.dependency 'trollop',       '~> 2.0', :development
 	self.dependency 'rdoc-generator-fivefish', '~> 0', :development
 
-	self.require_ruby_version( '>=1.9.2' )
+	self.require_ruby_version( '>=2.0.0' )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"

data/lib/inversion.rb

@@ -23,13 +23,13 @@ module Inversion
 	log_as :inversion
 
 
-	warn ">>> Inversion requires Ruby 1.9.2 or later. <<<" if RUBY_VERSION < '1.9.2'
+	warn ">>> Inversion requires Ruby 2.0.0 or later. <<<" if RUBY_VERSION < '2.0.0'
 
 	# Library version constant
-	VERSION = '0.15.0'
+	VERSION = '0.16.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 7db3ff80c8e1 $
+	REVISION = %q$Revision: 83bef41f95a3 $
 
 
 	### Get the Inversion version.

data/lib/inversion/template.rb

@@ -169,7 +169,9 @@ class Inversion::Template
 
 		tmpl = nil
 		path = Pathname( path )
-		template_paths = self.template_paths + [ Dir.pwd ]
+		opts[:template_paths] ||= self.template_paths
+		search_path = opts[:template_paths] + [ Dir.pwd ]
+		self.log.debug "Searching template paths: %p" % [ search_path ]
 
 		# Unrestricted template location.
 		if path.absolute?
@@ -178,12 +180,12 @@ class Inversion::Template
 		# Template files searched under paths specified in 'template_paths', then
 		# the current working directory. First match wins.
 		else
-			tmpl = template_paths.collect {|dir| Pathname(dir) + path }.find do |fullpath|
+			tmpl = search_path.collect {|dir| Pathname(dir) + path }.find do |fullpath|
 				fullpath.exist?
 			end
 
 			raise RuntimeError, "Unable to find template %p within configured paths %p" %
-				[ path.to_s, template_paths ] if tmpl.nil?
+				[ path.to_s, search_path ] if tmpl.nil?
 		end
 
 		# We trust files read from disk

data/spec/helpers.rb

@@ -10,6 +10,8 @@ require 'loggability/spechelpers'
 
 require 'inversion'
 
+Inversion::Template::Tag.load_all
+
 
 ### RSpec helper functions.
 module Inversion::SpecHelpers

data/spec/inversion/template/configtag_spec.rb

@@ -7,15 +7,6 @@ require 'inversion/template/configtag'
 
 describe Inversion::Template::ConfigTag do
 
-	before( :all ) do
-		Inversion::Template.template_paths << 'spec/data'
-	end
-
-	after( :all ) do
-		Inversion::Template.template_paths.delete( 'spec/data' )
-	end
-
-
 	# <?config comment_start: /* ?>
 	# <?config comment_end: */ ?>
 	it "can contain a single configuration setting" do
@@ -97,7 +88,7 @@ describe Inversion::Template::ConfigTag do
 		<?include unknown-tag.tmpl ?>
 		TEMPLATE
 		expect {
-			Inversion::Template.new( source )
+			Inversion::Template.new( source, template_paths: %w[spec/data] )
 		}.to raise_error( Inversion::ParseError, /unknown tag "unknown"/i )
 	end
 
@@ -107,7 +98,7 @@ describe Inversion::Template::ConfigTag do
 		<?attr subtemplate ?>
 		TEMPLATE
 		tmpl = Inversion::Template.new( source )
-		tmpl.subtemplate = Inversion::Template.load( 'unknown-tag.tmpl' )
+		tmpl.subtemplate = Inversion::Template.load( 'unknown-tag.tmpl', template_paths: %w[spec/data] )
 
 		expect( tmpl.render ).to match( /commented out 1 nodes on line 3: some stuff/i )
 	end

data/spec/inversion/template/includetag_spec.rb

@@ -9,7 +9,6 @@ require 'inversion/template/includetag'
 
 describe Inversion::Template::IncludeTag do
 
-
 	it "renders the IncludeTag as an empty string" do
 		included_path = Pathname.pwd + 'included.tmpl'
 		expect( FileTest ).to receive( :exist? ).with( included_path.to_s ).and_return( true )

data/spec/inversion/template_spec.rb

@@ -9,6 +9,16 @@ require 'inversion/template'
 
 describe Inversion::Template do
 
+	before( :all ) do
+		@default_template_path = Inversion::Template.template_paths
+		Inversion::Template::Tag.load_all
+	end
+
+	after( :all ) do
+		Inversion::Template.template_paths = @default_template_path
+	end
+
+
 	context "created from a simple string" do
 
 		let( :template ) { described_class.new("a template") }
@@ -278,6 +288,15 @@ describe Inversion::Template do
 			expect( IO ).to receive( :read ).with( tmplpath.to_s ).and_return( 'file contents' )
 			expect( described_class.load( 'hooowat.tmpl' ).source ).to eq( 'file contents' )
 		end
+
+		it "instances can be loaded from a path provided via options" do
+			expect( FileTest ).to receive( :exist? ).with( '/tmp/hooowat' ).and_return( true )
+			expect( IO ).to receive( :read ).with( '/tmp/hooowat' ).and_return( 'file contents' )
+			expect(
+				described_class.load( 'hooowat', template_paths: %w[/tmp] ).source
+			).to eq( 'file contents' )
+		end
+
 	end
 
 
@@ -397,8 +416,8 @@ describe Inversion::Template do
 
 			described_class.configure( config.templates )
 
-			expect( described_class.config[:ignore_unknown_tags] ).to be_false()
-			expect( described_class.config[:debugging_comments] ).to be_true()
+			expect( described_class.config[:ignore_unknown_tags] ).to be_falsey()
+			expect( described_class.config[:debugging_comments] ).to be_truthy()
 			expect( described_class.config[:comment_start] ).to eq( '#' )
 			expect( described_class.config[:comment_end] ).to eq( '' )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Michael Granger
@@ -31,230 +31,230 @@ cert_chain:
   c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
   ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.13'
 description: |-
@@ -277,7 +277,7 @@ extra_rdoc_files:
 - README.rdoc
 - Tags.rdoc
 files:
-- ".gemtest"
+- .gemtest
 - ChangeLog
 - Examples.rdoc
 - GettingStarted.rdoc
@@ -370,23 +370,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Inversion is a templating system for Ruby