utopia 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca9a6f28fcec98323ae67b683f903e44fb68eea
-  data.tar.gz: 1b86bb5bb7a36448df329b2aeda819feb2c66fa2
+  metadata.gz: 5095d35222a513f2daa3c4b93e1a03490fa89654
+  data.tar.gz: 6d71788ce9d2d1cd24e65ccb1314946e3d2c692f
 SHA512:
-  metadata.gz: 7279e0472f9c4e1760368ee5c138f1338e2426dd2c194e5014a318b5faf2e0227c04bd09f556c32bc3abeca899270bbbd92208c7aaf454cac2100d4116a2b4c8
-  data.tar.gz: 5be21037ad98e014ece09d98ceef3812256aaa9239eb7ea770f68df6aa636f245fe9a5168ef545944e0206954a11ed0d7388c0083f3ff7237e35f62a4cbb80d9
+  metadata.gz: 6ba7fadd9730016d29fdefb2ff26ca2911867daa811290bd40a76f7cd640af4ea534e3ab8f040f97fc75b1f445bb81cf133295a77d9bf4a5c519014c077299a4
+  data.tar.gz: cc97dcf681d73a609e2adfd1d6422403340a2708e0763f1229ec34d4bc7ddd67e1491932da42c9df801f719ada966432068092a5437a8c0a51eca122847dcd4b

data/README.md

@@ -253,11 +253,25 @@ This template would typically be designed with supporting `_page.xnode` and `_he
 The session management uses symmetric private key encryption to store data on the client and avoid tampering.
 
 	use Utopia::Session,
-		:expire_after => 3600,
+		:expires_after => 3600,
 		:secret => '40 or more random characters for your secret key'
 
 All session data is stored on the client, but it's encrypted with a salt and the secret key. It would be hard for the client to decrypt the data without the secret.
 
+### Testing
+
+Utopia websites include a default set of tests, and associated `rake test` tasks. These specs can test against the actual running website. By default, `simplecov` is included for coverage testing.
+
+	$ rake coverage test
+
+	my website
+		should have an accessible front page
+
+	Finished in 0.44849 seconds (files took 0.15547 seconds to load)
+	1 example, 0 failures
+
+	Coverage report generated for RSpec. 5 / 5 LOC (100.0%) covered.
+
 ## Contributing
 
 1. Fork it

data/lib/utopia/setup.rb

@@ -20,8 +20,10 @@
 
 module Utopia
 	class Bootstrap
-		def initialize(config_root)
+		def initialize(config_root, external_encoding: Encoding::UTF_8)
 			@config_root = config_root
+			
+			@external_encoding = external_encoding
 		end
 		
 		def setup
@@ -38,10 +40,13 @@ module Utopia
 			File.expand_path('environment.yaml', @config_root)
 		end
 		
+		# If you don't specify these, it's possible to have issues when encodings mismatch on the server.
 		def setup_encoding
-			# If you don't specify these, it's possible to have issues when encodings mismatch on the server.
-			Encoding.default_external = Encoding::UTF_8
-			Encoding.default_internal = Encoding::UTF_8
+			# TODO: Deprecate and remove this setup - it should be the responsibility of the server to set this correctly.
+			if @external_encoding and Encoding.default_external != @external_encoding
+				warn "Updating Encoding.default_external from #{Encoding.default_external} to #{@external_encoding}"
+				Encoding.default_external = @external_encoding
+			end
 		end
 		
 		def setup_environment

data/lib/utopia/version.rb

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

data/setup/site/.rspec

@@ -0,0 +1,4 @@
+--color
+--format documentation
+--backtrace
+--warnings

data/setup/site/.simplecov

@@ -0,0 +1,9 @@
+
+SimpleCov.start do
+	add_filter "/spec/"
+end
+
+# if ENV['TRAVIS']
+# 	require 'coveralls'
+# 	Coveralls.wear!
+# end

data/setup/site/Gemfile

@@ -15,6 +15,10 @@ group :development do
 	# For `rake console`:
 	gem "pry"
 	gem "rack-test"
+	
+	# For `rspec` testing:
+	gem "rspec"
+	gem "simplecov"
 end
 
 group :production do

data/setup/site/spec/website_context.rb

@@ -0,0 +1,11 @@
+
+require 'rack/test'
+
+RSpec.shared_context "website" do
+	include Rack::Test::Methods
+	
+	let(:rackup_path) {File.expand_path('../config.ru', __dir__)}
+	let(:rackup_directory) {File.dirname(rackup_path)}
+	
+	let(:app) {Rack::Builder.parse_file(rackup_path).first}
+end

data/setup/site/spec/website_spec.rb

@@ -0,0 +1,15 @@
+
+require_relative 'website_context'
+
+# Learn about best practice specs from http://betterspecs.org
+RSpec.describe "my website" do
+	include_context "website"
+	
+	it "should have an accessible front page" do
+		get "/"
+		
+		follow_redirect!
+		
+		expect(last_response.status).to be == 200
+	end
+end

data/setup/site/tasks/test.rake

@@ -0,0 +1,10 @@
+
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:test) do |task|
+	task.rspec_opts = %w{--require simplecov} if ENV['COVERAGE']
+end
+
+task :coverage do
+	ENV['COVERAGE'] = 'y'
+end

data/spec/utopia/setup_spec.rb

@@ -56,7 +56,12 @@ 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", "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", "spec")
+			
+			Dir.chdir(dir) do
+				result = sh("rake", "test")
+				expect(result).to be == 0
+			end
 		end
 	end
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -236,6 +236,8 @@ files:
 - setup/server/config/environment.yaml
 - setup/server/git/hooks/post-receive
 - setup/site/.bowerrc
+- setup/site/.rspec
+- setup/site/.simplecov
 - setup/site/Gemfile
 - setup/site/README.md
 - setup/site/Rakefile
@@ -254,6 +256,9 @@ files:
 - setup/site/public/_static/utopia-background.svg
 - setup/site/public/_static/utopia.svg
 - setup/site/public/readme.txt
+- setup/site/spec/website_context.rb
+- setup/site/spec/website_spec.rb
+- setup/site/tasks/test.rake
 - setup/site/tasks/utopia.rake
 - setup/site/tmp/readme.txt
 - spec/utopia/content/link_spec.rb