utopia 1.7.1 → 1.8.0

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

@@ -1,10 +1,10 @@
 
 on 'flat' do
-	success! content: "flat"
+	succeed! content: "flat"
 end
 
 on '**/hello-world' do
-	success! content: @hello_world
+	succeed! content: @hello_world
 end
 
 on '**' do
@@ -20,5 +20,5 @@ on 'redirect' do
 end
 
 on 'index' do
-	success! content: 'Hello World'
+	succeed! content: 'Hello World'
 end

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

@@ -1,4 +1,4 @@
 
 on 'foobar' do
-	success! content: "Foobar"
+	succeed! content: "Foobar"
 end

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

@@ -1,6 +1,6 @@
 
 on '**' do |request, path|
-	#puts "**: #{URI_PATH.inspect}"
+	# puts "**: #{URI_PATH.inspect}"
 	
 	if path.include? 'foo'
 		# This should ALWAYS give /redirect

data/spec/utopia/controller/respond_spec.rb

@@ -30,7 +30,8 @@ require 'utopia/controller'
 module Utopia::Controller::RespondSpec
 	describe Utopia::Controller do
 		class TestController < Utopia::Controller::Base
-			prepend Utopia::Controller::Respond
+			# Request goes from right to left.
+			prepend Utopia::Controller::Respond, Utopia::Controller::Actions
 			
 			respond.with("application/json") do |content|
 				JSON::dump(content)
@@ -41,7 +42,7 @@ module Utopia::Controller::RespondSpec
 			end
 			
 			on 'fetch' do |request, path|
-				success! content: {user_id: 10}
+				succeed! content: {user_id: 10}
 			end
 			
 			def self.uri_path

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

@@ -1,5 +1,5 @@
 
-prepend Respond
+prepend Respond, Actions
 respond.with_json
 
 class VersionedResponse
@@ -23,5 +23,5 @@ end
 # Accept: application/json;version=1
 # Accept: application/json;version=2
 on 'fetch' do
-	success! content: VersionedResponse.new
+	succeed! content: VersionedResponse.new
 end

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

@@ -1,5 +1,5 @@
 
-prepend Respond
+prepend Respond, Actions
 
 # If the request doesn't match application/json specifically, it would be passed through:
 respond.with_passthrough

data/spec/utopia/controller/rewrite_spec.rb

@@ -27,7 +27,7 @@ require 'utopia/controller'
 module Utopia::Controller::RewriteSpec
 	describe Utopia::Controller do
 		class TestController < Utopia::Controller::Base
-			prepend Utopia::Controller::Rewrite
+			prepend Utopia::Controller::Rewrite, Utopia::Controller::Actions
 			
 			on 'edit' do |request, path|
 				@edit = true

data/spec/utopia/controller/sequence_spec.rb

@@ -26,8 +26,10 @@ require 'utopia/controller'
 
 module Utopia::Controller::SequenceSpec
 	class TestController < Utopia::Controller::Base
+		prepend Utopia::Controller::Actions
+		
 		on 'success' do
-			success!
+			succeed!
 		end
 		
 		on :failure do
@@ -37,13 +39,11 @@ module Utopia::Controller::SequenceSpec
 		on :variable do |request, path|
 			@variable = :value
 		end
-		
-		def self.uri_path
-			Utopia::Path["/"]
-		end
 	end
 	
 	class TestIndirectController < Utopia::Controller::Base
+		prepend Utopia::Controller::Actions
+		
 		def initialize
 			@sequence = ""
 		end
@@ -71,10 +71,6 @@ module Utopia::Controller::SequenceSpec
 		on('*') do
 			@sequence << 'F'
 		end
-		
-		def self.uri_path
-			Utopia::Path["/"]
-		end
 	end
 	
 	describe Utopia::Controller do
@@ -85,13 +81,13 @@ module Utopia::Controller::SequenceSpec
 			controller = TestController.new
 			variables << controller
 		
-			result = controller.process!(request, Utopia::Path["/success"])
+			result = controller.process!(request, Utopia::Path["success"])
 			expect(result).to be == [200, {}, []]
 		
-			result = controller.process!(request, Utopia::Path["/foo/bar/failure"])
+			result = controller.process!(request, Utopia::Path["foo/bar/failure"])
 			expect(result).to be == [400, {}, ["Bad Request"]]
 		
