utopia 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c561c449df8eaaff74066cd697d74d59144eed35
-  data.tar.gz: 31e712f26e682f8f6f002b3f7f425ef8b68199f1
+  metadata.gz: 015ec482d8717b045b3d2cc12802afaf93b65560
+  data.tar.gz: 4a96d5699bc6bdb5398417dd518232a6b7798214
 SHA512:
-  metadata.gz: 021df2ac5a3caddcb2c6a1e3951660670bc8e6244f6457791a15a3b93f377495270604575d4ee75b06850a26ef6f2ee56019bc7af6a5fdc44d8c48e2cc10c911
-  data.tar.gz: 1f30b81c891cebf3a35a5c9536569b18553f7306d32f119967b385c66dd230ae020ac37c30672c6c2763fd93c452d7984c5ef6baf3c85acf0f2faaab2e5ff1d0
+  metadata.gz: 5e7f158a4aa3a175b9fc0c0b5686a1b7bb190e2d66018ca7f6f56523ba9d136ef373bd9089ec9ed0999503ba37815dbe3d6c3967a5f5e1bc5da7cca91ab78090
+  data.tar.gz: 4ee41e67fa41687bcd379b534c8c2a04947c9838da952aa3b93d448b674d0d059423f239ee6ce8ace1507ae67947ebab61d21be2c663a8f7c1b87913170759a9

data/.rspec

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

data/.travis.yml

@@ -1,11 +1,13 @@
 language: ruby
 sudo: false
 rvm:
-  - "2.0"
-  - "2.1"
-  - "2.2"
-  - "rbx-2"
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
+  - rbx-2
+env: COVERAGE=true
 matrix:
   allow_failures:
-    - rvm: "rbx-2"
-env: COVERAGE=true
+    - rvm: "rbx-2"

data/lib/utopia/content.rb

@@ -38,7 +38,9 @@ module Utopia
 			@root = File.expand_path(options[:root] || Utopia::default_root)
 			
 			if options[:cache_templates]
-				@templates = Concurrent::Map.new
+				@template_cache = Concurrent::Map.new
+			else
+				@template_cache = nil
 			end
 			
 			@tags = options.fetch(:tags, {})
@@ -56,8 +58,8 @@ module Utopia
 		attr :root
 
 		def fetch_xml(path)
-			if @templates
-				@templates.fetch_or_store(path.to_s) do
+			if @template_cache
+				@template_cache.fetch_or_store(path.to_s) do
 					Trenni::Template.load(path)
 				end
 			else

data/lib/utopia/content/link.rb

@@ -21,7 +21,6 @@
 require 'yaml'
 require 'trenni/builder'
 
-require_relative '../content'
 require_relative '../path'
 require_relative '../locale'
 

data/lib/utopia/content/links.rb

@@ -53,7 +53,7 @@ module Utopia
 				
 				# Named:
 				if name = options[:name]
-					ordered.select!{|link| link.name[options[:name]]}
+					ordered.select!{|link| link.name[name]}
 				end
 				
 				if locale = options[:locale]

data/lib/utopia/content/node.rb

@@ -80,7 +80,7 @@ module Utopia
 				links = Links.index(@controller.root, path, options)
 				
 				if block_given?
-					links.each &block
+					links.each(&block)
 				else
 					links
 				end
@@ -88,7 +88,8 @@ module Utopia
 
 			def related_links
 				name = @uri_path.last.split('.', 2).first
-				links = Links.index(@controller.root, uri_path.dirname, :name => name, :indices => true)
+				
+				return Links.index(@controller.root, uri_path.dirname, :name => name, :indices => true)
 			end
 
 			def siblings_path

data/lib/utopia/content/processor.rb

@@ -79,7 +79,7 @@ module Utopia
 			end
 
 			def cdata(text)
-				@delegate.cdata(Trenni::Strings::to_html(text))
+				@delegate.cdata("<![CDATA[#{text}]]>")
 			end
 
 			def comment(text)

data/lib/utopia/content/tag.rb

@@ -41,9 +41,17 @@ module Utopia
 				@closed = false
 			end
 
