utopia 2.19.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677174ac49d8e0a2194ce704a4ef9913ea441f0870e15240e544d7ffa96543cb
-  data.tar.gz: c0344d7c6a00eea78414fce663ed9c6a6d03d37d36fc47e6c5f7f422de4b7cb2
+  metadata.gz: 56923a2e74dc8c0c9741d25e21e871b8e1aabb2085c47b6f5880af60befa72fa
+  data.tar.gz: 0f7e1423b063dad1c370c700dfeb541a8c3b149b29418086fe2952574b216bfc
 SHA512:
-  metadata.gz: cf487dfd07bcf584a0aca8a9d8f6b4c97151941155a98a1d506c5c8d80bbe26e13f253f347e09d04f556ca3182380b8fd01363ebb37582cd15bd0b88e5a1690f
-  data.tar.gz: '069036ceb3bf30f8d04d7523126434043123d17f657d3ebc84225d5213ca43ac0935058a26feec316a744576d46084042ca97e44f54c68150d7c634324b18b33'
+  metadata.gz: 263fb770d5ea32a76b1c2ce42802194dfd6fb2386304a2b18ee5f71f2d2a3560ce97203a48e8e9a6c6e5eb120236abefc490d6b45df9e032fd4d4d44cb4477fd
+  data.tar.gz: ad207a65dfc5e0cbc270b33769c1113f84f670395e4d4a8a5059a17de7d06e2e69be1d90073f55384a3f9e16b4cbe8918c563ec6696f5270785f8000831c609e

data/lib/utopia/content/link.rb

@@ -43,10 +43,12 @@ module Utopia
 			end
 			
 			def key
-				if locale
-					"#{@path.last}.#{@locale}"
-				else
-					@path.last
+				if @path
+					if locale
+						"#{@path.last}.#{@locale}"
+					else
+						@path.last
+					end
 				end
 			end
 			

data/lib/utopia/content/links.rb

@@ -142,8 +142,10 @@ module Utopia
 			def load_metadata(path)
 				yaml_path = File.join(path, LINKS_YAML)
 				
-				if File.exist?(yaml_path) && data = YAML.load_file(yaml_path)
-					return symbolize_keys(data)
+				if File.exist?(yaml_path)
+					if data = YAML.safe_load(File.read(yaml_path), permitted_classes: [Date, Time])
+						return symbolize_keys(data)
+					end
 				else
 					return {}
 				end

data/lib/utopia/content.rb

@@ -32,6 +32,8 @@ require 'trenni/template'
 
 require 'concurrent/map'
 
+require 'traces/provider'
+
 module Utopia
 	# A middleware which serves dynamically generated content based on markup files.
 	class Content
@@ -107,6 +109,16 @@ module Utopia
 			end
 		end
 		
+		def respond(link, request)
+			if node = resolve_link(link)
+				attributes = request.env.fetch(VARIABLES_KEY, {}).to_hash
+				
+				return node.process!(request, attributes)
+			elsif redirect_uri = link[:uri]
+				return [307, {HTTP::LOCATION => redirect_uri}, []]
+			end
+		end
+		
 		def call(env)
 			request = Rack::Request.new(env)
 			path = Path.create(request.path_info)
@@ -124,12 +136,8 @@ module Utopia
 			
 			locale = env[Localization::CURRENT_LOCALE_KEY]
 			if link = @links.for(path, locale)
-				if node = resolve_link(link)
-					attributes = request.env.fetch(VARIABLES_KEY, {}).to_hash
-					
-					return node.process!(request, attributes)
-				elsif redirect_uri = link[:uri]
-					return [307, {HTTP::LOCATION => redirect_uri}, []]
+				if response = self.respond(link, request)
+					return response
 				end
 			end
 			
@@ -191,4 +199,15 @@ module Utopia
 			end
 		end
 	end
+	
+	Traces::Provider(Content) do
+		def respond(link, request)
+			attributes = {
+				'link.key' => link.key,
+				'link.href' => link.href
+			}
+			
+			trace("utopia.content.respond", attributes: attributes) {super}
+		end
+	end
 end

data/lib/utopia/localization.rb

@@ -219,6 +219,8 @@ module Utopia
 				response = @app.call(localized_env)
 				
 				break unless response[0] >= 400
+
+				response[2].close if response[2].respond_to?(:close)
 			end
 			
 			return vary(env, response)

data/lib/utopia/static/mime_types.rb

