utopia 1.8.3 → 1.9.0

data/lib/utopia/controller/actions.rb

@@ -133,6 +133,7 @@ module Utopia
 				end
 			end
 			
+			# TODO: Test this functionality and confirm working. Document.
 			def otherwise(request, path)
 			end
 			

data/lib/utopia/redirection.rb

@@ -78,7 +78,7 @@ module Utopia
 		# We cache 301 redirects for 24 hours.
 		DEFAULT_MAX_AGE = 3600*24
 		
-		class Redirection
+		class ClientRedirect
 			def initialize(app, status: 307, max_age: DEFAULT_MAX_AGE)
 				@app = app
 				@status = status
@@ -123,7 +123,7 @@ module Utopia
 			end
 		end
 		
-		class DirectoryIndex < Redirection
+		class DirectoryIndex < ClientRedirect
 			def initialize(app, index: 'index')
 				@app = app
 				@index = index
@@ -138,7 +138,7 @@ module Utopia
 			end
 		end
 		
-		class Rewrite < Redirection
+		class Rewrite < ClientRedirect
 			def initialize(app, patterns, status: 301)
 				@patterns = patterns
 				
@@ -152,7 +152,7 @@ module Utopia
 			end
 		end
 		
-		class Moved < Redirection
+		class Moved < ClientRedirect
 			def initialize(app, pattern, prefix, status: 301, flatten: false)
 				@app = app
 				

data/lib/utopia/version.rb

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

data/setup/site/public/_static/site.css

@@ -1,15 +1,16 @@
 
 html {
 	font-family: "PT Sans", Verdana, Helvetica, Arial, sans-serif;
+	font-size: 16px;
 }
 
