utopia 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473bc20c3cb5a2b2b0bc08830a5b34ac5519f60fbc97453292da59671a857c6f
-  data.tar.gz: 1c78fb9a0d685502b675ac1351eaa465c4140317ad0aa1fbd323632822b5d84f
+  metadata.gz: 38a3620d1dd5c80d45d17ae55a53306107c006ae3a4ca1fe2a25a8140ebdd4f0
+  data.tar.gz: c9196d6b9c9914b7bed4b137a0d0a8fa9cae0a4cacb49b59d6d06002c4f75253
 SHA512:
-  metadata.gz: 2b2d06006aff49f81104a7fa0bf7b03167e1b92d3afe2412409032b22f652b3493a6fccef5b578aa7dcb9b14c10797248db6e5e5d24e088f122af7957bffe1a3
-  data.tar.gz: 001e36314faf87ab21c25b047d2ad532c7e96990d9f365fa4b407e04e2fe61cc2ffaa35c1ce883fa91501c6e192164d50223581ad52bec6b6fc58d5a6da490ce
+  metadata.gz: e9ec96e1c2634b3a68090d1e5dd0323cfb591ebf72b6a7119999948d3b6607eb3e0bed7e5935d0fd246054f306437cda0c4e5d3fa692ed30b1368d9aa84ab470
+  data.tar.gz: 755d8d885cbf838c4a90b7b416e7c4e75776ccdb1131938b4fa03504522ecc56d61bf1617c79e786cd4d6fd6257bcf7377ea131562daea9330be6a862066e51f

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 cache: bundler
 
 before_install:
-  - gem install utopia # Install all dependencies.
+  # Install all dependencies:
+  - gem install utopia
   # For testing purposes:
   - git config --global user.email "samuel@oriontransfer.net"
   - git config --global user.name "Samuel Williams"
@@ -17,6 +18,7 @@ matrix:
       env: COVERAGE=BriefSummary,Coveralls
     - rvm: 2.6
       os: osx
+    - rvm: 2.7
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: truffleruby

data/README.md

