utopia 0.12.6 → 1.0.0

data/spec/utopia/content/localized/four/links.yaml

@@ -0,0 +1,4 @@
+index.en:
+  title: "Four"
+index.zh:
+  title: "四"

data/spec/utopia/content/localized/links.yaml

@@ -0,0 +1,16 @@
+one:
+  order: 1
+two.en: &two
+  order: 2
+two.zh:
+  <<: *two
+three:
+  order: 3
+four.en: &four
+  order: 4
+  title: "Four"
+four.zh:
+  order: 4
+  title: "四"
+five.en:
+  order: 5

data/spec/utopia/content/node/ordered/links.yaml

@@ -0,0 +1,4 @@
+first:
+  order: 0
+second:
+  order: 1

data/spec/utopia/content/node/related/links.yaml

@@ -0,0 +1,4 @@
+foo.en:
+  order: 0
+foo.ja:
+  order: 1

data/spec/utopia/content/node_spec.rb

@@ -0,0 +1,63 @@
+# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative '../spec_helper'
+
+require 'utopia/content'
+
+module Utopia::ContentSpec
+	describe Utopia::Content::Node do
+		let(:root) {File.expand_path("../node", __FILE__)}
+		let(:content) {Utopia::Content.new(lambda{}, root: root)}
+		
+		it "should list siblings in correct order" do
+			node = content.lookup_node(Utopia::Path['/ordered/first'])
+			
+			links = node.sibling_links
+			
+			expect(links.size).to be == 2
+			expect(links[0].name).to be == 'first'
+			expect(links[1].name).to be == 'second'
+		end
+		
+		it "should list all links in correct order" do
+			node = content.lookup_node(Utopia::Path['/ordered/index'])
+			
+			links = node.links
+			
+			expect(links.size).to be == 2
+			expect(links[0].name).to be == 'first'
+			expect(links[1].name).to be == 'second'
+		end
+		
+		it "should list related links" do
+			node = content.lookup_node(Utopia::Path['/related/foo.en'])
+			
+			links = node.related_links
+			
+			expect(links.size).to be == 2
+			expect(links[0].name).to be == 'foo'
+			expect(links[0].variant).to be == 'en'
+			
+			expect(links[1].name).to be == 'foo'
+			expect(links[1].variant).to be == 'ja'
+		end
+	end
+end

data/spec/utopia/{middleware/content_spec.rb → content/processor_spec.rb}

@@ -1,4 +1,6 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#!/usr/bin/env rspec
+
+# Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,12 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rack/mock'
-require 'utopia/middleware/content'
+require_relative '../spec_helper'
 
-module Utopia::Middleware::ContentSpec
-	APP = lambda {|env| [404, [], []]}
-	
+require 'utopia/content/link'
+
+module Utopia::Content::ProcessorSpec
 	class TestDelegate
 		def initialize
 			@events = []
@@ -36,29 +37,40 @@ module Utopia::Middleware::ContentSpec
 		end
 	end
 	
-	describe Utopia::Middleware::Content::Processor do
+	describe Utopia::Content::Processor do
+		it "should format open tags correctly" do
+			foo_tag = Utopia::Content::Tag.new("foo", bar: nil, baz: 'bob')
+			
+			expect(foo_tag[:bar]).to be nil
+			expect(foo_tag[:baz]).to be == 'bob'
+			
+			expect(foo_tag.to_s('content')).to be == '<foo bar baz="bob">content</foo>'
+		end
+		
 		it "should parse single tag" do
 			delegate = TestDelegate.new
-			processor = Utopia::Middleware::Content::Processor.new(delegate)
+			processor = Utopia::Content::Processor.new(delegate)
 			
 			processor.parse %Q{<foo></foo>}
 			
-			foo_tag = Utopia::Tag.new("foo")
+			foo_tag = Utopia::Content::Tag.new("foo")
 			expected_events = [
 				[:tag_begin, foo_tag],
 				[:tag_end, foo_tag],
 			]
 			
 			expect(delegate.events).to be == expected_events
