utopia 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a91aed5e157e184b1b589dfc8889ac51f2e3c1
-  data.tar.gz: d0f25b2d877416986be490f54d18d342b559f217
+  metadata.gz: f0f3495be3876412f9a11d21c4b836197905a1f4
+  data.tar.gz: cf908f69663dd5ed3319d3197445008b1afa4068
 SHA512:
-  metadata.gz: bbfb18198ef48f6b26823fc756792db596a1e46baa57e596ab563f22346c6e38a1eb8f39b68f8d3c73cb1a1c2aced1f11f31796f648f32a8d97e1cce3d92defe
-  data.tar.gz: 259cab3cc8b147a0729e63ea154ef04d220673ef3394271dbe4f1949ece0534560ee54c53c736b120a02e9a61bbb976bb0fcc1fb265944bdb57e6d5c0956c4fe
+  metadata.gz: c8e165f8e46e805d86abdbaeb91188b62e1d6ee900b41184741912c32b88c00085cc90e36f4494048d0d02c705b3a1729059571c9c7ffd16ded1f3e75e39f689
+  data.tar.gz: a032b62905906e418ad36d946725208cf07080332050cb78fa655624700d5e47d9be65513e9eaa4364ab532bae9383f7b52cc564870b929afd956269686d5966

data/.rspec

@@ -1,4 +1,3 @@
---color
 --format documentation
 --backtrace
 --require spec_helper

data/.travis.yml

@@ -6,16 +6,16 @@ before_install:
   # For testing purposes:
   - git config --global user.email "samuel@oriontransfer.net"
   - git config --global user.name "Samuel Williams"
+  # https://github.com/rubygems/rubygems/issues/1448
+  - gem update --system
 rvm:
-  - 2.2.4
-  - 2.3.2
-  - 2.4.0
+  - 2.2
+  - 2.3
+  - 2.4
   - jruby-head
   - ruby-head
-  - rbx-3.65
 env: COVERAGE=true BENCHMARK=true
 matrix:
   allow_failures:
-    - rvm: rbx-3.65
     - rvm: ruby-head
     - rvm: jruby-head

data/README.md

