utopia 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944c3e8fb35114656d9bf4f5628d6c4ecf569015
-  data.tar.gz: b34c396bc981f396faee6d49ace329141d3c5d20
+  metadata.gz: 45aef2de7e3895af0d07047f106c870ddf6f52a9
+  data.tar.gz: c44105d12552392fc82e952e1084cc56f563e5cc
 SHA512:
-  metadata.gz: 969bb2a0804488b5f72ea3b1d5652a5219cd1f865a6e3652dcb3bd0794f67de48b1d0ddaf8f2df4796ccc396b92b85d0205ed1e8c800528857b3edb28de22a42
-  data.tar.gz: '022596c8e3262206412bd534e3c78fbeb127f310081381971e2567e51a42a7af91b6a64d60bb78226b940280fe0e274787c98352462081bcfc3c3edf76f2ac09'
+  metadata.gz: 84bcd1fde7888daeae19321e11eae4cddf9ad83968994e12f838f1972387b6aee51612a2ba642f449bbeecb0364b014983c75020f7be045bfac1bd25a7d2f9a0
+  data.tar.gz: 9da83f29130302129c6d4928bf621d9db153b3ae937b5dc428e9266ba32d6dac125562ff1500e9705884b2b9e6b3303a900ae43e8ca123a3dc862744fc6ef785

data/lib/utopia/command/server.rb

@@ -69,6 +69,7 @@ module Utopia
 					# Copy git hooks:
 					system("cp", "-r", File.join(Setup::Server::ROOT, 'git', 'hooks'), File.join(destination_root, '.git')) or fail "could not copy git hooks"
 					# finally set everything in the .git directory to be group writable
+					# This failed for me and I had to do sudo chown http:http .git -R first.
 					system("chmod", "-Rf", "g+w", File.join(destination_root, '.git')) or fail "could not update permissions of .git directory"
 				end
 			end

data/lib/utopia/content/links.rb

@@ -54,7 +54,8 @@ module Utopia
 				
 				# Named:
 				if name = options[:name]
-					ordered.select!{|link| link.name[name]}
+					# We use pattern === name, which matches either the whole string, or matches a regexp.
+					ordered.select!{|link| name === link.name}
 				end
 				
 				if locale = options[:locale]
@@ -155,7 +156,7 @@ module Utopia
 			end
 			
 			def indices(path, &block)
-				Dir.entries(path).reject{|filename| !filename.match(INDEX_XNODE_FILTER)}
+				Dir.entries(path).select{|filename| filename.match(INDEX_XNODE_FILTER)}
 			end
 			
 			def load_indices(name, path, metadata)

data/lib/utopia/static.rb

@@ -21,202 +21,12 @@
 require_relative 'middleware'
 require_relative 'localization'
 
-require 'time'
-
-require 'digest/sha1'
-require 'mime/types'
+require_relative 'static/local_file'
+require_relative 'static/mime_types'
 
 module Utopia
 	# A middleware which serves static files from the specified root directory.
 	class Static