+			
+			expect(foo_tag.to_s)
 		end
 		
 		it "should parse and escape text" do
 			delegate = TestDelegate.new
-			processor = Utopia::Middleware::Content::Processor.new(delegate)
+			processor = Utopia::Content::Processor.new(delegate)
 			
 			processor.parse %Q{<foo>Bob &amp; Barley<!-- Comment --><![CDATA[Hello & World]]></foo>}
 			
-			foo_tag = Utopia::Tag.new("foo")
+			foo_tag = Utopia::Content::Tag.new("foo")
 			expected_events = [
 				[:tag_begin, foo_tag],
 				[:cdata, "Bob &amp; Barley"],
@@ -69,20 +81,19 @@ module Utopia::Middleware::ContentSpec
 			
 			expect(delegate.events).to be == expected_events
 		end
-	end
-	
-	describe Utopia::Middleware::Content do
-		it "Should parse file and expand variables" do
-			root = File.expand_path("../content_root", __FILE__)
-			content = Utopia::Middleware::Content.new(APP, :root => root)
 		
-			path = Utopia::Path.create('/index')
-			node = content.lookup_node(path)
-			expect(node).to be_kind_of Utopia::Middleware::Content::Node
+		it "should fail with incorrect closing tag" do
+			delegate = TestDelegate.new
+			processor = Utopia::Content::Processor.new(delegate)
+			
+			expect{processor.parse %Q{<p>Foobar</dl>}}.to raise_exception(Utopia::Content::Processor::UnbalancedTagError)
+		end
 		
-			output = StringIO.new
-			node.process!({}, output, {})
-			expect(output.string).to be == %Q{<h1>Hello World</h1>}
+		it "should fail with unclosed tag" do
+			delegate = TestDelegate.new
+			processor = Utopia::Content::Processor.new(delegate)
+			
+			expect{processor.parse %Q{<p>Foobar}}.to raise_exception(Utopia::Content::Processor::UnbalancedTagError)
 		end
 	end
 end

data/spec/utopia/content_spec.rb

@@ -0,0 +1,87 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'spec_helper'
+
+require 'utopia/content'
+
+module Utopia::ContentSpec
+	describe Utopia::Content do
+		include Rack::Test::Methods
+		
+		let(:app) {Rack::Builder.parse_file(File.expand_path('../content_spec.ru', __FILE__)).first}
+		
+		it "should get a local path" do
+			get '/node/index'
+			
+			expect(last_response.body).to be == File.expand_path('../pages/node', __FILE__)
+		end
+		
+		it "should successfully redirect to the index page" do
+			get '/'
+			
+			expect(last_response.status).to be == 307
+			expect(last_response.headers['Location']).to be == '/index'
+			
+			get '/content'
+			
+			expect(last_response.status).to be == 307
+			expect(last_response.headers['Location']).to be == '/content/index'
+		end
+		
+		it "should successfully render the index page" do
+			get "/index"
+			
+			expect(last_response.body).to be == '<h1>Hello World</h1>'
+		end
+		
+		it "should render partials correctly" do
+			get "/content/test-partial"
+			
+			expect(last_response.body).to be == '10'
+		end
+	end
+	
+	describe Utopia::Content do
+		let(:root) {File.expand_path("../pages", __FILE__)}
+		let(:content) {Utopia::Content.new(lambda{}, root: root, cache_templates: true)}
+		
+		it "should parse file and expand variables" do
+			path = Utopia::Path.create('/index')
+			node = content.lookup_node(path)
+			expect(node).to be_kind_of Utopia::Content::Node
+		
+			output = StringIO.new
+			node.process!({}, output, {})
+			expect(output.string).to be == '<h1>Hello World</h1>'
+		end
+		
+		it "should fetch xml and use cache" do
+			node_path = File.expand_path('../pages/index.xnode', __FILE__)
+			
+			template = content.fetch_xml(node_path)
+			
+			expect(template).to be_kind_of Trenni::Template
+			
+			# Check that the same object is returned:
+			expect(template).to be content.fetch_xml(node_path)
+		end
+	end
+end

data/spec/utopia/content_spec.ru

@@ -0,0 +1,10 @@
+
+require 'utopia/tags/deferred'
+
+use Utopia::Content,
+	root: File.expand_path('../pages', __FILE__),
+	tags: {
+		'deferred' => Utopia::Tags::Deferred
+	}
+
+run lambda {|env| [404, {}, []]}

data/spec/utopia/{middleware/controller_spec.rb → controller_spec.rb}

@@ -1,3 +1,5 @@
+#!/usr/bin/env rspec
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,13 +20,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'spec_helper'
+
 require 'rack/mock'
-require 'utopia/middleware/controller'
+require 'rack/test'
+require 'utopia/controller'
 
-module Utopia::Middleware::ControllerSpec
-	describe Utopia::Middleware::Controller::Action do
+module Utopia::ControllerSpec
+	describe Utopia::Controller::Action do
 		it "should resolve callbacks" do
-			actions = Utopia::Middleware::Controller::Action.new
+			actions = Utopia::Controller::Action.new
 			
 			specific_action = actions.define(['a', 'b', 'c']) {puts 'specific_action'}
 			indirect_action = actions.define(['**']) {puts 'indirect_action'}
@@ -41,7 +46,7 @@ module Utopia::Middleware::ControllerSpec
 		end
 		
 		it "should be greedy matching" do
-			actions = Utopia::Middleware::Controller::Action.new
+			actions = Utopia::Controller::Action.new
 			
 			greedy_action = actions.define(['**', 'r']) {puts 'greedy_action'}
 			
@@ -49,10 +54,8 @@ module Utopia::Middleware::ControllerSpec
 			expect(actions.select(['r'])).to be_include greedy_action
 		end
 	end
-	
-	APP = lambda {|env| [404, [], []]}
-	
-	class TestController < Utopia::Middleware::Controller::Base
+		
+	class TestController < Utopia::Controller::Base
 		on 'success' do
 			success!
 		end
@@ -70,7 +73,7 @@ module Utopia::Middleware::ControllerSpec
 		end
 	end
 	
-	class TestIndirectController < Utopia::Middleware::Controller::Base
+	class TestIndirectController < Utopia::Controller::Base
 		def initialize
 			@sequence = ""
 		end
@@ -104,16 +107,58 @@ module Utopia::Middleware::ControllerSpec
 		end
 	end
 	
-	class MockControllerMiddleware
-		attr :env
+	describe Utopia::Controller do
+		include Rack::Test::Methods
+		
+		let(:app) {Rack::Builder.parse_file(File.expand_path('../controller_spec.ru', __FILE__)).first}
+		
+		it "should successfully call the controller method" do
+			get "/controller/hello-world"
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.body).to be == 'Hello World'
+		end
+		
+		it "should successfully call the recursive controller method" do
+			get "/controller/recursive/hello-world"
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.body).to be == 'Hello World'
+		end
+		
+		it "should successfully call the controller method" do
+			get "/controller/flat"
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.body).to be == 'flat'
+		end
+		
+		it "should successfully call the recursive controller method" do
+			get "/controller/recursive/flat"
+			
+			expect(last_response.status).to be == 404
+		end
+		
+		it "should perform ignore the request" do
+			get '/controller/ignore'
+			expect(last_response.status).to be == 404
+		end
+		
+		it "should redirect the request" do
+			get '/controller/redirect'
+			expect(last_response.status).to be == 302
+			expect(last_response.headers['Location']).to be == 'bar'
+		end
 		
-		def call(env)
-			@env = env
+		it "should rewrite the request" do
+			get '/controller/rewrite'
+			expect(last_response.status).to be == 200
+			expect(last_response.body).to be == 'Hello World'
 		end
 	end
 	
-	describe Utopia::Middleware::Controller do
-		let(:variables) {Utopia::Middleware::Controller::Variables.new}
+	describe Utopia::Controller do
+		let(:variables) {Utopia::Controller::Variables.new}
 		
 		it "should call controller methods" do
 			request = Rack::Request.new("utopia.controller" => variables)