inversion 1.0.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4b8da84f00dd67a57f9f261339c2f8fd0dad397
-  data.tar.gz: 21dbe5879f682b3b5b4a8c955bc48619cd6636ab
+SHA256:
+  metadata.gz: de95b723b4e1d977b915f72d99659c4b73f6ca222afe91b4536c5e3e2c12bd73
+  data.tar.gz: 62b09f236668d37f6e33757d7cc7db174374ae5663ad42c6bd20aa9b55c40835
 SHA512:
-  metadata.gz: 586cf26085d8dc43c9034c686428009ba5d55d12c9c8bdeb2ad9a888aa8a8b5b5eefb305a0be3485b74d1d3e7a08d14ec9ac9e0a668ddc412f547883be426ca4
-  data.tar.gz: 7c5995c50244a22c035242a5363901fb110ac84fc541e6feea4ca172a954598e570ca0b75b11a452fe8d448f6330496cd009fcabe42189398720d979b2fd8b9d
+  metadata.gz: 1ad4969a736b028863e67d56e5b85b0ad887dcbba2313d9fe90f65f4a982216285c0dc988ba7852f23b157281395ad3dc43c78864fab233f82510d77a49bf284
+  data.tar.gz: 5c50d1f6636a0de6c65616a4996806d20bf50ba26d4da7295edf6d7d7e4eb6fdeb1bbff6b8148bd408137ceaf4a8ed465d87ba6e2fc4ba80f2df37d7d2224ef5

data/History.rdoc

@@ -1,3 +1,49 @@
+= Release History for inversion
+
+---
+
+== v1.3.1 [2020-09-29] Michael Granger <ged@faeriemud.org>
+
+Improvements:
+
+- Only use SafeYAML if it's already loaded
+- Handle HTML encoding for uriencoding tag ourselves
+
+
+== v1.3.0 [2020-04-08] Mahlon E. Smith <mahlon@martini.nu>
+
+- Use safe_yaml when deserializing config tag contents.
+- Un-hoeify.
+- Updates for Ruby 2.7.
+
+
+== v1.2.0 [2019-05-14] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Add frozen string literal support (Ruby 2.6+)
+- Allow the timedelta tag to accept hash arguments and make
+  'decorators' optional.
+
+
+== v1.1.1 [2017-11-13] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Yield subarrays in `each` tags when there's only one block argument (#3).
+
+
+== v1.1.0 [2017-08-17] Mahlon E. Smith <mahlon@martini.nu>
+
+Enhancements:
+
+- Allow the use of the '!' operator in conditional tags, logically
+  inverting the evaluated body.
+
+- Provide a method for children tags to inherit and append to their
+  parents matcher patterns.
+
+
 == v1.0.0 [2017-01-16] Michael Granger <ged@FaerieMUD.org>
 
 Mark as stable, update dependencies.

data/Manifest.txt

@@ -1,4 +1,3 @@
-ChangeLog
 Examples.rdoc
 GettingStarted.rdoc
 Guide.rdoc

data/README.rdoc

@@ -1,8 +1,9 @@
 = inversion
 
-home :: http://deveiate.org/projects/Inversion
-code :: http://repo.deveiate.org/Inversion
-github :: http://github.com/ged/inversion.git
+home:: https://hg.sr.ht/~ged/Inversion
+code:: https://hg.sr.ht/~ged/Inversion/browse
+github:: https://github.com/ged/inversion
+docs:: http://deveiate.org/code/Inversion
 
 
 == Description
@@ -116,10 +117,15 @@ After checking out the source, run:
 This task will install any missing dependencies, run the tests/specs,
 and generate the API documentation.
 
+== Authors
+
+* Michael Granger <ged@faeriemud.org>
+* Mahlon E. Smith <mahlon@martini.nu>
+
 
 == License
 
-Copyright © 2011-2015, Michael Granger and Mahlon E. Smith
+Copyright © 2011-2020, Michael Granger and Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -1,93 +1,7 @@
-#!/usr/bin/env rake
+# -*- ruby -*-
+# frozen_string_literal: true
 
-require 'rake/clean'
-require 'rdoc/task'
+require 'rake/deveiate'
 
-begin
-	require 'hoe'
-rescue LoadError
-	abort "This Rakefile requires hoe (gem install hoe)"
-end
+Rake::DevEiate.setup( 'inversion' )
 