-			result = controller.process!(request, Utopia::Path["/variable"])
+			result = controller.process!(request, Utopia::Path["variable"])
 			expect(result).to be == nil
 			expect(variables.to_hash).to be == {:variable => :value}
 		end
@@ -101,7 +97,7 @@ module Utopia::Controller::SequenceSpec
 			controller = TestIndirectController.new
 			variables << controller
 			
-			controller.process!(request, Utopia::Path["/user/update"])
+			controller.process!(request, Utopia::Path["user/update"])
 			expect(variables['sequence']).to be == 'EA'
 		end
 		
@@ -110,7 +106,7 @@ module Utopia::Controller::SequenceSpec
 			controller = TestIndirectController.new
 			variables << controller
 			
-			result = controller.process!(request, Utopia::Path["/foo/comment/post"])
+			result = controller.process!(request, Utopia::Path["foo/comment/post"])
 			expect(result).to be nil
 			expect(variables['sequence']).to be == 'EB'
 		end
@@ -120,7 +116,7 @@ module Utopia::Controller::SequenceSpec
 			controller = TestIndirectController.new
 			variables << controller
 			
-			result = controller.process!(request, Utopia::Path["/comment/delete"])
+			result = controller.process!(request, Utopia::Path["comment/delete"])
 			expect(result).to be nil
 			expect(variables['sequence']).to be == 'EDC'
 		end
@@ -130,7 +126,7 @@ module Utopia::Controller::SequenceSpec
 			controller = TestIndirectController.new
 			variables << controller
 			
-			result = controller.process!(request, Utopia::Path["/foo"])
+			result = controller.process!(request, Utopia::Path["foo"])
 			expect(result).to be nil
 			expect(variables['sequence']).to be == 'EF'
 		end

data/spec/utopia/exceptions/handler_spec/controller.rb

@@ -8,9 +8,9 @@ end
 
 # The ExceptionHandler middleware will redirect here when an exception occurs. If this also fails, things get ugly.
 on 'exception' do |request|
-	if request['fatal']
+	if request.params['fatal']
 		raise TharSheBlows.new("Yarrh!")
 	else
-		success! :content => 'Error Will Robertson', :type => 'text/plain'
+		succeed! :content => 'Error Will Robertson', :type => 'text/plain'
 	end
 end

data/spec/utopia/performance_spec/config.ru

@@ -1,6 +1,7 @@
 #!/usr/bin/env rackup
 
 require 'utopia'
+require 'json'
 
 # use Rack::ContentLength
 use Utopia::ContentLength

data/spec/utopia/session_spec.rb

@@ -23,7 +23,6 @@ require 'rack'
 require 'rack/test'
 
 require 'utopia/session'
-require 'utopia/session/encrypted_cookie'
 
 module Utopia::SessionSpec
 	describe Utopia::Session do
@@ -51,6 +50,40 @@ module Utopia::SessionSpec
 		end
 	end
 	
+	describe Utopia::Session do
+		include Rack::Test::Methods
+		
+		let(:app) {Rack::Builder.parse_file(File.expand_path('../session_spec.ru', __FILE__)).first}
+		
+		before(:each) do
+			# Initial user agent:
+			header 'User-Agent', 'A'
+			
+			get "/session-set?key=foo&value=bar"
+		end
+		
+		it "should be able to retrive the value if there are no changes" do
+			get "/session-get?key=foo"
+			expect(last_response.body).to be == "bar"
+		end
+		
+		it "should fail if user agent is changed" do
+			# Change user agent:
+			header 'User-Agent', 'B'
+			
+			get "/session-get?key=foo"
+			expect(last_response.body).to be == ""
+		end
+		
+		it "should fail if ip address is changed" do
+			# Change user agent:
+			header 'X-Forwarded-For', '127.0.0.10'
+			
+			get "/session-get?key=foo"
+			expect(last_response.body).to be == ""
+		end
+	end
+	
 	describe Utopia::Session::LazyHash do
 		it "should load hash when required" do
 			loaded = false

data/spec/utopia/session_spec.ru

@@ -1,5 +1,5 @@
 
