utopia 2.9.5 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96bc613a811559da9b85d83e9bf9465874582cf1bc6cb6bca7b8fe93d0768290
-  data.tar.gz: 3e9a80e381f58ee71c455999e1ff6d5600ce2c34c8c2d7cad1742fe9c6bd0f47
+  metadata.gz: 473bc20c3cb5a2b2b0bc08830a5b34ac5519f60fbc97453292da59671a857c6f
+  data.tar.gz: 1c78fb9a0d685502b675ac1351eaa465c4140317ad0aa1fbd323632822b5d84f
 SHA512:
-  metadata.gz: 948b833d0e28b70f133127ede3efe3eacde864b4fc8d56ade1aa11f308bce613d3cb7e5c2d4c303dcc06f7740cf39da4933c80758c7ea21029692e1524cb4f66
-  data.tar.gz: d74697bf496eecec19821b678a2aaf47cd886327006a8b5cad94bccdbfb4f62726228009a57d3acf8814234db8ccdcb0918956b22f2effd4499b42fa39a7da5c
+  metadata.gz: 2b2d06006aff49f81104a7fa0bf7b03167e1b92d3afe2412409032b22f652b3493a6fccef5b578aa7dcb9b14c10797248db6e5e5d24e088f122af7957bffe1a3
+  data.tar.gz: 001e36314faf87ab21c25b047d2ad532c7e96990d9f365fa4b407e04e2fe61cc2ffaa35c1ce883fa91501c6e192164d50223581ad52bec6b6fc58d5a6da490ce

data/lib/utopia/content/link.rb

@@ -94,21 +94,20 @@ module Utopia
 				@info.fetch(:title, @title)
 			end
 
-			def to_anchor(**options)
-				Trenni::Builder.fragment(options[:builder]) do |builder|
+			def to_anchor(base: nil, content: self.title, builder: nil, **attributes)
+				attributes[:class] ||= 'link'
+				
+				Trenni::Builder.fragment(builder) do |builder|
 					if href?
-						attributes = {
-							:class => options.fetch(:class, 'link'),
-							:href => relative_href(options[:base]),
-							:target => options.fetch(:target, @info[:target])
-						}
+						attributes[:href] ||= relative_href(base)
+						attributes[:target] ||= @info[:target]
 						
 						builder.inline('a', attributes) do
-							builder.text(options[:content] || title)
+							builder.text(content)
 						end
 					else
-						builder.inline('span', class: options.fetch(:class, 'link')) do
-							builder.text(options[:content] || title)
+						builder.inline('span', attributes) do
+							builder.text(content)
 						end
 					end
 				end

data/lib/utopia/content/node.rb

@@ -65,7 +65,14 @@ module Utopia
 					return root.join(*(base + path).components)
 				end
 			end
-
+			
+			def relative_path(path = '.')
+				path = Path[path]
+				base = uri_path.dirname
+				
+				return base + path
+			end
+			
 			def parent_path
 				@uri_path.dirname
 			end

data/lib/utopia/static/local_file.rb

@@ -109,7 +109,7 @@ module Utopia
 				else
 					# Partial content:
 					@range = ranges[0]
-					partial_size = @range.count
+					partial_size = @range.size
 					
 					response[0] = 206
 					response[1][CONTENT_LENGTH] = partial_size.to_s

data/lib/utopia/version.rb

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

data/spec/utopia/content/node_spec.rb

@@ -20,48 +20,76 @@
 
 require 'utopia/content'
 
-module Utopia::ContentSpec
-	describe Utopia::Content::Node do
-		let(:root) {File.expand_path("node", __dir__)}
-		let(:content) {Utopia::Content.new(lambda{}, root: root)}
+RSpec.describe Utopia::Content::Node do
+	let(:root) {File.expand_path("node", __dir__)}
+	let(:content) {Utopia::Content.new(lambda{}, root: root)}
+	
+	it "should list siblings in correct order" do
+		node = content.lookup_node(Utopia::Path['/ordered/first'])
 		
-		it "should list siblings in correct order" do
-			node = content.lookup_node(Utopia::Path['/ordered/first'])
-			
-			links = node.sibling_links
-			
-			expect(links.size).to be == 2
-			expect(links[0].name).to be == 'first'
-			expect(links[1].name).to be == 'second'
-		end
+		links = node.sibling_links
+		
+		expect(links.size).to be == 2
+		expect(links[0].name).to be == 'first'
+		expect(links[1].name).to be == 'second'
+	end
+	
+	it "should list all links in correct order" do
+		node = content.lookup_node(Utopia::Path['/ordered/index'])
+		
+		links = node.links
+		
+		expect(links.size).to be == 2
+		expect(links[0].name).to be == 'first'
+		expect(links[1].name).to be == 'second'
+	end
+	
+	it "should list related links" do
+		node = content.lookup_node(Utopia::Path['/related/foo.en'])
+		
+		links = node.related_links
+		
+		expect(links.size).to be == 2
+		expect(links[0].name).to be == 'foo'
+		expect(links[0].locale).to be == 'en'
 		
-		it "should list all links in correct order" do
+		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
+	
+	describe '#local_path' do
+		let(:base) {Pathname.new(root)}
+		
+		it "can compute relative path from index node" do
 			node = content.lookup_node(Utopia::Path['/ordered/index'])
 			
-			links = node.links
-			
-			expect(links.size).to be == 2
-			expect(links[0].name).to be == 'first'
-			expect(links[1].name).to be == 'second'
+			expect(node.local_path("preview.jpg")).to eq(base + 'ordered/preview.jpg')
 		end
 		
-		it "should list related links" do
-			node = content.lookup_node(Utopia::Path['/related/foo.en'])
-			
-			links = node.related_links
+		it "can compute relative path from named node" do
+			node = content.lookup_node(Utopia::Path['/ordered/first'])
 			
-			expect(links.size).to be == 2
-			expect(links[0].name).to be == 'foo'
-			expect(links[0].locale).to be == 'en'
+			expect(node.local_path("preview.jpg")).to eq(base + 'ordered/preview.jpg')
+		end
+	end
+	
+	describe '#relative_path' do
+		it "can compute relative path from index node" do
+			node = content.lookup_node(Utopia::Path['/ordered/index'])
 			
-			expect(links[1].name).to be == 'foo'
-			expect(links[1].locale).to be == 'ja'
+			expect(node.relative_path("preview.jpg")).to eq(Utopia::Path['/ordered/preview.jpg'])
 		end
 		
-		it "should look up node by path" do
-			node = content.lookup_node(Utopia::Path['/lookup/index'])
+		it "can compute relative path from named node" do
+			node = content.lookup_node(Utopia::Path['/ordered/first'])
 			
-			expect(node.process!(nil)).to be == [200, {"Content-Type"=>"text/html; charset=utf-8"}, ["<p>Hello World</p>"]]
+			expect(node.relative_path("preview.jpg")).to eq(Utopia::Path['/ordered/preview.jpg'])
 		end
 	end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.10.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -792,7 +792,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.