utopia 0.12.6 → 1.0.0

data/lib/utopia/tags/deferred.rb

@@ -18,12 +18,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'utopia/tags'
-
-Utopia::Tags.create("deferred") do |transaction, state|
-	id = state[:id].to_i
-	
-	procedure = transaction.parent.deferred[id]
-	
-	procedure.call(transaction, state)
+module Utopia
+	module Tags
+		class Deferred
+			def self.call(transaction, state)
+				id = state[:id].to_i
+				
+				procedure = transaction.parent.deferred[id]
+				
+				procedure.call(transaction, state)
+			end
+		end
+	end
 end

data/lib/utopia/tags/environment.rb

@@ -18,12 +18,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'utopia/tags'
+module Utopia
+	module Tags
+		class Environment
+			def self.for(environment)
+				self.new(environment)
+			end
+			
+			def initialize(environment)
+				@environment = environment
+			end
+			
+			def call(transaction, state)
+				only = state[:only].split(",").collect(&:to_sym) rescue []
 
-Utopia::Tags.create("env") do |transaction, state|
-	only = state[:only].split(",").collect(&:to_sym) rescue []
-
-	if defined?(UTOPIA_ENV) && only.include?(UTOPIA_ENV)
-		transaction.parse_xml(state.content)
+				if defined?(@environment) and only.include?(@environment)
+					transaction.parse_xml(state.content)
+				end
+			end
+		end
 	end
 end

data/lib/utopia/tags/node.rb

@@ -18,12 +18,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'utopia/tags'
-
-Utopia::Tags.create("node") do |transaction, state|
-	path = Utopia::Path.create(state[:path])
-	
-	node = transaction.lookup_node(path)
-	
-	transaction.render_node(node)
+module Utopia
+	module Tags
+		class Node
+			def self.call(transaction, state)
+				path = Utopia::Path.create(state[:path])
+				
+				node = transaction.lookup_node(path)
+				
+				transaction.render_node(node)
+			end
+		end
+	end
 end

data/lib/utopia/tags/override.rb

@@ -18,16 +18,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'utopia/tags'
-
-class Utopia::Tags::Override
-	def self.tag_begin(transaction, state)
-		state.overrides[state[:name]] = state[:with]
-	end
-	
-	def self.call(transaction, state)
-		transaction.parse_xml(state.content)
+module Utopia
+	module Tags
+		class Override
+			def self.tag_begin(transaction, state)
+				state.overrides[state[:name]] = state[:with]
+			end
+			
+			def self.call(transaction, state)
+				transaction.parse_xml(state.content)
+			end
+		end
 	end
-end
-
-Utopia::Tags.register("override", Utopia::Tags::Override)
+end

data/lib/utopia/version.rb

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

data/setup/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory" : "public/_static/components"
+}

data/{lib/utopia/setup → setup}/Gemfile

@@ -6,5 +6,5 @@ gem "utopia", "~> $UTOPIA_VERSION"
 # gem "utopia-tags-google-analytics"
 
 group :development do
-	gem "thin"
+	gem "puma"
 end

data/setup/Rakefile

@@ -0,0 +1,4 @@
+
+task :server do
+	system('puma')
+end

data/setup/config.ru

@@ -0,0 +1,64 @@
+#!/usr/bin/env rackup
+
+# Setup default encoding:
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
+# Setup the server environment:
+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__)
+
+require 'utopia'
+require 'rack/cache'
+
+if RACK_ENV == :production
+	use Utopia::ExceptionHandler, "/errors/exception"
+	use Utopia::MailExceptions
+else
+	use Rack::ShowExceptions
+end
+
+use Rack::Sendfile
+
+if RACK_ENV == :production
+	use Rack::Cache,
+		metastore: "file:#{Utopia::default_root("cache/meta")}",
+		entitystore: "file:#{Utopia::default_root("cache/body")}",
+		verbose: RACK_ENV == :development
+end
+
+use Rack::ContentLength
+
+use Utopia::Redirector,
+	patterns: [
+		Utopia::Redirector::DIRECTORY_INDEX
+	],
+	strings: {
+		'/' => '/welcome/index',
+	},
+	errors: {
+		404 => "/errors/file-not-found"
+	}
+
+use Utopia::Localization,
+	:default_locale => 'en',
+	:locales => ['en', 'de', 'ja', 'zh'],
+	:nonlocalized => ['/_static/', '/_cache/']
+
+use Utopia::Controller,
+	cache_controllers: (RACK_ENV == :production)
+
+use Utopia::Static
+
+use Utopia::Content,
+	cache_templates: (RACK_ENV == :production),
+	tags: {
+		'deferred' => Utopia::Tags::Deferred,
+		'override' => Utopia::Tags::Override,
+		'node' => Utopia::Tags::Node,
+		'environment' => Utopia::Tags::Environment.for(RACK_ENV)
+	}
+
+run lambda { |env| [404, {}, []] }

