utopia 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614d40f19533fc62a561a328da3eb0c6967d3932
-  data.tar.gz: b0be93ad3767370b1be9fe9348d634cea1d33bdb
+  metadata.gz: d2e3b4571e1608dc18393ab64c06466768a317fb
+  data.tar.gz: 570850efbb213cd4991dbfcbb05af634cb7b393e
 SHA512:
-  metadata.gz: 7767bc2f59c64cfb51a54c0c702fa852c20e060c3b0e66b79e21838e2ecf910f545ea487180c97d12507d63dc1693c7f2cd98dd667170d2802b7ebac0e225e35
-  data.tar.gz: 6c7689c25c3fa8d40c84f41312ac3f42fa36bac19423ba6a352455d1cc21ec871a6c5b6768e37c58777a682a4e65fce0853074616d6b565374354782268527cb
+  metadata.gz: 89d4c62731b34d5d7092b9eae18b8230ece7e0ed5afb0a4f6e899515f92e8064adeba3be65456ff0f205b32c532d986d6b25f9703e2e05e95a7803c44fe592f4
+  data.tar.gz: be1417acf04b2bbf7bc0e1060200db741884771275cf41604eb8ac8bbf67bb94a29634b3bdf38f500bf4d46e8d538e5b7880d813ef4bbf124e473d63a8bd5842

data/README.md