@@ -54,12 +54,18 @@ There is an excellent documentation wiki included with the source code. Simply c
 - [Trenni](https://github.com/ioquatix/trenni) — Template and markup parsers, markup generation.
 - [Trenni::Formatters](https://github.com/ioquatix/trenni-formatters) — Helpers for HTML generation including views and forms.
 - [Utopia::Gallery](https://github.com/ioquatix/utopia-gallery) — A fast photo gallery based on [libvips](https://github.com/jcupitt/libvips).
+- [Utopia::Analytics](https://github.com/ioquatix/utopia-analytics) — Simple integration with Google Analytics.
 - [Rack::Freeze](https://github.com/ioquatix/rack-freeze) — Multi-thread safety in Rack.
 - [HTTP::Accept](https://github.com/ioquatix/http-accept) — RFC compliant header parser.
 - [Samovar](https://github.com/ioquatix/samovar) — Command line parser used by Utopia.
 - [Mapping](https://github.com/ioquatix/mapping) — Provide structured conversions for web interfaces.
 - [Rack::Test::Body](https://github.com/ioquatix/rack-test-body) — Provide convenient helpers for testing web interfaces.
 
+### Applications
+
+- [Financier](https://github.com/ioquatix/financier) — A small business management platform.
+- [mail.oriontransfer.net](https://github.com/oriontransfer/mail.oriontransfer.net) - Mail server account management.
+
 ## License
 
 Released under the MIT license.

data/bin/utopia

@@ -22,4 +22,4 @@
 
 require 'utopia/command'
 
-Utopia::Command::Top.parse(ARGV).invoke
+Utopia::Command.parse(ARGV).invoke

data/documentation/Gemfile

@@ -12,8 +12,7 @@ gem "kramdown"
 
 group :development do
 	# For `rake server`:
-	gem "puma"
-	gem "guard-puma"
+	gem "guard-falcon"
 	
 	# For `rake console`:
 	gem "pry"
@@ -22,8 +21,6 @@ group :development do
 	# For `rspec` testing:
 	gem "rspec"
 	gem "simplecov"
-	
-	gem "launchy"
 end
 
 group :production do

data/documentation/Guardfile

@@ -1,20 +1,21 @@
 
 group :development do
-	guard :puma, port: 4000 do
+	guard :falcon do
 		watch('Gemfile.lock')
 		watch('config.ru')
 		watch(%r{^config|lib|pages/.*})
+		notification :off
 	end
 	
-	# Open the documentation website when the command is run, once puma has started:
-	require 'launchy'
-	$first_time = true
-	
-	url_path = 'run/url.txt'
-	watch(url_path) do
-		if $first_time
-			$first_time = false
-			Launchy.open(File.read(url_path))
-		end
-	end
+	# # Open the documentation website when the command is run, once puma has started:
+	# require 'launchy'
+	# $first_time = true
+	# 
+	# url_path = 'run/url.txt'
+	# watch(url_path) do
+	# 	if $first_time
+	# 		$first_time = false
+	# 		Launchy.open(File.read(url_path))
+	# 	end
+	# end
 end

data/documentation/config.ru

@@ -18,8 +18,6 @@ end
 
 use Rack::Sendfile
 
-use Utopia::ContentLength
-
 use Utopia::Redirection::Rewrite,
 	'/' => '/wiki/index'
 

data/documentation/pages/_page.xnode

@@ -9,8 +9,6 @@
 			<title>Utopia</title>
 		<?r end ?>
 		
-		<base href="#{first.node.uri_path}"/>
-		
 		<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
 		
 		<link rel="icon" type="image/png" href="/_static/icon.png" />

data/documentation/pages/wiki/updating-utopia/content.md

@@ -6,7 +6,7 @@ Utopia provides a model for both local development (`utopia site create`) and de
 
 Utopia as a framework introduces changes and versions change according to semantic versioning. 
 
-### Controller Update 1.9.x to 2.0.0
+### Controller Update 1.9.x to 2.x
 
 The controller layer no longer automatically prepends the `Actions` layer. The following program does a best effort attempt to update existing controllers:
 
@@ -43,6 +43,14 @@ paths.each do |path|
 end
 ```
 
+### View Update 1.9.x to 2.x
+
+Dynamic tags in 2.x require namespaces. This affects all `.xnode` files, in particular the following 3 cases:
+
+1. Rewrite `<(/?)(NAME)(\W)` to `<$1content:$2$3` where NAME is a tag which would expand using a `_NAME.xnode` file.
+2. Rewrite `<content/>` to `<utopia:content/>`. This affects `<node>`, `<deferred>`, `<environment>` tags.
+3. Rewrite `partial 'NAME'` to be `partial 'content:NAME'`.
+
 ## Server Update
 
 The utopia server git hooks are updated occasionally to improve the deployment process or to handle changes in the underlying process.

data/lib/utopia/command.rb

@@ -25,6 +25,10 @@ require_relative 'command/server'
 
 module Utopia
 	module Command
+		def self.parse(*args)
+			Top.parse(*args)
+		end
+		
 		# The top level utopia command.
 		class Top < Samovar::Command
 			self.description = "A website development and deployment framework."

data/lib/utopia/content.rb

@@ -104,11 +104,11 @@ module Utopia
 			
 			# Check if the request is to a non-specific index. This only works for requests with a given name:
 			basename = path.basename
-			directory_path = File.join(@root, path.dirname.components, basename.name)
+			directory_path = File.join(@root, path.dirname.components, basename)
 
-			# If the request for /foo/bar{extensions} is actually a directory, rewrite it to /foo/bar/index{extensions}:
+			# If the request for /foo/bar is actually a directory, rewrite it to /foo/bar/index:
 			if File.directory? directory_path
-				index_path = [basename.name, basename.rename(INDEX)]
+				index_path = [basename, INDEX]
 				
 				return [307, {HTTP::LOCATION => path.dirname.join(index_path).to_s}, []]
 			end

data/lib/utopia/content/document.rb

@@ -24,7 +24,7 @@ require_relative 'markup'
 
 module Utopia
 	class Content
-		# This error is thrown if a tag doesn't match up when parsing the 
+		# This error is raised if a tag doesn't match up when parsing.
 		class UnbalancedTagError < StandardError
 			def initialize(tag)
 				@tag = tag

data/lib/utopia/content/link.rb

@@ -58,7 +58,7 @@ module Utopia
 
 			def href
 				@href ||= @info.fetch(:uri) do
-					(@path.dirname + @path.basename.parts[0]).to_s if @path
+					(@path.dirname + @path.basename).to_s if @path
 				end
 			end
 

data/lib/utopia/path.rb

@@ -19,52 +19,6 @@
 # THE SOFTWARE.
 
 module Utopia
-	class Basename
-		# A basename represents a file name with an optional extension. You can specify a specific extension to identify or specify true to select any extension after the last trailing dot.
-		def initialize(name, extension = false)
-			if extension
-				if extension == true
-					offset = name.rindex('.')
-				else
-					offset = name.rindex(extension) - 1
-				end
-				
-				@name = name[0...offset]
-				@extension = name[offset+1..-1]
-			else
-				@name = name
-				@extension = nil
-			end
-		end
-		
-		def rename(name)
-			copy = self.dup
-			
-			copy.send(:instance_variable_set, :@name, name)
-			
-			return copy
-		end
-		
-		attr :name
-		attr :extension
-		
-		def parts
-			@parts ||= @name.split('.')
-		end
-		
-		def locale
-			parts.last if parts.size > 1
-		end
-		
-		def to_str
-			"#{name}#{extension}"
-		end
-		
-		def to_s
-			to_str
-		end
-	end
-	
 	# Represents a path as an array of path components. Useful for efficient URL manipulation.
 	class Path
 		include Comparable
@@ -143,6 +97,14 @@ module Utopia
 			self.new(unescape(string).split(SEPARATOR, -1))
 		end
 		
+		def self.load(value)
+			from_string(value) if value
+		end
+		
+		def self.dump(instance)
+			instance.to_s if instance
+		end
+		
 		def self.create(path)
 			case path
 			when Path
@@ -155,7 +117,11 @@ module Utopia
 				return self.new([path])
 			end
 		end
-
+		
+		def replace(other_path)
+			@components = other_path.components.dup
+		end
+		
 		def include?(*args)
 			@components.include?(*args)
 		end
@@ -200,9 +166,7 @@ module Utopia
 			end
 		end
 
-		def to_s
-			to_str
-		end
+		alias to_s to_str
 		
 		def to_a
 			@components
@@ -267,8 +231,8 @@ module Utopia
 			return self.class.new(result)
 		end
 
-		def basename(*args)
-			Basename.new(@components.last, *args)
+		def basename
+			@components.last
 		end
 		
 		def dirname(count = 1)

data/lib/utopia/redirection.rb

@@ -52,10 +52,16 @@ module Utopia
 				super
 			end
 			
+			CONTENT_TYPE = 'Content-Type'.freeze
+			
+			def unhandled_error?(response)
+				response[0] >= 400 && !response[1].include?(CONTENT_TYPE)
+			end
+			
 			def call(env)
 				response = @app.call(env)
 				
-				if response[0] >= 400 and location = @codes[response[0]]
+				if unhandled_error?(response) && location = @codes[response[0]]
 					error_request = env.merge(Rack::PATH_INFO => location, Rack::REQUEST_METHOD => Rack::GET)
 					error_response = @app.call(error_request)
 

data/lib/utopia/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.0.3"
+	VERSION = "2.1.0"
 end

data/setup/site/.rspec

@@ -1,4 +1,3 @@
---color
 --format documentation
 --backtrace
 --warnings

data/setup/site/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 
 gem "utopia", "~> $UTOPIA_VERSION"
 # gem "utopia-gallery"
-# gem "utopia-google-analytics"
+# gem "utopia-analytics"
 
 gem "rake"
 gem "bundler"
@@ -12,8 +12,7 @@ gem "rack-freeze", "~> 1.2"
 
 group :development do
 	# For `rake server`:
-	gem "puma"
-	gem "guard-puma", require: false
+	gem "guard-falcon", require: false
 	gem 'guard-rspec', require: false
 	
 	# For `rake console`:

data/setup/site/Guardfile

@@ -1,17 +1,29 @@
 
 group :development do
-	guard :puma, port: 9292 do
+	guard :falcon, bind: "tcp://localhost:8080" do
 		watch('Gemfile.lock')
 		watch('config.ru')
 		watch(%r{^config|lib|pages/.*})
+		
+		notification :off
 	end
 end
 
 group :test do
 	guard :rspec, cmd: 'rspec' do
+		# Notifications can get a bit tedious:
+		# notification :off
+		
+		# Re-run specs if they are changed:
 		watch(%r{^spec/.+_spec\.rb$})
-		watch(%r{^lib/(.+)\.rb$}) { |m| 'spec/lib/#{m[1]}_spec.rb' }
-		watch('spec/spec_helper.rb') { 'spec' }
-		watch(%r{^pages/.*}) { 'spec/website_spec.rb' }
+		watch('spec/spec_helper.rb') {'spec'}
+		
+		# Run relevent specs if files in `lib/` or `pages/` are changed:
+		watch(%r{^lib/(.+)\.rb$}) {|match| "spec/lib/#{match[1]}_spec.rb" }
+		watch(%r{^pages/(.+)\.(rb|xnode)$}) {|match| "spec/pages/#{match[1]}_spec.rb"}
+		watch(%r{^pages/(.+)controller\.rb$}) {|match| Dir.glob("spec/pages/#{match[1]}*_spec.rb")}
+		
+		# If any files in pages changes, ensure the website still works:
+		watch(%r{^pages/.*}) {'spec/website_spec.rb'}
 	end
 end

data/setup/site/public/_static/site.css

@@ -51,7 +51,7 @@ body > header img {
 	height: 4rem;
 }
 
-p {
+p, ul, ol {
 	color: #555;
 }
 
@@ -88,6 +88,10 @@ p, ul, ol, dl, h3 {
 	margin: 2rem;
 }
 
+li {
+	margin: 0.2rem;
+}
+
 li > ul, li > ol {
 	margin: 0;
 }

data/spec/utopia/controller/respond_spec.rb

@@ -138,5 +138,25 @@ 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,4 +1,7 @@
 
+use Utopia::Redirection::Errors,
+	404 => '/fail'
+
 use Utopia::Controller,
 	root: File.expand_path('respond_spec', __dir__)
 

data/spec/utopia/controller/respond_spec/rewrite/controller.rb

@@ -0,0 +1,12 @@
+
+prepend Respond, Rewrite, Actions
+
+respond.with_json
+
+rewrite.extract_prefix id: Integer do |request|
+	fail! :not_found, message: "Could not find record" if @id == 1
+end
+
+on 'show' do
+	succeed! content: {id: @id, foo: 'bar'}
+end

data/spec/utopia/path_spec.rb

@@ -22,131 +22,121 @@
 
 require 'utopia/path'
 
-module Utopia::PathSpec
-	describe Utopia::Path do
-		it "should be root path" do
-			root = Utopia::Path["/"]
-			
-			expect(root.components).to be == ['', '']
-			expect(root.to_local_path).to be == '/'
-		end
+RSpec.describe Utopia::Path do
+	context "coder" do
+		subject {"foo/bar/baz"}
+		let(:instance) {described_class.load(subject)}
 		
-		it "should concatenate absolute paths" do
-			root = Utopia::Path["/"]
-			
-			expect(root).to be_absolute
-			expect(root + Utopia::Path["foo/bar"]).to be == Utopia::Path["/foo/bar"]
+		it "loads a string" do
+			expect(instance).to be_a described_class
 		end
 		
-		it "should compute all descendant paths" do
-			root = Utopia::Path["/foo/bar"]
-			
-			descendants = root.descend.to_a
-			
-			expect(descendants[0].components).to be == [""]
-			expect(descendants[1].components).to be == ["", "foo"]
-			expect(descendants[2].components).to be == ["", "foo", "bar"]
-			
-			ascendants = root.ascend.to_a
-			
-			expect(descendants.reverse).to be == ascendants
+		it "dump generates the original string" do
+			expect(described_class.dump(instance)).to be == subject
 		end
+	end
+	
+	it "should be root path" do
+		root = Utopia::Path["/"]
 		
-		it "should be able to remove relative path entries" do
-			path = Utopia::Path["/foo/bar/../baz/."]
-			expect(path.simplify.components).to be == ['', 'foo', 'baz']
-			
-			path = Utopia::Path["/foo/bar/../baz/./"]
-			expect(path.simplify.components).to be == ['', 'foo', 'baz', '']
-		end
+		expect(root.components).to be == ['', '']
+		expect(root.to_local_path).to be == '/'
+	end
+	
+	it "should concatenate absolute paths" do
+		root = Utopia::Path["/"]
 		
-		it "should remove the extension from the basename" do
-			path = Utopia::Path["dir/foo.html"]
-			
-			basename = path.basename("html")
-			
-			expect(basename.name).to be == 'foo'
-			expect(basename.extension).to be == 'html'
-		end
+		expect(root).to be_absolute
+		expect(root + Utopia::Path["foo/bar"]).to be == Utopia::Path["/foo/bar"]
+	end
+	
+	it "should compute all descendant paths" do
+		root = Utopia::Path["/foo/bar"]
 		
-		it "should be able to convert into a directory" do
-			path = Utopia::Path["foo/bar"]
-			
-			expect(path).to_not be_directory
-			
-			expect(path.to_directory).to be_directory
-			
-			dir_path = path.to_directory
-			expect(dir_path.to_directory).to be == dir_path
-		end
+		descendants = root.descend.to_a
 		
-		it "should start with the given path" do
-			path = Utopia::Path["/a/b/c/d/e"]
-			
-			expect(path.start_with?(path.dirname)).to be true
-		end
+		expect(descendants[0].components).to be == [""]
+		expect(descendants[1].components).to be == ["", "foo"]
+		expect(descendants[2].components).to be == ["", "foo", "bar"]
 		
-		it "should split at the specified point" do
-			path = Utopia::Path["/a/b/c/d/e"]
-			
-			expect(path.split('c')).to be == [Utopia::Path['/a/b'], Utopia::Path['d/e']]
-		end
+		ascendants = root.ascend.to_a
 		
-		it "shouldn't be able to modify frozen paths" do
-			path = Utopia::Path["dir/foo.html"]
-			
-			path.freeze
-			
-			expect(path.frozen?).to be true
-			
-			expect{path[0] = 'bob'}.to raise_exception(RuntimeError)
-		end
+		expect(descendants.reverse).to be == ascendants
+	end
+	
+	it "should be able to remove relative path entries" do
+		path = Utopia::Path["/foo/bar/../baz/."]
+		expect(path.simplify.components).to be == ['', 'foo', 'baz']
 		
-		it "should give the correct locale" do
-			path = Utopia::Path["foo.en"]
-			
-			expect(path.basename.locale).to be == 'en'
-		end
+		path = Utopia::Path["/foo/bar/../baz/./"]
+		expect(path.simplify.components).to be == ['', 'foo', 'baz', '']
+	end
+	
+	it "should be able to convert into a directory" do
+		path = Utopia::Path["foo/bar"]
 		
-		it "should give no locale" do
-			path = Utopia::Path["foo"]
-			
-			expect(path.basename.locale).to be == nil
-		end
+		expect(path).to_not be_directory
 		
-		it "should expand relative paths" do
-			root = Utopia::Path['/root']
-			path = Utopia::Path["dir/foo.html"]
-			
-			expect(path.expand(root)).to be == (root + path)
-		end
+		expect(path.to_directory).to be_directory
 		
-		it "shouldn't expand absolute paths" do
-			root = Utopia::Path['/root']
-			
-			expect(root.expand(root)).to be == root
-		end
+		dir_path = path.to_directory
+		expect(dir_path.to_directory).to be == dir_path
+	end
+	
+	it "should start with the given path" do
+		path = Utopia::Path["/a/b/c/d/e"]
 		
-		it "should give the shortest path for outer paths" do
-			input = Utopia::Path.create("/a/b/c/index")
-			output = Utopia::Path.create("/a/b/c/d/e/")
-			
-			short = input.shortest_path(output)
-			
-			expect(short.components).to be == ["..", "..", "index"]
-			
-			expect((output + short).simplify).to be == input
-		end
+		expect(path.start_with?(path.dirname)).to be true
+	end
+	
+	it "should split at the specified point" do
+		path = Utopia::Path["/a/b/c/d/e"]
 		
-		it "should give the shortest path for inner paths" do
-			input = Utopia::Path.create("/a/b/c/index")
-			output = Utopia::Path.create("/a/")
-			
-			short = input.shortest_path(output)
-			
-			expect(short.components).to be == ["b", "c", "index"]
-			
-			expect((output + short).simplify).to be == input
-		end
+		expect(path.split('c')).to be == [Utopia::Path['/a/b'], Utopia::Path['d/e']]
+	end
+	
+	it "shouldn't be able to modify frozen paths" do
+		path = Utopia::Path["dir/foo.html"]
+		
+		path.freeze
+		
+		expect(path.frozen?).to be true
+		
+		expect{path[0] = 'bob'}.to raise_exception(RuntimeError)
+	end
+	
+	it "should expand relative paths" do
+		root = Utopia::Path['/root']
+		path = Utopia::Path["dir/foo.html"]
+		
+		expect(path.expand(root)).to be == (root + path)
+	end
+	
+	it "shouldn't expand absolute paths" do
+		root = Utopia::Path['/root']
+		
+		expect(root.expand(root)).to be == root
+	end
+	
+	it "should give the shortest path for outer paths" do
+		input = Utopia::Path.create("/a/b/c/index")
+		output = Utopia::Path.create("/a/b/c/d/e/")
+		
+		short = input.shortest_path(output)
+		
+		expect(short.components).to be == ["..", "..", "index"]
+		
+		expect((output + short).simplify).to be == input
+	end
+	
+	it "should give the shortest path for inner paths" do
+		input = Utopia::Path.create("/a/b/c/index")
+		output = Utopia::Path.create("/a/")
+		
+		short = input.shortest_path(output)
+		
+		expect(short.components).to be == ["b", "c", "index"]
+		
+		expect((output + short).simplify).to be == input
 	end
 end

data/spec/utopia/setup_spec.rb

@@ -22,6 +22,8 @@ require 'fileutils'
 require 'tmpdir'
 require 'yaml'
 
+require 'open3'
+
 RSpec.describe "utopia executable" do
 	let(:utopia) {File.expand_path("../../bin/utopia", __dir__)}
 	let(:gemspec) {Gem::Specification.load File.expand_path("../../utopia.gemspec", __dir__)}
@@ -37,6 +39,9 @@ RSpec.describe "utopia executable" do
 	
 	around(:each) do |example|
 		Bundler.with_clean_env do
+			# If we don't delete this, when running on travis, it will try submit the coverage report.
+			ENV.delete('COVERAGE')
+			
 			# This allows the utopia command to load the correct library:
 			ENV['RUBYLIB'] = File.expand_path("../../lib", __dir__)
 			
@@ -45,14 +50,11 @@ RSpec.describe "utopia executable" do
 	end
 	
 	def sh_status(*args)
-		puts args.join(' ')
-		system(*args)
-		return $?
+		system(*args) ? 0 : false
 	end
 	
 	def sh_stdout(*args)
-		puts args.join(' ')
-		output = %x[#{args.join ' '}]
+		output, status = Open3.capture2(*args)
 		return output
 	end
 	

data/utopia.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
 	EOF
 	spec.summary       = %q{Utopia is a framework for building dynamic content-driven websites.}
 	spec.homepage      = 'https://github.com/ioquatix/utopia'
+	spec.license       = "MIT"
 	
 	spec.files         = `git ls-files`.split($/)
 	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -37,7 +38,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'concurrent-ruby', '~> 1.0'
 	
 	spec.add_development_dependency 'bundler', '~> 1.3'
-	spec.add_development_dependency 'rspec', '~> 3.4'
+	spec.add_development_dependency 'rspec', '~> 3.6'
 	spec.add_development_dependency 'puma'
 	spec.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +211,6 @@ files:
 - documentation/config.ru
 - documentation/config/README.md
 - documentation/config/environment.rb
-- documentation/config/puma.rb
 - documentation/lib/readme.txt
 - documentation/pages/_editor.xnode
 - documentation/pages/_heading.xnode
@@ -486,6 +485,7 @@ files:
 - spec/utopia/controller/respond_spec/api/controller.rb
 - spec/utopia/controller/respond_spec/errors/controller.rb
 - spec/utopia/controller/respond_spec/errors/file-not-found.xnode
+- spec/utopia/controller/respond_spec/rewrite/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/controller/variables_spec.rb
@@ -530,7 +530,8 @@ files:
 - spec/utopia/static_spec/test.txt
 - utopia.gemspec
 homepage: https://github.com/ioquatix/utopia
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -608,6 +609,7 @@ test_files:
 - spec/utopia/controller/respond_spec/api/controller.rb
 - spec/utopia/controller/respond_spec/errors/controller.rb
 - spec/utopia/controller/respond_spec/errors/file-not-found.xnode
+- spec/utopia/controller/respond_spec/rewrite/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/controller/variables_spec.rb

data/documentation/config/puma.rb

@@ -1,20 +0,0 @@
-
-# Configure "min" to be the minimum number of threads to use to answer
-# requests and "max" the maximum.
-threads 0,4
-
-# Preload the application before starting the workers; this conflicts with
-# phased restart feature. (off by default)
-preload_app!
-
-# This writes run/url.txt which allows us to watch and load the URL once puma has started.
-get(:binds).tap do |binds|
-	urls = binds.grep(/tcp:\/\/0.0.0.0:(\d+)/).collect do
-		"http://localhost:#{$1}"
-	end
-	
-	run_path = File.expand_path('../run', __dir__)
-	
-	FileUtils.mkdir_p run_path
-	File.write(File.join(run_path, 'url.txt'), urls.first)
-end