inversion 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff47aba3a83fd9d627a25879f5dda61e904fcb60743fce28c45da4524c0c82f1
-  data.tar.gz: 58f0c44113f5cb33e1070e5767f08a95368867b5205f45addf7d9436da5246e3
+  metadata.gz: de95b723b4e1d977b915f72d99659c4b73f6ca222afe91b4536c5e3e2c12bd73
+  data.tar.gz: 62b09f236668d37f6e33757d7cc7db174374ae5663ad42c6bd20aa9b55c40835
 SHA512:
-  metadata.gz: 50af88a980608c0644d79f045a327ec145d257f299e19477f10379fcfe83148d07ec3d9bb93abd1bcfb3c06373772dfacfd3a2c44bd306ca39e5d25f16d3535c
-  data.tar.gz: ff1ccfb839a8963c4a9713ced1861a37aade69455a1a31b309f27dd23626b68a4ba423c80a0ef67c8e788c240176d1a4ae147658097fe2303297d9f46e1180b7
+  metadata.gz: 1ad4969a736b028863e67d56e5b85b0ad887dcbba2313d9fe90f65f4a982216285c0dc988ba7852f23b157281395ad3dc43c78864fab233f82510d77a49bf284
+  data.tar.gz: 5c50d1f6636a0de6c65616a4996806d20bf50ba26d4da7295edf6d7d7e4eb6fdeb1bbff6b8148bd408137ceaf4a8ed465d87ba6e2fc4ba80f2df37d7d2224ef5

data/History.rdoc

@@ -1,3 +1,14 @@
+= 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>
 

data/lib/inversion.rb

@@ -26,7 +26,7 @@ module Inversion
 	warn ">>> Inversion requires Ruby 2.4.0 or later. <<<" if RUBY_VERSION < '2.4.0'
 
 	# Library version constant
-	VERSION = '1.3.0'
+	VERSION = '1.3.1'
 
 	# Version-control revision constant
 	REVISION = %q$Revision$

data/lib/inversion/mixins.rb

@@ -130,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 )
@@ -154,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/template/configtag.rb

@@ -2,7 +2,8 @@
 # frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
-require 'safe_yaml'
+require 'yaml'
+
 require 'inversion/mixins'
 require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
@@ -36,7 +37,12 @@ class Inversion::Template::ConfigTag < Inversion::Template::Tag
 		raise Inversion::ParseError, 'Empty config settings' if
 			body.nil? || body.strip.empty?
 
-		opts = YAML.load( body, safe: true )
+		opts = if defined?( SafeYAML ) then
+				YAML.load( body, safe: true )
+			else
+				YAML.load( body )
+			end
+
 		@options = symbolify_keys( opts )
 
 		super

data/lib/inversion/template/uriencodetag.rb

@@ -16,16 +16,14 @@ require 'inversion/template/attrtag'
 #   <?uriencode foo.bar ?>
 #
 class Inversion::Template::UriencodeTag < Inversion::Template::AttrTag
+	include Inversion::Escaping
 
-	# Unreserved characters from section 2.3 of RFC 3986
-	# ALPHA / DIGIT / "-" / "." / "_" / "~"
-	DEFAULT_ENCODED_CHARACTERS = /[^\w\-\.~]/
 
 	### Render the method chains against the attributes of the specified +render_state+
 	### and return them.
 	def render( render_state )
 		raw = super
-		return URI.encode( raw.to_s, DEFAULT_ENCODED_CHARACTERS )
+		return escape_uri( raw.to_s )
 	end
 
 end # class Inversion::Template::UriencodeTag

data/spec/data/unknown-tag.tmpl

@@ -1,4 +1,4 @@
-<!-- $Id: unknown-tag.tmpl,v 1b4030ae65f3 2013/06/19 16:00:23 ged $ -->
+<!-- $Id$ -->
 <?unknown This is an unknown tag type ?>
 <?comment Some stuff. ?>
 Stuff

data/spec/inversion/mixins_spec.rb

@@ -108,7 +108,7 @@ describe Inversion, "mixins" do
 				include Inversion::Escaping
 
 				def render( state )
-					return self.escape( "<something>", state )
+					return self.escape( "</something>", state )
 				end
 			end
 			@obj = objclass.new
@@ -116,18 +116,28 @@ describe Inversion, "mixins" do
 
 		it "adds configurable escaping to including classes" do
 			render_state = Inversion::RenderState.new( {}, :escape_format => :html )
-			expect( @obj.render( render_state ) ).to eq( "&lt;something&gt;" )
+			expect( @obj.render( render_state ) ).to eq( "&lt;/something&gt;" )
 		end
 
 		it "doesn't escape anything if escaping is disabled" do
 			render_state = Inversion::RenderState.new( {}, :escape_format => nil )
-			expect( @obj.render( render_state ) ).to eq( "<something>" )
+			expect( @obj.render( render_state ) ).to eq( "</something>" )
 		end
 
 		it "doesn't escape anything if escaping is set to ':none'" do
 			render_state = Inversion::RenderState.new( {}, :escape_format => :none )
-			expect( @obj.render( render_state ) ).to eq( "<something>" )
+			expect( @obj.render( render_state ) ).to eq( "</something>" )
 		end
+
+		it "supports URI escaping" do
+			render_state = Inversion::RenderState.new( {}, :escape_format => :uri )
+
+			rval = @obj.render( render_state )
+
+			expect( rval.encoding ).to eq( Encoding::US_ASCII )
+			expect( rval ).to eq( "%3C%2Fsomething%3E" )
+		end
+
 	end
 
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Michael Granger
 - Mahlon E. Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdtYWhs
-  b24vREM9bWFydGluaS9EQz1udTAeFw0yMDAyMTkyMTU4NDBaFw0yMTAyMTgyMTU4
-  NDBaMCIxIDAeBgNVBAMMF21haGxvbi9EQz1tYXJ0aW5pL0RDPW51MIIBojANBgkq
-  hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA3cz7ILM8n+Y5nvz7mVRVqE8LusWdT8NX
-  nlnETynDndenI+a2S3j22DR+U4ooGUjuCHE3iR1CVmTDGbxFfNRfmnC1AN9Hybat
-  ewW+onvMBye7yfO0bJB5vkqaW5vd35rzquOffgBtJMo7rPRu6pX8RkL34Wnew4J7
-  POooUcYbWSAO934HSCUC8wVm6b4v/ejVF1Lk44Dz45jtMqtR7KTAtpipdbTXAarO
-  HQy3eVes/0oTqhk4CP50r1KP09nUHTn2lzVaCN9vmNE/Jwe0AuQ9ImvZXPpCsMMl
-  V03/tuJ++48sVmOIusJkASPupXcdI6zqsjYw2vLMFtuYNskRSvwbn6Wm6x9hLWWj
-  IRp5FvHPORLRCHFizXRmXZ3PyFHqbv6m4yG0SyfMzOXPk3Hn5dqqmK+BFCihTZIN
-  fqpBmuxyNEE21fSO9ALLlWeW9ffg9Ye5Sc1n3yEyv8rPb9VDvi1B5N6xIcDFMNVs
-  RiCamNbET4Sq9VIYwYtcB1f6EataqFEhAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBR8KtAhZIhe2uPQHCgU5HurIG7crTAcBgNVHREE
-  FTATgRFtYWhsb25AbWFydGluaS5udTAcBgNVHRIEFTATgRFtYWhsb25AbWFydGlu
-  aS5udTANBgkqhkiG9w0BAQsFAAOCAYEAHXlLXIKQUjd0VYj2mPgMheMjLEtmhHu+
-  7NdIv8Bz4rpKAdhypy30xjukGLTOKBp1C0TjfHXowW/icK0bv9CO9Chbc09/+Ed2
-  K5IsyENen+YLeLfE8dguq5tHlfocbFilRGHt8BHHO9BpPpAYoPt/76SCC2NaU5vN
-  33YTCpaVP0raS6E4i+xtx5PNdKoeTdrgwCQtUBhGf3L9YbZy1UaSeAyng5keuOzV
-  Mu2osihEB0GE0pOZJNpI6ow+0emwN/XvBKHpN9D2bjbvKetyQSrm0OniaZBXIGzW
-  Bg0JmajxUaGYWnz+QFADT+HLPmekxF3mB4+0ymZCHKPC+04h6RDjvkEOji6Jm+VB
-  JHjnceUEejSXTkZAKAmiOAtnX4j1MM1DLiFMlZ5Wbt7hbiOiO5HoN9p9snZhYqSU
-  JyAQQloqY/KyzQqxPlKdMNmBxRU+Cdarp05lEI6Sfj9MdrndoIL6MT/f6PgoCWZQ
-  xEarK1Fn47yS4UZqRi6VgKc3JHscX9x4
+  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
+  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
+  L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
+  M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
+  5PU2AEbf04GGSrmqADGWXeaslaoRdb1fu/0M5qfPTRn5V39sWD9umuDAF9qqil/x
+  Sl6phTvgBrG8GExHbNZpLARd3xrBYLEFsX7RvBn2UPfgsrtvpdXjsHGfpT3IPN+B
+  vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
+  dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
+  ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
+  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
+  FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
+  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAFqsr6o0SvQRgjQVmhbQvExRnCMCoW1yb
+  FJiN7A5RA2Iy2E61OG1Ul5nGmaDmx/PNB/6JIbIV3B9Uq8aTZx4uOjK7r8vMl1/t
+  ZfY7r6HejJfXlcO2m6JDMbpdyEVv916LncBkzZRz6vnnNCx+31f15FKddxujpAFd
+  qpn3JRQY+oj7ZkoccL/IUiDpxQWeS3oOoz9qr2kVTp8R50InZimt79FqCl/1m66W
+  kdOuf+wM3DDx7Rt4IVNHrhGlyfMr7xjKW1Q3gll+pMN1DT6Ajx/t3JDSEg7BnnEW
+  r7AciSO6J4ApUdqyG+coLFlGdtgFTgRHv7ihbQtDI7Z/LV7A4Spn1j2PK3j0Omri
+  kSl1hPVigRytfgdVGiLXzvkkrkgj9EknCaj5UHbac7XvVBrljXj9hsnnqTANaKsg
+  jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
+  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -205,6 +205,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  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'
 description: Inversion is a templating system for Ruby. It uses the “Inversion of
   Control” principle to decouple the contents and structure of templates from the
   code that uses them, making it easier to separate concerns, keep your tests simple,
@@ -311,7 +325,7 @@ metadata:
   documentation_uri: http://deveiate.org/code/Inversion
   source_uri: https://hg.sr.ht/~ged/Inversion/browse
   bug_tracker_uri: https://todo.sr.ht/~ged/Inversion/browse
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -326,8 +340,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Inversion is a templating system for Ruby.
 test_files: []