utopia 0.12.6 → 1.0.0

data/spec/utopia/spec_helper.rb

@@ -0,0 +1,16 @@
+
+if ENV['TRAVIS']
+	require 'coveralls'
+	Coveralls.wear!
+end
+
+if ENV['COVERAGE']
+	require 'simplecov'
+	
+	SimpleCov.start do
+		add_filter "/spec/"
+	end if ENV["COVERAGE"]
+end
+
+require 'rack/mock'
+require 'rack/test'

data/{lib/utopia/extensions/string.rb → spec/utopia/static_spec.rb}

@@ -1,4 +1,5 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#!/usr/bin/env rspec
+# 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
@@ -18,22 +19,30 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'trenni/strings'
+require_relative 'spec_helper'
 
-class String
-	def to_html
-		Trenni::Strings::to_html(self)
-	end
-
-	def to_quoted_string
-		Trenni::Strings::to_quoted_string(self)
-	end
+require 'rack'
+require 'rack/test'
 
-	def to_title
-		Trenni::Strings::to_title(self)
-	end
+require 'utopia/static'
 
-	def to_snake
-		Trenni::Strings::to_snake(self)
+module Utopia::StaticSpec
+	describe Utopia::Static do
+		include Rack::Test::Methods
+		
+		let(:app) {Rack::Builder.parse_file(File.expand_path('../static_spec.ru', __FILE__)).first}
+		
+		it "should give the correct mime type" do
+			get "/test.txt"
+			
+			expect(last_response.header['Content-Type']).to be == 'text/plain'
+		end
+		
+		it "should return partial content" do
+			get "/test.txt", {}, 'HTTP_RANGE' => 'bytes=0-4'
+			
+			expect(last_response.status).to be == 206 
+			expect(last_response.body).to be == "Hello"
+		end
 	end
 end

data/spec/utopia/static_spec.ru

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

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.add_dependency "trenni", "~> 1.3.0"
+	spec.add_dependency "trenni", "~> 1.4.1"
 	spec.add_dependency "mime-types", "~> 2.0"
 	
 	spec.add_dependency "rack", "~> 1.5"
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "mail", "~> 2.6.1"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "rspec", "~> 3.0.0"
-	spec.add_development_dependency "thin"
+	spec.add_development_dependency "rspec", "~> 3.1.0"
+	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: 0.12.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -100,16 +100,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -154,64 +154,103 @@ files:
 - Rakefile
 - bin/utopia
 - lib/utopia.rb
+- lib/utopia/content.rb
+- lib/utopia/content/link.rb
+- lib/utopia/content/links.rb
+- lib/utopia/content/node.rb
+- lib/utopia/content/processor.rb
+- lib/utopia/content/tag.rb
+- lib/utopia/controller.rb
+- lib/utopia/controller/action.rb
+- lib/utopia/controller/base.rb
+- lib/utopia/controller/variables.rb
+- lib/utopia/exception_handler.rb
 - lib/utopia/extensions/array.rb
 - lib/utopia/extensions/date.rb
-- lib/utopia/extensions/hash.rb
 - lib/utopia/extensions/rack.rb
-- lib/utopia/extensions/regexp.rb
-- lib/utopia/extensions/string.rb
 - lib/utopia/http.rb
-- lib/utopia/link.rb
+- lib/utopia/localization.rb
+- lib/utopia/mail_exceptions.rb
 - lib/utopia/middleware.rb
-- lib/utopia/middleware/all.rb
-- lib/utopia/middleware/content.rb
-- lib/utopia/middleware/content/node.rb
-- lib/utopia/middleware/content/processor.rb
-- lib/utopia/middleware/controller.rb
-- lib/utopia/middleware/controller/action.rb
-- lib/utopia/middleware/controller/base.rb
-- lib/utopia/middleware/controller/variables.rb
-- lib/utopia/middleware/directory_index.rb
-- lib/utopia/middleware/exception_handler.rb
-- lib/utopia/middleware/localization.rb
-- lib/utopia/middleware/localization/name.rb
-- lib/utopia/middleware/mail_exceptions.rb
-- lib/utopia/middleware/redirector.rb
-- lib/utopia/middleware/requester.rb
-- lib/utopia/middleware/static.rb
 - lib/utopia/path.rb
+- lib/utopia/redirector.rb
+- lib/utopia/session.rb
 - lib/utopia/session/encrypted_cookie.rb
