inversion 1.3.1 → 1.5.0

data/spec/inversion/sinatra_spec.rb

@@ -13,7 +13,7 @@ rescue LoadError => err
 	$sinatra_support = false
 end
 
-describe "Sinatra support", :if => $sinatra_support do
+RSpec.describe "Sinatra support", :if => $sinatra_support do
 	include Rack::Test::Methods if defined?( ::Rack )
 
 	before( :each ) do

data/spec/inversion/template/attrtag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/attrtag'
 
-describe Inversion::Template::AttrTag do
+RSpec.describe Inversion::Template::AttrTag do
 
 	describe "parsing" do
 

data/spec/inversion/template/begintag_spec.rb

@@ -11,7 +11,7 @@ require 'inversion/template/rescuetag'
 require 'inversion/template/endtag'
 require 'inversion/renderstate'
 
-describe Inversion::Template::BeginTag do
+RSpec.describe Inversion::Template::BeginTag do
 
 
 	context "without any rescue clauses" do

data/spec/inversion/template/calltag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/calltag'
 
-describe Inversion::Template::CallTag do
+RSpec.describe Inversion::Template::CallTag do
 
 	# Since call is just an alias, the attrtag_spec already tests all of
 	# this.

data/spec/inversion/template/codetag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/codetag'
 
-describe Inversion::Template::CodeTag do
+RSpec.describe Inversion::Template::CodeTag do
 
 
 	it "is an abstract class" do
@@ -70,4 +70,27 @@ describe Inversion::Template::CodeTag do
 			}.to raise_exception( ScriptError, /patterns already exist/i )
 		end
 	end
+
+
+	it "throws an error if trying to declare a tag pattern with an invalid character" do
+		expect {
+			Class.new( described_class ) do
+				tag_pattern "°°°" do |tag, match|
+					:foo
+				end
+			end
+		}.to raise_error( Ripper::TokenPattern::CompileError, /invalid char/i )
+	end
+
+
+	it "throws an error if given an invalid tag pattern" do
+		expect {
+			Class.new( described_class ) do
+				tag_pattern "$(ident)$(" do |tag, match|
+					:foo
+				end
+			end
+		}.to raise_error( Ripper::TokenPattern::CompileError, /unmatched paren/i )
+	end
+
 end

data/spec/inversion/template/commenttag_spec.rb

@@ -8,7 +8,7 @@ require 'inversion/template/attrtag'
 require 'inversion/template/textnode'
 require 'inversion/renderstate'
 
-describe Inversion::Template::CommentTag do
+RSpec.describe Inversion::Template::CommentTag do
 
 	it "allows any free-form text in its body" do
 		# <?comment Disabled for now ?>...<?end?>

data/spec/inversion/template/configtag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/configtag'
 
-describe Inversion::Template::ConfigTag do
+RSpec.describe Inversion::Template::ConfigTag do
 
 	# <?config comment_start: /* ?>
 	# <?config comment_end: */ ?>

data/spec/inversion/template/containertag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/containertag'
 
-describe Inversion::Template::ContainerTag do
+RSpec.describe Inversion::Template::ContainerTag do
 
 	context "instances of including classes" do
 

data/spec/inversion/template/defaulttag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/defaulttag'
 
-describe Inversion::Template::DefaultTag do
+RSpec.describe Inversion::Template::DefaultTag do
 
 
 	it "sets a template attribute to a default value" do

data/spec/inversion/template/elsetag_spec.rb

@@ -10,7 +10,7 @@ require 'inversion/template/commenttag'
 require 'inversion/template/fortag'
 require 'inversion/renderstate'
 
-describe Inversion::Template::ElseTag do
+RSpec.describe Inversion::Template::ElseTag do
 
 	it "handles a non-existant body" do
 		Inversion::Template::ElseTag.new( nil )

data/spec/inversion/template/elsiftag_spec.rb

@@ -9,7 +9,7 @@ require 'inversion/template/unlesstag'
 require 'inversion/template/textnode'
 require 'inversion/renderstate'
 
-describe Inversion::Template::ElsifTag do
+RSpec.describe Inversion::Template::ElsifTag do
 
 
 	it "can be appended to an 'if' tag" do

data/spec/inversion/template/endtag_spec.rb

@@ -8,7 +8,7 @@ require 'inversion/template/textnode'
 require 'inversion/template/endtag'
 require 'inversion/renderstate'
 