-@media (min-width: 48em) {
+@media (min-width: 40em) {
 	html {
-		font-size: 16px;
+		font-size: 18px;
 	}
 }
 
-@media (min-width: 58em) {
+@media (min-width: 80em) {
 	html {
 		font-size: 20px;
 	}
@@ -23,7 +24,7 @@ body {
 }
 
 body > header {
-	margin: 1em 0 1em 0;
+	margin: 1rem 0 1rem 0;
 	
 	background-color: white;
 	
@@ -35,7 +36,7 @@ body > header {
 body > header img {
 	display: block;
 	margin: auto;
-	height: 4em;
+	height: 4rem;
 }
 
 p {
@@ -47,7 +48,7 @@ p strong {
 }
 
 h1, h2, h3, h4, h5, h6 {
-	margin: 2em 1em 1em 1em;
+	margin: 2rem 1rem 1rem 1rem;
 	color: #4E8DD9;
 }
 
@@ -64,7 +65,16 @@ a:hover {
 }
 
 p, ul, ol, dl, h3 {
-	margin: 2em;
+	margin: 2rem;
+}
+
+pre {
+	padding: 1rem 3rem;
+	
+	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	
+	background-color: #eee;
 }
 
 h3 {
@@ -72,7 +82,7 @@ h3 {
 }
 
 ul {
-	margin-bottom: 1em;
+	margin-bottom: 1rem;
 }
 
 h2, h3, h4, h5, h6 {
@@ -90,6 +100,8 @@ body.front h1 {
 footer {
 	text-align: right;
 	margin: 2rem;
+	font-size: 0.65rem;
+	color: #aaa;
 }
 
 section.features {

data/spec/utopia/content/markup_spec.rb

@@ -35,9 +35,9 @@ module Utopia::Content::MarkupSpec
 		end
 	end
 	
-	describe Utopia::Content::Markup do
+	describe Utopia::Content::MarkupParser do
 		it "should format open tags correctly" do
-			foo_tag = Utopia::Content::Tag.new("foo", bar: nil, baz: 'bob')
+			foo_tag = Utopia::Content::Tag.opened("foo", bar: nil, baz: 'bob')
 			
 			expect(foo_tag[:bar]).to be nil
 			expect(foo_tag[:baz]).to be == 'bob'
@@ -49,7 +49,7 @@ module Utopia::Content::MarkupSpec
 			delegate = TestDelegate.new
 			
 			buffer = Trenni::Buffer.new(string)
-			Utopia::Content::Markup.new(buffer, delegate).parse!
+			Utopia::Content::MarkupParser.new(buffer, delegate).parse!
 			
 			return delegate
 		end
@@ -58,7 +58,7 @@ module Utopia::Content::MarkupSpec
 			
 			delegate = parse %Q{<foo></foo>}
 			
-			foo_tag = Utopia::Content::Tag.new("foo")
+			foo_tag = Utopia::Content::Tag.opened("foo")
 			expected_events = [
 				[:tag_begin, foo_tag],
 				[:tag_end, foo_tag],
@@ -72,12 +72,12 @@ module Utopia::Content::MarkupSpec
 		it "should parse and escape text" do
 			delegate = parse %Q{<foo>Bob &amp; Barley<!-- Comment --><![CDATA[Hello & World]]></foo>}
 			
-			foo_tag = Utopia::Content::Tag.new("foo")
+			foo_tag = Utopia::Content::Tag.opened("foo")
 			expected_events = [
 				[:tag_begin, foo_tag],
-				[:cdata, "Bob &amp; Barley"],
-				[:cdata, "<!-- Comment -->"],
-				[:cdata, "<![CDATA[Hello & World]]>"],
+				[:text, "Bob & Barley"],
+				[:write, "<!-- Comment -->"],
+				[:write, "<![CDATA[Hello & World]]>"],
 				[:tag_end, foo_tag],
 			]
 			
@@ -85,11 +85,11 @@ module Utopia::Content::MarkupSpec
 		end
 		
 		it "should fail with incorrect closing tag" do
-			expect{parse %Q{<p>Foobar</dl>}}.to raise_exception(Utopia::Content::Markup::UnbalancedTagError)
+			expect{parse %Q{<p>Foobar</dl>}}.to raise_exception(Utopia::Content::MarkupParser::UnbalancedTagError)
 		end
 		
 		it "should fail with unclosed tag" do
-			expect{parse %Q{<p>Foobar}}.to raise_exception(Utopia::Content::Markup::UnbalancedTagError)
+			expect{parse %Q{<p>Foobar}}.to raise_exception(Utopia::Content::MarkupParser::UnbalancedTagError)
 		end
 	end
 end

data/spec/utopia/content/tag_spec.rb

@@ -0,0 +1,36 @@
+# 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/content/tag'
+
+RSpec.describe Utopia::Content::Tag.new("body", false, 'class' => 'main') do
+	it "should have name" do
+		expect(subject.name).to be == "body"
+	end
+	
+	it "should be open by default" do
+		expect(subject).to_not be_self_closed
+	end
+	
+	it "should have a attribute" do
+		expect(subject.attributes).to include('class')
+		expect(subject['class']).to be == 'main'
+	end
+end

data/spec/utopia/controller/middleware_spec.ru

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

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

@@ -1,4 +1,6 @@
 
+prepend Actions
+
 on 'flat' do
 	succeed! content: "flat"
 end

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

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

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

@@ -1,4 +1,6 @@
 
+prepend Actions
+
 on '**' do |request, path|
 	# puts "**: #{URI_PATH.inspect}"
 	

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

@@ -1,4 +1,6 @@
 
+prepend Actions
+
 on 'bar' do |request, path|
 	# puts "bar: #{URI_PATH.inspect}"
 	

data/spec/utopia/controller/respond_spec.ru

@@ -1,6 +1,9 @@
 
-use Utopia::Controller, root: File.expand_path('respond_spec', __dir__)
+use Utopia::Controller,
+	root: File.expand_path('respond_spec', __dir__),
+	base: Utopia::Controller::Base
 
-use Utopia::Content, root: File.expand_path('respond_spec', __dir__)
+use Utopia::Content,
+	root: File.expand_path('respond_spec', __dir__)
 
 run lambda {|env| [404, {}, []]}

data/spec/utopia/exceptions/handler_spec.ru

@@ -1,6 +1,8 @@
 
 use Utopia::Exceptions::Handler, '/exception'
 
-use Utopia::Controller, root: File.expand_path('handler_spec', __dir__)
+use Utopia::Controller,
+	root: File.expand_path('handler_spec', __dir__),
+	base: Utopia::Controller::Base
 
 run lambda {|env| [404, {}, []]}

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

@@ -1,4 +1,6 @@
 
+prepend Actions
+
 class TharSheBlows < StandardError
 end
 

data/spec/utopia/exceptions/mailer_spec.ru

@@ -1,6 +1,10 @@
 
-use Utopia::Exceptions::Mailer, delivery_method: :test, from: 'test@localhost'
+use Utopia::Exceptions::Mailer,
+	delivery_method: :test,
+	from: 'test@localhost'
 
-use Utopia::Controller, root: File.expand_path('handler_spec', __dir__)
+use Utopia::Controller,
+	root: File.expand_path('handler_spec', __dir__),
+	base: Utopia::Controller::Base
 
 run lambda {|env| [404, {}, []]}

data/spec/utopia/localization_spec.rb

@@ -27,8 +27,8 @@ require 'utopia/content'
 require 'utopia/controller'
 require 'utopia/localization'
 
-module Utopia::StaticSpec
-	describe Utopia::Static do
+module Utopia::LocalizationSpec
+	describe Utopia::Localization do
 		include Rack::Test::Methods
 		
 		let(:app) {Rack::Builder.parse_file(File.expand_path('../localization_spec.ru', __FILE__)).first}

data/spec/utopia/localization_spec.ru

@@ -6,7 +6,8 @@ use Utopia::Localization,
 	hosts: {/foobar\.com$/ => 'en', /foobar\.co\.jp$/ => 'ja', /foobar\.de$/ => 'de'}
 
 use Utopia::Controller,
-	root: localization_spec_root
+	root: localization_spec_root,
+	base: Utopia::Controller::Base
 
 use Utopia::Static,
 	root: localization_spec_root

data/spec/utopia/localization_spec/controller.rb

@@ -1,4 +1,6 @@
 
+prepend Actions
+
 on 'all_locales' do |request, path|
 	wrapper = Utopia::Localization[request]
 	

data/spec/utopia/performance_spec/config.ru

@@ -21,6 +21,7 @@ use Utopia::Redirection::Errors,
 
 use Utopia::Controller,
 	root: File.expand_path('pages', __dir__),
+	base: Utopia::Controller::Base,
 	cache_controllers: true
 
 use Utopia::Static,

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

@@ -1,5 +1,5 @@
 
-prepend Respond
+prepend Respond, Actions
 respond.with_json
 
 on 'fetch' do

data/utopia.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = '~> 2.2'
 	
-	spec.add_dependency 'trenni', '~> 1.6'
+	spec.add_dependency 'trenni', '~> 2.0'
 	spec.add_dependency 'mime-types', '~> 3.0'
 	
-	spec.add_dependency 'samovar', '~> 1.1'
+	spec.add_dependency 'samovar', '~> 1.2'
 	
 	spec.add_dependency 'rack', '~> 2.0'
 	
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'concurrent-ruby', '~> 1.0'
 	
 	spec.add_development_dependency 'bundler', '~> 1.3'
-	spec.add_development_dependency 'rspec', '~> 3.4.0'
+	spec.add_development_dependency 'rspec', '~> 3.4'
 	spec.add_development_dependency 'puma'
 	spec.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -186,8 +186,32 @@ files:
 - benchmarks/string_vs_symbol.rb
 - benchmarks/struct_vs_class.rb
 - bin/utopia
-- ext/utopia/xnode/fast_scanner/extconf.rb
-- ext/utopia/xnode/fast_scanner/parser.c
+- documentation/.bowerrc
+- documentation/.rspec
+- documentation/Gemfile
+- documentation/Rakefile
+- documentation/config.ru
+- documentation/config/README.md
+- documentation/config/environment.rb
+- documentation/lib/readme.txt
+- documentation/pages/_heading.xnode
+- documentation/pages/_page.xnode
+- documentation/pages/errors/exception.xnode
+- documentation/pages/errors/file-not-found.xnode
+- documentation/pages/links.yaml
+- documentation/pages/welcome/index.xnode
+- documentation/pages/wiki/content.md
+- documentation/pages/wiki/controller.rb
+- documentation/pages/wiki/development-environment-setup/content.md
+- documentation/pages/wiki/edit.xnode
+- documentation/pages/wiki/server-setup/content.md
+- documentation/pages/wiki/show.xnode
+- documentation/pages/wiki/your-first-page/content.md
+- documentation/public
+- documentation/spec/website_context.rb
+- documentation/spec/website_spec.rb
+- documentation/tasks/test.rake
+- documentation/tasks/utopia.rake
 - lib/utopia.rb
 - lib/utopia/command.rb
 - lib/utopia/content.rb
@@ -229,10 +253,6 @@ 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
@@ -288,6 +308,7 @@ files:
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
 - spec/utopia/content/response_spec.rb
+- spec/utopia/content/tag_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/content_spec/_heading.xnode
@@ -405,6 +426,7 @@ test_files:
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
 - spec/utopia/content/response_spec.rb
+- spec/utopia/content/tag_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/content_spec/_heading.xnode