utopia 2.17.1 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 271df583d52d5b53718ed38a322b2ed66d73d1e8ecfe460f18961e156ce92d10
-  data.tar.gz: eaa41f80ca7244853bb1a08acc9ca0b1d76932e1cc3ebff58771fee1686eb4a7
+  metadata.gz: a8851f81c898bf14616952ae21c9c5379bff340c112e84c422f652ceeff26a2f
+  data.tar.gz: e1abf3e367e371b83edfb2089371367952d6f4d23ffae441074abe3dd3daff66
 SHA512:
-  metadata.gz: b9d8cef96cde92e960559a9618d447512ec35905b75cb67a116899607181db2c7bc4de457fe7739a8aea20cd98f9f1e7ee56e33656cc84873aaacc1f4337e22a
-  data.tar.gz: 4b6df56fabfc179ca95c11db76e31689ec722c1bdd6d1f430e5ce8f0a2d613d390bcee7f22b4399f59311c7ed2dc1843a706da49fc63af03f745319b0e0c322b
+  metadata.gz: e191685798e34a85a19c06828987938efc4876b50691add9dd923ab6b53d38c6a5e578cc3b94fa5fc3129dba368106dcf621f02d1a6cf0e8243238d79fac83e9
+  data.tar.gz: fc79ea764f46e0352ed1fa000a049d32c7c2c3ea8511ef12fd2e5270d4465873fac12468bb93fe576eeea496297dd23826bff342216493b98b54b2b36f7e0dc5

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.18.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -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