utopia 1.0.11 → 1.1.0

data/spec/utopia/exception_handler_spec.rb

@@ -30,17 +30,17 @@ module Utopia::ExceptionHandlerSpec
 	describe Utopia::ExceptionHandler do
 		include Rack::Test::Methods
 		
-		let(:app) {Rack::Builder.parse_file(File.expand_path('../exception_handler_spec.ru', __FILE__)).first}
+		let(:app) {Rack::Builder.parse_file(File.expand_path('exception_handler_spec.ru', __dir__)).first}
 		
 		it "should successfully call the controller method" do
-			get "/controller/blow?fatal=true"
+			get "/blow?fatal=true"
 			
 			expect(last_response.status).to be == 400
 			expect(last_response.body).to be_include 'Fatal Error'
 		end
 		
 		it "should fail with a 500 error" do
-			get "/controller/blow"
+			get "/blow"
 			
 			expect(last_response.status).to be == 500
 			expect(last_response.body).to be_include 'Error Will Robertson'

data/spec/utopia/exception_handler_spec.ru

@@ -1,6 +1,6 @@
 
-use Utopia::ExceptionHandler, '/controller/exception'
+use Utopia::ExceptionHandler, '/exception'
 
-use Utopia::Controller, root: File.expand_path('../pages', __FILE__)
+use Utopia::Controller, root: File.expand_path('exception_handler_spec', __dir__)
 
 run lambda {|env| [404, {}, []]}

data/spec/utopia/exception_handler_spec/controller.rb

@@ -0,0 +1,15 @@
+
+class TharSheBlows < StandardError
+end
+
+on 'blow' do
+	raise TharSheBlows.new("Arrrh!")
+end
+
+on 'exception' do |request|
+	if request['fatal']
+		raise TharSheBlows.new("Yarrh!")
+	else
+		success! :content => 'Error Will Robertson', :type => 'text/plain'
+	end
+end

data/spec/utopia/path/matcher_spec.rb

@@ -0,0 +1,65 @@
+#!/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/path/matcher'
+
+module Utopia::Path::MatcherSpec
+	describe Utopia::Path::Matcher do
+		it "should match strings" do
+			path = Utopia::Path['users/20/edit']
+			matcher = Utopia::Path::Matcher[users: 'users']
+			
+			match_data = matcher.match(path)
+			expect(match_data).to_not be nil
+			
+			expect(match_data.post_match).to be == Utopia::Path['20/edit']
+		end
+		
+		it "shouldn't match strings" do
+			path = Utopia::Path['users/20/edit']
+			matcher = Utopia::Path::Matcher[accounts: 'accounts']
+			
+			match_data = matcher.match(path)
+			expect(match_data).to be nil
+		end
+		
+		it "shouldn't match integer" do
+			path = Utopia::Path['users/20/edit']
+			matcher = Utopia::Path::Matcher[id: Integer]
+			
+			match_data = matcher.match(path)
+			expect(match_data).to be nil
+		end
+		
+		it "should match regexps" do
+			path = Utopia::Path['users/20/edit']
+			matcher = Utopia::Path::Matcher[users: 'users', id: Integer, action: String]
+			
+			match_data = matcher.match(path)
+			expect(match_data).to_not be_falsey
+			
+			expect(match_data[:users]).to be == 'users'
+			expect(match_data[:id]).to be == 20
+			expect(match_data[:action]).to be == 'edit'
+		end
+	end
+end

data/spec/utopia/rack_spec.rb

@@ -22,18 +22,6 @@ require 'utopia/extensions/date'
 require 'utopia/extensions/rack'
 
 module Utopia::RackSpec
-	describe Rack::Request do
-		it "should construct the url" do
-			request = Rack::Request.new(
-				'rack.url_scheme' => 'http', 
-				'HTTP_HOST' => 'localhost',
-				'SERVER_PORT' => 80
-			)
-			
-			expect(request.url_with_path("/foo/bar")).to be == "http://localhost/foo/bar"
-		end
-	end
-	
 	describe Rack::Response do
 		it "should specify not to cache content" do
 			response = Rack::Response.new

data/utopia.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "trenni", "~> 1.4.1"
 	spec.add_dependency "mime-types", "~> 2.0"
 	
-	spec.add_dependency "rack", "~> 1.5"
+	spec.add_dependency "rack", "~> 1.6"
 	spec.add_dependency "rack-cache", "~> 1.2.0"
 	
 	spec.add_dependency "mail", "~> 2.6.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -164,6 +165,7 @@ files:
 - lib/utopia/controller.rb
 - lib/utopia/controller/action.rb
 - lib/utopia/controller/base.rb
+- lib/utopia/controller/rewrite.rb
 - lib/utopia/controller/variables.rb
 - lib/utopia/exception_handler.rb
 - lib/utopia/extensions/array.rb