-			attr :name
-			attr :attributes
-			attr :closed, true
+			def freeze
+				@name.freeze
+				@attributes.freeze
+				@closed.freeze
+				
+				super
+			end
+
+			attr_accessor :name
+			attr_accessor :attributes
+			attr_accessor :closed
 
 			def [](key)
 				@attributes[key]

data/lib/utopia/controller.rb

@@ -51,7 +51,9 @@ module Utopia
 			@root = options[:root] || Utopia::default_root
 			
 			if options[:cache_controllers]
-				@controllers = Concurrent::Map.new
+				@controller_cache = Concurrent::Map.new
+			else
+				@controller_cache = nil
 			end
 			
 			self.freeze
@@ -66,8 +68,8 @@ module Utopia
 		end
 		
 		def lookup_controller(path)
-			if @controllers
-				@controllers.fetch_or_store(path.to_s) do
+			if @controller_cache
+				@controller_cache.fetch_or_store(path.to_s) do
 					load_controller_file(path)
 				end
 			else
@@ -136,7 +138,7 @@ module Utopia
 		end
 		
 		def call(env)
-			variables = (env[VARIABLES_KEY] ||= Variables.new)
+			env[VARIABLES_KEY] ||= Variables.new
 			
 			request = Rack::Request.new(env)
 			

data/lib/utopia/controller/action.rb

@@ -21,6 +21,14 @@
 module Utopia
 	class Controller
 		class Action < Hash
+			def initialize
+				@path = nil
+				@options = options
+				@callback = nil
+				
+				super
+			end
+			
 			attr_accessor :path, :callback, :options
 			
 			def callback?
@@ -75,7 +83,7 @@ module Utopia
 			# relative_path = 2014/mr-potato
 			# actions => {:** => A}
 			def select(relative_path)
-				selection = [].tap do |actions|
+				[].tap do |actions|
 					append(relative_path.reverse, 0, actions)
 				end
 			end

data/lib/utopia/http.rb

@@ -90,7 +90,7 @@ module Utopia
 					code = STATUS_CODES[code]
 				end
 				
-				unless 100...600
+				unless valid_range.include? code
 					raise ArgumentError.new("Status must be in range #{valid_range}, was given #{code}!")
 				end
 				

data/lib/utopia/localization.rb

@@ -91,7 +91,7 @@ module Utopia
 		end
 		
 		def freeze
-			@all_locale.freeze
+			@all_locales.freeze
 			@default_locales.freeze
 			@default_locale.freeze
 			@hosts.freeze
@@ -132,8 +132,6 @@ module Utopia
 		def host_preferred_locales(env)
 			http_host = env[Rack::HTTP_HOST]
 			
-			locales = []
-			
 			# Get a list of all hosts which match the incoming htt_host:
 			matching_hosts = @hosts.select{|host_pattern, locale| http_host =~ host_pattern}
 			
@@ -203,10 +201,10 @@ module Utopia
 			response = nil
 			
 			# We have a non-localized request, but there might be a localized resource. We return the best localization possible:
-			preferred_locales(env) do |env|
+			preferred_locales(env) do |localized_env|
 				# puts "Trying locale: #{env[CURRENT_LOCALE_KEY]}: #{env[Rack::PATH_INFO]}..."
 				
-				response = @app.call(env)
+				response = @app.call(localized_env)
 				
 				break unless response[0] >= 400
 			end

data/lib/utopia/path.rb

@@ -74,7 +74,7 @@ module Utopia
 			@components = components
 		end
 
-		attr :components, true
+		attr_accessor :components
 
 		def freeze
 			@components.freeze

data/lib/utopia/static.rb

@@ -134,14 +134,15 @@ module Utopia
 					# TODO: Support multiple byte-ranges, for now just send entire file:
 					response[0] = 200
 					response[1]["Content-Length"] = size.to_s
-					@range = 0..size-1
+					@range = 0...size
 				else
 					# Partial content:
 					@range = ranges[0]
+					partial_size = @range.count
+					
 					response[0] = 206
-					response[1]["Content-Range"] = "bytes #{@range.begin}-#{@range.end}/#{size}"
-					response[1]["Content-Length"] = (@range.end - @range.begin+1).to_s
-					size = @range.end - @range.begin + 1
+					response[1]["Content-Length"] = partial_size.to_s
+					response[1]["Content-Range"] = "bytes #{@range.min}-#{@range.max}/#{size}"
 				end
 
 				# LOG.debug {"Serving file #{full_path.inspect}, range #{@range.inspect}"}
