utopia 2.11.1 → 2.12.0

data/lib/utopia/content/markup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/content/namespace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/content/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -79,7 +81,8 @@ module Utopia
 
 			def links(path = '.', **options, &block)
 				path = uri_path.dirname + Path[path]
-				links = Links.index(@controller.root, path, **options)
+				
+				links = @controller.links(path, **options)
 				
 				if block_given?
 					links.each(&block)
@@ -91,7 +94,7 @@ module Utopia
 			def related_links
 				name = @uri_path.basename
 				
-				return Links.index(@controller.root, @uri_path.dirname, :name => @uri_path.basename, :indices => true)
+				return @controller.links(@uri_path.dirname, :name => @uri_path.basename, :indices => true)
 			end
 
 			def siblings_path
@@ -103,7 +106,7 @@ module Utopia
 			end
 
 			def sibling_links(**options)
-				return Links.index(@controller.root, siblings_path, **options)
+				return @controller.links(siblings_path, **options)
 			end
 			
 			# Lookup the given tag which is being rendered within the given node. Invoked by {Document}.

data/lib/utopia/content/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/content/tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/content_length.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/controller/actions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/controller/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/controller/respond.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/controller/rewrite.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/controller/variables.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/exceptions/handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/exceptions/mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/extensions/array_split.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/extensions/date_comparisons.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/locale.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/localization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/path/matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/redirection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/session/lazy_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/session/serialization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/static.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/static/local_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/static/mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/utopia/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -19,5 +21,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.11.1"
+	VERSION = "2.12.0"
 end

data/setup/site/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 source 'https://rubygems.org'
 

data/setup/site/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'pathname'
 SITE_ROOT = Pathname.new(__dir__).realpath

data/setup/site/config.ru

@@ -1,4 +1,5 @@
 #!/usr/bin/env rackup
+# frozen_string_literal: true
 
 require_relative 'config/environment'
 

data/setup/site/config/environment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'bundler/setup'
 Bundler.setup

data/setup/site/falcon.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env -S falcon host
+# frozen_string_literal: true
 
 load :rack, :lets_encrypt_tls, :supervisor
 

data/setup/site/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'covered/rspec'

data/setup/site/spec/website_context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'rack/test'
 require 'async/rspec/reactor'

data/setup/site/spec/website_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require_relative 'website_context'
 

data/setup/site/tasks/deploy.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 desc 'Run by git post-update hook when deployed to a web server'
 task :deploy do

data/setup/site/tasks/development.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require "rspec/core/rake_task"
 

data/setup/site/tasks/environment.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 desc 'Set up the environment for running your web application'
 task :environment => :log do |task|

data/setup/site/tasks/log.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 task :log do
 	require 'utopia/logger'

data/setup/site/tasks/static.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 namespace :static do
 	task :static_environment do

data/setup/site/tasks/yarn.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 namespace :yarn do
 	desc 'Load the .bowerrc file and setup the environment for other tasks.'

data/spec/mock_node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class MockNode
 	def initialize(namespaces = {}, &block)

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'covered/rspec'
 require 'async/rspec'

data/spec/utopia/command_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/spec/utopia/content/document_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/spec/utopia/content/link_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env rspec
+# frozen_string_literal: true
 
 # Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 

data/spec/utopia/content/links_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env rspec
+# frozen_string_literal: true
 
 # Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
@@ -23,6 +24,9 @@
 require 'utopia/content/links'
 
 RSpec.describe Utopia::Content::Links do
+	let(:root) {File.expand_path("links", __dir__)}
+	subject {described_class.new(root)}
+	
 	describe 'INDEX_XNODE_FILTER' do
 		subject{Utopia::Content::Links::INDEX_XNODE_FILTER}
 		
@@ -36,13 +40,13 @@ RSpec.describe Utopia::Content::Links do
 	end
 	
 	it "should not match partial strings" do
-		links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"), name: "come")
+		links = subject.index(Utopia::Path.create("/"), name: "come")
 		
 		expect(links).to be_empty
 	end
 	
 	it "should give a list of links" do
-		links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"))
+		links = subject.index(Utopia::Path.create("/"))
 		
 		expect(links.size).to be == 3
 		
@@ -65,37 +69,33 @@ RSpec.describe Utopia::Content::Links do
 	end
 	
 	it "should filter links by name" do
-		links = Utopia::Content::Links.index(File.expand_path("links", __dir__), Utopia::Path.create("/"), name: /foo/)
+		links = subject.index(Utopia::Path.create("/"), name: /foo/)
 		
 		expect(links.size).to be == 1
 	end
 	
 	it "should select localized links" do
-		root = File.expand_path("links", __dir__)
-		
 		# Select both test links
-		links = Utopia::Content::Links.index(root, Utopia::Path.create("/foo"))
+		links = subject.index(Utopia::Path.create("/foo"))
 		expect(links.size).to be == 2
 		
-		links = Utopia::Content::Links.index(root, Utopia::Path.create("/foo"), locale: 'en')
+		links = subject.index(Utopia::Path.create("/foo"), locale: 'en')
 		expect(links.size).to be == 1
 	end
 	
-	it "should read correct link order for en" do
-		root = File.expand_path("localized", __dir__)
-		
-		# Select both test links
-		links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), locale: 'en')
-		
-		expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', 'Four', 'Five']
-	end
-	
-	it "should read correct link order for zh" do
-		root = File.expand_path("localized", __dir__)
+	context 'localized links'  do
+		let(:root) {File.expand_path("localized", __dir__)}
 		
-		# Select both test links
-		links = Utopia::Content::Links.index(root, Utopia::Path.create("/"), locale: 'zh')
+		it "should read correct link order for en" do
+			links = subject.index(Utopia::Path.create("/"), locale: 'en')
+			
+			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', 'Four', 'Five']
+		end
 		
-		expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', '四']
+		it "should read correct link order for zh" do
+			links = subject.index(Utopia::Path.create("/"), locale: 'zh')
+			
+			expect(links.collect(&:title)).to be == ['One', 'Two', 'Three', '四']
+		end
 	end
 end