-		# Default mime-types which are common for files served over HTTP:
-		MIME_TYPES = {
-			:xiph => {
-				"ogx" => "application/ogg",
-				"ogv" => "video/ogg",
-				"oga" => "audio/ogg",
-				"ogg" => "audio/ogg",
-				"spx" => "audio/ogg",
-				"flac" => "audio/flac",
-				"anx" => "application/annodex",
-				"axa" => "audio/annodex",
-				"xspf" => "application/xspf+xml",
-			},
-			:media => [
-				:xiph, "mp3", "mp4", "wav", "aiff", ["aac", "audio/x-aac"], "mov", "avi", "wmv", "mpg"
-			],
-			:text => [
-				"html", "css", "js", ["map", "application/json"], "txt", "rtf", "xml", "pdf"
-			],
-			:fonts => [
-				"otf", ["eot", "application/vnd.ms-fontobject"], "ttf", "woff"
-			],
-			:archive => [
-				"zip", "tar", "tgz", "tar.gz", "tar.bz2", ["dmg", "application/x-apple-diskimage"],
-				["torrent", "application/x-bittorrent"]
-			],
-			:images => [
-				"png", "gif", "jpeg", "tiff", "svg"
-			],
-			:default => [
-				:media, :text, :archive, :images, :fonts
-			]
-		}
-		
-		# A class to assist with loading mime-type metadata.
-		class MimeTypeLoader
-			def initialize(library)
-				@extensions = {}
-				@library = library
-			end
-			
-			attr :extensions
-			
-			def self.extensions_for(types, library = MIME_TYPES)
-				loader = self.new(library)
-				loader.expand(types)
-				return loader.extensions
-			end
-			
-			def extract_extensions(mime_types)
-				mime_types.select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
-					mime_type.extensions.each do |ext|
-						@extensions["." + ext] = mime_type.content_type
-					end
-				end
-			end
-			
-			class ExpansionError < ArgumentError
-			end
-			
-			def expand(types)
-				types.each do |type|
-					current_count = @extensions.size
-					
-					begin
-						case type
-						when Symbol
-							self.expand(MIME_TYPES[type])
-						when Array
-							@extensions["." + type[0]] = type[1]
-						when String
-							self.extract_extensions MIME::Types.of(type)
-						when Regexp
-							self.extract_extensions MIME::Types[type]
-						when MIME::Type
-							self.extract_extensions.call([type])
-						end
-					rescue
-						raise ExpansionError.new("#{self.class.name}: Error while processing #{type.inspect}!")
-					end
-					
-					if @extensions.size == current_count
-						raise ExpansionError.new("#{self.class.name}: Could not find any mime type for #{type.inspect}")
-					end
-				end
-			end
-		end
-		
-		private
-		
-		# Represents a local file on disk which can be served directly, or passed upstream to sendfile.
-		class LocalFile
-			def initialize(root, path)
-				@root = root
-				@path = path
-				@etag = Digest::SHA1.hexdigest("#{File.size(full_path)}#{mtime_date}")
-
-				@range = nil
-			end
-
-			attr :root
-			attr :path
-			attr :etag
-			attr :range
-
-			# Fit in with Rack::Sendfile
-			def to_path
-				full_path
-			end
-
-			def full_path
-				File.join(@root, @path.components)
-			end
-
-			def mtime_date
-				File.mtime(full_path).httpdate
-			end
-
-			def bytesize
-				File.size(full_path)
-			end
-
-			# This reflects whether calling each would yield anything.
-			def empty?
-				bytesize == 0
-			end
-
-			alias size bytesize
-
-			def each
-				File.open(full_path, "rb") do |file|
-					file.seek(@range.begin)
-					remaining = @range.end - @range.begin+1
-
-					while remaining > 0
-						break unless part = file.read([8192, remaining].min)
-
-						remaining -= part.length
-
-						yield part
-					end
-				end
-			end
-
-			def modified?(env)
-				if modified_since = env['HTTP_IF_MODIFIED_SINCE']
-					return false if File.mtime(full_path) <= Time.parse(modified_since)
-				end
-
-				if etags = env['HTTP_IF_NONE_MATCH']
-					etags = etags.split(/\s*,\s*/)
-					return false if etags.include?(etag) || etags.include?('*')
-				end
-
-				return true
-			end
-
-			CONTENT_LENGTH = Rack::CONTENT_LENGTH
-			CONTENT_RANGE = 'Content-Range'.freeze
-			
-			def serve(env, response_headers)
-				ranges = Rack::Utils.get_byte_ranges(env['HTTP_RANGE'], size)
-				response = [200, response_headers, self]
-
-				# puts "Requesting ranges: #{ranges.inspect} (#{size})"
-
-				if ranges == nil or ranges.size != 1
-					# No ranges, or multiple ranges (which we don't support).
-					# TODO: Support multiple byte-ranges, for now just send entire file:
-					response[0] = 200
-					response[1][CONTENT_LENGTH] = size.to_s
-					@range = 0...size
-				else
-					# Partial content:
-					@range = ranges[0]
-					partial_size = @range.count
-					
-					response[0] = 206
-					response[1][CONTENT_LENGTH] = partial_size.to_s
-					response[1][CONTENT_RANGE] = "bytes #{@range.min}-#{@range.max}/#{size}"
-				end
-				
-				return response
-			end
-		end
-
-		public
-
 		DEFAULT_CACHE_CONTROL = 'public, max-age=3600'.freeze
 
 		# @param root [String] The root directory to serve files from.