-- lib/utopia/setup.rb
-- lib/utopia/setup/Gemfile
-- lib/utopia/setup/cache/head/readme.txt
-- lib/utopia/setup/cache/meta/readme.txt
-- lib/utopia/setup/config.ru
-- lib/utopia/setup/lib/readme.txt
-- lib/utopia/setup/pages/_heading.xnode
-- lib/utopia/setup/pages/_page.xnode
-- lib/utopia/setup/pages/_static/background.png
-- lib/utopia/setup/pages/_static/icon.png
-- lib/utopia/setup/pages/_static/site.css
-- lib/utopia/setup/pages/errors/exception.xnode
-- lib/utopia/setup/pages/errors/file-not-found.xnode
-- lib/utopia/setup/pages/links.yaml
-- lib/utopia/setup/pages/welcome/index.xnode
-- lib/utopia/setup/public/readme.txt
-- lib/utopia/tag.rb
-- lib/utopia/tags.rb
-- lib/utopia/tags/all.rb
+- lib/utopia/session/lazy_hash.rb
+- lib/utopia/static.rb
 - lib/utopia/tags/deferred.rb
 - lib/utopia/tags/environment.rb
 - lib/utopia/tags/node.rb
 - lib/utopia/tags/override.rb
 - lib/utopia/version.rb
+- setup/.bowerrc
+- setup/Gemfile
+- setup/Rakefile
+- setup/cache/head/readme.txt
+- setup/cache/meta/readme.txt
+- setup/config.ru
+- setup/lib/readme.txt
+- setup/pages/_heading.xnode
+- setup/pages/_page.xnode
+- setup/pages/_static/icon.png
+- setup/pages/_static/site.css
+- setup/pages/errors/exception.xnode
+- setup/pages/errors/file-not-found.xnode
+- setup/pages/links.yaml
+- setup/pages/welcome/index.xnode
+- setup/public/readme.txt
+- spec/utopia/content/link_spec.rb
+- spec/utopia/content/links/foo/index.xnode
+- spec/utopia/content/links/foo/links.yaml
+- spec/utopia/content/links/foo/test.de.xnode
+- spec/utopia/content/links/foo/test.en.xnode
+- spec/utopia/content/links/links.yaml
+- spec/utopia/content/links/welcome.xnode
+- spec/utopia/content/localized/five/index.en.xnode
+- spec/utopia/content/localized/four/index.en.xnode
+- spec/utopia/content/localized/four/index.zh.xnode
+- spec/utopia/content/localized/four/links.yaml
+- spec/utopia/content/localized/links.yaml
+- spec/utopia/content/localized/one.xnode
+- spec/utopia/content/localized/three/index.xnode
+- spec/utopia/content/localized/two.en.xnode
+- spec/utopia/content/localized/two.zh.xnode
+- spec/utopia/content/node/ordered/first.xnode
+- spec/utopia/content/node/ordered/index.xnode
+- spec/utopia/content/node/ordered/links.yaml
+- spec/utopia/content/node/ordered/second.xnode
+- spec/utopia/content/node/related/foo.en.xnode
+- spec/utopia/content/node/related/foo.ja.xnode
+- spec/utopia/content/node/related/links.yaml
+- spec/utopia/content/node_spec.rb
+- 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/extensions_spec.rb
-- spec/utopia/middleware/content_root/_heading.xnode
-- spec/utopia/middleware/content_root/index.xnode
-- spec/utopia/middleware/content_spec.rb
-- spec/utopia/middleware/controller_spec.rb
+- spec/utopia/localization_spec.rb
+- spec/utopia/localization_spec.ru
+- spec/utopia/middleware_spec.rb
+- spec/utopia/pages/_heading.xnode
+- spec/utopia/pages/content/_show-value.xnode
+- 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_spec.rb
 - spec/utopia/rack_spec.rb
+- spec/utopia/session_spec.rb
+- spec/utopia/session_spec.ru
+- spec/utopia/spec_helper.rb
+- spec/utopia/static_spec.rb
+- spec/utopia/static_spec.ru
 - utopia.gemspec
 homepage: https://github.com/ioquatix/utopia
 licenses: []
