utopia 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c82107a036d11f5f56d84ed77517e349e84ea244d68f38dd59e69605519a110e
-  data.tar.gz: 6a6bbed8272706c82a33ed410e215019d1e68e7e094e9812cdbadc8cb5f14032
+  metadata.gz: 37d97837ade8d210c7f13ac156ca9a1bdbc8f1f3f9eb9ef195dcc688b6ea933c
+  data.tar.gz: 6d3bb1d8a49183df2b3decdba70d8d42d996f1868fb44e4a184ca413f799760a
 SHA512:
-  metadata.gz: c2a2bc42c4d978af6035ec6c460b81bb4e32cb544e4136890534569d191206c4463a0acfee5075456071d82e187264fdab566ff2679e972f75c20ee4dbacae09
-  data.tar.gz: 592ff149b58116bef28f6233541ac266809c95f238c7952c645db508c76be891ccfb18a6404698ecc7cef50722af5ec161411bf552e898084f81eb79498aa077
+  metadata.gz: 93a81c8a0cf74142599575da2421eeb8e62ec0190de34c470451e44381855f304b2ba3390142ae41a98da80125c5a78623fd6dc75d2d2d2430c8114eea54b05e
+  data.tar.gz: 34ee51883e8abfbee0bb6be8fddaebeb358c644ba6e264d7f86aa4a95f0baad4bc3cd5d2e1408d3b285fc58df8812168b8e7bf3312c30311ab7dac85ea063d4d

data/lib/utopia/content/document.rb

@@ -208,7 +208,9 @@ module Utopia
 			# Lookup a node with the given path relative to the current node.
 			# @return [Node] The node if could be found.
 			def lookup_node(path)
-				@current.node.lookup_node(path)
+				@end_tags.reverse_each do |state|
+					return state.node.lookup_node(path) if state.node.respond_to?(:lookup_node)
+				end
 			end
 			
 			# The content of the node

data/lib/utopia/content/node.rb

@@ -50,7 +50,7 @@ module Utopia
 			end
 
 			def lookup_node(path)
-				@controller.lookup_node(@uri_path + Path[path])
+				@controller.lookup_node(parent_path + Path[path])
 			end
 
 			def local_path(path = '.', base = nil)

data/lib/utopia/exceptions/mailer.rb

@@ -32,7 +32,7 @@ module Utopia
 				:enable_starttls_auto => false
 			}]
 			
-			DEFAULT_FROM = (ENV['USER'] || 'rack').freeze
+			DEFAULT_FROM = (ENV['USER'] || 'utopia').freeze
 			DEFAULT_SUBJECT = '%{exception} [PID %{pid} : %{cwd}]'.freeze
 			
 			# @param to [String] The address to email error reports to.

data/lib/utopia/version.rb

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

data/spec/utopia/content/node/lookup/content.xnode

@@ -0,0 +1 @@
+<p>Hello World</p>

data/spec/utopia/content/node/lookup/index.xnode

@@ -0,0 +1 @@
+<utopia:node path="content"/>

data/spec/utopia/content/node_spec.rb

@@ -57,5 +57,11 @@ module Utopia::ContentSpec
 			expect(links[1].name).to be == 'foo'
 			expect(links[1].locale).to be == 'ja'
 		end
+		
+		it "should look up node by path" do
+			node = content.lookup_node(Utopia::Path['/lookup/index'])
+			
+			expect(node.process!(nil)).to be == [200, {"Content-Type"=>"text/html; charset=utf-8"}, ["<p>Hello World</p>"]]
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -634,6 +634,8 @@ files:
 - spec/utopia/content/localized/two.zh.xnode
 - spec/utopia/content/markup_spec.rb
 - spec/utopia/content/namespace_spec.rb
+- spec/utopia/content/node/lookup/content.xnode
+- spec/utopia/content/node/lookup/index.xnode
 - spec/utopia/content/node/ordered/first.xnode
 - spec/utopia/content/node/ordered/index.xnode
 - spec/utopia/content/node/ordered/links.yaml
@@ -760,6 +762,8 @@ test_files:
 - spec/utopia/content/localized/two.zh.xnode
 - spec/utopia/content/markup_spec.rb
 - spec/utopia/content/namespace_spec.rb
+- spec/utopia/content/node/lookup/content.xnode
+- spec/utopia/content/node/lookup/index.xnode
 - spec/utopia/content/node/ordered/first.xnode
 - spec/utopia/content/node/ordered/index.xnode
 - spec/utopia/content/node/ordered/links.yaml