utopia 1.6.5 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 568d13725a84d36df5372dbeddaee9d7dac100fc
-  data.tar.gz: 166571e522f619f11c8867357e64fb1ebb4612c4
+  metadata.gz: 07173b2b6b89dcffb447ca36221fe509007c358a
+  data.tar.gz: a0a4ad7937dd644d29b2ccee57cae6e3bbba021f
 SHA512:
-  metadata.gz: 1a9627b9c483e035dbe30ed562dc9cf2546b4b6953bd258865271138d487d14c2c9e0938a032cab800cb401c0362c844fa6486fd4685dcad86098517ba44fef7
-  data.tar.gz: ee75d2d7079db75d76d652b06c20942b7f1f5ef05c4cf30315c699969b93ca4c50e18dc21bd19eaa4b3bf6b9a7c68bbed0105211ed902b448773f97dc2330696
+  metadata.gz: f720ad9e13832f308b4a3185245fbba666301054aa62a82963d9307c4b7289a151e6d996046f19cfb0be2ebb07f5ecb22ed977873adaeb1a65cb241d35b4937e
+  data.tar.gz: d62721a3a5f24ca6476230919cbe797bea4f6ebe099171639ae5c297d3338f9c63f9f6196d7dca94993fa331beac8fabb88d6fadfbe1ab6ad01374b2cc446a2e

data/README.md

@@ -74,6 +74,13 @@ Then, Nginx is configured like so:
 		rewrite ^ http://www.example.com$uri permanent;
 	}
 