@@ -237,10 +276,55 @@ signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files:
+- spec/utopia/content/link_spec.rb
+- spec/utopia/content/links/foo/index.xnode
+- spec/utopia/content/links/foo/links.yaml
+- spec/utopia/content/links/foo/test.de.xnode
+- spec/utopia/content/links/foo/test.en.xnode
+- spec/utopia/content/links/links.yaml
+- spec/utopia/content/links/welcome.xnode
+- spec/utopia/content/localized/five/index.en.xnode
+- spec/utopia/content/localized/four/index.en.xnode
+- spec/utopia/content/localized/four/index.zh.xnode
+- spec/utopia/content/localized/four/links.yaml
+- spec/utopia/content/localized/links.yaml
+- spec/utopia/content/localized/one.xnode
+- spec/utopia/content/localized/three/index.xnode
+- spec/utopia/content/localized/two.en.xnode
+- spec/utopia/content/localized/two.zh.xnode
+- spec/utopia/content/node/ordered/first.xnode
+- spec/utopia/content/node/ordered/index.xnode
+- spec/utopia/content/node/ordered/links.yaml
+- spec/utopia/content/node/ordered/second.xnode
+- spec/utopia/content/node/related/foo.en.xnode
+- spec/utopia/content/node/related/foo.ja.xnode
+- spec/utopia/content/node/related/links.yaml
+- spec/utopia/content/node_spec.rb
+- 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/extensions_spec.rb
-- spec/utopia/middleware/content_root/_heading.xnode
-- spec/utopia/middleware/content_root/index.xnode
-- spec/utopia/middleware/content_spec.rb
-- spec/utopia/middleware/controller_spec.rb
+- spec/utopia/localization_spec.rb
+- spec/utopia/localization_spec.ru
+- spec/utopia/middleware_spec.rb
+- spec/utopia/pages/_heading.xnode
+- spec/utopia/pages/content/_show-value.xnode
+- 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_spec.rb
 - spec/utopia/rack_spec.rb
+- spec/utopia/session_spec.rb
+- spec/utopia/session_spec.ru
+- spec/utopia/spec_helper.rb
+- spec/utopia/static_spec.rb
+- spec/utopia/static_spec.ru

data/lib/utopia/extensions/regexp.rb

@@ -1,33 +0,0 @@
-# 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.
-
-class Regexp
-	def self.starts_with(string)
-		return /^#{Regexp.escape(string)}/
-	end
-
-	def self.ends_with(string)
-		return /#{Regexp.escape(string)}$/
-	end
-
-	def self.contains(string)
-		return Regexp.new(string)
-	end
-end

data/lib/utopia/link.rb

