utopia 1.9.11 → 2.0.0

data/setup/site/tasks/environment.rake

@@ -0,0 +1,17 @@
+
+desc 'Set up the environment for running your web application'
+task :environment do
+	require_relative '../config/environment'
+	
+	# We ensure this is part of the shell environment so if other commands are invoked they will work correctly.
+	ENV['RACK_ENV'] = RACK_ENV.to_s if defined?(RACK_ENV)
+	ENV['DATABASE_ENV'] = DATABASE_ENV.to_s if defined?(DATABASE_ENV)
+	
+	# This generates a consistent session secret if one was not already provided:
+	if ENV['UTOPIA_SESSION_SECRET'].nil?
+		require 'securerandom'
+		
+		warn 'Generating transient session key for development...'
+		ENV['UTOPIA_SESSION_SECRET'] = SecureRandom.hex(32)
+	end
+end

data/spec/mock_node.rb

@@ -0,0 +1,15 @@
+
+class MockNode
+	def initialize(namespaces = {}, &block)
+		@namespaces = namespaces
+		define_singleton_method(:call, block)
+	end
+	
+	def lookup_tag(tag)
+		namespace, name = Trenni::Tag.split(tag.name)
+		
+		if library = @namespaces[namespace]
+			library.call(name, self)
+		end
+	end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+
+if ENV['COVERAGE']
+	begin
+		require 'simplecov'
+		
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+		
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "utopia"
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

data/{lib/utopia/extensions/date.rb → spec/utopia/content/document_spec.rb}

@@ -1,4 +1,4 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2017, 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,31 +18,41 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# These amendments allow for Date <=> DateTime <=> Time, and so on.
-# Use only if required. This implementation works for Ruby 1.9.2.
+require 'utopia/content/document'
 
-require 'date'
-
-class Time
-	alias_method :old_compare, :<=>
+RSpec.describe Utopia::Content::Document do
+	subject{described_class.new(nil, {})}
 	
-	def <=>(other)
-		if Date === other or DateTime === other
-			self.to_datetime <=> other
-		else
-			old_compare(other)
+	it "should generate valid self-closing markup" do
+		node = proc do |document, state|
+			subject.tag("img", src: "cats.jpg")
 		end
+		
+		result = subject.render_node(node)
+		
+		expect(result).to be == '<img src="cats.jpg"/>'
+	end
+	
+	it "should generate valid nested markup" do
+		node = proc do |document, state|
+			subject.tag("div") do
+				subject.tag("img", src: "cats.jpg")
+			end
+		end
+		
+		result = subject.render_node(node)
+		
+		expect(result).to be == '<div><img src="cats.jpg"/></div>'
 	end
-end
-
-class Date
-	alias_method :old_compare, :<=>
 	
-	def <=>(other)
-		if Time === other
-			self.to_datetime <=> other.to_datetime
-		else
-			old_compare(other)
+	it "should fail if tags are unbalanced" do
+		node = proc do |document, state|
+			div = Utopia::Content::Tag.opened('div')
+			span = Utopia::Content::Tag.opened('span')
+			subject.tag_begin(div)
+			subject.tag_end(span)
 		end
+		
+		expect{subject.render_node(node)}.to raise_error Utopia::Content::UnbalancedTagError, /tag span/
 	end
 end

data/spec/utopia/content/markup_spec.rb

@@ -37,9 +37,9 @@ module Utopia::Content::MarkupSpec
 	
 	describe Utopia::Content::MarkupParser do
 		it "should format open tags correctly" do
-			foo_tag = Utopia::Content::Tag.opened("foo", bar: nil, baz: 'bob')
+			foo_tag = Utopia::Content::Tag.opened("foo", bar: true, baz: 'bob')
 			
-			expect(foo_tag[:bar]).to be nil
+			expect(foo_tag[:bar]).to be == true
 			expect(foo_tag[:baz]).to be == 'bob'
 			
 			expect(foo_tag.to_s('content')).to be == '<foo bar baz="bob">content</foo>'

data/spec/utopia/content/{tag_spec.rb → namespace_spec.rb}

@@ -1,4 +1,4 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2017, 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,19 +18,26 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'utopia/content/tag'
+require 'utopia/content/namespace'
 
-RSpec.describe Utopia::Content::Tag.new("body", false, 'class' => 'main') do
-	it "should have name" do
-		expect(subject.name).to be == "body"
+RSpec.describe Utopia::Content::Namespace do
+	let(:tags) do
+		Module.new.tap do |mod|
+			mod.extend(Utopia::Content::Namespace)
+			
+			mod.tag('foo') do |document, state|
+			end
+		end
 	end
 	
-	it "should be open by default" do
-		expect(subject).to_not be_self_closed
+	it "should freeze tags" do
+		tags.freeze
+		
+		expect(tags).to be_frozen
+		expect(tags.named).to be_frozen
 	end
 	