data/{lib/utopia/setup → setup}/pages/_page.xnode

@@ -14,7 +14,7 @@
 		<link rel="stylesheet" href="/_static/site.css" type="text/css" media="screen" />
 	</head>
 
-	<body>
+	<body class="#{attributes['class']}">
 		<div id="header">
 		</div>
 

data/setup/pages/_static/site.css

@@ -0,0 +1,70 @@
+
+body {
+	font-family: Verdana, Helvetica, Arial;
+	background-color: #ccc;
+	padding: 50px;
+}
+
+p {
+	color: #333;
+}
+
+p strong {
+	color: black;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	color: #eee;
+	margin-top: 2em;
+	margin-bottom: 1em;
+	text-shadow: 0px 1px 4px rgba(0, 0, 0, 0.7);
+}
+
+img {
+	border: none;
+}
+
+a {
+	color: #33a;
+}
+
+a:hover {
+	color: #55c;
+}
+
+p, dl, h3 {
+	margin: 1em;
+}
+
+h3 {
+	border-bottom: 1px solid #ccf;
+}
+
+ul {
+	margin-bottom: 1em;
+}
+
+h3, h4, h5, h6 {
+	font-weight: normal;
+}
+
+body.front h1 {
+	font-weight: normal;
+	font-size: 60pt;
+	color: white;
+	text-shadow:
+	0 1px 0 #ccc,
+	0 2px 0 #c9c9c9,
+	0 3px 0 #bbb,
+	0 4px 0 #b9b9b9,
+	0 5px 0 #aaa,
+	0 6px 1px rgba(0,0,0,.1),
+	0 0 5px rgba(0,0,0,.1),
+	0 1px 3px rgba(0,0,0,.3),
+	0 3px 5px rgba(0,0,0,.2),
+	0 5px 10px rgba(0,0,0,.25),
+	0 10px 10px rgba(0,0,0,.2),
+	0 20px 20px rgba(0,0,0,.15);
+	
+	text-align: center;
+}

data/setup/pages/welcome/index.xnode

@@ -0,0 +1,17 @@
+<page class="front">
+	<heading>Welcome to Utopia</heading>
+	
+	<p><strong>Utopia is designed to simplify web development.</strong> Utopia is a fully featured stack for both content-heavy sites and dynamic web applications.</p>
+	
+	<h2>Server Side Tag Based Markup</h2>
+	
+	<p>Server side tags reduce the amount of duplicate view code especially for content-heavy sites.</p>
+	
+	<h2>Recursive Controller Layer</h2>
+	
+	<p>Nested controllers make access control a breeze.</p>
+	
+	<h2>Standards Based Localization</h2>
+	
+	<p>Automatically sniff the user's desired language and provide content in the correct language.</p>
+</page>

data/spec/utopia/content/link_spec.rb

@@ -0,0 +1,108 @@
+#!/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_relative '../spec_helper'
+
+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
+			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
+			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
+			expect(subject.name).to be == "bob"
+			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", __FILE__), 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", __FILE__), Utopia::Path.create("/"), name: /foo/)
+			
+			expect(links.size).to be == 1
+		end
+		
+		it "should select localized links" do
+			root = File.expand_path("../links", __FILE__)
+			
+			# 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", __FILE__)
+			
+			# 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", __FILE__)
+			
+			# 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/foo/links.yaml

@@ -0,0 +1,2 @@
+index:
+  title: "Foo Bar"

data/spec/utopia/content/links/links.yaml

@@ -0,0 +1,9 @@
+welcome:
+  order: 1
+  title: "Welcome"
+  uri: "/welcome"
+index:
+  order: 0
+# This metadata also gets merged with foo/links.yml#index
+foo:
+  order: 2