@@ -1,288 +0,0 @@
-# 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 'yaml'
-
-require 'utopia/extensions/string'
-require 'utopia/extensions/hash'
-require 'utopia/extensions/array'
-
-module Utopia
-
-	class Link
-		XNODE_EXT = ".xnode"
-
-		def initialize(kind, path, info = nil)
-			path = Path.create(path)
-
-			@info = info ? info.symbolize_keys : {}
-			@locale = @info.delete(:locale) || path.locale(XNODE_EXT)
-			@kind = kind
-
-			case @kind
-			when :file
-				@name = path.basename(XNODE_EXT)
-				@path = path
-			when :directory
-				@name = path.dirname.basename(XNODE_EXT)
-				@path = path
-			when :virtual
-				@name = path.to_s
-				@path = @info[:path] ? Path.create(@info[:path]) : nil
-			end
-
-			@components = @name.split(".")
-			@title = components[0]
-		end
-
-		attr :kind
-		attr :name
-		attr :path
-		attr :locale
-		attr :info
-		attr :components
-
-		def [] (key)
-			if key == :title
-				return @title
-			end
-			
-			return @info[key]
-		end
-
-		def href
-			@info.fetch(:uri) do
-				if @path
-					@path.to_s
-				else
-					nil
-				end
-			end
-		end
-
-		def href?
-			return href != nil
-		end
-
-		def title
-			@info[:title] || @title.to_title
-		end
-
-		def to_href(options = {})
-			options[:content] ||= title
-			options[:class] ||= "link"
-			
-			if href?
-				"<a class=#{options[:class].dump} href=\"#{href.to_html}\">#{options[:content].to_html}</a>"
-			else
-				"<span class=#{options[:class].dump}>#{options[:content].to_html}</span>"
-			end
-		end
-		
-		def eql? other
-			if other && self.class == other.class
-				return kind.eql?(other.kind) && 
-				       name.eql?(other.name) && 
-				       path.eql?(other.path) && 
-				       info.eql?(other.info)
-			else
-				return false
-			end
-		end
-
-		def == other
-			return other && kind == other.kind && name == other.name && path == other.path
-		end
-		
-		def default_locale
-			@locale == ''
-		end
-	end
-	
-	module Links
-		XNODE_FILTER = /^(.+)\.xnode$/
-		INDEX_XNODE_FILTER = /^(index(\..+)*)\.xnode$/
-		LINKS_YAML = "links.yaml"
-
-		def self.metadata(path)
-			links_path = File.join(path, LINKS_YAML)
-			if File.exist?(links_path)
-				return YAML::load(File.read(links_path)) || {}
-			else
-				return {}
-			end
-		end
-
-		def self.indices(path, &block)
-			entries = Dir.entries(path).delete_if{|filename| !filename.match(INDEX_XNODE_FILTER)}
-
-			if block_given?
-				entries.each &block
-			else
-				return entries
-			end
-		end
-
-		DEFAULT_OPTIONS = {
-			:directories => true,
-			:files => true,
-			:virtual => true,
-			:indices => false,
-			:sort => :order,
-			:display => :display,
-			:locale => nil
-		}
-		
-		def self.index(root, top = Path.new, options = {})
-			options = DEFAULT_OPTIONS.merge(options)
-			path = File.join(root, top.components)
-			metadata = Links.metadata(path)
-			
-			virtual_metadata = metadata.dup
-
-			links = []
-
-			Dir.entries(path).each do |filename|
-				next if filename.match(/^[\._]/)
-
-				fullpath = File.join(path, filename)
-
-				if File.directory?(fullpath) && options[:directories]
-					name = filename
-					indices_metadata = Links.metadata(fullpath)
-					directory_metadata = metadata.delete(name) || {}
-
-					indices = 0
-					Links.indices(fullpath) do |index|
-						index_name = File.basename(index, ".xnode")
-						# Values in indices_metadata will override values in directory_metadata:
-						index_metadata = directory_metadata.merge(indices_metadata[index_name] || {})
-
-						directory_link = Link.new(:directory, top + [filename, index_name], index_metadata)
-
-						# Check for localized directory metadata and update the link:
-						if directory_link.locale
-							localized_metadata = metadata.delete(name + "." + directory_link.locale)
-
-							if localized_metadata
-								directory_link.info.update(localized_metadata.symbolize_keys)
-							end
-						end
-
-						links << directory_link
-
-						indices += 1
-					end
-
-					if indices == 0
-						# Specify a nil uri if no index could be found for the directory:
-						links << Link.new(:directory, top + [filename, ""], {'uri' => nil}.merge(directory_metadata))
-					end
-				elsif filename.match(INDEX_XNODE_FILTER) && options[:indices] == false
-					name = $1
-					metadata.delete(name)
-
-					# We don't include indices in the list of pages.
-					next
-				elsif filename.match(XNODE_FILTER) && options[:files]
-					name = $1
-
-					links << Link.new(:file, top + name, metadata.delete(name))
-				end
-			end
-
-			if options[:virtual]
-				metadata.each do |name, details|
-					# Given a virtual named such as "welcome.cn", merge it with metadata from "welcome" if it exists:
-					basename, locale = name.split(".", 2)
-
-					if virtual_metadata[basename]
-						details = virtual_metadata[basename].merge(details || {})
-						name = basename
-						details[:locale] = locale
-					end
-
-					links << Link.new(:virtual, name, details)
-				end
-			end
-
-			if options[:display]
-				links = links.delete_if{|link| link[options[:display]] == false}
-			end
-
-			if options[:name]
-				case options[:name]
-				when Regexp
-					links.reject!{|link| !link.name.match(options[:name])}
-				when String
-					links.reject!{|link| link.name.index(options[:name]) != 0}
-				end
-			end
-
-			if options[:locale]
-				reduced = []
-
-				links.group_by(&:name).each do |name, links|
-					specific = nil
-
-					links.each do |link|
-						if link.locale == options[:locale]
-							specific = link
-							break
-						elsif link.default_locale
-							specific ||= link
-						end
-					end
-
-					reduced << specific if specific
-				end
-				
-				links = reduced
-			end
-			
-			if options[:sort]
-				sort_key = options[:sort]
-				sort_default = options[:sort_default] || 0
-				
-				links = links.sort do |a, b|
-					result = nil
-
-					lhs = a[sort_key] || sort_default
-					rhs = b[sort_key] || sort_default
-					
-					begin
-						result ||= lhs <=> rhs
-					rescue
-						# LOG.debug("Invalid comparison between #{a.path} and #{b.path} using key #{options[:sort]}!")
-					end
-					
-					if result == 0 || result == nil
-						a.title <=> b.title
-					else
-						result
-					end
-				end
-			end
-			
-			return links
-		end
-	end
-	
-end