@@ -52,7 +52,7 @@ module Utopia
 				["torrent", "application/x-bittorrent"]
 			],
 			:images => [
-				"png", "gif", "jpeg", "tiff", "svg"
+				"png", "gif", "jpeg", "tiff", "svg", "webp"
 			],
 			:default => [
 				:media, :text, :archive, :images, :fonts

data/lib/utopia/static.rb

@@ -26,6 +26,8 @@ require_relative 'localization'
 require_relative 'static/local_file'
 require_relative 'static/mime_types'
 
+require 'traces/provider'
+
 module Utopia
 	# A middleware which serves static files from the specified root directory.
 	class Static
@@ -72,36 +74,52 @@ module Utopia
 		ETAG = 'ETag'.freeze
 		ACCEPT_RANGES = 'Accept-Ranges'.freeze
 		
+		def respond(env, path_info, extension)
+			path = Path[path_info].simplify
+			
+			if locale = env[Localization::CURRENT_LOCALE_KEY]
+				path.last.insert(path.last.rindex('.') || -1, ".#{locale}")
+			end
+			
+			if file = fetch_file(path)
+				response_headers = {
+					LAST_MODIFIED => file.mtime_date,
+					CONTENT_TYPE => @extensions[extension],
+					CACHE_CONTROL => @cache_control,
+					ETAG => file.etag,
+					ACCEPT_RANGES => "bytes"
+				}
+				
+				if file.modified?(env)
+					return file.serve(env, response_headers)
+				else
+					return [304, response_headers, []]
+				end
+			end
+		end
+		
 		def call(env)
 			path_info = env[Rack::PATH_INFO]
 			extension = File.extname(path_info)
-
-			if @extensions.key? extension.downcase
-				path = Path[path_info].simplify
-				
-				if locale = env[Localization::CURRENT_LOCALE_KEY]
-					path.last.insert(path.last.rindex('.') || -1, ".#{locale}")
-				end
-				
-				if file = fetch_file(path)
-					response_headers = {
-						LAST_MODIFIED => file.mtime_date,
-						CONTENT_TYPE => @extensions[extension],
-						CACHE_CONTROL => @cache_control,
-						ETAG => file.etag,
-						ACCEPT_RANGES => "bytes"
-					}
-
-					if file.modified?(env)
-						return file.serve(env, response_headers)
-					else
-						return [304, response_headers, []]
-					end
+			
+			if @extensions.key?(extension.downcase)
+				if response = self.respond(env, path_info, extension)
+					return response
 				end
 			end
-
+			
 			# else if no file was found:
 			return @app.call(env)
 		end
 	end
+	
+	Traces::Provider(Static) do
+		def respond(env, path_info, extension)
+			attributes = {
+				path_info: path_info,
+			}
+			
+			trace("utopia.static.respond", attributes: attributes) {super}
+		end
+	end
 end

data/lib/utopia/version.rb

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

data/setup/site/spec/website_spec.rb

@@ -2,7 +2,6 @@
 
 require_relative 'website_context'
 
-# Learn about best practice specs from http://betterspecs.org
 RSpec.describe "website", timeout: 120 do
 	include_context "server"
 	
@@ -13,7 +12,7 @@ RSpec.describe "website", timeout: 120 do
 		Async::HTTP::Client.open(endpoint, connection_limit: 8) do |client|
 			spider.fetch(statistics, client, endpoint.url) do |method, uri, response|
 				if response.failure?
-					Async.logger.error{"#{method} #{uri} -> #{response.status}"}
+					Console.logger.error(endpoint) {"#{method} #{uri} -> #{response.status}"}
 				end
 			end.wait
 		end

data/setup/site/tmp/Gemfile

@@ -0,0 +1,20 @@
+
+source "https://rubygems.org"
+
+gem "utopia", "~> 1.8.0"
+# gem "utopia-tags-gallery"
+# gem "utopia-tags-google-analytics"
+
+gem "rake"
+gem "bundler"
+
+gem "kramdown"
+
+group :development do
+	# For `rake server`:
+	gem "puma"
+	
+	# For `rake console`:
+	gem "pry"
+	gem "rack-test"
+end

data.tar.gz.sig

@@ -0,0 +1,3 @@
+d���sT͡Jĭ�z:�ѡ�Eؗ�u�A\��+U<t�<$\&�ݗ��*�m�h�h)�������}��j?���&�v�Τ�X�|4�
+�#V�����	j�6��H�h?�֘l}L����Uo�N98O'7��Cz�����+��R��];ɩ�lcLW�U��sP�J�!DJ
+�b�y��敗��C�	�/�?[�	DuYLJJ�kn�•��6���U�S�8�5T
�Z�f�Z�Pi��T=7q�߈f�f

metadata

@@ -1,14 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Samuel Williams
+- Huba Nagy
+- Michael Adams
+- Olle Jonsson
+- System Administrator
+- k1tsu
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-12-25 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -136,6 +169,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: traces
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trenni
   requirement: !ruby/object:Gem::Requirement
@@ -275,12 +322,15 @@ 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
@@ -291,6 +341,7 @@ files:
 - lib/utopia/content/tags.rb
 - lib/utopia/content_length.rb
 - lib/utopia/controller.rb
+- lib/utopia/controller/.DS_Store
 - lib/utopia/controller/actions.md
 - lib/utopia/controller/actions.rb
 - lib/utopia/controller/base.rb
@@ -321,7 +372,10 @@ 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/Guardfile
@@ -333,12 +387,14 @@ files:
 - setup/site/falcon.rb
 - setup/site/gems.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.svg
 - setup/site/public/_static/site.css
 - setup/site/public/_static/utopia-background.svg
@@ -347,6 +403,7 @@ 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
@@ -367,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.

metadata.gz.sig

@@ -0,0 +1,3 @@
+h�+��5�0��#�1EG�4�ۛĉ�k��d�XHx�ĉ��n��"S�n�&Q������^_�&�K�iq�j�1v�
+)U_�煉$!T80�<��BoZK�%=�\�35�!��I�P]�`�Ri�
+���2l�݄n��