utopia 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965466abaa777fe6b33b71c24253718da3544bd1
-  data.tar.gz: 1a53312d2f58949a2a6027292dd5d6a66e0c56ab
+  metadata.gz: 614d40f19533fc62a561a328da3eb0c6967d3932
+  data.tar.gz: b0be93ad3767370b1be9fe9348d634cea1d33bdb
 SHA512:
-  metadata.gz: a24b35e08ccdbb23e1a85236e25b5166235a39d04d08fa2b5d8b5f00f9feb7ae07a43956bf6629ef4e2e98eaf00ac32b95638efa5b5e8df5cb7eb9d33a1fc002
-  data.tar.gz: 56ec05c1856d72c0bf9305f6c0ce821348c83f9d8c2d90a4cc3c53586755533b67c2b89fb1d50c7a4b0fa865e747b25d0d8b94d64983e23210717766325ddb81
+  metadata.gz: 7767bc2f59c64cfb51a54c0c702fa852c20e060c3b0e66b79e21838e2ecf910f545ea487180c97d12507d63dc1693c7f2cd98dd667170d2802b7ebac0e225e35
+  data.tar.gz: 6c7689c25c3fa8d40c84f41312ac3f42fa36bac19423ba6a352455d1cc21ec871a6c5b6768e37c58777a682a4e65fce0853074616d6b565374354782268527cb

data/lib/utopia/controller/base.rb

@@ -74,20 +74,25 @@ module Utopia
 				self.class.lookup(path)
 			end
 			
+			def catch_response
+				response = catch(:response) do
+					yield and nil
+				end
+				
+				if response
+					return self.respond_with(*response)
+				end
+			end
+			
 			# Given a request, call associated actions if at least one exists.
 			def passthrough(request, path)
 				actions = actions_for_request(request, path)
 				
 				unless actions.empty?
-					response = catch(:response) do
-						# By default give nothing - i.e. keep on processing:
+					return catch_response do
 						actions.each do |action|
 							action.invoke!(self, request, path)
-						end and nil
-					end
-					
-					if response
-						return self.respond_with(*response)
+						end
 					end
 				end
 				

data/lib/utopia/controller/rewrite.rb

@@ -95,9 +95,9 @@ module Utopia
 			
 			# Rewrite the path before processing the request if possible.
 			def passthrough(request, path)
-				self.class.rewrite.invoke!(self, request, path)
-				
-				super
+				catch_response do
+					self.class.rewrite.invoke!(self, request, path)
+				end || super
 			end
 		end
 	end

data/lib/utopia/version.rb

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

data/spec/utopia/content/link_spec.rb

@@ -43,64 +43,4 @@ module Utopia::Content::LinkSpec
 			expect(subject.path).to be == nil
 		end
 	end
-	
-	describe Utopia::Content::Links do
-		it "should give a list of links" do
-			links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"))
-			
-			expect(links.size).to be == 3
-			
-			expect(links[0].kind).to be == :virtual
-			expect(links[0].href).to be == nil
-			
-			expect(links[1].title).to be == "Welcome"
-			expect(links[1].to_href).to be == '<a class="link" href="/welcome">Welcome</a>'
-			expect(links[1].kind).to be == :file
-			expect(links[1].href).to be == "/welcome"
-			expect(links[1].name).to be == 'welcome'
-			
-			expect(links[2].title).to be == 'Foo Bar'
-			expect(links[2].kind).to be == :directory
-			expect(links[2].href).to be == "/foo/index"
-			expect(links[2].name).to be == 'foo'
-			
-			expect(links[1]).to be_eql links[1]
-			expect(links[0]).to_not be_eql links[1]
-		end
-		
-		it "should filter links by name" do
-			links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"), name: /foo/)
-			
-			expect(links.size).to be == 1
-		end
-		
-		it "should select localized links" do
-			root = File.expand_path("links", __dir__)
-			
-			# Select both test links
-			links = Utopia::Content::Links.index(root, Utopia::Path.create("/foo"))
-			expect(links.size).to be == 2
-			
-			links = Utopia::Content::Links.index(root, Utopia::Path.create("/foo"), variant: 'en')
-			expect(links.size).to be == 1
-		end
-		
-		it "should read correct link order for en" do
-			root = File.expand_path("localized", __dir__)
-			
-			# Select both test links
-			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), variant: 'en')
-			
-			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', 'Four', 'Five']
-		end
-		
-		it "should read correct link order for zh" do
-			root = File.expand_path("localized", __dir__)
-			
-			# Select both test links
-			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), variant: 'zh')
-			
-			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', '四']
-		end
-	end
 end

