inversion 0.12.3 → 0.14.0

data/spec/inversion/tilt_spec.rb

@@ -1,19 +1,10 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent.parent
-	libdir  = basedir + 'lib'
-
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s )  unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
+require_relative '../helpers'
 
 begin
+	require 'tilt'
 	require 'inversion/tilt'
 	$tilt_support = true
 rescue LoadError => err
@@ -28,19 +19,19 @@ describe "Tilt support", :if => $tilt_support do
 	end
 
 	it "registers itself with Tilt" do
-		Tilt['layout.tmpl'].should == Inversion::TiltWrapper
+		expect( Tilt['layout.tmpl'] ).to eq( Inversion::TiltWrapper )
 	end
 
 	it "merges locals with template attributes upon evaluation" do
-		File.stub( :open ).with( 'test.tmpl', 'rb' ).and_return( '<?attr foo ?>' )
-		Tilt.new( 'test.tmpl' ).render( Object.new, :foo => 'Booyakasha!' ).should == 'Booyakasha!'
+		expect( File ).to receive( :open ).with( 'test.tmpl', 'rb' ).and_return( '<?attr foo ?>' )
+		expect( Tilt.new( 'test.tmpl' ).render( Object.new, :foo => 'Booyakasha!' ) ).to eq( 'Booyakasha!' )
 	end
 
 	it "merges the 'scope' object if it responds_to #to_h" do
 		scope = Object.new
 		def scope.to_h; { :message => "Respek!" }; end
-		File.stub( :open ).with( 'test.tmpl', 'rb' ).and_return( '<?attr message ?>' )
-		Tilt.new( 'test.tmpl' ).render( scope, {} ).should == 'Respek!'
+		expect( File ).to receive( :open ).with( 'test.tmpl', 'rb' ).and_return( '<?attr message ?>' )
+		expect( Tilt.new( 'test.tmpl' ).render( scope, {} ) ).to eq( 'Respek!' )
 	end
 
 end

data/spec/inversion_spec.rb

@@ -1,42 +1,27 @@
 #!/usr/bin/env rspec -cfd -b
 # vim: set noet nosta sw=4 ts=4 :
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent
-	libdir = basedir + 'lib'
+require_relative 'helpers'
 
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
 require 'inversion'
 
 describe Inversion do
 
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-
-	after( :each ) do
-		reset_logging()
-	end
-
-
 	it "defines a version" do
-		Inversion::VERSION.should =~ /^\d+(\.\d+)*$/
+		expect( described_class::VERSION ).to match( /^\d+(\.\d+)*$/ )
 	end
 
+
 	describe "version methods" do
 
 		it "returns a version string if asked" do
-			Inversion.version_string.should =~ /\w+ [\d.]+/
+			expect( described_class.version_string ).to match( /\w+ [\d.]+/ )
 		end
 
 		it "returns a version string with a build number if asked" do
-			Inversion.version_string(true).should =~ /\w+ [\d.]+ \(build [[:xdigit:]]+\)/
+			expect(
+				described_class.version_string(true)
+			).to match( /\w+ [\d.]+ \(build [[:xdigit:]]+\)/ )
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inversion
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.14.0
 platform: ruby
 authors:
 - Michael Granger
@@ -13,7 +13,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTMwMjI3MTY0ODU4WhcNMTQwMjI3MTY0ODU4WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -24,14 +24,14 @@ cert_chain:
   AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
   qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
   BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  Vlcfyq6GwyE8i0QuFPCeVOwJaneSvcwx316DApjy9/tt2YD2HomLbtpXtji5QXor
-  ON6oln4tWBIB3Klbr3szq5oR3Rc1D02SaBTalxSndp4M6UkW9hRFu5jn98pDB4fq
-  5l8wMMU0Xdmqx1VYvysVAjVFVC/W4NNvlmg+2mEgSVZP5K6Tc9qDh3eMQInoYw6h
-  t1YA6RsUJHp5vGQyhP1x34YpLAaly8icbns/8PqOf7Osn9ztmg8bOMJCeb32eQLj
-  6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
-  /YSusaiDXHKU2O3Akc3htA==
+  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
+  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
+  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
+  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
+  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
+  ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -39,28 +39,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: hoe-manualgen
   requirement: !ruby/object:Gem::Requirement
@@ -76,61 +76,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: hoe-highline
+  name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-deveiate
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,42 +165,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
@@ -221,28 +221,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        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.7'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.13'
 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
@@ -255,15 +269,24 @@ executables:
 - inversion
 extensions: []
 extra_rdoc_files:
+- Examples.rdoc
+- GettingStarted.rdoc
+- Guide.rdoc
 - History.rdoc
 - Manifest.txt
 - README.rdoc
+- Tags.rdoc
 files:
+- .gemtest
 - ChangeLog
+- Examples.rdoc
+- GettingStarted.rdoc
+- Guide.rdoc
 - History.rdoc
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- Tags.rdoc
 - bin/inversion
 - lib/inversion.rb
 - lib/inversion/exceptions.rb
@@ -286,6 +309,7 @@ files:
 - lib/inversion/template/endtag.rb
 - lib/inversion/template/escapetag.rb
 - lib/inversion/template/fortag.rb
+- lib/inversion/template/fragmenttag.rb
 - lib/inversion/template/iftag.rb
 - lib/inversion/template/importtag.rb
 - lib/inversion/template/includetag.rb
@@ -303,6 +327,7 @@ files:
 - lib/inversion/tilt.rb
 - spec/data/sinatra/hello.inversion
 - spec/data/unknown-tag.tmpl
+- spec/helpers.rb
 - spec/inversion/mixins_spec.rb
 - spec/inversion/monkeypatches_spec.rb
 - spec/inversion/parser_spec.rb
@@ -321,6 +346,7 @@ files:
 - spec/inversion/template/endtag_spec.rb
 - spec/inversion/template/escapetag_spec.rb
 - spec/inversion/template/fortag_spec.rb
+- spec/inversion/template/fragmenttag_spec.rb
 - spec/inversion/template/iftag_spec.rb
 - spec/inversion/template/importtag_spec.rb
 - spec/inversion/template/includetag_spec.rb
@@ -338,9 +364,6 @@ files:
 - spec/inversion/template_spec.rb
 - spec/inversion/tilt_spec.rb
 - spec/inversion_spec.rb
-- spec/lib/constants.rb
-- spec/lib/helpers.rb
-- .gemtest
 homepage: http://deveiate.org/projects/Inversion
 licenses:
 - BSD
@@ -362,8 +385,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: inversion
-rubygems_version: 2.0.5
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Inversion is a templating system for Ruby

data/spec/lib/constants.rb

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-
-### A collection of constants used in testing
-module Inversion::TestConstants # :nodoc:all
-
-end # module Inversion::TestConstants
-
-