utopia 2.16.1 → 2.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f7a327d1848543592fbdf7a17fa1f45893852cff6ff763ddfdb08c9cb64ad80
-  data.tar.gz: 0bcf595720fb09061dfb130e9ca3fc68f6ac071b279e661b9a76a186736fec42
+  metadata.gz: f1833aabc2d72234952e6ee164138d234cafc5d0d2015b64edcb28cead480c95
+  data.tar.gz: d6e9675b9921ae290547c25b11c8b5974860256393c65147705d0dd1472ba851
 SHA512:
-  metadata.gz: 6a246d50f6dd455582454f62e49c313c1e9c851094febfc20929d4ead609532c7b8e9673ab05c4ed037994960ece9e3a59c9de364b2074d0845fe2c50aaa298b
-  data.tar.gz: 906526e65a9c040d781ac7544cec1425556bb78614e89c0a63ae39d2b805a25a1ede314d78c17830a2348adf094bb5be1b2a748792742d477421377f06c5d1f6
+  metadata.gz: cd8ee2bdd633f9bcd10be1bd18db664299e9cc8c16169ad7d84d934ba8abb301037d0a0f459608087204cd43ac51eb155e88c4af2e988d03b2c29859df5fc2a3
+  data.tar.gz: 4a16550958bc3ddf8fc37760f8436cc450d3e84ee2178ba6f194ce557869e0e20bfee0f3412eb6f2364c7f5ccc831da2b8f440fce11a81e8fc7f436914d64dde

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

@@ -235,6 +235,14 @@ module Utopia
 			return self.class.new(result)
 		end
 		
+		def pop
+			@components.pop
+		end
+		
+		def last
+			@components.last
+		end
+		
 		# @return [String] the last path component without any file extension.
 		def basename
 			basename, _ = @components.last.split('.', 2)
@@ -284,7 +292,7 @@ module Utopia
 		end
 		
 		def split(at)
-			if at.kind_of? String
+			if at.kind_of?(String)
 				at = @components.index(at)
 			end
 			

data/lib/utopia/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.16.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -303,15 +303,12 @@ files:
 - bake/utopia/static.rb
 - bake/utopia/test.rb
 - bin/utopia
-- lib/.DS_Store
 - lib/utopia.rb
-- lib/utopia/.DS_Store
 - lib/utopia/command.rb
 - lib/utopia/command/environment.rb
 - lib/utopia/command/server.rb
 - lib/utopia/command/site.rb
 - lib/utopia/content.rb
-- lib/utopia/content/.DS_Store
 - lib/utopia/content/document.rb
 - lib/utopia/content/link.rb
 - lib/utopia/content/links.rb
@@ -322,7 +319,6 @@ files:
 - lib/utopia/content/tags.rb
 - lib/utopia/content_length.rb
 - lib/utopia/controller.rb
-- lib/utopia/controller/.DS_Store
 - lib/utopia/controller/actions.rb
 - lib/utopia/controller/base.rb
 - lib/utopia/controller/respond.rb
@@ -351,10 +347,7 @@ files:
 - lib/utopia/static/local_file.rb
 - lib/utopia/static/mime_types.rb
 - lib/utopia/version.rb
-- setup/.DS_Store
-- setup/server/.DS_Store
 - setup/server/git/hooks/post-receive
-- setup/site/.DS_Store
 - setup/site/.gitignore
 - setup/site/.rspec
 - setup/site/Gemfile
@@ -366,14 +359,12 @@ files:
 - setup/site/config/environment.rb
 - setup/site/falcon.rb
 - setup/site/lib/readme.txt
-- setup/site/pages/.DS_Store
 - setup/site/pages/_heading.xnode
 - setup/site/pages/_page.xnode
 - setup/site/pages/errors/exception.xnode
 - setup/site/pages/errors/file-not-found.xnode
 - setup/site/pages/links.yaml
 - setup/site/pages/welcome/index.xnode
-- setup/site/public/.DS_Store
 - setup/site/public/_static/icon.png
 - setup/site/public/_static/site.css
 - setup/site/public/_static/utopia-background.svg
@@ -382,7 +373,6 @@ files:
 - setup/site/spec/spec_helper.rb
 - setup/site/spec/website_context.rb
 - setup/site/spec/website_spec.rb
-- setup/site/tmp/Gemfile
 homepage: https://github.com/ioquatix/utopia
 licenses:
 - MIT