@@ -169,12 +170,12 @@ module Utopia
 					when Array
 						result["." + type[0]] = type[1]
 					when String
-						mt = MIME::Types.of(type).select{|mt| !mt.obsolete?}.each do |mt|
-							extract_extensions.call(mt)
+						MIME::Types.of(type).select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
+							extract_extensions.call(mime_type)
 						end
 					when Regexp
-						MIME::Types[type].select{|mt| !mt.obsolete?}.each do |mt|
-							extract_extensions.call(mt)
+						MIME::Types[type].select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
+							extract_extensions.call(mime_type)
 						end
 					when MIME::Type
 						extract_extensions.call(type)

data/lib/utopia/version.rb

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

data/materials/utopia.svg

@@ -1,25 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="420px" height="76.993px" viewBox="0 0 420 76.993" enable-background="new 0 0 420 76.993" xml:space="preserve">
-<g>
-	<rect y="-0.246" fill="#F79433" width="420" height="74.246"/>
-	<rect y="54" fill="#4E8DD8" width="420" height="23"/>
-	<g>
-		<path fill="#FFFFFF" d="M74.365,68.163c2.379-2.981,4.189-6.661,5.131-10.939C80.41,53.068,81,48.311,81,43.083V0H18v43.083
-			c0,2.53,0.245,5.133,0.409,7.734c0.168,2.678,0.676,5.308,1.35,7.814c0.683,2.545,1.746,4.979,3.079,7.235
-			c1.368,2.315,3.276,4.356,5.631,6.066c2.328,1.69,5.265,3.045,8.711,4.016C38.803,76.408,40.609,77,42.555,77h13.91
-			c3.083,0,5.82-1.018,8.163-1.926C68.686,73.504,71.962,71.177,74.365,68.163z"/>
-		<polygon fill="#FFFFFF" points="151,18 151,0 88,-0.021 88,18 110.334,18 110.354,77 128.354,77 128.334,18 		"/>
-		<path fill="#FFFFFF" d="M229.753,38.499c0-21.224-17.046-38.492-38-38.492s-38,17.269-38,38.492c0,21.227,17.046,38.494,38,38.494
-			S229.753,59.726,229.753,38.499z"/>
-		<path fill="#FFFFFF" d="M269.219,49c9.755,0,17.248-1.989,22.27-6.155c5.107-4.234,7.697-10.532,7.697-18.841
-			c0-3.135-0.394-5.739-1.171-8.158c-0.782-2.434-1.891-4.749-3.294-6.559c-1.407-1.811-3.11-3.328-5.065-4.526
-			c-1.903-1.165-4.019-2.116-6.289-2.833c-2.247-0.709-4.658-1.216-7.167-1.502C273.727,0.145,271.165,0,268.584,0H239v77h18V49
-			H269.219z"/>
-		<rect x="305" fill="#FFFFFF" width="18" height="77"/>
-		<polygon fill="#FFFFFF" points="362.936,0 333.343,77 409.529,77 378.159,0 		"/>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 420 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><rect x="0" y="0" width="420" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="420" height="24" style="fill:#4e8dd8;"/><g><path d="M75.145,70.819c2.37,-3.097 4.173,-6.921 5.111,-11.365c0.91,-4.318 1.498,-9.261 1.498,-14.692l0,-44.762l-62.754,0l0,44.762c0,2.628 0.244,5.333 0.407,8.035c0.168,2.782 0.674,5.515 1.345,8.118c0.68,2.644 1.739,5.173 3.067,7.517c1.363,2.405 3.263,4.526 5.609,6.303c2.319,1.755 5.245,3.163 8.677,4.172c1.617,0.478 3.416,1.093 5.354,1.093l13.856,0c3.071,0 5.797,-1.058 8.131,-2.001c4.042,-1.631 7.305,-4.049 9.699,-7.18Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M151.481,18.701l0,-18.701l-62.754,-0.022l0,18.723l22.246,0l0.02,61.299l17.93,0l-0.02,-61.299l22.578,0Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M229.926,39.999c0,-22.051 -16.979,-39.992 -37.852,-39.992c-20.872,0 -37.851,17.942 -37.851,39.992c0,22.054 16.979,39.994 37.851,39.994c20.873,0 37.852,-17.94 37.852,-39.994Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M269.238,50.909c9.717,0 17.181,-2.066 22.183,-6.395c5.087,-4.399 7.667,-10.942 7.667,-19.575c0,-3.257 -0.393,-5.962 -1.167,-8.476c-0.778,-2.528 -1.883,-4.934 -3.281,-6.814c-1.401,-1.882 -3.098,-3.458 -5.045,-4.703c-1.895,-1.21 -4.003,-2.198 -6.264,-2.943c-2.239,-0.737 -4.64,-1.263 -7.139,-1.56c-2.464,-0.292 -5.016,-0.443 -7.587,-0.443l-29.468,0l0,80l17.93,0l0,-29.091l12.171,0Z" style="fill:#fff;fill-rule:nonzero;"/><rect x="304.879" y="0" width="17.93" height="80" style="fill:#fff;"/><path d="M362.589,0l-29.477,80l75.888,0l-31.247,-80l-15.164,0Z" style="fill:#fff;fill-rule:nonzero;"/></g></g></svg>