+### Arch Linux
+
+Packages for deploying Passenger+Nginx on Arch are available in the AUR. There are issues with the official packages so please avoid them.
+
+- [nginx-mainline-passenger](https://aur.archlinux.org/packages/nginx-mainline-passenger/)
+- [passenger-nginx-module](https://aur.archlinux.org/packages/passenger-nginx-module/)
+
 #### Compression
 
 We suggest [enabling gzip compression](https://zoompf.com/blog/2012/02/lose-the-wait-http-compression):

data/lib/utopia/command.rb

@@ -32,13 +32,13 @@ module Utopia
 			BASE = File.expand_path("../../setup", __dir__)
 			
 			module Site
-				CONFIGURATION_FILES = ['config.ru', 'Gemfile', 'Rakefile']
+				CONFIGURATION_FILES = ['config.ru', 'config/environment.rb', 'Gemfile', 'Rakefile', 'tasks/utopia.rake']
 				
-				DIRECTORIES = ["cache", "cache/meta", "cache/body", "lib", "pages", "public", "tmp"]
+				DIRECTORIES = ["config", "lib", "pages", "public", "tasks", "tmp"]
 				SYMLINKS = {"public/_static" => "../pages/_static"}
 				
 				# Removed during upgrade process
-				OLD_DIRECTORIES = ["access_log"]
+				OLD_DIRECTORIES = ["access_log", "cache"]
 				
 				ROOT = File.join(BASE, 'site')
 			end
@@ -127,7 +127,7 @@ module Utopia
 						
 						if `which bundle`.strip != ''
 							puts "Generating initial package list with bundle..."
-							system("bundle", "install")
+							system("bundle", "install", "--binstubs")
 						end
 						
 						if `which git`.strip == ""

data/lib/utopia/version.rb

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

data/setup/site/Rakefile

@@ -1,32 +1,5 @@
 
-desc 'Run by git post-update hook when deployed to a web server'
-task :deploy do
-	# This task is typiclly run after the site is updated but before the server is restarted.
-end
-
-desc 'Set up the environment for running your web application'
-task :environment do
-	RACK_ENV = (ENV['RACK_ENV'] ||= 'development').to_sym
-end
-
-desc 'Run a server for testing your web application'
-task :server => :environment do
-	port = ENV.fetch('SERVER_PORT', 9292).to_s
-	exec('puma', '-v', '-p', port)
-end
-
-desc 'Start an interactive console for your web application'
-task :console => :environment do
-	require 'pry'
-	require 'rack/test'
-	
-	include Rack::Test::Methods
-	
-	def app
-		@app ||= Rack::Builder.parse_file(File.expand_path("config.ru", __dir__)).first
-	end
-	
-	Pry.start
-end
+# Load all rake tasks:
+import(*Dir.glob('tasks/*.rake'))
 
 task :default => :server

data/setup/site/config/README.md

@@ -0,0 +1,7 @@
+# Utopia Config
+
+This directory contains `environment.rb` which is used to initialize the running environment for tasks and servers.
+
+## Setting Environment Variables
+
+If you wish to set environment variables on a per-deployment basis, you can do so by creating an `config/environment.yaml` and populating it with key-value pairs.

data/setup/site/config/environment.rb

@@ -0,0 +1,20 @@
+
+# Setup default encoding:
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
+# Load environment variables:
+environment_path = File.expand_path('environment.yaml', __dir__)
+if File.exist? environment_path
+	require 'yaml'
+	ENV.update(YAML.load_file(environment_path))
+end
+
+# Setup the server environment:
+RACK_ENV = ENV.fetch('RACK_ENV', :development).to_sym unless defined?(RACK_ENV)
+
+# Allow loading library code from lib directory:
+$LOAD_PATH << File.expand_path('../lib', __dir__)
+
+# Load utopia framework:
+require 'utopia'

data/setup/site/config.ru

@@ -1,17 +1,6 @@
 #!/usr/bin/env rackup
 
-# Setup default encoding:
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
-# Setup the server environment:
-RACK_ENV = ENV.fetch('RACK_ENV', :development).to_sym unless defined?(RACK_ENV)
-
-# Allow loading library code from lib directory:
-$LOAD_PATH << File.expand_path("lib", __dir__)
-
-require 'utopia'
-require 'rack/cache'
+require_relative 'config/environment'
 
 if RACK_ENV == :production
 	# Handle exceptions in production with a error page and send an email notification:
@@ -27,14 +16,6 @@ end
 
 use Rack::Sendfile
 
-if RACK_ENV == :production
-	# Cache dynamically generated content where possible:
-	use Rack::Cache,
-		metastore: "file:#{Utopia::default_root("cache/meta")}",
-		entitystore: "file:#{Utopia::default_root("cache/body")}",
-		verbose: RACK_ENV == :development
-end
-
 use Utopia::ContentLength
 
 use Utopia::Redirection::Rewrite,

data/setup/site/tasks/utopia.rake

@@ -0,0 +1,30 @@
+
+desc 'Run by git post-update hook when deployed to a web server'
+task :deploy do
+	# This task is typiclly run after the site is updated but before the server is restarted.
+end
+
+desc 'Set up the environment for running your web application'
+task :environment do
+	require_relative '../config/environment'
+end
+
+desc 'Run a server for testing your web application'
+task :server => :environment do
+	port = ENV.fetch('SERVER_PORT', 9292).to_s
+	exec('puma', '-v', '-p', port)
+end
+
+desc 'Start an interactive console for your web application'
+task :console => :environment do
+	require 'pry'
+	require 'rack/test'
+	
+	include Rack::Test::Methods
+	
+	def app
+		@app ||= Rack::Builder.parse_file(File.expand_path("config.ru", __dir__)).first
+	end
+	
+	Pry.start
+end

data/spec/utopia/setup_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe "utopia executable" do
 			result = sh(utopia, "--in", dir, "site", "create")
 			expect(result).to be == 0
 			
-			expect(Dir.entries(dir)).to include(".bowerrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "cache", "config.ru", "lib", "pages", "public", "tmp")
+			expect(Dir.entries(dir)).to include(".bowerrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "config.ru", "lib", "pages", "public", "tmp")
 		end
 	end
 	
@@ -90,7 +90,7 @@ RSpec.describe "utopia executable" do
 				expect(result).to be == 0
 			end
 			
-			expect(Dir.entries(server_path)).to include(".bowerrc", ".git", "Gemfile", "README.md", "Rakefile", "cache", "config.ru", "lib", "pages", "public", "tmp")
+			expect(Dir.entries(server_path)).to include(".bowerrc", ".git", "Gemfile", "README.md", "Rakefile", "config.ru", "lib", "pages", "public", "tmp")
 		end
 	end
 end

data/utopia.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'samovar', '~> 1.1.0'
 	
 	spec.add_dependency 'rack', '~> 1.6'
-	spec.add_dependency 'rack-cache', '~> 1.2.0'
 	
 	spec.add_dependency 'http-accept', '~> 1.4.0'
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.8
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -72,20 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: http-accept
   requirement: !ruby/object:Gem::Requirement
@@ -253,9 +239,9 @@ files:
 - setup/site/Gemfile
 - setup/site/README.md
 - setup/site/Rakefile
-- setup/site/cache/head/readme.txt
-- setup/site/cache/meta/readme.txt
 - setup/site/config.ru
+- setup/site/config/README.md
+- setup/site/config/environment.rb
 - setup/site/lib/readme.txt
 - setup/site/pages/_heading.xnode
 - setup/site/pages/_page.xnode
@@ -268,6 +254,7 @@ files:
 - setup/site/public/_static/utopia-background.svg
 - setup/site/public/_static/utopia.svg
 - setup/site/public/readme.txt
+- setup/site/tasks/utopia.rake
 - setup/site/tmp/readme.txt
 - spec/utopia/content/link_spec.rb
 - spec/utopia/content/links/foo/index.xnode

data/setup/site/cache/head/readme.txt

@@ -1 +0,0 @@
-This is a place-holder file so that this directory is created correctly.

data/setup/site/cache/meta/readme.txt

@@ -1 +0,0 @@
-This is a place-holder file so that this directory is created correctly.