data/spec/utopia/content/links_spec.rb

@@ -0,0 +1,85 @@
+#!/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
+# 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/links'
+
+module Utopia::Content::LinksSpec
+	describe Utopia::Content::Links do
+		it "should give a list of links" do
+			links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"))
+			
+			expect(links.size).to be == 3
+			
+			expect(links[0].kind).to be == :virtual
+			expect(links[0].href).to be == nil
+			
+			expect(links[1].title).to be == "Welcome"
+			expect(links[1].to_href).to be == '<a class="link" href="/welcome">Welcome</a>'
+			expect(links[1].kind).to be == :file
+			expect(links[1].href).to be == "/welcome"
+			expect(links[1].name).to be == 'welcome'
+			
+			expect(links[2].title).to be == 'Foo Bar'
+			expect(links[2].kind).to be == :directory
+			expect(links[2].href).to be == "/foo/index"
+			expect(links[2].name).to be == 'foo'
+			
+			expect(links[1]).to be_eql links[1]
+			expect(links[0]).to_not be_eql links[1]
+		end
+		
+		it "should filter links by name" do
+			links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"), name: /foo/)
+			
+			expect(links.size).to be == 1
+		end
+		
+		it "should select localized links" do
+			root = File.expand_path("links", __dir__)
+			
+			# Select both test links
+			links = Utopia::Content::Links.index(root, Utopia::Path.create("/foo"))
+			expect(links.size).to be == 2
+			
+			links = Utopia::Content::Links.index(root, Utopia::Path.create("/foo"), variant: 'en')
+			expect(links.size).to be == 1
+		end
+		
+		it "should read correct link order for en" do
+			root = File.expand_path("localized", __dir__)
+			
+			# Select both test links
+			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), variant: 'en')
+			
+			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', 'Four', 'Five']
+		end
+		
+		it "should read correct link order for zh" do
+			root = File.expand_path("localized", __dir__)
+			
+			# Select both test links
+			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), variant: 'zh')
+			
+			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', '四']
+		end
+	end
+end

data/spec/utopia/controller/rewrite_spec.rb

@@ -40,6 +40,10 @@ module Utopia::Controller::RewriteSpec
 			attr :user_id
 			attr :order_id
 			
+			rewrite.extract_prefix fail: 'fail' do
+				fail! 444
+			end
+			
 			def self.uri_path
 				Utopia::Path['/']
 			end
@@ -62,5 +66,14 @@ module Utopia::Controller::RewriteSpec
 			expect(controller.order_id).to be == 20
 			expect(controller.edit).to be true
 		end
+		
+		it "should allow rewrite to fail request" do
+			request, path, variables = mock_request("/fail")
+			relative_path = path - controller.class.uri_path
+			
+			response = controller.process!(request, relative_path)
+			
+			expect(response[0]).to be == 444
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -212,6 +212,7 @@ files:
 - spec/utopia/content/links/foo/test.en.xnode
 - spec/utopia/content/links/links.yaml
 - spec/utopia/content/links/welcome.xnode
+- spec/utopia/content/links_spec.rb
 - spec/utopia/content/localized/five/index.en.xnode
 - spec/utopia/content/localized/four/index.en.xnode
 - spec/utopia/content/localized/four/index.zh.xnode
@@ -296,6 +297,7 @@ test_files:
 - spec/utopia/content/links/foo/test.en.xnode
 - spec/utopia/content/links/links.yaml
 - spec/utopia/content/links/welcome.xnode
+- spec/utopia/content/links_spec.rb
 - spec/utopia/content/localized/five/index.en.xnode
 - spec/utopia/content/localized/four/index.en.xnode
 - spec/utopia/content/localized/four/index.zh.xnode