utopia 1.0.11 → 1.1.0

data/lib/utopia/redirector.rb

@@ -37,14 +37,14 @@ module Utopia
 
 	class Redirector
 		# This redirects directories to the directory + 'index' 
-		DIRECTORY_INDEX = [/^(.*)\/$/, lambda{|prefix| [307, {"Location" => "#{prefix}index"}, []]}]
+		DIRECTORY_INDEX = [/^(.*)\/$/, lambda{|prefix| [307, {HTTP::LOCATION => "#{prefix}index"}, []]}]
 		
 		# Redirects a whole source tree to a destination tree, given by the roots.
 		def self.moved(source_root, destination_root)
 			return [
 				/^#{Regexp.escape(source_root)}(.*)$/,
 				lambda do |match|
-					[301, {"Location" => (destination_root + match[1]).to_s}, []]
+					[301, {HTTP::LOCATION => (destination_root + match[1]).to_s}, []]
 				end
 			]
 		end
@@ -88,7 +88,7 @@ module Utopia
 
 		public
 		
-		def initialize(app, options = {})
+		def initialize(app, **options)
 			@app = app
 
 			@strings = options[:strings] || {}
@@ -112,7 +112,7 @@ module Utopia
 			if uri.respond_to? :call
 				return uri.call(match_data)
 			else
-				return [301, {"Location" => uri.to_s}, []]
+				return [301, {HTTP::LOCATION => uri.to_s}, []]
 			end
 		end
 

data/lib/utopia/session/encrypted_cookie.rb

@@ -28,7 +28,7 @@ module Utopia
 	module Session
 		# Stores all session data client side using a private symmetric encrpytion key.
 		class EncryptedCookie
-			def initialize(app, options = {})
+			def initialize(app, **options)
 				@app = app
 				@cookie_name = options.delete(:cookie_name) || (RACK_SESSION + ".encrypted")
 

data/lib/utopia/static.rb

@@ -194,7 +194,7 @@ module Utopia
 
 		public
 
-		def initialize(app, options = {})
+		def initialize(app, **options)
 			@app = app
 			@root = options[:root] || Utopia::default_root
 

data/lib/utopia/tags/node.rb

@@ -22,7 +22,7 @@ module Utopia
 	module Tags
 		class Node
 			def self.call(transaction, state)
-				path = Utopia::Path.create(state[:path])
+				path = Path[state[:path]]
 				
 				node = transaction.lookup_node(path)
 				

data/lib/utopia/version.rb

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

data/setup/site/config.ru

@@ -8,7 +8,7 @@ Encoding.default_internal = Encoding::UTF_8
 RACK_ENV = ENV.fetch('RACK_ENV', :development).to_sym unless defined?(RACK_ENV)
 
 # Allow loading library code from lib directory:
-$LOAD_PATH << File.expand_path("../lib", __FILE__)
+$LOAD_PATH << File.expand_path("lib", __dir__)
 
 require 'utopia'
 require 'rack/cache'

data/spec/utopia/content/link_spec.rb

@@ -24,21 +24,21 @@ require 'utopia/content/link'
 
 module Utopia::Content::LinkSpec
 	describe Utopia::Content::Link.new(:file, "/foo/bar/baz") do
-		it "should link should have full path" do
+		it "should be valid file link" do
 			expect(subject.name).to be == "baz"
 			expect(subject.path).to be == Utopia::Path.create("/foo/bar/baz")
 		end
 	end
 	
 	describe Utopia::Content::Link.new(:directory, "/foo/bar/index") do
-		it "should link should have full path" do
+		it "should be valid directory link" do
 			expect(subject.name).to be == "bar"
 			expect(subject.path).to be == Utopia::Path.create("/foo/bar/index")
 		end
 	end
 	
 	describe Utopia::Content::Link.new(:virtual, "bob") do
-		it "should link should have full path" do
+		it "should be valid virtual link" do
 			expect(subject.name).to be == "bob"
 			expect(subject.path).to be == nil
 		end
@@ -46,7 +46,7 @@ module Utopia::Content::LinkSpec
 	
 	describe Utopia::Content::Links do
 		it "should give a list of links" do
-			links = Utopia::Content::Links.index(File.expand_path("../links", __FILE__), Utopia::Path.create("/"))
+			links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"))
 			
 			expect(links.size).to be == 3
 			
@@ -69,13 +69,13 @@ module Utopia::Content::LinkSpec
 		end
 		
 		it "should filter links by name" do
-			links = Utopia::Content::Links.index(File.expand_path("../links", __FILE__), Utopia::Path.create("/"), name: /foo/)
+			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", __FILE__)
+			root = File.expand_path("links", __dir__)
 			
 			# Select both test links
 			links = Utopia::Content::Links.index(root, Utopia::Path.create("/foo"))
@@ -86,7 +86,7 @@ module Utopia::Content::LinkSpec
 		end
 		
 		it "should read correct link order for en" do