-describe Inversion::Template::EndTag do
+RSpec.describe Inversion::Template::EndTag do
 
 	before( :each ) do
 		@tag = Inversion::Template::EndTag.new

data/spec/inversion/template/escapetag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/escapetag'
 
-describe Inversion::Template::EscapeTag do
+RSpec.describe Inversion::Template::EscapeTag do
 
 	before( :each ) do
 		@attribute_object = double( "template attribute" )

data/spec/inversion/template/fortag_spec.rb

@@ -9,7 +9,7 @@ require 'inversion/template/attrtag'
 require 'inversion/template/textnode'
 require 'inversion/renderstate'
 
-describe Inversion::Template::ForTag do
+RSpec.describe Inversion::Template::ForTag do
 
 	it "knows which identifiers should be added to the template" do
 		tag = Inversion::Template::ForTag.new( 'foo in bar' )

data/spec/inversion/template/fragmenttag_spec.rb

@@ -8,7 +8,7 @@ require 'inversion/template/attrtag'
 require 'inversion/template/textnode'
 require 'inversion/renderstate'
 
-describe Inversion::Template::FragmentTag do
+RSpec.describe Inversion::Template::FragmentTag do
 
 	it "raises a parse error if the body isn't a simple attribute" do
 		expect {

data/spec/inversion/template/iftag_spec.rb

@@ -7,7 +7,7 @@ require 'inversion/template/iftag'
 require 'inversion/template/textnode'
 require 'inversion/renderstate'
 
-describe Inversion::Template::IfTag do
+RSpec.describe Inversion::Template::IfTag do
 
 
 	it "renders its contents if its attribute is true" do

data/spec/inversion/template/importtag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/importtag'
 
-describe Inversion::Template::ImportTag do
+RSpec.describe Inversion::Template::ImportTag do
 
 	it "can import a single attribute" do
 		tag = Inversion::Template::ImportTag.new( 'txn ' )

data/spec/inversion/template/includetag_spec.rb

@@ -7,7 +7,7 @@ require 'timeout'
 require 'inversion/template'
 require 'inversion/template/includetag'
 
-describe Inversion::Template::IncludeTag do
+RSpec.describe Inversion::Template::IncludeTag do
 
 	it "renders the IncludeTag as an empty string" do
 		included_path = Pathname.pwd + 'included.tmpl'

data/spec/inversion/template/node_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/node'
 
-describe Inversion::Template::Node do
+RSpec.describe Inversion::Template::Node do
 
 	let( :concrete_subclass ) { Class.new(Inversion::Template::Node) }
 

data/spec/inversion/template/pptag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/pptag'
 
-describe Inversion::Template::PpTag do
+RSpec.describe Inversion::Template::PpTag do
 
 	before( :each ) do
 		@attribute_object = double( "template attribute" )

data/spec/inversion/template/publishtag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/publishtag'
 
-describe Inversion::Template::PublishTag do
+RSpec.describe Inversion::Template::PublishTag do
 
 	class TestSubscriber
 		def initialize

data/spec/inversion/template/rescuetag_spec.rb

@@ -9,7 +9,7 @@ require 'inversion/template/commenttag'
 require 'inversion/template/fortag'
 require 'inversion/renderstate'
 
-describe Inversion::Template::RescueTag do
+RSpec.describe Inversion::Template::RescueTag do
 
 	it "handles a non-existant body" do
 		tag = Inversion::Template::RescueTag.new( nil )

data/spec/inversion/template/subscribetag_spec.rb

@@ -7,7 +7,7 @@ require 'inversion/template'
 require 'inversion/template/textnode'
 require 'inversion/template/subscribetag'
 
-describe Inversion::Template::SubscribeTag do
+RSpec.describe Inversion::Template::SubscribeTag do
 
 
 	it "raises a parse error if the key isn't a simple attribute" do

data/spec/inversion/template/tag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/tag'
 
-describe Inversion::Template::Tag do
+RSpec.describe Inversion::Template::Tag do
 
 	before( :all ) do
 		@real_derivatives = Inversion::Template::Tag.derivatives.dup

data/spec/inversion/template/textnode_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/textnode'
 
-describe Inversion::Template::TextNode do
+RSpec.describe Inversion::Template::TextNode do
 
 	before( :each ) do
 		@state = Inversion::RenderState.new

data/spec/inversion/template/timedeltatag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/timedeltatag'
 
-describe Inversion::Template::TimeDeltaTag do
+RSpec.describe Inversion::Template::TimeDeltaTag do
 
 	MINUTES = 60
 	HOURS   = 60  * MINUTES

data/spec/inversion/template/unlesstag_spec.rb

@@ -7,7 +7,7 @@ require 'inversion/template/unlesstag'
 require 'inversion/template/textnode'
 require 'inversion/renderstate'
 
-describe Inversion::Template::UnlessTag do
+RSpec.describe Inversion::Template::UnlessTag do
 
 
 	it "renders its contents if its attribute is false" do

data/spec/inversion/template/uriencodetag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/uriencodetag'
 
-describe Inversion::Template::UriencodeTag do
+RSpec.describe Inversion::Template::UriencodeTag do
 
 	before( :each ) do
 		@attribute_object = double( "template attribute" )

data/spec/inversion/template/yieldtag_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 
 require 'inversion/template/yieldtag'
 
-describe Inversion::Template::YieldTag do
+RSpec.describe Inversion::Template::YieldTag do
 
 
 	it "calls the renderstate's block before rendering, and renders as its return value" do

data/spec/inversion/template_spec.rb

@@ -7,7 +7,7 @@ require 'stringio'
 
 require 'inversion/template'
 
-describe Inversion::Template do
+RSpec.describe Inversion::Template do
 
 	before( :all ) do
 		@default_template_path = Inversion::Template.template_paths

data/spec/inversion/tilt_spec.rb

@@ -12,7 +12,7 @@ rescue LoadError => err
 	$tilt_support = false
 end
 
-describe "Tilt support", :if => $tilt_support do
+RSpec.describe "Tilt support", :if => $tilt_support do
 
 	before( :all ) do
 		setup_logging( :fatal )

data/spec/inversion_spec.rb

@@ -5,7 +5,7 @@ require_relative 'helpers'
 
 require 'inversion'
 
-describe Inversion do
+RSpec.describe Inversion do
 
 	it "defines a version" do
 		expect( described_class::VERSION ).to match( /^\d+(\.\d+)*$/ )

data/spec/roda/plugins/inversion_spec.rb

@@ -0,0 +1,91 @@
+#!/usr/bin/env rspec -cfd -b
+# vim: set noet nosta sw=4 ts=4 :
+
+require_relative '../../helpers'
+
+begin
+	require 'roda'
+	$roda_support = true
+rescue LoadError => err
+	warn "Roda support testing disabled: %p: %s" % [ err.class, err.message ]
+	$roda_support = false
+end
+
+
+RSpec.describe "Roda support", :if => $roda_support do
+	include Rack::Test::Methods if defined?( ::Rack )
+
+	before( :all ) do
+		setup_logging( :fatal )
+	end
+
+	before( :each ) do
+		allow( Inversion::Template ).to receive( :load ).and_return( tmpl )
+		app.app # looks weird, but creates an instance for Rack::Test.
+	end
+
+	let( :tmpl ) { Inversion::Template.new("Hi <?attr name ?>!") }
+
+	let( :app ) do
+		Class.new( Roda ) do
+			plugin :inversion
+			templates \
+				tmpl: 'template.tmpl'
+
+			route do |r|
+				r.get "symbol" do
+					:tmpl
+				end
+
+				r.get "unknown" do
+					template( :nope )
+				end
+
+				r.get "template" do
+					tmpl = template( :tmpl )
+					tmpl.name = "handsome"
+					return tmpl
+				end
+			end
+		end
+	end
+
+
+	it "registers itself with Roda on demand" do
+		plugs = Roda::RodaPlugins.instance_variable_get( :@plugins )
+		expect( plugs[:inversion] ).to be( Roda::RodaPlugins::Inversion )
+	end
+
+
+	it "extends the Roda DSL with a #template helper method" do
+		expect( app.instance_methods ).to include( :template )
+	end
+
+
+	it "falls through to Roda default behavior on unmapped symbols" do
+		get '/nonexistent'
+		expect( last_response ).to_not be_ok
+	end
+
+
+	it "can reference a known template via symbol" do
+		get '/symbol'
+		expect( last_response ).to be_ok
+		expect( last_response.body ).to eq( 'Hi !' )
+	end
+
+
+	it "can render a returned template via template()" do
+		get '/template'
+		expect( last_response ).to be_ok
+		expect( last_response.body ).to eq( 'Hi handsome!' )
+	end
+
+
+	it "fails fast if referencing an unknown template at runtime" do
+		expect {
+			get '/unknown'
+		}.to raise_error( ArgumentError, /no :nope template registered/ )
+	end
+end
+