data/setup/site/pages/_page.xnode

@@ -16,6 +16,7 @@
 
 	<body class="#{attributes['class']}">
 		<div id="header">
+			<img src="/_static/utopia.svg" />
 		</div>
 
 		<div id="page">

data/setup/site/pages/_static/site.css

@@ -1,23 +1,53 @@
 
+html {
+	font-family: "PT Sans", Verdana, Helvetica, Arial, sans-serif;
+}
+@media (min-width: 48em) {
+	html {
+		font-size: 16px;
+	}
+}
+@media (min-width: 58em) {
+	html {
+		font-size: 20px;
+	}
+}
+
 body {
-	font-family: Verdana, Helvetica, Arial;
-	background-color: #ccc;
-	padding: 50px;
+	padding: 0;
+	margin: 0;
+	
+	background-color: #fafafa;
+}
+
+#header {
+	margin: 1em 0 1em 0;
+	
+	background-color: white;
+	
+	background-image: url(/_static/utopia-background.svg);
+	
+	box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
+}
+
+#header img {
+	display: block;
+	margin: auto;
+	height: 4em;
 }
 
 p {
-	color: #333;
+	color: #555;
 }
 
 p strong {
-	color: black;
+	color: #222;
 }
 
 h1, h2, h3, h4, h5, h6 {
-	color: #eee;
-	margin-top: 2em;
-	margin-bottom: 1em;
-	text-shadow: 0px 1px 4px rgba(0, 0, 0, 0.7);
+	color: #333;
+	margin: 2em 1em 1em 1em;
+	color: #4E8DD9;
 }
 
 img {
@@ -33,7 +63,7 @@ a:hover {
 }
 
 p, dl, h3 {
-	margin: 1em;
+	margin: 2em;
 }
 
 h3 {
@@ -44,27 +74,14 @@ ul {
 	margin-bottom: 1em;
 }
 
-h3, h4, h5, h6 {
+h2, h3, h4, h5, h6 {
 	font-weight: normal;
 }
 
 body.front h1 {
 	font-weight: normal;
-	font-size: 60pt;
-	color: white;
-	text-shadow:
-	0 1px 0 #ccc,
-	0 2px 0 #c9c9c9,
-	0 3px 0 #bbb,
-	0 4px 0 #b9b9b9,
-	0 5px 0 #aaa,
-	0 6px 1px rgba(0,0,0,.1),
-	0 0 5px rgba(0,0,0,.1),
-	0 1px 3px rgba(0,0,0,.3),
-	0 3px 5px rgba(0,0,0,.2),
-	0 5px 10px rgba(0,0,0,.25),
-	0 10px 10px rgba(0,0,0,.2),
-	0 20px 20px rgba(0,0,0,.15);
-	
+	font-size: 300%;
+	color: #F89432;
+
 	text-align: center;
 }

data/setup/site/pages/_static/utopia-background.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 10 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><rect x="0" y="0" width="10" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="10" height="24" style="fill:#4e8dd8;"/></svg>

data/setup/site/pages/_static/utopia.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 420 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><rect x="0" y="0" width="420" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="420" height="24" style="fill:#4e8dd8;"/><g><path d="M75.145,70.819c2.37,-3.097 4.173,-6.921 5.111,-11.365c0.91,-4.318 1.498,-9.261 1.498,-14.692l0,-44.762l-62.754,0l0,44.762c0,2.628 0.244,5.333 0.407,8.035c0.168,2.782 0.674,5.515 1.345,8.118c0.68,2.644 1.739,5.173 3.067,7.517c1.363,2.405 3.263,4.526 5.609,6.303c2.319,1.755 5.245,3.163 8.677,4.172c1.617,0.478 3.416,1.093 5.354,1.093l13.856,0c3.071,0 5.797,-1.058 8.131,-2.001c4.042,-1.631 7.305,-4.049 9.699,-7.18Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M151.481,18.701l0,-18.701l-62.754,-0.022l0,18.723l22.246,0l0.02,61.299l17.93,0l-0.02,-61.299l22.578,0Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M229.926,39.999c0,-22.051 -16.979,-39.992 -37.852,-39.992c-20.872,0 -37.851,17.942 -37.851,39.992c0,22.054 16.979,39.994 37.851,39.994c20.873,0 37.852,-17.94 37.852,-39.994Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M269.238,50.909c9.717,0 17.181,-2.066 22.183,-6.395c5.087,-4.399 7.667,-10.942 7.667,-19.575c0,-3.257 -0.393,-5.962 -1.167,-8.476c-0.778,-2.528 -1.883,-4.934 -3.281,-6.814c-1.401,-1.882 -3.098,-3.458 -5.045,-4.703c-1.895,-1.21 -4.003,-2.198 -6.264,-2.943c-2.239,-0.737 -4.64,-1.263 -7.139,-1.56c-2.464,-0.292 -5.016,-0.443 -7.587,-0.443l-29.468,0l0,80l17.93,0l0,-29.091l12.171,0Z" style="fill:#fff;fill-rule:nonzero;"/><rect x="304.879" y="0" width="17.93" height="80" style="fill:#fff;"/><path d="M362.589,0l-29.477,80l75.888,0l-31.247,-80l-15.164,0Z" style="fill:#fff;fill-rule:nonzero;"/></g></g></svg>

data/spec/utopia/content/processor_spec.rb

@@ -73,7 +73,7 @@ module Utopia::Content::ProcessorSpec
 				[:tag_begin, foo_tag],
 				[:cdata, "Bob & Barley"],
 				[:cdata, "<!-- Comment -->"],
-				[:cdata, "Hello &amp; World"],
+				[:cdata, "<![CDATA[Hello & World]]>"],
 				[:tag_end, foo_tag],
 			]
 			

data/spec/utopia/controller/middleware_spec.rb

@@ -73,5 +73,15 @@ module Utopia::Controller::MiddlewareSpec
 			expect(last_response.status).to be == 302
 			expect(last_response.headers['Location']).to be == 'bar'
 		end
+		
+		# This was a bug, where by the controller URI_PATH was being mutated by Controller#invoke_controllers.
+		it "should give the correct URI_PATH" do
+			get '/redirect/test/bar'
+			expect(last_response.status).to be == 200
+			
+			get '/redirect/test/foo'
+			expect(last_response.status).to be == 200
+			expect(last_response.body).to be == '/redirect'
+		end
 	end
 end

data/spec/utopia/controller/middleware_spec.ru

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

data/spec/utopia/controller/middleware_spec/redirect/controller.rb

@@ -0,0 +1,9 @@
+
+on '**' do |request, path|
+	#puts "**: #{URI_PATH.inspect}"
+	
+	if path.include? 'foo'
+		# This should ALWAYS give /redirect
+		succeed! content: URI_PATH.to_s
+	end
+end

data/spec/utopia/controller/middleware_spec/redirect/test/controller.rb

@@ -0,0 +1,6 @@
+
+on 'bar' do |request, path|
+	# puts "bar: #{URI_PATH.inspect}"
+	
+	succeed!
+end

data/spec/utopia/controller/rewrite_spec.rb

@@ -57,7 +57,7 @@ module Utopia::Controller::RewriteSpec
 		end
 		
 		it "should match path prefix and extract parameters" do
-			request, path, variables = mock_request("/10/summary/20/edit")
+			request, path = mock_request("/10/summary/20/edit")
 			relative_path = path - controller.class.uri_path
 			
 			controller.process!(request, relative_path)
@@ -68,7 +68,7 @@ module Utopia::Controller::RewriteSpec
 		end
 		
 		it "should allow rewrite to fail request" do
-			request, path, variables = mock_request("/fail")
+			request, path = mock_request("/fail")
 			relative_path = path - controller.class.uri_path
 			
 			response = controller.process!(request, relative_path)

data/spec/utopia/controller/sequence_spec.rb

@@ -92,6 +92,7 @@ module Utopia::Controller::SequenceSpec
 			expect(result).to be == [400, {}, ["Bad Request"]]
 		
 			result = controller.process!(request, Utopia::Path["/variable"])
+			expect(result).to be == nil
 			expect(variables.to_hash).to be == {"variable"=>:value}
 		end
 		
@@ -110,6 +111,7 @@ module Utopia::Controller::SequenceSpec
 			variables << controller
 			
 			result = controller.process!(request, Utopia::Path["/foo/comment/post"])
+			expect(result).to be nil
 			expect(variables['sequence']).to be == 'EB'
 		end
 		
@@ -119,6 +121,7 @@ module Utopia::Controller::SequenceSpec
 			variables << controller
 			
 			result = controller.process!(request, Utopia::Path["/comment/delete"])
+			expect(result).to be nil
 			expect(variables['sequence']).to be == 'EDC'
 		end
 		
@@ -128,6 +131,7 @@ module Utopia::Controller::SequenceSpec
 			variables << controller
 			
 			result = controller.process!(request, Utopia::Path["/foo"])
+			expect(result).to be nil
 			expect(variables['sequence']).to be == 'EF'
 		end
 	end

data/spec/utopia/path_spec.rb

@@ -123,7 +123,6 @@ module Utopia::PathSpec
 		
 		it "shouldn't expand absolute paths" do
 			root = Utopia::Path['/root']
-			path = Utopia::Path["dir/foo.html"]
 			
 			expect(root.expand(root)).to be == root
 		end

data/spec/utopia/static_spec.rb

@@ -37,10 +37,11 @@ module Utopia::StaticSpec
 		end
 		
 		it "should return partial content" do
-			get "/test.txt", {}, 'HTTP_RANGE' => 'bytes=0-4'
+			get "/test.txt", {}, 'HTTP_RANGE' => 'bytes=1-4'
 			
 			expect(last_response.status).to be == 206 
-			expect(last_response.body).to be == "Hello"
+			expect(last_response.content_length).to be == 4
+			expect(last_response.body).to be == "ello"
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -220,6 +220,8 @@ files:
 - setup/site/pages/_page.xnode
 - setup/site/pages/_static/icon.png
 - setup/site/pages/_static/site.css
+- setup/site/pages/_static/utopia-background.svg
+- setup/site/pages/_static/utopia.svg
 - setup/site/pages/errors/exception.xnode
 - setup/site/pages/errors/file-not-found.xnode
 - setup/site/pages/links.yaml
@@ -261,6 +263,8 @@ files:
 - spec/utopia/controller/middleware_spec/controller/index.xnode
 - spec/utopia/controller/middleware_spec/controller/nested/controller.rb
 - spec/utopia/controller/middleware_spec/empty/controller.rb
+- spec/utopia/controller/middleware_spec/redirect/controller.rb
+- spec/utopia/controller/middleware_spec/redirect/test/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/exception_handler_spec.rb
@@ -350,6 +354,8 @@ test_files:
 - spec/utopia/controller/middleware_spec/controller/index.xnode
 - spec/utopia/controller/middleware_spec/controller/nested/controller.rb
 - spec/utopia/controller/middleware_spec/empty/controller.rb
+- spec/utopia/controller/middleware_spec/redirect/controller.rb
+- spec/utopia/controller/middleware_spec/redirect/test/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/exception_handler_spec.rb