data/lib/utopia/static/local_file.rb

@@ -0,0 +1,123 @@
+# 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 'time'
+require 'digest/sha1'
+
+module Utopia
+	# A middleware which serves static files from the specified root directory.
+	class Static
+		# Represents a local file on disk which can be served directly, or passed upstream to sendfile.
+		class LocalFile
+			def initialize(root, path)
+				@root = root
+				@path = path
+				@etag = Digest::SHA1.hexdigest("#{File.size(full_path)}#{mtime_date}")
+
+				@range = nil
+			end
+
+			attr :root
+			attr :path
+			attr :etag
+			attr :range
+
+			# Fit in with Rack::Sendfile
+			def to_path
+				full_path
+			end
+
+			def full_path
+				File.join(@root, @path.components)
+			end
+
+			def mtime_date
+				File.mtime(full_path).httpdate
+			end
+
+			def bytesize
+				File.size(full_path)
+			end
+
+			# This reflects whether calling each would yield anything.
+			def empty?
+				bytesize == 0
+			end
+
+			alias size bytesize
+
+			def each
+				File.open(full_path, "rb") do |file|
+					file.seek(@range.begin)
+					remaining = @range.end - @range.begin+1
+
+					while remaining > 0
+						break unless part = file.read([8192, remaining].min)
+
+						remaining -= part.length
+
+						yield part
+					end
+				end
+			end
+
+			def modified?(env)
+				if modified_since = env['HTTP_IF_MODIFIED_SINCE']
+					return false if File.mtime(full_path) <= Time.parse(modified_since)
+				end
+
+				if etags = env['HTTP_IF_NONE_MATCH']
+					etags = etags.split(/\s*,\s*/)
+					return false if etags.include?(etag) || etags.include?('*')
+				end
+
+				return true
+			end
+
+			CONTENT_LENGTH = Rack::CONTENT_LENGTH
+			CONTENT_RANGE = 'Content-Range'.freeze
+			
+			def serve(env, response_headers)
+				ranges = Rack::Utils.get_byte_ranges(env['HTTP_RANGE'], size)
+				response = [200, response_headers, self]
+
+				# puts "Requesting ranges: #{ranges.inspect} (#{size})"
+
+				if ranges == nil or ranges.size != 1
+					# No ranges, or multiple ranges (which we don't support).
+					# TODO: Support multiple byte-ranges, for now just send entire file:
+					response[0] = 200
+					response[1][CONTENT_LENGTH] = size.to_s
+					@range = 0...size
+				else
+					# Partial content:
+					@range = ranges[0]
+					partial_size = @range.count
+					
+					response[0] = 206
+					response[1][CONTENT_LENGTH] = partial_size.to_s
+					response[1][CONTENT_RANGE] = "bytes #{@range.min}-#{@range.max}/#{size}"
+				end
+				
+				return response
+			end
+		end
+	end
+end

data/lib/utopia/static/mime_types.rb