-use Utopia::Session::EncryptedCookie, secret: "97111cabf4c1a5e85b8029cf7c61aa44424fc24a"
+use Utopia::Session, secret: "97111cabf4c1a5e85b8029cf7c61aa44424fc24a"
 
 run lambda { |env|
 	request = Rack::Request.new(env)
@@ -9,11 +9,11 @@ run lambda { |env|
 		
 		[200, {}, []]
 	elsif env[Rack::PATH_INFO] =~ /session-set/
-		env['rack.session'][request[:key]] = request[:value]
+		env['rack.session'][request.params['key']] = request.params['value']
 		
 		[200, {}, []]
 	elsif env[Rack::PATH_INFO] =~ /session-get/
-		[200, {}, [env['rack.session'][request[:key]]]]
+		[200, {}, [env['rack.session'][request.params['key']]]]
 	else
 		[404, {}, []]
 	end

data/spec/utopia/setup_spec.rb

@@ -22,6 +22,8 @@ require 'fileutils'
 
 RSpec.describe "utopia executable" do
 	let(:utopia) {File.expand_path("../../bin/utopia", __dir__)}
+	let(:gemspec) {Gem::Specification.load File.expand_path("../../utopia.gemspec", __dir__)}
+	let(:package_path) {File.expand_path("../../pkg/#{gemspec.file_name}", __dir__)}
 	
 	before(:all) do
 		# We need to build a package to test deployment:
@@ -42,8 +44,6 @@ RSpec.describe "utopia executable" do
 	end
 	
 	def install_packages(dir)
-		package_path = File.expand_path("../../pkg/utopia-#{Utopia::VERSION}.gem", __dir__)
-		
 		# We do a bit of a hack here to ensure the package is available:
 		FileUtils.mkpath File.join(dir, "vendor/cache")
 		FileUtils.cp package_path, File.join(dir, "vendor/cache")

data/utopia.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ['lib']
 	
-	spec.required_ruby_version = '~> 2.0'
+	spec.required_ruby_version = '~> 2.2'
 	
 	spec.add_dependency 'trenni', '~> 1.6'
 	spec.add_dependency 'mime-types', '~> 3.0'
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency 'rack', '~> 2.0'
 	
-	spec.add_dependency 'http-accept', '~> 1.4'
+	spec.add_dependency 'http-accept', '~> 1.6'
 	
 	spec.add_dependency 'mail', '~> 2.6'
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ files:
 - README.md
 - Rakefile
 - benchmarks/hash_vs_openstruct.rb
+- benchmarks/string_vs_symbol.rb
 - benchmarks/struct_vs_class.rb
 - bin/utopia
 - ext/utopia/xnode/fast_scanner/extconf.rb
@@ -194,11 +195,12 @@ files:
 - lib/utopia/content/links.rb
 - lib/utopia/content/markup.rb
 - lib/utopia/content/node.rb
+- lib/utopia/content/response.rb
 - lib/utopia/content/tag.rb
 - lib/utopia/content/transaction.rb
 - lib/utopia/content_length.rb
 - lib/utopia/controller.rb
-- lib/utopia/controller/action.rb
+- lib/utopia/controller/actions.rb
 - lib/utopia/controller/base.rb
 - lib/utopia/controller/respond.rb
 - lib/utopia/controller/rewrite.rb
@@ -208,7 +210,6 @@ files:
 - lib/utopia/exceptions/mailer.rb
 - lib/utopia/extensions/array.rb
 - lib/utopia/extensions/date.rb
-- lib/utopia/extensions/rack.rb
 - lib/utopia/http.rb
 - lib/utopia/locale.rb
 - lib/utopia/localization.rb
@@ -217,8 +218,8 @@ files:
 - lib/utopia/path/matcher.rb
 - lib/utopia/redirection.rb
 - lib/utopia/session.rb
-- lib/utopia/session/encrypted_cookie.rb
 - lib/utopia/session/lazy_hash.rb
+- lib/utopia/setup.rb
 - lib/utopia/static.rb
 - lib/utopia/tags/deferred.rb
 - lib/utopia/tags/environment.rb
@@ -228,6 +229,11 @@ files:
 - materials/utopia.png
 - materials/utopia.svg
 - setup/.bowerrc
+- setup/examples/wiki/controller.rb
+- setup/examples/wiki/edit.xnode
+- setup/examples/wiki/index.xnode
+- setup/examples/wiki/welcome/content.md
+- setup/server/config/environment.yaml
 - setup/server/git/hooks/post-receive
 - setup/site/.bowerrc
 - setup/site/Gemfile
@@ -276,6 +282,7 @@ files:
 - spec/utopia/content/node/related/foo.ja.xnode
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
+- spec/utopia/content/response_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/content_spec/_heading.xnode
@@ -285,7 +292,7 @@ files:
 - spec/utopia/content_spec/index.xnode
 - spec/utopia/content_spec/node/index.xnode
 - spec/utopia/content_spec/test.xnode
-- spec/utopia/controller/action_spec.rb
+- spec/utopia/controller/actions_spec.rb
 - spec/utopia/controller/middleware_spec.rb
 - spec/utopia/controller/middleware_spec.ru
 - spec/utopia/controller/middleware_spec/controller/controller.rb
@@ -333,7 +340,6 @@ files:
 - spec/utopia/performance_spec/pages/links.yaml
 - spec/utopia/performance_spec/pages/welcome/index.xnode
 - spec/utopia/rack_helper.rb
-- spec/utopia/rack_spec.rb
 - spec/utopia/redirection_spec.rb
 - spec/utopia/redirection_spec.ru
 - spec/utopia/session_spec.rb
@@ -354,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -393,6 +399,7 @@ test_files:
 - spec/utopia/content/node/related/foo.ja.xnode
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
+- spec/utopia/content/response_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/content_spec/_heading.xnode
@@ -402,7 +409,7 @@ test_files:
 - spec/utopia/content_spec/index.xnode
 - spec/utopia/content_spec/node/index.xnode
 - spec/utopia/content_spec/test.xnode
-- spec/utopia/controller/action_spec.rb
+- spec/utopia/controller/actions_spec.rb
 - spec/utopia/controller/middleware_spec.rb
 - spec/utopia/controller/middleware_spec.ru
 - spec/utopia/controller/middleware_spec/controller/controller.rb
@@ -450,7 +457,6 @@ test_files:
 - spec/utopia/performance_spec/pages/links.yaml
 - spec/utopia/performance_spec/pages/welcome/index.xnode
 - spec/utopia/rack_helper.rb
-- spec/utopia/rack_spec.rb
 - spec/utopia/redirection_spec.rb
 - spec/utopia/redirection_spec.ru
 - spec/utopia/session_spec.rb

data/lib/utopia/controller/action.rb

@@ -1,116 +0,0 @@
-# Copyright, 2014, 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.
-
-module Utopia
-	class Controller
-		class Action < Hash
-			def initialize(options = {}, &block)
-				@options = options
-				@callback = block
-				
-				super()
-			end
-			
-			attr_accessor :callback, :options
-			
-			def callback?
-				@callback != nil
-			end
-			
-			def indirect?
-				@options[:indirect]
-			end
-			
-			def eql? other
-				super and @callback.eql? other.callback and @options.eql? other.options
-			end
-			
-			def hash
-				[super, @callback, @options].hash
-			end
-			
-			def == other
-				super and @callback == other.callback and @options == other.options
-			end
-			
-			protected
-			
-			def append(path, index, actions = [])
-				# ** is greedy, it always matches if possible:
-				if match_all = self[:**]
-					# Match all remaining input:
-					actions << match_all if match_all.callback?
-				end
-				
-				if index < path.size
-					name = path[index].to_sym
-					
-					if match_name = self[name]
-						# Match the exact name:
-						match_name.append(path, index+1, actions)
-					end
-					
-					if match_one = self[:*]
-						# Match one input:
-						match_one.append(path, index+1, actions)
-					end
-				else
-					# Got to end, matched completely:
-					actions << self if self.callback?
-				end
-			end
-			
-			public
-			
-			# relative_path = 2014/mr-potato
-			# actions => {:** => A}
-			def select(relative_path)
-				[].tap do |actions|
-					append(relative_path.reverse, 0, actions)
-				end
-			end
-			
-			def define(path, **options, &callback)
-				current = self
-				
-				path.reverse_each do |name|
-					current = (current[name.to_sym] ||= Action.new)
-				end
-				
-				current.options = options
-				current.callback = callback
-				
-				return current
-			end
-			
-			def call(controller, *arguments)
-				controller.instance_exec(*arguments, self, &@callback)
-			end
-			
-			def inspect
-				if callback?
-					"<action " + super + ":#{callback.source_location}(#{options})>"
-				else
-					"<action " + super + ">"
-				end
-			end
-		end
-	end
-end