-GEMSPEC = 'inversion.gemspec'
-
-Hoe.plugin :mercurial
-Hoe.plugin :publish
-Hoe.plugin :signing
-
-Hoe.plugins.delete :rubyforge
-
-hoespec = Hoe.spec 'inversion' do
-	self.readme_file = 'README.rdoc'
-	self.history_file = 'History.rdoc'
-	self.extra_rdoc_files << 'README.rdoc' << 'History.rdoc'
-	self.license "BSD"
-
-	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
-	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
-
-	self.dependency 'loggability',   '~> 0.12'
-
-	self.dependency 'highline',                '~> 1.6', :development
-	self.dependency 'hoe-deveiate',            '~> 0.5', :development
-	self.dependency 'rack-test',               '~> 0.6', :development
-	self.dependency 'simplecov',               '~> 0.8', :development
-	self.dependency 'sinatra',                 '~> 1.4', :development
-	self.dependency 'tilt',                    '~> 1.4', :development
-	self.dependency 'sysexits',                '~> 1.0', :development
-	self.dependency 'trollop',                 '~> 2.0', :development
-	self.dependency 'rdoc-generator-fivefish', '~> 0', :development
-	self.dependency 'configurability',         '~> 3.1', :development
-
-	self.require_ruby_version( '>=2.2.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}"
-end
-
-ENV['VERSION'] ||= hoespec.spec.version.to_s
-
-# Ensure the specs pass before checking in
-task 'hg:precheckin' => [:check_history, :check_manifest, :gemspec, :spec]
-
-if Rake::Task.task_defined?( '.gemtest' )
-	Rake::Task['.gemtest'].clear
-	task '.gemtest' do
-		$stderr.puts "Not including a .gemtest until I'm confident the test suite is idempotent."
-	end
-end
-
-desc "Build a coverage report"
-task :coverage do
-	ENV["COVERAGE"] = 'yes'
-	Rake::Task[:spec].invoke
-end
-
-
-# Use the fivefish formatter for docs generated from development checkout
-if File.directory?( '.hg' )
-	require 'rdoc/task'
-
-	Rake::Task[ 'docs' ].clear
-	RDoc::Task.new( 'docs' ) do |rdoc|
-	rdoc.main = "README.rdoc"
-	rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb" )
-	rdoc.generator = :fivefish
-	rdoc.title = "Inversion Templating"
-	rdoc.rdoc_dir = 'doc'
-	end
-end
-
-task :gemspec => GEMSPEC
-file GEMSPEC => __FILE__
-task GEMSPEC do |task|
-	spec = $hoespec.spec
-	spec.files.delete( '.gemtest' )
-	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
-	File.open( task.name, 'w' ) do |fh|
-		fh.write( spec.to_ruby )
-	end
-end
-
-CLOBBER.include( GEMSPEC.to_s )
-task :default => :gemspec

data/bin/inversion

@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
+# vim: set noet nosta sw=4 ts=4 :
 
 require 'inversion'
 require 'inversion/command'

data/lib/inversion.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'loggability'
@@ -23,13 +23,13 @@ module Inversion
 	log_as :inversion
 
 
-	warn ">>> Inversion requires Ruby 2.2.0 or later. <<<" if RUBY_VERSION < '2.2.0'
+	warn ">>> Inversion requires Ruby 2.4.0 or later. <<<" if RUBY_VERSION < '2.4.0'
 
 	# Library version constant
-	VERSION = '1.0.0'
+	VERSION = '1.3.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: a4b621e66915 $
+	REVISION = %q$Revision$
 
 
 	### Get the Inversion version.

data/lib/inversion/command.rb

@@ -1,5 +1,6 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
+# vim: set noet nosta sw=4 ts=4 :
 
 require 'logger'
 require 'trollop'

data/lib/inversion/exceptions.rb

@@ -1,6 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion' unless defined?( Inversion )
+
 #--
 module Inversion
 

data/lib/inversion/mixins.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env ruby
-# vim: set nosta noet ts=4 sw=4:
+# -*- ruby -*-
+# frozen_string_literal: true
+# vim: set noet nosta sw=4 ts=4 :
 
 require 'tempfile'
 
@@ -87,7 +88,7 @@ module Inversion
 
 
 		### Return a duplicate of the given +hash+ with its identifier-like keys
-		### untainted and transformed into symbols from whatever they were before.
+		### transformed into symbols from whatever they were before.
 		###
 		###    symbolhash = symbolify_keys( stringhash )
 		###
@@ -95,7 +96,7 @@ module Inversion
 			newhash = {}
 
 			hash.each do |key,val|
-				keysym = key.to_s.dup.untaint.to_sym
+				keysym = key.to_s.to_sym
 
 				if val.is_a?( Hash )
 					newhash[ keysym ] = symbolify_keys( val )
@@ -129,6 +130,20 @@ module Inversion
 		# The fallback escape format
 		DEFAULT_ESCAPE_FORMAT = :none
 
+		# Unreserved characters from section 2.3 of RFC 3986
+		# ALPHA / DIGIT / "-" / "." / "_" / "~"
+		URI_ENCODED_CHARACTERS = /[^\w\-\.~]/
+
+
+		### Inclusion callback; add Loggability if it isn't already present
+		def self::included( mod )
+			super
+			unless mod < Loggability
+				mod.extend( Loggability )
+				mod.log_to( :inversion )
+			end
+		end
+
 
 		### Escape the +output+ using the format specified by the given +render_state+'s config.
 		def escape( output, render_state )
@@ -153,6 +168,17 @@ module Inversion
 				gsub( />/, '&gt;' )
 		end
 
+
+		### Escape the given +output+ using the encoding specified in RFC3986 (URIs)
+		def escape_uri( output )
+			return output.to_s.gsub( URI_ENCODED_CHARACTERS ) do |m|
+				bytes = m[ 0 ].each_byte
+				bytes.inject( String.new ) do |buf, char|
+					buf + sprintf( '%%%0X', char )
+				end
+			end.force_encoding( Encoding::US_ASCII )
+		end
+
 	end # Escaping
 
 

data/lib/inversion/monkeypatches.rb

@@ -1,5 +1,6 @@
-#!/usr/bin/env ruby
-# vim: set nosta noet ts=4 sw=4:
+# -*- ruby -*-
+# frozen_string_literal: true
+# vim: set noet nosta sw=4 ts=4 :
 
 require 'inversion' unless defined?( Inversion )
 require 'ripper'

data/lib/inversion/parser.rb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'loggability'

data/lib/inversion/renderstate.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'loggability'

data/lib/inversion/sinatra.rb

@@ -1,4 +1,7 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
+# vim: set noet nosta sw=4 ts=4 :
+
 
 begin
 	require 'inversion/tilt'

data/lib/inversion/template.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'loggability'
@@ -200,7 +201,6 @@ class Inversion::Template
 			else
 				tmpl.read
 			end
-		source.untaint
 
 		# Load the instance and set the path to the source
 		template = self.new( source, parsestate, opts )
@@ -344,7 +344,7 @@ class Inversion::Template
 	### Render the template, optionally passing a render state (if, for example, the
 	### template is being rendered inside another template).
 	def render( parentstate=nil, &block )
-		self.log.info "rendering template %#x" % [ self.object_id/2 ]
+		self.log.info "rendering template %#x" % [ self.object_id * 2 ]
 		opts = self.options
 		opts.merge!( parentstate.options ) if parentstate
 

data/lib/inversion/template/attrtag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/codetag'
 
 # Inversion attribute tag.
@@ -17,7 +19,7 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 	# <?attr foo ?>
 	tag_pattern '$(ident)' do |tag, match|
 		tag.send( :log ).debug "  Identifier is: %p" % [ match.string(1) ]
-		tag.name = match.string( 1 ).untaint.to_sym
+		tag.name = match.string( 1 ).to_sym
 	end
 
 	# <?attr "%s" % foo ?>
@@ -26,12 +28,12 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 		raise Inversion::ParseError, "expected '%%', got %p instead" % [ op ] unless op == '%'
 
 		tag.format = match.string( 1 )
-		tag.name   = match.string( 3 ).untaint.to_sym
+		tag.name   = match.string( 3 ).to_sym
 	end
 
 	# <?attr foo.methodchain ?>
 	tag_pattern '$(ident) $( .+ )' do |tag, match|
-		tag.name = match.string( 1 ).untaint.to_sym
+		tag.name = match.string( 1 ).to_sym
 		tag.methodchain = match.string( 2 )
 	end
 
@@ -41,7 +43,7 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 		raise Inversion::ParseError, "expected '%%', got %p instead" % [ op ] unless op == '%'
 
 		tag.format      = match.string( 1 )
-		tag.name        = match.string( 3 ).untaint.to_sym
+		tag.name        = match.string( 3 ).to_sym
 		tag.methodchain = match.string( 4 )
 	end
 
@@ -58,7 +60,7 @@ class Inversion::Template::AttrTag < Inversion::Template::CodeTag
 		super
 
 		# Add an identifier for the tag name
-		self.identifiers << self.name.untaint.to_sym
+		self.identifiers << self.name.to_sym
 	end
 
 

data/lib/inversion/template/begintag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/mixins'
 require 'inversion/template/attrtag'
 require 'inversion/template/containertag'

data/lib/inversion/template/calltag.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/attrtag'
 
 # Inversion call tag.