-	it "should have a attribute" do
-		expect(subject.attributes).to include('class')
-		expect(subject['class']).to be == 'main'
+	it "should have named tag" do
+		expect(tags.call('foo', nil)).to_not be_nil
 	end
 end

data/spec/utopia/content/tags_spec.rb

@@ -0,0 +1,80 @@
+# Copyright, 2017, 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 'utopia/content/tags'
+require 'utopia/content/document'
+
+require 'mock_node'
+
+RSpec.describe Utopia::Content::Tags do
+	let(:document) {Utopia::Content::Document.new(nil, {})}
+	
+	describe '<utopia:environment>' do
+		let(:node) do
+			MockNode.new('utopia' => subject) do |document, state|
+				document.tag("utopia:environment", only: 'test') do
+					document.text("Hello World")
+				end
+				
+				document.tag("utopia:environment", only: 'production') do
+					document.text("Goodbye World")
+				end
+			end
+		end
+		
+		it "it should render correct content for test" do
+			document[:environment] = "test"
+			
+			result = document.render_node(node)
+			
+			expect(result).to be == 'Hello World'
+		end
+		
+		it "it should render correct content for production" do
+			document[:environment] = "production"
+			
+			result = document.render_node(node)
+			
+			expect(result).to be == 'Goodbye World'
+		end
+	end
+	
+	describe '<utopia:node>' do
+		let(:node) do
+			MockNode.new('utopia' => subject) do |document, state|
+				document.tag("utopia:node", path: 'test')
+			end
+		end
+		
+		let(:test_node) do
+			MockNode.new do |document, state|
+				document.text("Test Node")
+			end
+		end
+		
+		it "it should render correct content for test" do
+			expect(document).to receive(:lookup_node).with('test').and_return(test_node)
+			
+			result = document.render_node(node)
+			
+			expect(result).to be == 'Test Node'
+		end
+	end
+end

data/spec/utopia/content_spec.rb

@@ -73,7 +73,7 @@ module Utopia::ContentSpec
 	
 	describe Utopia::Content do
 		let(:root) {File.expand_path('content_spec', __dir__)}
-		let(:content) {Utopia::Content.new(lambda{}, root: root, cache_templates: true)}
+		let(:content) {Utopia::Content.new(lambda{}, root: root)}
 		
 		it "should parse file and expand variables" do
 			path = Utopia::Path.create('/index')

data/spec/utopia/content_spec.ru

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

data/spec/utopia/content_spec/_heading.xnode

@@ -1 +1 @@
-<h1><content /></h1>
+<h1><utopia:content/></h1>

data/spec/utopia/content_spec/content/test-partial.xnode

@@ -1 +1 @@
-#{partial 'show-value', value: 10}
+#{partial 'content:show-value', value: 10}

data/spec/utopia/content_spec/index.xnode

@@ -1 +1 @@
-<heading>Hello World</heading>
+<content:heading>Hello World</content:heading>

data/spec/utopia/controller/middleware_spec.ru

@@ -1,7 +1,5 @@
 
 use Utopia::Controller,
-	root: File.expand_path('middleware_spec', __dir__),
-	base: Utopia::Controller::Base,
-	cache_controllers: true
+	root: File.expand_path('middleware_spec', __dir__)
 
 run lambda {|env| [404, {}, []]}

data/spec/utopia/controller/respond_spec.rb

@@ -96,8 +96,8 @@ module Utopia::Controller::RespondSpec
 			get '/errors/file-not-found'
 			
 			expect(last_response.status).to be == 200
-			expect(last_response.headers['Content-Type']).to be == 'text/html'
-			expect(last_response.body).to be_include "<heading>File Not Found</heading>"
+			expect(last_response.headers['Content-Type']).to include('text/html')
+			expect(last_response.body).to be_include "<h1>File Not Found</h1>"
 		end
 		
 		it "should get json error response" do
@@ -138,25 +138,5 @@ module Utopia::Controller::RespondSpec
 			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
 			expect(last_response.body).to be == '{}'
 		end
-		
-		it "should give record as JSON" do
-			header 'Accept', 'application/json'
-			
-			get '/rewrite/2/show'
-			
-			expect(last_response.status).to be == 200
-			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
-			expect(last_response.body).to be == '{"id":2,"foo":"bar"}'
-		end
-		
-		it "should give error as JSON" do
-			header 'Accept', 'application/json'
-			
-			get '/rewrite/1/show'
-			
-			expect(last_response.status).to be == 404
-			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
-			expect(last_response.body).to be == '{"message":"Could not find record"}'
-		end
 	end
 end

data/spec/utopia/controller/respond_spec.ru

