inversion 1.1.1 → 1.2.0

data/History.rdoc

@@ -1,3 +1,12 @@
+== 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:
@@ -7,7 +16,7 @@ Bugfixes:
 
 == v1.1.0 [2017-08-17] Mahlon E. Smith <mahlon@martini.nu>
 
-Mark as stable, update dependencies.
+Enhancements:
 
 - Allow the use of the '!' operator in conditional tags, logically
   inverting the evaluated body.

data/Rakefile

@@ -41,7 +41,7 @@ hoespec = Hoe.spec 'inversion' do
 	self.dependency 'configurability',         '~> 3.1', :development
 	self.dependency 'rspec-wait',              '~> 0.0', :development
 
-	self.require_ruby_version( '>=2.2.0' )
+	self.require_ruby_version( '>=2.4.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}"
@@ -85,6 +85,8 @@ file GEMSPEC => __FILE__
 task GEMSPEC do |task|
 	spec = $hoespec.spec
 	spec.files.delete( '.gemtest' )
+	spec.signing_key = nil
+	spec.cert_chain = ['certs/ged.pem']
 	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 )

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.1.1'
+	VERSION = '1.2.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 83231fd98787 $
+	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'
 

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'

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.

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.

data/lib/inversion/template/codetag.rb

@@ -1,7 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'ripper'
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/tag'
 
 # The base class for Inversion tags that parse the body section of the tag using
@@ -52,7 +54,7 @@ class Inversion::Template::CodeTag < Inversion::Template::Tag
 					"invalid char in pattern: #{m[0].inspect}"
 			end
 
-			buf = '^'
+			buf = String.new( '^' )
 			pattern.scan( /(?:\w+|\$\(|[()\[\]\{\}?*+\.]+)/ ) do |tok|
 				case tok
 				when /\w/

data/lib/inversion/template/commenttag.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/tag'
 require 'inversion/template/containertag'
 

data/lib/inversion/template/configtag.rb

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

data/lib/inversion/template/containertag.rb

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
-require 'inversion' unless defined?( Inversion )
 require 'inversion/template' unless defined?( Inversion::Template )
 
 # A mixin for a tag that allows it to contain other nodes.

data/lib/inversion/template/defaulttag.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 'default' tag.

data/lib/inversion/template/elsetag.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/tag'
 
 

data/lib/inversion/template/elsiftag.rb

@@ -1,10 +1,11 @@
-#!/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'
 require 'inversion/template/commenttag'
-require 'inversion/template/iftag' unless
-	defined?( Inversion::Template::IfTag )
+require 'inversion/template/iftag'
 
 
 # Inversion 'elsif' tag.

data/lib/inversion/template/endtag.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
-require 'inversion' unless defined?( Inversion )
 require 'inversion/template' unless defined?( Inversion::Template )
-require 'inversion/template/tag' unless defined?( Inversion::Template::Tag )
+require 'inversion/template/tag'
 
 # Closing tag class
 class Inversion::Template::EndTag < Inversion::Template::Tag

data/lib/inversion/template/escapetag.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 escaping tag.

data/lib/inversion/template/fortag.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'
 require 'inversion/template/containertag'
 

data/lib/inversion/template/fragmenttag.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/tag'
 require 'inversion/template/containertag'
 

data/lib/inversion/template/iftag.rb

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

data/lib/inversion/template/importtag.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/tag'
 
 # Inversion import tag.

data/lib/inversion/template/includetag.rb

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

data/lib/inversion/template/node.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/template/pptag.rb

@@ -1,7 +1,9 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'pp'
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/calltag'
 
 # Inversion object inspection tag.
@@ -19,7 +21,7 @@ class Inversion::Template::PpTag < Inversion::Template::CallTag
 	### and return them.
 	def render( render_state )
 		raw = super
-		buf = ''
+		buf = String.new( '' )
 		PP.pp( raw, buf )
 		return self.escape( buf.chomp, render_state )
 	end

data/lib/inversion/template/publishtag.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/tag'
 require 'inversion/template/containertag'
 

data/lib/inversion/template/rescuetag.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/tag'
 
 

data/lib/inversion/template/subscribetag.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/tag'
 
 # Inversion subscription tag.

data/lib/inversion/template/tag.rb

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

data/lib/inversion/template/textnode.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/node'
 
 # Inversion text node class -- container for static content in templates between tags.

data/lib/inversion/template/timedeltatag.rb

@@ -1,11 +1,15 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 require 'uri'
 require 'time'
 require 'date'
+
+require 'inversion/template' unless defined?( Inversion::Template )
 require 'inversion/template/attrtag'
 
+
 # Inversion time delta tag.
 #
 # This tag is a derivative of the 'attr' tag that transforms the results of its method call
@@ -37,6 +41,11 @@ class Inversion::Template::TimeDeltaTag < Inversion::Template::AttrTag
 	def render( renderstate )
 		val = super( renderstate )
 		time = nil
+		omit_decorator = false
+
+		if val.respond_to?( :key )
+			val, omit_decorator = val.values_at( :time, :omit_decorator )
+		end
 
 		if val.respond_to?( :to_time )
 			time = val.to_time
@@ -49,10 +58,14 @@ class Inversion::Template::TimeDeltaTag < Inversion::Template::AttrTag
 		now = Time.now
 		if now > time
 			seconds = now - time
-			return "%s ago" % [ timeperiod(seconds) ]
+			period = timeperiod( seconds )
+			period += ' ago' unless omit_decorator
+			return period
 		else
 			seconds = time - now
-			return "%s from now" % [ timeperiod(seconds) ]
+			period = timeperiod( seconds )
+			period += ' from now' unless omit_decorator
+			return period
 		end
 	end