utopia 2.16.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb5cc8a1bb593d344e0d2f2c8bf315704f297ae1e8063b4d7c0e5f3d71f4014
-  data.tar.gz: '09ff4febe6dd06945a3725e0c1354402e23bf837026c5aa09b6c2106b482e00d'
+  metadata.gz: a8851f81c898bf14616952ae21c9c5379bff340c112e84c422f652ceeff26a2f
+  data.tar.gz: e1abf3e367e371b83edfb2089371367952d6f4d23ffae441074abe3dd3daff66
 SHA512:
-  metadata.gz: 6a5a89b6bf438d72007dd8617085125aae4a038ee8267716361810e149f9488166323c299aea04baf69ebd54e630e20093c32ec8e016553b11ad46bfa54fe22c
-  data.tar.gz: bf6fcfe77a7423b39fabd019b40309c52db7a15284661243119d32c279d32d51d2467e4bff409cf6d53924baca9cc60d7788b00bbaf4f9986b65e2b0522e5dbd
+  metadata.gz: e191685798e34a85a19c06828987938efc4876b50691add9dd923ab6b53d38c6a5e578cc3b94fa5fc3129dba368106dcf621f02d1a6cf0e8243238d79fac83e9
+  data.tar.gz: fc79ea764f46e0352ed1fa000a049d32c7c2c3ea8511ef12fd2e5270d4465873fac12468bb93fe576eeea496297dd23826bff342216493b98b54b2b36f7e0dc5

data/lib/utopia/command/server.rb

@@ -68,7 +68,8 @@ module Utopia
 						system("git", "config", "receive.denyCurrentBranch", "ignore") or fail "could not set configuration"
 						system("git", "config", "core.worktree", destination_root) or fail "could not set configuration"
 						
-						system("bundle", "config", "set", "--local", "deployment", "true")
+						# Doing this invokes a lot of behaviour that isn't always ideal...
+						# system("bundle", "config", "set", "--local", "deployment", "true")
 						system("bundle", "config", "set", "--local", "without", "development")
 						
 						# In theory, to convert from non-shared to shared:

data/lib/utopia/command/site.rb

@@ -33,7 +33,7 @@ module Utopia
 		# Local site setup commands.
 		class Site < Samovar::Command
 			# Configuration files which should be installed/updated:
-			CONFIGURATION_FILES = ['.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'Gemfile', 'Guardfile', 'bake.rb', 'spec/spec_helper.rb', 'spec/website_context.rb', 'spec/website_spec.rb']
+			CONFIGURATION_FILES = ['.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'gems.rb', 'Guardfile', 'bake.rb', 'spec/spec_helper.rb', 'spec/website_context.rb', 'spec/website_spec.rb']
 			
 			# Directories that should exist:
 			DIRECTORIES = ["config", "lib", "pages", "public", "tasks", "spec"]
@@ -142,6 +142,15 @@ module Utopia
 					end
 				end
 				
+				# Move `Gemfile` to `gems.rb`.
+				def update_gemfile!
+					# If `Gemfile` doens't exist, we are done:
+					return unless File.exist?('Gemfile')
+					
+					system("git", "mv", "Gemfile", "gems.rb")
+					system("git", "mv", "Gemfile.lock", "gems.locked")
+				end
+				
 				def call
 					destination_root = parent.root
 					branch_name = "utopia-upgrade-#{Utopia::VERSION}"
@@ -184,6 +193,7 @@ module Utopia
 							system("git", "add", *Site::CONFIGURATION_FILES) or fail "could not add files"
 							
 							move_static!
+							update_gemfile!
 							
 							# Commit all changes:
 							system("git", "commit", "-m", "Upgrade to utopia #{Utopia::VERSION}.") or fail "could not commit changes"

data/lib/utopia/content.rb

@@ -177,17 +177,19 @@ module Utopia
 		end
 		
 		def content_tag(name, node)
-			parent_path = node.parent_path
+			full_path = node.parent_path + name
+			
+			name = full_path.pop
 			
 			# If the current node is called 'foo', we can't lookup 'foo' in the current directory or we will have infinite recursion.
-			if name == node.name
-				parent_path = parent_path.dirname
+			while full_path.last == name
+				full_path.pop
 			end
 			
-			cache_key = parent_path + name
+			cache_key = full_path + name
 			
 			@node_cache.fetch_or_store(cache_key) do
-				lookup_content(name, parent_path)
+				lookup_content(name, full_path)
 			end
 		end
 	end

data/lib/utopia/content/link.rb

@@ -52,7 +52,9 @@ module Utopia
 			
 			def href
 				@href ||= @info.fetch(:uri) do
-					(@path.dirname + @path.basename).to_s if @path
+					@info.fetch(:href) do
+						(@path.dirname + @path.basename).to_s if @path
+					end
 				end
 			end
 			

data/lib/utopia/content/links.rb

@@ -234,7 +234,7 @@ module Utopia
 				end
 				
 				def load_index(name, locale, info)
-					info ||=  {}
+					info ||= {}
 					
 					if locale and defaults = @metadata[name]
 						info = defaults.merge(info)
@@ -245,17 +245,20 @@ module Utopia
 					yield Link.new(:index, name, locale, path, info, path[-2])
 				end
 				
+				DEFAULT_INDEX_INFO = {href: nil}.freeze
+				
+				# The default index for a directory which has no contents.
 				def load_default_index(name = INDEX, info = {})
 					path = @top + name
 					
 					if info
-						info = {uri: nil}.merge(info)
+						info = DEFAULT_INDEX_INFO.merge(info)
 					else
-						info = {uri: nil}
+						info = DEFAULT_INDEX_INFO
 					end
 					
 					# Specify a nil uri if no index could be found for the directory:
-					yield Link.new(:index, name, nil, @top, info, path[-2])
+					yield Link.new(:index, name, nil, @top.to_directory, info, path[-2])
 				end
 				
 				def load_file(name, locale, info)

data/lib/utopia/controller/base.rb

@@ -28,6 +28,10 @@ module Utopia
 		
 		# The base implementation of a controller class.
 		class Base
+			URI_PATH = nil
+			BASE_PATH = nil
+			CONTROLLER = nil
+			
 			# A string which is the full path to the directory which contains the controller.
 			def self.base_path
 				self.const_get(:BASE_PATH)
@@ -44,7 +48,7 @@ module Utopia
 			end
 			
 			def self.inspect
-				"Controller#{self.uri_path}"
+				"#{super}#{self.uri_path}"
 			end
 			
 			def self.to_s

data/lib/utopia/path.rb

@@ -25,7 +25,7 @@ module Utopia
 	class Path
 		include Comparable
 		
-		SEPARATOR = '/'.freeze
+		SEPARATOR = '/'
 		
 		def initialize(components = [])
 			@components = components
@@ -34,6 +34,8 @@ module Utopia
 		attr_accessor :components
 		
 		def freeze
+			return self if frozen?
+			
 			@components.freeze
 			
 			super
@@ -235,6 +237,30 @@ module Utopia
 			return self.class.new(result)
 		end
 		
+		# Returns the first path component.
+		def first
+			if absolute?
+				@components[1]
+			else
+				@components[0]
+			end
+		end
+		
+		# Returns the last path component.
+		def last
+			if @components != ['']
+				@components.last
+			end
+		end
+		
+		# Pops the last path component.
+		def pop
+			# We don't want to convert an absolute path to a relative path.
+			if @components != ['']
+				@components.pop
+			end
+		end
+		
 		# @return [String] the last path component without any file extension.
 		def basename
 			basename, _ = @components.last.split('.', 2)
@@ -284,7 +310,7 @@ module Utopia
 		end
 		
 		def split(at)
-			if at.kind_of? String
+			if at.kind_of?(String)
 				at = @components.index(at)
 			end
 			
@@ -342,22 +368,6 @@ module Utopia
 			@components.delete_at(component_offset(index))
 		end
 		
-		def first
-			if absolute?
-				@components[1]
-			else
-				@components[0]
-			end
-		end
-		
-		def last
-			if directory?
-				@components[-2]
-			else
-				@components[-1]
-			end
-		end
-		
 		private
 		
 		# We adjust the index slightly so that indices reference path components rather than the directory markers at the start and end of the path components array.

data/lib/utopia/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.16.0"
+	VERSION = "2.18.0"
 end

data/setup/server/git/hooks/post-receive

@@ -62,7 +62,7 @@ Dir.chdir(GIT_WORK_TREE) do
 	sudo %W{git checkout -f}
 	sudo %W{git submodule update -i}
 	
-	if File.exist? 'Gemfile'
+	if File.exist? 'gems.rb'
 		sudo %W{bundle install}
 	end
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -192,34 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bake-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bake-modernize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -290,8 +262,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: 
+description:
+email:
 executables:
 - utopia
 extensions: []
@@ -350,7 +322,6 @@ files:
 - setup/server/git/hooks/post-receive
 - setup/site/.gitignore
 - setup/site/.rspec
-- setup/site/Gemfile
 - setup/site/Guardfile
 - setup/site/README.md
 - setup/site/bake.rb
@@ -358,6 +329,7 @@ files:
 - setup/site/config/README.md
 - setup/site/config/environment.rb
 - setup/site/falcon.rb
+- setup/site/gems.rb
 - setup/site/lib/readme.txt
 - setup/site/pages/_heading.xnode
 - setup/site/pages/_page.xnode
@@ -378,7 +350,7 @@ licenses:
 - MIT
 metadata:
   funding_uri: https://github.com/sponsors/ioquatix/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -394,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files: []