@@ -1,10 +1,6 @@
 
-use Utopia::Redirection::Errors,
-	404 => '/fail'
-
 use Utopia::Controller,
-	root: File.expand_path('respond_spec', __dir__),
-	base: Utopia::Controller::Base
+	root: File.expand_path('respond_spec', __dir__)
 
 use Utopia::Content,
 	root: File.expand_path('respond_spec', __dir__)

data/spec/utopia/controller/respond_spec/errors/file-not-found.xnode

@@ -1,7 +1,8 @@
-<page>
-	<?r response.content_type = 'text/html' ?>
+<html>
+	<head><title>Error</title></head>
+	<body>
+		<h1>File Not Found</h1>
 	
-	<heading>File Not Found</heading>
-	
-	<p>The file you requested is unfortunately not available at this time!</p>
-</page>
+		<p>The file you requested is unfortunately not available at this time!</p>
+	</body>
+</html>

data/spec/utopia/exceptions/handler_spec.ru

@@ -2,7 +2,6 @@
 use Utopia::Exceptions::Handler, '/exception'
 
 use Utopia::Controller,
-	root: File.expand_path('handler_spec', __dir__),
-	base: Utopia::Controller::Base
+	root: File.expand_path('handler_spec', __dir__)
 
 run lambda {|env| [404, {}, []]}

data/spec/utopia/exceptions/mailer_spec.ru

@@ -4,7 +4,6 @@ use Utopia::Exceptions::Mailer,
 	from: 'test@localhost'
 
 use Utopia::Controller,
-	root: File.expand_path('handler_spec', __dir__),
-	base: Utopia::Controller::Base
+	root: File.expand_path('handler_spec', __dir__)
 
 run lambda {|env| [404, {}, []]}

data/spec/utopia/extensions_spec.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'utopia/extensions/array'
-require 'utopia/extensions/date'
+require 'utopia/extensions/array_split'
+require 'utopia/extensions/date_comparisons'
 
 module Utopia::ExtensionsSpec
 	describe Array do

data/spec/utopia/localization_spec.ru

@@ -6,8 +6,7 @@ use Utopia::Localization,
 	hosts: {/foobar\.com$/ => 'en', /foobar\.co\.jp$/ => 'ja', /foobar\.de$/ => 'de'}
 
 use Utopia::Controller,
-	root: localization_spec_root,
-	base: Utopia::Controller::Base
+	root: localization_spec_root
 
 use Utopia::Static,
 	root: localization_spec_root

data/spec/utopia/performance_spec.rb

@@ -30,10 +30,6 @@ RSpec.describe "Utopia Performance" do
 	if defined? Benchmark
 		def benchmark(name = nil)
 			Benchmark.ips do |benchmark|
-				# Collect more data for benchmark:
-				benchmark.time = 20
-				benchmark.warmup = 10
-				
 				benchmark.report(name) do |i|
 					yield i
 				end
@@ -44,10 +40,10 @@ RSpec.describe "Utopia Performance" do
 	elsif defined? RubyProf
 		def benchmark(name)
 			result = RubyProf.profile do
-				yield 1000
+				yield 2000
 			end
 			
-			result.eliminate_methods!([/^((?!Utopia).)*$/])
+			#result.eliminate_methods!([/^((?!Utopia|Trenni).)*$/])
 			printer = RubyProf::FlatPrinter.new(result)
 			printer.print($stderr, min_percent: 1.0)
 			

data/spec/utopia/performance_spec/config.ru

@@ -3,7 +3,8 @@
 require 'utopia'
 require 'json'
 
-# use Rack::ContentLength
+require 'rack/freeze'
+
 use Utopia::ContentLength
 
 use Utopia::Redirection::Rewrite,
@@ -17,24 +18,16 @@ use Utopia::Redirection::Errors,
 # use Utopia::Localization,
 # 	:default_locale => 'en',
 # 	:locales => ['en', 'de', 'ja', 'zh'],
-# 	:nonlocalized => ['/_static/', '/_cache/']
+# 	:ignore => ['/_static/', '/_cache/']
 
 use Utopia::Controller,
-	root: File.expand_path('pages', __dir__),
-	base: Utopia::Controller::Base,
-	cache_controllers: true
+	root: File.expand_path('pages', __dir__)
 
 use Utopia::Static,
 	root: File.expand_path('pages', __dir__)
 
 # Serve dynamic content
 use Utopia::Content,
-	root: File.expand_path('pages', __dir__),
-	cache_templates: true,
-	tags: {
-		'deferred' => Utopia::Tags::Deferred,
-		'override' => Utopia::Tags::Override,
-		'node' => Utopia::Tags::Node,
-	}
+	root: File.expand_path('pages', __dir__)
 
 run lambda { |env| [404, {}, []] }