@@ -1,12 +1,12 @@
-# Utopia
+# ![Utopia](materials/utopia.png?raw=true)
 
 Utopia is a website generation framework which provides a robust set of tools
 to build highly complex dynamic websites. It uses the filesystem heavily for
 content and provides functions for interacting with files and directories as
 structure representing the website.
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/utopia.png)](http://travis-ci.org/ioquatix/utopia)
-[![Code Climate](https://codeclimate.com/github/ioquatix/utopia.png)](https://codeclimate.com/github/ioquatix/utopia)
+[![Build Status](https://secure.travis-ci.org/ioquatix/utopia.svg)](http://travis-ci.org/ioquatix/utopia)
+[![Code Climate](https://codeclimate.com/github/ioquatix/utopia.svg)](https://codeclimate.com/github/ioquatix/utopia)
 [![Coverage Status](https://coveralls.io/repos/ioquatix/utopia/badge.svg)](https://coveralls.io/r/ioquatix/utopia)
 
 ## Installation

data/lib/utopia/content.rb

@@ -26,17 +26,21 @@ require_relative 'content/processor'
 
 require 'trenni/template'
 
+require 'concurrent/map'
+
 module Utopia
 	class Content
 		INDEX = 'index'.freeze
 		
 		def initialize(app, **options)
 			@app = app
-
+			
 			@root = File.expand_path(options[:root] || Utopia::default_root)
-
-			@templates = options[:cache_templates] ? {} : nil
-
+			
+			if options[:cache_templates]
+				@templates = Concurrent::Map.new
+			end
+			
 			@tags = options.fetch(:tags, {})
 		end
 
@@ -45,14 +49,14 @@ module Utopia
 
 		def fetch_xml(path)
 			if @templates
-				@templates.fetch(path) do |key|
-					@templates[key] = Trenni::Template.load(path)
+				@templates.fetch_or_store(path.to_s) do
+					Trenni::Template.load(path)
 				end
 			else
 				Trenni::Template.load(path)
 			end
 		end
-
+		
 		# Look up a named tag such as <entry />
 		def lookup_tag(name, parent_path)
 			if @tags.key? name

data/lib/utopia/content/links.rb

@@ -90,10 +90,13 @@ module Utopia
 				:indices => true,
 			}
 			
-			def initialize(root, top = Path.new, options = DEFAULT_OPTIONS)
+			def initialize(root, top = Path.root, options = DEFAULT_OPTIONS)
+				raise ArgumentError.new("top path must be absolute") unless top.absolute?
+				
 				@top = top
 				@options = options
 				
+				# top.components.first == '', but this isn't a problem here.
 				@path = File.join(root, top.components)
 				@metadata = self.class.metadata(@path)
 				

data/lib/utopia/content/node.rb

@@ -18,282 +18,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'set'
-
 require_relative 'processor'
 require_relative 'links'
+require_relative 'transaction'
+
+require 'pathname'
 
 module Utopia
 	class Content
-		class UnbalancedTagError < StandardError
-			def initialize(tag)
-				@tag = tag
-				
-				super("Unbalanced tag #{tag.name}")
-			end
-			
-			attr :tag
-		end
-		
-		# A single request through content middleware.
-		class Transaction
-			# The state of a single tag being rendered.
-			class State
-				def initialize(tag, node)
-					@node = node
-
-					@buffer = StringIO.new
-					@overrides = {}
-
-					@tags = []
-					@attributes = tag.to_hash
-
-					@content = nil
-					@deferred = []
-				end
-
-				attr :attributes
-				attr :overrides
-				attr :content
-				attr :node
-				attr :tags
-
-				attr :deferred
-
-				def defer(value = nil, &block)
-					@deferred << block
-				
-					Tag.closed("deferred", :id => @deferred.size - 1).to_html
-				end
-
-				def [](key)
-					@attributes[key.to_s]
-				end
-
-				def call(transaction)
-					@content = @buffer.string
-					@buffer = StringIO.new
-					
-					if node.respond_to? :call
-						node.call(transaction, self)
-					else
-						transaction.parse_xml(@content)
-					end
-
-					return @buffer.string
-				end
-
-				def lookup(tag)
-					if override = @overrides[tag.name]
-						if override.respond_to? :call
-							return override.call(tag)
-						elsif String === override
-							return Tag.new(override, tag.attributes)
-						else
-							return override
-						end
-					else
-						return tag
-					end
-				end
-
-				def cdata(text)
-					@buffer.write(text)
-				end
-
-				def markup(text)
-					cdata(text)
-				end
-
-				def tag_complete(tag)
-					tag.write_full_html(@buffer)
-				end
-
-				def tag_begin(tag)
-					@tags << tag
-					tag.write_open_html(@buffer)
-				end
-
-				def tag_end(tag)
-					raise UnbalancedTagError(tag) unless @tags.pop.name == tag.name
-
-					tag.write_close_html(@buffer)
-				end
-			end
-
-			def initialize(request, response)
-				@begin_tags = []
-				@end_tags = []
-
-				@request = request
-				@response = response
-			end
-
-			attr :request
-			attr :response
-			
-			# A helper method for accessing controller variables from view:
-			def controller
-				@request.env[VARIABLES_KEY]
-			end
-
-			def parse_xml(xml_data)
-				Processor.parse_xml(xml_data, self)
-			end
-
-			# Begin tags represents a list from outer to inner most tag.
-			# At any point in parsing xml, begin_tags is a list of the inner most tag,
-			# then the next outer tag, etc. This list is used for doing dependent lookups.
-			attr :begin_tags
-
-			# End tags represents a list of execution order. This is the order that end tags
-			# have appeared when evaluating nodes.
-			attr :end_tags
-
-			def attributes
-				return current.attributes
-			end
-
-			def current
-				@begin_tags[-1]
-			end
-
-			def content
-				@end_tags[-1].content
-			end
-
-			def parent
-				end_tags[-2]
-			end
-
-			def first
-				@begin_tags[0]
-			end
-
-			def tag(name, attributes = {}, &block)
-				tag = Tag.new(name, attributes)
-
-				node = tag_begin(tag)
-
-				yield node if block_given?
-
-				tag_end(tag)
-			end
-
-			def tag_complete(tag, node = nil)
-				if tag.name == "content"
-					current.markup(content)
-				else
-					node ||= lookup(tag)
-
-					if node
-						tag_begin(tag, node)
-						tag_end(tag)
-					else
-						current.tag_complete(tag)
-					end
-				end
-			end
-
-			def tag_begin(tag, node = nil)
-				node ||= lookup(tag)
-
-				if node
-					state = State.new(tag, node)
-					@begin_tags << state
-
-					if node.respond_to? :tag_begin
-						node.tag_begin(self, state)
-					end
-
-					return node
-				end
-
-				current.tag_begin(tag)
-
-				return nil
-			end
-
-			def cdata(text)
-				current.cdata(text)
-			end
-
-			def partial(*args, &block)
-				if block_given?
-					current.defer(&block)
-				else
-					current.defer do
-						tag(*args)
-					end
-				end
-			end
-
-			alias deferred_tag partial
-
-			def tag_end(tag = nil)
-				top = current
-
-				if top.tags.empty?
-					if top.node.respond_to? :tag_end
-						top.node.tag_end(self, top)
-					end
-
-					@end_tags << top
-					buffer = top.call(self)
-
-					@begin_tags.pop
-					@end_tags.pop
-
-					if current
-						current.markup(buffer)
-					end
-
-					return buffer
-				else
-					current.tag_end(tag)
-				end
-
-				return nil
-			end
-
-			def render_node(node, attributes = {})
-				state = State.new(attributes, node)
-				@begin_tags << state
-
-				return tag_end
-			end
-
-			# Takes an instance of Tag
-			def lookup(tag)
-				result = tag
-				node = nil
-
-				@begin_tags.reverse_each do |state|
-					result = state.lookup(result)
-					
-					node ||= state.node if state.node.respond_to? :lookup
-
-					return result if Node === result
-				end
-
-				@end_tags.reverse_each do |state|
-					return state.node.lookup(result) if state.node.respond_to? :lookup
-				end
-
-				return nil
-			end
-
-			def method_missing(name, *args)
-				@begin_tags.reverse_each do |state|
-					if state.node.respond_to? name
-						return state.node.send(name, *args)
-					end
-				end
-
-				super
-			end
-		end
-
 		class Node
 			def initialize(controller, uri_path, request_path, file_path)
 				@controller = controller
@@ -385,4 +117,4 @@ module Utopia
 			end
 		end
 	end
-end
+end

data/lib/utopia/content/processor.rb

@@ -49,8 +49,7 @@ module Utopia
 				attr :closing_tag
 
 				def to_s
-					"Unbalanced Tag Error. " \
-					"Line #{@starting_line[:line_number]}: #{@current_tag} has been closed by #{@closing_tag} on line #{@ending_line[:line_number]}!"
+					"Unbalanced Tag Error. Line #{@starting_line[:line_number]}: #{@current_tag} has been closed by #{@closing_tag} on line #{@ending_line[:line_number]}!"
 				end
 			end
 

data/lib/utopia/content/transaction.rb

@@ -0,0 +1,295 @@
+# 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_relative 'processor'
+require_relative 'links'
+
+module Utopia
+	class Content
+		class UnbalancedTagError < StandardError
+			def initialize(tag)
+				@tag = tag
+				
+				super("Unbalanced tag #{tag.name}")
+			end
+			
+			attr :tag
+		end
+		
+		# A single request through content middleware.
+		class Transaction
+			# The state of a single tag being rendered.
+			class State
+				def initialize(tag, node)
+					@node = node
+
+					@buffer = StringIO.new
+					@overrides = {}
+
+					@tags = []
+					@attributes = tag.to_hash
+
+					@content = nil
+					@deferred = []
+				end
+
+				attr :attributes
+				attr :overrides
+				attr :content
+				attr :node
+				attr :tags
+
+				attr :deferred
+
+				def defer(value = nil, &block)
+					@deferred << block
+				
+					Tag.closed("deferred", :id => @deferred.size - 1).to_html
+				end
+
+				def [](key)
+					@attributes[key.to_s]
+				end
+
+				def call(transaction)
+					@content = @buffer.string
+					@buffer = StringIO.new
+					
+					if node.respond_to? :call
+						node.call(transaction, self)
+					else
+						transaction.parse_xml(@content)
+					end
+
+					return @buffer.string
+				end
+
+				def lookup(tag)
+					if override = @overrides[tag.name]
+						if override.respond_to? :call
+							return override.call(tag)
+						elsif String === override
+							return Tag.new(override, tag.attributes)
+						else
+							return override
+						end
+					else
+						return tag
+					end
+				end
+
+				def cdata(text)
+					@buffer.write(text)
+				end
+
+				def markup(text)
+					cdata(text)
+				end
+
+				def tag_complete(tag)
+					tag.write_full_html(@buffer)
+				end
+
+				def tag_begin(tag)
+					@tags << tag
+					tag.write_open_html(@buffer)
+				end
+
+				def tag_end(tag)
+					raise UnbalancedTagError(tag) unless @tags.pop.name == tag.name
+
+					tag.write_close_html(@buffer)
+				end
+			end
+
+			def initialize(request, response)
+				@begin_tags = []
+				@end_tags = []
+
+				@request = request
+				@response = response
+			end
+
+			attr :request
+			attr :response
+			
+			# A helper method for accessing controller variables from view:
+			def controller
+				@request.env[VARIABLES_KEY]
+			end
+
+			def parse_xml(xml_data)
+				Processor.parse_xml(xml_data, self)
+			end
+
+			# Begin tags represents a list from outer to inner most tag.
+			# At any point in parsing xml, begin_tags is a list of the inner most tag,
+			# then the next outer tag, etc. This list is used for doing dependent lookups.
+			attr :begin_tags
+
+			# End tags represents a list of execution order. This is the order that end tags
+			# have appeared when evaluating nodes.
+			attr :end_tags
+
+			def attributes
+				return current.attributes
+			end
+
+			def current
+				@begin_tags[-1]
+			end
+
+			def content
+				@end_tags[-1].content
+			end
+
+			def parent
+				end_tags[-2]
+			end
+
+			def first
+				@begin_tags[0]
+			end
+
+			def tag(name, attributes = {}, &block)
+				tag = Tag.new(name, attributes)
+
+				node = tag_begin(tag)
+
+				yield node if block_given?
+
+				tag_end(tag)
+			end
+
+			def tag_complete(tag, node = nil)
+				if tag.name == "content"
+					current.markup(content)
+				else
+					node ||= lookup(tag)
+
+					if node
+						tag_begin(tag, node)
+						tag_end(tag)
+					else
+						current.tag_complete(tag)
+					end
+				end
+			end
+
+			def tag_begin(tag, node = nil)
+				node ||= lookup(tag)
+
+				if node
+					state = State.new(tag, node)
+					@begin_tags << state
+
+					if node.respond_to? :tag_begin
+						node.tag_begin(self, state)
+					end
+
+					return node
+				end
+
+				current.tag_begin(tag)
+
+				return nil
+			end
+
+			def cdata(text)
+				current.cdata(text)
+			end
+
+			def partial(*args, &block)
+				if block_given?
+					current.defer(&block)
+				else
+					current.defer do
+						tag(*args)
+					end
+				end
+			end
+
+			alias deferred_tag partial
+
+			def tag_end(tag = nil)
+				top = current
+
+				if top.tags.empty?
+					if top.node.respond_to? :tag_end
+						top.node.tag_end(self, top)
+					end
+
+					@end_tags << top
+					buffer = top.call(self)
+
+					@begin_tags.pop
+					@end_tags.pop
+
+					if current
+						current.markup(buffer)
+					end
+
+					return buffer
+				else
+					current.tag_end(tag)
+				end
+
+				return nil
+			end
+
+			def render_node(node, attributes = {})
+				state = State.new(attributes, node)
+				@begin_tags << state
+
+				return tag_end
+			end
+
+			# Takes an instance of Tag
+			def lookup(tag)
+				result = tag
+				node = nil
+
+				@begin_tags.reverse_each do |state|
+					result = state.lookup(result)
+					
+					node ||= state.node if state.node.respond_to? :lookup
+
+					return result if Node === result
+				end
+
+				@end_tags.reverse_each do |state|
+					return state.node.lookup(result) if state.node.respond_to? :lookup
+				end
+
+				return nil
+			end
+
+			def method_missing(name, *args)
+				@begin_tags.reverse_each do |state|
+					if state.node.respond_to? name
+						return state.node.send(name, *args)
+					end
+				end
+
+				super
+			end
+		end
+	end
+end

data/lib/utopia/controller.rb

@@ -27,6 +27,8 @@ require_relative 'controller/base'
 
 require_relative 'controller/rewrite'
 
+require 'concurrent/map'
+
 module Utopia
 	module Controllers
 		def self.class_name_for_controller(controller)
@@ -48,18 +50,18 @@ module Utopia
 		def initialize(app, **options)
 			@app = app
 			@root = options[:root] || Utopia::default_root
-
-			@controllers = {}
 			
-			@cache_controllers = options[:cache_controllers] || false
+			if options[:cache_controllers]
+				@controllers = Concurrent::Map.new
+			end
 		end
 		
 		attr :app
 		
 		def lookup_controller(path)
-			if @cache_controllers
-				return @controllers.fetch(path.to_s) do |key|
-					@controllers[key] = load_controller_file(path)
+			if @controllers
+				@controllers.fetch_or_store(path.to_s) do
+					load_controller_file(path)
 				end
 			else
 				return load_controller_file(path)

data/lib/utopia/path.rb

@@ -82,6 +82,10 @@ module Utopia
 			super
 		end
 		
+		def self.root
+			self.new([''])
+		end
+		
 		# Returns the length of the prefix which is shared by two strings.
 		def self.prefix_length(a, b)
 			[a.size, b.size].min.times{|i| return i if a[i] != b[i]}
@@ -115,19 +119,7 @@ module Utopia
 		def self.[] path
 			self.create(path)
 		end
-		
-		# Expand a relative path relative to a root.
-		def self.expand(path, root)
-			case path
-			when Path
-				return path.expand(root)
-			when String
-				return path if path.start_with?('/')
-			end
-			
-			Path[path].expand(root)
-		end
-		
+
 		def self.split(path)
 			case path
 			when Path
@@ -198,14 +190,6 @@ module Utopia
 			to_str
 		end
 		
-		def match(pattern)
-			to_str.match(pattern)
-		end
-		
-		def =~ (pattern)
-			to_str =~ pattern
-		end
-		
 		def to_a
 			@components
 		end

data/lib/utopia/version.rb

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

data/materials/utopia.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="420px" height="76.993px" viewBox="0 0 420 76.993" enable-background="new 0 0 420 76.993" xml:space="preserve">
+<g>
+	<rect y="-0.246" fill="#F79433" width="420" height="74.246"/>
+	<rect y="54" fill="#4E8DD8" width="420" height="23"/>
+	<g>
+		<path fill="#FFFFFF" d="M74.365,68.163c2.379-2.981,4.189-6.661,5.131-10.939C80.41,53.068,81,48.311,81,43.083V0H18v43.083
+			c0,2.53,0.245,5.133,0.409,7.734c0.168,2.678,0.676,5.308,1.35,7.814c0.683,2.545,1.746,4.979,3.079,7.235
+			c1.368,2.315,3.276,4.356,5.631,6.066c2.328,1.69,5.265,3.045,8.711,4.016C38.803,76.408,40.609,77,42.555,77h13.91
+			c3.083,0,5.82-1.018,8.163-1.926C68.686,73.504,71.962,71.177,74.365,68.163z"/>
+		<polygon fill="#FFFFFF" points="151,18 151,0 88,-0.021 88,18 110.334,18 110.354,77 128.354,77 128.334,18 		"/>
+		<path fill="#FFFFFF" d="M229.753,38.499c0-21.224-17.046-38.492-38-38.492s-38,17.269-38,38.492c0,21.227,17.046,38.494,38,38.494
+			S229.753,59.726,229.753,38.499z"/>
+		<path fill="#FFFFFF" d="M269.219,49c9.755,0,17.248-1.989,22.27-6.155c5.107-4.234,7.697-10.532,7.697-18.841
+			c0-3.135-0.394-5.739-1.171-8.158c-0.782-2.434-1.891-4.749-3.294-6.559c-1.407-1.811-3.11-3.328-5.065-4.526
+			c-1.903-1.165-4.019-2.116-6.289-2.833c-2.247-0.709-4.658-1.216-7.167-1.502C273.727,0.145,271.165,0,268.584,0H239v77h18V49
+			H269.219z"/>
+		<rect x="305" fill="#FFFFFF" width="18" height="77"/>
+		<polygon fill="#FFFFFF" points="362.936,0 333.343,77 409.529,77 378.159,0 		"/>
+	</g>
+</g>
+</svg>

data/utopia.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "mail", "~> 2.6.1"
 	
+	spec.add_dependency "concurrent-ruby", "~> 1.0.0.pre5"
+	
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rspec", "~> 3.1.0"
 	spec.add_development_dependency "puma"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.1
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +176,7 @@ files:
 - lib/utopia/content/node.rb
 - lib/utopia/content/processor.rb
 - lib/utopia/content/tag.rb
+- lib/utopia/content/transaction.rb
 - lib/utopia/controller.rb
 - lib/utopia/controller/action.rb
 - lib/utopia/controller/base.rb
@@ -187,6 +202,8 @@ files:
 - lib/utopia/tags/node.rb
 - lib/utopia/tags/override.rb
 - lib/utopia/version.rb
+- materials/utopia.png
+- materials/utopia.svg
 - setup/.bowerrc
 - setup/server/git/hooks/post-receive
 - setup/site/Gemfile