-			root = File.expand_path("../localized", __FILE__)
+			root = File.expand_path("localized", __dir__)
 			
 			# Select both test links
 			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), variant: 'en')
@@ -95,7 +95,7 @@ module Utopia::Content::LinkSpec
 		end
 		
 		it "should read correct link order for zh" do
-			root = File.expand_path("../localized", __FILE__)
+			root = File.expand_path("localized", __dir__)
 			
 			# Select both test links
 			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), variant: 'zh')

data/spec/utopia/content/node_spec.rb

@@ -22,7 +22,7 @@ require 'utopia/content'
 
 module Utopia::ContentSpec
 	describe Utopia::Content::Node do
-		let(:root) {File.expand_path("../node", __FILE__)}
+		let(:root) {File.expand_path("node", __dir__)}
 		let(:content) {Utopia::Content.new(lambda{}, root: root)}
 		
 		it "should list siblings in correct order" do

data/spec/utopia/content_spec.rb

@@ -25,12 +25,12 @@ 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}
+		let(:app) {Rack::Builder.parse_file(File.expand_path('content_spec.ru', __dir__)).first}
 		
 		it "should get a local path" do
 			get '/node/index'
 			
-			expect(last_response.body).to be == File.expand_path('../pages/node', __FILE__)
+			expect(last_response.body).to be == File.expand_path('pages/node', __dir__)
 		end
 		
 		it "should successfully redirect to the index page" do
@@ -66,7 +66,7 @@ module Utopia::ContentSpec
 	end
 	
 	describe Utopia::Content do
-		let(:root) {File.expand_path("../pages", __FILE__)}
+		let(:root) {File.expand_path("pages", __dir__)}
 		let(:content) {Utopia::Content.new(lambda{}, root: root, cache_templates: true)}
 		
 		it "should parse file and expand variables" do

data/spec/utopia/content_spec.ru

@@ -2,7 +2,7 @@
 require 'utopia/tags/deferred'
 
 use Utopia::Content,
-	root: File.expand_path('../pages', __FILE__),
+	root: File.expand_path('pages', __dir__),
 	tags: {
 		'deferred' => Utopia::Tags::Deferred
 	}

data/spec/utopia/controller/action_spec.rb

@@ -0,0 +1,61 @@
+#!/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
+# 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/controller'
+
+module Utopia::Controller::ActionSpec
+	describe Utopia::Controller::Action do
+		it "should resolve callbacks" do
+			actions = Utopia::Controller::Action.new
+			
+			specific_action = actions.define(['a', 'b', 'c']) {puts 'specific_action'}
+			indirect_action = actions.define(['**']) {puts 'indirect_action'}
+			indirect_named_action = actions.define(['**', 'r']) {puts 'indirect_named_action'}
+			
+			expect(specific_action).to_not be == indirect_action
+			expect(indirect_action).to_not be == indirect_named_action
+			
+			expect(actions.select(['a', 'b', 'c'])).to be == [indirect_action, specific_action]
+			expect(actions.select(['q'])).to be == [indirect_action]
+			
+			expect(actions.select(['q', 'r'])).to be == [indirect_action, indirect_named_action]
+			expect(actions.select(['q', 'r', 's'])).to be == [indirect_action]
+		end
+		
+		it "should be greedy matching" do
+			actions = Utopia::Controller::Action.new
+			
+			greedy_action = actions.define(['**', 'r']) {puts 'greedy_action'}
+			
+			expect(actions.select(['g', 'r'])).to be_include greedy_action
+			expect(actions.select(['r'])).to be_include greedy_action
+		end
+		
+		it "should match patterns" do
+			actions = Utopia::Controller::Action.new
+			
+			variable_action = actions.define(['*', 'summary', '*']) {puts 'variable_action'}
+				
+			expect(actions.select(['10', 'summary', '20'])).to be_include variable_action
+		end
+	end
+end

data/spec/utopia/controller/middleware_spec.rb