@@ -0,0 +1,114 @@
+# 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 'mime/types'
+
+module Utopia
+	# A middleware which serves static files from the specified root directory.
+	class Static
+		# Default mime-types which are common for files served over HTTP:
+		MIME_TYPES = {
+			:xiph => {
+				"ogx" => "application/ogg",
+				"ogv" => "video/ogg",
+				"oga" => "audio/ogg",
+				"ogg" => "audio/ogg",
+				"spx" => "audio/ogg",
+				"flac" => "audio/flac",
+				"anx" => "application/annodex",
+				"axa" => "audio/annodex",
+				"xspf" => "application/xspf+xml",
+			},
+			:media => [
+				:xiph, "mp3", "mp4", "wav", "aiff", ["aac", "audio/x-aac"], "mov", "avi", "wmv", "mpg"
+			],
+			:text => [
+				"html", "css", "js", ["map", "application/json"], "txt", "rtf", "xml", "pdf"
+			],
+			:fonts => [
+				"otf", ["eot", "application/vnd.ms-fontobject"], "ttf", "woff"
+			],
+			:archive => [
+				"zip", "tar", "tgz", "tar.gz", "tar.bz2", ["dmg", "application/x-apple-diskimage"],
+				["torrent", "application/x-bittorrent"]
+			],
+			:images => [
+				"png", "gif", "jpeg", "tiff", "svg"
+			],
+			:default => [
+				:media, :text, :archive, :images, :fonts
+			]
+		}
+		
+		# A class to assist with loading mime-type metadata.
+		class MimeTypeLoader
+			def initialize(library)
+				@extensions = {}
+				@library = library
+			end
+			
+			attr :extensions
+			
+			def self.extensions_for(types, library = MIME_TYPES)
+				loader = self.new(library)
+				loader.expand(types)
+				return loader.extensions
+			end
+			
+			def extract_extensions(mime_types)
+				mime_types.select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
+					mime_type.extensions.each do |ext|
+						@extensions["." + ext] = mime_type.content_type
+					end
+				end
+			end
+			
+			class ExpansionError < ArgumentError
+			end
+			
+			def expand(types)
+				types.each do |type|
+					current_count = @extensions.size
+					
+					begin
+						case type
+						when Symbol
+							self.expand(MIME_TYPES[type])
+						when Array
+							@extensions["." + type[0]] = type[1]
+						when String
+							self.extract_extensions MIME::Types.of(type)
+						when Regexp
+							self.extract_extensions MIME::Types[type]
+						when MIME::Type
+							self.extract_extensions.call([type])
+						end
+					rescue
+						raise ExpansionError.new("#{self.class.name}: Error while processing #{type.inspect}!")
+					end
+					
+					if @extensions.size == current_count
+						raise ExpansionError.new("#{self.class.name}: Could not find any mime type for #{type.inspect}")
+					end
+				end
+			end
+		end
+	end
+end

data/lib/utopia/version.rb

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

data/spec/utopia/content/links_spec.rb

@@ -22,64 +22,80 @@
 
 require 'utopia/content/links'
 
-module Utopia::Content::LinksSpec
-	describe Utopia::Content::Links do
-		it "should give a list of links" do
-			links = Utopia::Content::Links.index(File.expand_path("links", __dir__), 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
+RSpec.describe Utopia::Content::Links do
+	describe 'INDEX_XNODE_FILTER' do
+		subject{Utopia::Content::Links::INDEX_XNODE_FILTER}
 		
-		it "should filter links by name" do
-			links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"), name: /foo/)
-			
-			expect(links.size).to be == 1
+		it "should match index" do
+			expect("index.xnode").to match(subject)
 		end
 		
-		it "should select localized links" do
-			root = File.expand_path("links", __dir__)
-			
-			# 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"), locale: 'en')
-			expect(links.size).to be == 1
+		it "should not match invalid index" do
+			expect("old-index.xnode").to_not match(subject)
 		end
+	end
+	
+	it "should not match partial strings" do
+		links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"), name: "come")
 		
-		it "should read correct link order for en" do
-			root = File.expand_path("localized", __dir__)
-			
-			# Select both test links
-			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), locale: 'en')
-			
-			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', 'Four', 'Five']
-		end
+		expect(links).to be_empty
+	end
+	
+	it "should give a list of links" do
+		links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"))
 		
-		it "should read correct link order for zh" do
-			root = File.expand_path("localized", __dir__)
-			
-			# Select both test links
-			links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), locale: 'zh')
-			
-			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', '四']
-		end
+		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", __dir__), Utopia::Path.create("/"), name: /foo/)
+		
+		expect(links.size).to be == 1
+	end
+	
+	it "should select localized links" do
+		root = File.expand_path("links", __dir__)
+		
+		# 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"), locale: 'en')
+		expect(links.size).to be == 1
+	end
+	
+	it "should read correct link order for en" do
+		root = File.expand_path("localized", __dir__)
+		
+		# Select both test links
+		links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), locale: '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", __dir__)
+		
+		# Select both test links
+		links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), locale: 'zh')
+		
+		expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', '四']
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -394,6 +394,8 @@ files:
 - lib/utopia/session/lazy_hash.rb
 - lib/utopia/setup.rb
 - lib/utopia/static.rb
+- lib/utopia/static/local_file.rb
+- lib/utopia/static/mime_types.rb
 - lib/utopia/version.rb
 - materials/utopia.png
 - materials/utopia.svg