@@ -174,6 +176,7 @@ files:
 - lib/utopia/mail_exceptions.rb
 - lib/utopia/middleware.rb
 - lib/utopia/path.rb
+- lib/utopia/path/matcher.rb
 - lib/utopia/redirector.rb
 - lib/utopia/session.rb
 - lib/utopia/session/encrypted_cookie.rb
@@ -229,10 +232,17 @@ files:
 - spec/utopia/content/processor_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
-- spec/utopia/controller_spec.rb
-- spec/utopia/controller_spec.ru
+- spec/utopia/controller/action_spec.rb
+- spec/utopia/controller/middleware_spec.rb
+- spec/utopia/controller/middleware_spec.ru
+- spec/utopia/controller/middleware_spec/controller/controller.rb
+- spec/utopia/controller/middleware_spec/controller/index.xnode
+- spec/utopia/controller/middleware_spec/controller/nested/controller.rb
+- spec/utopia/controller/rewrite_spec.rb
+- spec/utopia/controller/sequence_spec.rb
 - spec/utopia/exception_handler_spec.rb
 - spec/utopia/exception_handler_spec.ru
+- spec/utopia/exception_handler_spec/controller.rb
 - spec/utopia/extensions_spec.rb
 - spec/utopia/localization_spec.rb
 - spec/utopia/localization_spec.ru
@@ -241,15 +251,13 @@ files:
 - spec/utopia/pages/content/_show-value.xnode
 - spec/utopia/pages/content/links.yaml
 - spec/utopia/pages/content/test-partial.xnode
-- spec/utopia/pages/controller/controller.rb
-- spec/utopia/pages/controller/index.xnode
-- spec/utopia/pages/controller/nested/controller.rb
 - spec/utopia/pages/index.xnode
 - spec/utopia/pages/localized.de.txt
 - spec/utopia/pages/localized.en.txt
 - spec/utopia/pages/localized.jp.txt
 - spec/utopia/pages/node/index.xnode
 - spec/utopia/pages/test.txt
+- spec/utopia/path/matcher_spec.rb
 - spec/utopia/path_spec.rb
 - spec/utopia/rack_spec.rb
 - spec/utopia/session_spec.rb
@@ -308,10 +316,17 @@ test_files:
 - spec/utopia/content/processor_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
-- spec/utopia/controller_spec.rb
-- spec/utopia/controller_spec.ru
+- spec/utopia/controller/action_spec.rb
+- spec/utopia/controller/middleware_spec.rb
+- spec/utopia/controller/middleware_spec.ru
+- spec/utopia/controller/middleware_spec/controller/controller.rb
+- spec/utopia/controller/middleware_spec/controller/index.xnode
+- spec/utopia/controller/middleware_spec/controller/nested/controller.rb
+- spec/utopia/controller/rewrite_spec.rb
+- spec/utopia/controller/sequence_spec.rb
 - spec/utopia/exception_handler_spec.rb
 - spec/utopia/exception_handler_spec.ru
+- spec/utopia/exception_handler_spec/controller.rb
 - spec/utopia/extensions_spec.rb
 - spec/utopia/localization_spec.rb
 - spec/utopia/localization_spec.ru
@@ -320,15 +335,13 @@ test_files:
 - spec/utopia/pages/content/_show-value.xnode
 - spec/utopia/pages/content/links.yaml
 - spec/utopia/pages/content/test-partial.xnode
-- spec/utopia/pages/controller/controller.rb
-- spec/utopia/pages/controller/index.xnode
-- spec/utopia/pages/controller/nested/controller.rb
 - spec/utopia/pages/index.xnode
 - spec/utopia/pages/localized.de.txt
 - spec/utopia/pages/localized.en.txt
 - spec/utopia/pages/localized.jp.txt
 - spec/utopia/pages/node/index.xnode
 - spec/utopia/pages/test.txt
+- spec/utopia/path/matcher_spec.rb
 - spec/utopia/path_spec.rb
 - spec/utopia/rack_spec.rb
 - spec/utopia/session_spec.rb

data/spec/utopia/controller_spec.ru

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

data/spec/utopia/pages/controller/controller.rb

@@ -1,43 +0,0 @@
-
-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 'rewrite' do
-	rewrite! 'index'
-end
-
-on 'index' do
-	success! content: 'Hello World'
-end
-
-class TharSheBlows < StandardError
-end
-
-on 'blow' do
-	raise TharSheBlows.new("Arrrh!")
-end
-
-on 'exception' do |request|
-	if request['fatal']
-		raise TharSheBlows.new("Yarrh!")
-	else
-		success! :content => 'Error Will Robertson', :type => 'text/plain'
-	end
-end