@@ -0,0 +1,71 @@
+#!/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
+# 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 'rack/mock'
+require 'rack/test'
+require 'utopia/controller'
+
+module Utopia::Controller::MiddlewareSpec
+	describe Utopia::Controller do
+		include Rack::Test::Methods
+		
+		let(:app) {Rack::Builder.parse_file(File.expand_path('../middleware_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
+	end
+end

data/spec/utopia/controller/middleware_spec.ru

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

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

@@ -0,0 +1,24 @@
+
+on 'flat' do
+	success! content: "flat"
+end
+
+on '**/hello-world' do
+	success! content: @hello_world
+end
+
+on '**' do
+	@hello_world = "Hello World"
+end
+
+on 'ignore' do
+	ignore!
+end
+
+on 'redirect' do
+	redirect! 'bar'
+end
+
+on 'index' do
+	success! content: 'Hello World'
+end

data/spec/utopia/controller/rewrite_spec.rb

@@ -0,0 +1,66 @@
+#!/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
+# 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 'rack/mock'
+
+require 'utopia/controller'
+
+module Utopia::Controller::RewriteSpec
+	describe Utopia::Controller do
+		class TestController < Utopia::Controller::Base
+			prepend Utopia::Controller::Rewrite
+			
+			on 'edit' do |request, path|
+				@edit = true
+			end
+			
+			attr :edit
+			
+			rewrite.extract_prefix user_id: Integer, summary: 'summary', order_id: Integer
+			
+			attr :user_id
+			attr :order_id
+			
+			def self.uri_path
+				Utopia::Path['/']
+			end
+		end
+		
+		let(:controller) {TestController.new}
+		
+		def mock_request(*args)
+			request = Rack::Request.new(Rack::MockRequest.env_for(*args))
+			return request, Utopia::Path[request.path_info]
+		end
+		
+		it "should match path prefix and extract parameters" do
+			request, path, variables = mock_request("/10/summary/20/edit")
+			relative_path = path - controller.class.uri_path
+			
+			controller.process!(request, relative_path)
+			
+			expect(controller.user_id).to be == 10
+			expect(controller.order_id).to be == 20
+			expect(controller.edit).to be true
+		end
+	end
+end

data/spec/utopia/{controller_spec.rb → controller/sequence_spec.rb}

@@ -24,35 +24,7 @@ require 'rack/mock'
 require 'rack/test'
 require 'utopia/controller'
 
-module Utopia::ControllerSpec
-	describe Utopia::Controller::Action do
-		it "should resolve callbacks" do
-			actions = Utopia::Controller::Action.new
-			
-			specific_action = actions.define(['a', 'b', 'c']) {puts 'specific_action'}
-			indirect_action = actions.define(['**']) {puts 'indirect_action'}
-			indirect_named_action = actions.define(['**', 'r']) {puts 'indirect_named_action'}
-			
-			expect(specific_action).to_not be == indirect_action
-			expect(indirect_action).to_not be == indirect_named_action
-			
-			expect(actions.select(['a', 'b', 'c'])).to be == [indirect_action, specific_action]
-			expect(actions.select(['q'])).to be == [indirect_action]
-			
-			expect(actions.select(['q', 'r'])).to be == [indirect_action, indirect_named_action]
-			expect(actions.select(['q', 'r', 's'])).to be == [indirect_action]
-		end
-		
-		it "should be greedy matching" do
-			actions = Utopia::Controller::Action.new
-			
-			greedy_action = actions.define(['**', 'r']) {puts 'greedy_action'}
-			
-			expect(actions.select(['g', 'r'])).to be_include greedy_action
-			expect(actions.select(['r'])).to be_include greedy_action
-		end
-	end
-		
+module Utopia::Controller::SequenceSpec
 	class TestController < Utopia::Controller::Base
 		on 'success' do
 			success!
@@ -105,62 +77,13 @@ module Utopia::ControllerSpec
 		end
 	end
 	
-	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
-		
-		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::Controller do
 		let(:variables) {Utopia::Controller::Variables.new}
 		
 		it "should call controller methods" do
-			request = Rack::Request.new("utopia.controller" => variables)
+			request = Rack::Request.new(Utopia::VARIABLES_KEY => variables)
 			controller = TestController.new
+			variables << controller
 		
 			result = controller.process!(request, Utopia::Path["/success"])
 			expect(result).to be == [200, {}, []]
@@ -173,32 +96,36 @@ module Utopia::ControllerSpec
 		end
 		
 		it "should call direct controller methods" do
-			request = Rack::Request.new("utopia.controller" => variables)
+			request = Rack::Request.new(Utopia::VARIABLES_KEY => variables)
 			controller = TestIndirectController.new
+			variables << controller
 			
 			controller.process!(request, Utopia::Path["/user/update"])
 			expect(variables['sequence']).to be == 'EA'
 		end
 		
 		it "should call indirect controller methods" do
-			request = Rack::Request.new("utopia.controller" => variables)
+			request = Rack::Request.new(Utopia::VARIABLES_KEY => variables)
 			controller = TestIndirectController.new
+			variables << controller
 			
 			result = controller.process!(request, Utopia::Path["/foo/comment/post"])
 			expect(variables['sequence']).to be == 'EB'
 		end
 		
 		it "should call multiple indirect controller methods in order" do
-			request = Rack::Request.new("utopia.controller" => variables)
+			request = Rack::Request.new(Utopia::VARIABLES_KEY => variables)
 			controller = TestIndirectController.new
+			variables << controller
 			
 			result = controller.process!(request, Utopia::Path["/comment/delete"])
 			expect(variables['sequence']).to be == 'EDC'
 		end
 		
 		it "should match single patterns" do
-			request = Rack::Request.new("utopia.controller" => variables)
+			request = Rack::Request.new(Utopia::VARIABLES_KEY => variables)
 			controller = TestIndirectController.new
+			variables << controller
 			
 			result = controller.process!(request, Utopia::Path["/foo"])
 			expect(variables['sequence']).to be == 'EF'