@@ -2,7 +2,7 @@
 
 Utopia is a website generation framework which provides a robust set of tools to build highly complex dynamic websites. It uses the filesystem heavily for content and provides functions for interacting with files and directories as structure representing the website.
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/utopia.svg)](http://travis-ci.org/ioquatix/utopia)
+[![Build Status](https://travis-ci.com/socketry/utopia.svg?branch=master)](http://travis-ci.com/socketry/utopia)
 [![Code Climate](https://codeclimate.com/github/ioquatix/utopia.svg)](https://codeclimate.com/github/ioquatix/utopia)
 [![Coverage Status](https://coveralls.io/repos/ioquatix/utopia/badge.svg)](https://coveralls.io/r/ioquatix/utopia)
 

data/lib/utopia/command/site.rb

@@ -31,7 +31,7 @@ module Utopia
 		# Local site setup commands.
 		class Site < Samovar::Command
 			# Configuration files which should be installed/updated:
-			CONFIGURATION_FILES = ['.yarnrc', '.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'Gemfile', 'Guardfile', 'Rakefile', 'tasks/yarn.rake', 'tasks/deploy.rake', 'tasks/development.rake', 'tasks/environment.rake', 'tasks/log.rake']
+			CONFIGURATION_FILES = ['.yarnrc', '.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'Gemfile', 'Guardfile', 'Rakefile', 'tasks/yarn.rake', 'tasks/deploy.rake', 'tasks/development.rake', 'tasks/environment.rake', 'tasks/log.rake', 'spec/spec_helper.rb', 'spec/website_context.rb', 'spec/website_spec.rb']
 			
 			# Directories that should exist:
 			DIRECTORIES = ["config", "lib", "pages", "public", "tasks"]

data/lib/utopia/content/node.rb

@@ -79,7 +79,7 @@ module Utopia
 
 			def links(path = '.', **options, &block)
 				path = uri_path.dirname + Path[path]
-				links = Links.index(@controller.root, path, options)
+				links = Links.index(@controller.root, path, **options)
 				
 				if block_given?
 					links.each(&block)
@@ -103,7 +103,7 @@ module Utopia
 			end
 
 			def sibling_links(**options)
-				return Links.index(@controller.root, siblings_path, options)
+				return Links.index(@controller.root, siblings_path, **options)
 			end
 			
 			# Lookup the given tag which is being rendered within the given node. Invoked by {Document}.
@@ -181,8 +181,8 @@ module Utopia
 					document.first
 				end
 				
-				def links(*arguments, &block)
-					state.node.links(*arguments, &block)
+				def links(*arguments, **options, &block)
+					state.node.links(*arguments, **options, &block)
 				end
 			end
 		end

data/lib/utopia/controller/actions.rb

@@ -139,7 +139,7 @@ module Utopia
 						first = ['**', first.to_s]
 					end
 					
-					actions.define(Path.split(first) + path, options, &block)
+					actions.define(Path.split(first) + path, **options, &block)
 				end
 				
 				def otherwise(&block)

data/lib/utopia/version.rb

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

data/setup/site/.gitignore

@@ -7,3 +7,6 @@ tmp/
 
 # This file should only ever exist on production, and may contain sensitive information:
 config/environment.yaml
+
+# Ignore resized gallery photos:
+public/_gallery/

data/setup/site/Gemfile

@@ -1,25 +1,28 @@
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "utopia", "~> $UTOPIA_VERSION"
-# gem "utopia-gallery"
-# gem "utopia-analytics"
+gem 'utopia', '~> $UTOPIA_VERSION'
+# gem 'utopia-gallery'
+# gem 'utopia-analytics'
 
-gem "rake"
-gem "bundler"
+gem 'rake'
+gem 'bundler'
 
-gem "rack-freeze", "~> 1.2"
+gem 'rack-freeze', '~> 1.2'
 
 group :development do
 	# For `rake server`:
-	gem "guard-falcon", require: false
+	gem 'guard-falcon', require: false
 	gem 'guard-rspec', require: false
 	
 	# For `rake console`:
-	gem "pry"
-	gem "rack-test"
+	gem 'pry'
+	gem 'rack-test'
 	
 	# For `rspec` testing:
-	gem "rspec"
-	gem "covered"
+	gem 'rspec'
+	gem 'covered'
+	
+	gem 'async-rspec'
+	gem 'benchmark-http'
 end

data/setup/site/spec/website_context.rb

@@ -1,5 +1,6 @@
 
 require 'rack/test'
+require 'async/rspec/reactor'
 
 RSpec.shared_context "website" do
 	include Rack::Test::Methods
@@ -9,3 +10,42 @@ RSpec.shared_context "website" do
 	
 	let(:app) {Rack::Builder.parse_file(rackup_path).first}
 end
+
+RSpec.shared_examples_for "valid page" do |path|
+	it "can access #{path}" do
+		get path
+		
+		while last_response.redirect?
+			follow_redirect!
+		end
+		
+		expect(last_response.status).to be == 200
+	end
+end
+
+RSpec.shared_context "server" do
+	include_context "website"
+	include_context Async::RSpec::Reactor
+	
+	before(:all) do
+		require 'falcon/server'
+		require 'async/io/unix_endpoint'
+		require 'benchmark/http/spider'
+	end
+	
+	let(:endpoint) {Async::HTTP::Endpoint.parse("http://localhost", Async::IO::Endpoint.unix("server.ipc"))}
+	
+	let!(:server_task) do
+		reactor.async do
+			middleware = Falcon::Server.middleware(app)
+			
+			server = Falcon::Server.new(middleware, endpoint)
+			
+			server.run
+		end
+	end
+	
+	after do
+		server_task.stop
+	end
+end

data/setup/site/spec/website_spec.rb

@@ -2,14 +2,24 @@
 require_relative 'website_context'
 
 # Learn about best practice specs from http://betterspecs.org
-RSpec.describe "my website" do
-	include_context "website"
+RSpec.describe "website", timeout: 120 do
+	include_context "server"
 	
-	it "should have an accessible front page" do
-		get "/"
+	let(:spider) {Benchmark::HTTP::Spider.new(depth: 128)}
+	let(:statistics) {Benchmark::HTTP::Statistics.new}
+	
+	it "should be responsive" 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}"}
+				#end
+			end.wait
+		end
 		
-		follow_redirect!
+		statistics.print
 		
-		expect(last_response.status).to be == 200
+		expect(statistics.samples).to be_any
+		expect(statistics.failed).to be_zero
 	end
 end

data/spec/utopia/command_spec.rb

@@ -23,6 +23,7 @@ require 'tmpdir'
 require 'yaml'
 
 require 'open3'
+require 'bundler'
 
 RSpec.describe "utopia command" do
 	let(:utopia) {File.expand_path("../../bin/utopia", __dir__)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-01-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.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.