utopia 1.9.11 → 2.0.0

data/spec/utopia/performance_spec/pages/_heading.xnode

@@ -1,2 +1,2 @@
-<?r transaction.attributes[:title] ||= content ?>
-<h1><content/></h1>
+<?r document.attributes[:title] ||= content ?>
+<h1><utopia:content/></h1>

data/spec/utopia/performance_spec/pages/_page.xnode

@@ -20,7 +20,7 @@
 		</div>
 
 		<div id="page">
-			<content />
+			<utopia:content/>
 		</div>
 	</body>
 </html>

data/spec/utopia/performance_spec/pages/errors/exception.xnode

@@ -1,5 +1,5 @@
-<page>
-	<heading>Exception</heading>
+<content:page>
+	<content:heading>Exception</content:heading>
 	
 	<p>It seems like something didn't quite work out as expected!</p>
-</page>
+</content:page>

data/spec/utopia/performance_spec/pages/errors/file-not-found.xnode

@@ -1,5 +1,5 @@
-<page>
-	<heading>File Not Found</heading>
+<content:page>
+	<content:heading>File Not Found</content:heading>
 	
 	<p>The file you requested is unfortunately not available at this time!</p>
-</page>
+</content:page>

data/spec/utopia/performance_spec/pages/welcome/index.xnode

@@ -1,5 +1,5 @@
-<page class="front">
-	<heading>Welcome to Utopia</heading>
+<content:page class="front">
+	<content:heading>Welcome to Utopia</content:heading>
 	
 	<p><strong>Utopia is designed to simplify web development.</strong> Utopia is a fully featured stack for both content-heavy sites and dynamic web applications.</p>
 	
@@ -14,4 +14,4 @@
 	<h2>Standards Based Localization</h2>
 	
 	<p>Automatically sniff the user's desired language and provide content in the correct language.</p>
-</page>
+</content:page>

data/spec/utopia/setup_spec.rb

@@ -19,6 +19,8 @@
 # THE SOFTWARE.
 
 require 'fileutils'
+require 'tmpdir'
+require 'yaml'
 
 RSpec.describe "utopia executable" do
 	let(:utopia) {File.expand_path("../../bin/utopia", __dir__)}
@@ -29,20 +31,44 @@ RSpec.describe "utopia executable" do
 		# We need to build a package to test deployment:
 		system("rake", "build") or abort("Could not build package for setup spec!")
 		
-		ENV.delete 'BUNDLE_BIN_PATH'
-		ENV.delete 'BUNDLE_GEMFILE'
-		ENV.delete 'RUBYOPT'
-		
-		# This allows the utopia command to load the correct library:
-		ENV['RUBYLIB'] = File.expand_path("../../lib", __dir__)
+		ENV['DEPLOY_USER'] = 'http'
+		ENV['DEPLOY_GROUP'] = 'http'
+	end
+	
+	around(:each) do |example|
+		Bundler.with_clean_env do
+			# This allows the utopia command to load the correct library:
+			ENV['RUBYLIB'] = File.expand_path("../../lib", __dir__)
+			
+			example.run
+		end
 	end
 	
-	def sh(*args)
+	def sh_status(*args)
 		puts args.join(' ')
 		system(*args)
 		return $?
 	end
 	
+	def sh_stdout(*args)
+		puts args.join(' ')
+		output = %x[#{args.join ' '}]
+		return output
+	end
+	
+	def git_config(name, value=nil)
+		unless value.nil?
+			return sh_status('git', 'config', name, value)
+		else
+			return sh_stdout('git', 'config', name).chomp
+		end
+	end
+	
+	def group_rw(path)
+		gaccess = File.stat(path).mode.to_s(8)[-2]
+		return gaccess == '6' || gaccess == '7'
+	end
+	
 	def install_packages(dir)
 		# We do a bit of a hack here to ensure the package is available:
 		FileUtils.mkpath File.join(dir, "vendor/cache")
@@ -53,13 +79,13 @@ RSpec.describe "utopia executable" do
 		Dir.mktmpdir('test-site') do |dir|
 			install_packages(dir)
 			
-			result = sh(utopia, "--in", dir, "site", "create")
+			result = sh_status(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", "spec")
+			expect(Dir.entries(dir)).to include(".bowerrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "config.ru", "lib", "pages", "public", "spec")
 			
 			Dir.chdir(dir) do
-				result = sh("rake", "test")
+				result = sh_status("rake", "test")
 				expect(result).to be == 0
 			end
 		end
@@ -69,16 +95,48 @@ RSpec.describe "utopia executable" do
 		Dir.mktmpdir('test-server') do |dir|
 			install_packages(dir)
 			
-			result = sh(utopia, "--in", dir, "server", "create")
+			result = sh_status(utopia, "--in", dir, "server", "create")
 			expect(result).to be == 0
 			
 			expect(Dir.entries(dir)).to include(".git")
 			
+			# make sure git is set up properly
+			Dir.chdir(dir) do
+				expect(git_config 'core.sharedRepository').to be == '1'
+				expect(git_config 'receive.denyCurrentBranch').to be == 'ignore'
+				expect(git_config 'core.worktree').to be == dir
+			end
+			
 			environment = YAML.load_file(File.join(dir, 'config/environment.yaml'))
 			expect(environment).to include('RACK_ENV', 'UTOPIA_SESSION_SECRET')
 		end
 	end
 	
+	it "should not trash the sample server during update" do
+		Dir.mktmpdir('test-server') do |dir|
+			install_packages(dir)
+			
+			result = sh_status(utopia, "--in", dir, "server", "create")
+			expect(result).to be == 0
+			
+			Dir.chdir(dir) do
+				# make the repository look a bit like like it's an old one
+				git_config 'core.sharedRepository', 'false'
+				sh_status 'chmod', '-Rf', 'g-x', '.git'
+				sh_status 'rm', '-f', '.git/hooks/post-receive'
+			end
+			
+			result = sh_status(utopia, "--in", dir, "server", "update")
+			expect(result).to be == 0
+			
+			# check a couple of files to make sure they have group read and write access
+			# after the update
+			Dir.glob(File.join(dir, '.git/**/*')).each do |path|
+				expect(group_rw path).to be == true
+			end
+		end
+	end
+	
 	it "can generate sample site, server and push to the server" do
 		Dir.mktmpdir('test') do |dir|
 			site_path = File.join(dir, 'site')
@@ -87,18 +145,24 @@ RSpec.describe "utopia executable" do
 			
 			server_path = File.join(dir, 'server')
 			
-			result = sh(utopia, "--in", site_path, "site", "create")
+			result = sh_status(utopia, "--in", site_path, "site", "create")
 			expect(result).to be == 0
 			
-			result = sh(utopia, "--in", server_path, "server", "create")
+			result = sh_status(utopia, "--in", server_path, "server", "create")
 			expect(result).to be == 0
 			
 			Dir.chdir(site_path) do
-				result = sh("git", "push", "--set-upstream", server_path, "master")
+				result = sh_status("git", "push", "--set-upstream", server_path, "master")
 				expect(result).to be == 0
 			end
 			
-			expect(Dir.entries(server_path)).to include(".bowerrc", ".git", "Gemfile", "README.md", "Rakefile", "config.ru", "lib", "pages", "public", "tmp")
+			files = %W[.bowerrc .git Gemfile Gemfile.lock README.md Rakefile config.ru lib pages public]
+			
+			expect(Dir.entries(server_path)).to include(*files)
+			
+			expect(File.executable? File.join(server_path, 'config.ru')).to be == true
+			
+			puts File.stat(File.join(dir, 'server', '.git')).mode
 		end
 	end
 end

data/utopia.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
 	EOF
 	spec.summary       = %q{Utopia is a framework for building dynamic content-driven websites.}
 	spec.homepage      = 'https://github.com/ioquatix/utopia'
-
+	
 	spec.files         = `git ls-files`.split($/)
 	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = '~> 2.2'
 	
-	spec.add_dependency 'trenni', '~> 2.0'
+	spec.add_dependency 'trenni', '~> 3.0'
 	spec.add_dependency 'mime-types', '~> 3.0'
 	
 	spec.add_dependency 'samovar', '~> 1.2'
-	spec.add_dependency 'rainbow', '~> 2.0'
+	spec.add_dependency 'rainbow', '~> 2.1'
 	
 	spec.add_dependency 'rack', '~> 2.0'
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -192,11 +192,13 @@ files:
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
 - ".travis.yml"
+- ".yardopts"
 - Gemfile
 - README.md
 - Rakefile
+- benchmarks/call_vs_check.rb
+- benchmarks/const_vs_hash.rb
 - benchmarks/hash_vs_openstruct.rb
 - benchmarks/string_vs_symbol.rb
 - benchmarks/struct_vs_class.rb
@@ -204,30 +206,32 @@ files:
 - documentation/.bowerrc
 - documentation/.rspec
 - documentation/Gemfile
+- documentation/Guardfile
 - documentation/Rakefile
 - documentation/config.ru
 - documentation/config/README.md
 - documentation/config/environment.rb
+- documentation/config/puma.rb
 - documentation/lib/readme.txt
+- documentation/pages/_editor.xnode
 - documentation/pages/_heading.xnode
 - documentation/pages/_page.xnode
 - documentation/pages/errors/exception.xnode
 - documentation/pages/errors/file-not-found.xnode
 - documentation/pages/links.yaml
-- documentation/pages/welcome/index.xnode
 - documentation/pages/wiki/_listing.xnode
 - documentation/pages/wiki/_navigation.xnode
 - documentation/pages/wiki/bower-integration/content.md
 - documentation/pages/wiki/content.md
 - documentation/pages/wiki/controller.rb
-- documentation/pages/wiki/controller/actions/content.md
-- documentation/pages/wiki/controller/links.yaml
-- documentation/pages/wiki/controller/rewrite/content.md
 - documentation/pages/wiki/development-environment-setup/content.md
 - documentation/pages/wiki/edit.xnode
 - documentation/pages/wiki/links.yaml
 - documentation/pages/wiki/middleware/content/content.md
+- documentation/pages/wiki/middleware/controller/actions/content.md
 - documentation/pages/wiki/middleware/controller/content.md
+- documentation/pages/wiki/middleware/controller/links.yaml
+- documentation/pages/wiki/middleware/controller/rewrite/content.md
 - documentation/pages/wiki/middleware/localization/content.md
 - documentation/pages/wiki/middleware/redirection/content.md
 - documentation/pages/wiki/middleware/session/content.md
@@ -235,6 +239,7 @@ files:
 - documentation/pages/wiki/server-setup/content.md
 - documentation/pages/wiki/show.xnode
 - documentation/pages/wiki/testing/content.md
+- documentation/pages/wiki/updating-utopia/content.md
 - documentation/pages/wiki/your-first-page/content.md
 - documentation/public/_components/jquery-syntax/.sass-cache/040afc1428b286fb3c50151378b349a6149698d3/jquery.syntax.core.sassc
 - documentation/public/_components/jquery-syntax/.sass-cache/098642d80a1682613dca2bba6fd0a3bc9fd2bf04/jquery.syntax.layout.editor.sassc
@@ -346,19 +351,24 @@ files:
 - documentation/public/_components/jquery/jquery.slim.min.js
 - documentation/public/_components/jquery/jquery.slim.min.map
 - documentation/public/_static
+- documentation/public/materials
 - documentation/spec/website_context.rb
 - documentation/spec/website_spec.rb
 - documentation/tasks
 - lib/utopia.rb
 - lib/utopia/command.rb
+- lib/utopia/command/server.rb
+- lib/utopia/command/setup.rb
+- lib/utopia/command/site.rb
 - lib/utopia/content.rb
+- lib/utopia/content/document.rb
 - lib/utopia/content/link.rb
 - lib/utopia/content/links.rb
 - lib/utopia/content/markup.rb
+- lib/utopia/content/namespace.rb
 - lib/utopia/content/node.rb
 - lib/utopia/content/response.rb
-- lib/utopia/content/tag.rb
-- lib/utopia/content/transaction.rb
+- lib/utopia/content/tags.rb
 - lib/utopia/content_length.rb
 - lib/utopia/controller.rb
 - lib/utopia/controller/actions.rb
@@ -369,8 +379,8 @@ files:
 - lib/utopia/exceptions.rb
 - lib/utopia/exceptions/handler.rb
 - lib/utopia/exceptions/mailer.rb
-- lib/utopia/extensions/array.rb
-- lib/utopia/extensions/date.rb
+- lib/utopia/extensions/array_split.rb
+- lib/utopia/extensions/date_comparisons.rb
 - lib/utopia/http.rb
 - lib/utopia/locale.rb
 - lib/utopia/localization.rb
@@ -384,19 +394,16 @@ files:
 - lib/utopia/session/lazy_hash.rb
 - lib/utopia/setup.rb
 - lib/utopia/static.rb
-- lib/utopia/tags/deferred.rb
-- lib/utopia/tags/environment.rb
-- lib/utopia/tags/node.rb
-- lib/utopia/tags/override.rb
 - lib/utopia/version.rb
 - materials/utopia.png
 - materials/utopia.svg
 - setup/.bowerrc
 - setup/server/git/hooks/post-receive
 - setup/site/.bowerrc
+- setup/site/.gitignore
 - setup/site/.rspec
-- setup/site/.simplecov
 - setup/site/Gemfile
+- setup/site/Guardfile
 - setup/site/README.md
 - setup/site/Rakefile
 - setup/site/config.ru
@@ -414,13 +421,17 @@ files:
 - setup/site/public/_static/utopia-background.svg
 - setup/site/public/_static/utopia.svg
 - setup/site/public/readme.txt
+- setup/site/spec/spec_helper.rb
 - setup/site/spec/website_context.rb
 - setup/site/spec/website_spec.rb
 - setup/site/tasks/bower.rake
+- setup/site/tasks/deploy.rake
+- setup/site/tasks/development.rake
+- setup/site/tasks/environment.rake
 - setup/site/tasks/log.rake
-- setup/site/tasks/test.rake
-- setup/site/tasks/utopia.rake
-- setup/site/tmp/readme.txt
+- spec/mock_node.rb
+- spec/spec_helper.rb
+- spec/utopia/content/document_spec.rb
 - spec/utopia/content/link_spec.rb
 - spec/utopia/content/links/foo/index.xnode
 - spec/utopia/content/links/foo/links.yaml
@@ -439,6 +450,7 @@ files:
 - spec/utopia/content/localized/two.en.xnode
 - spec/utopia/content/localized/two.zh.xnode
 - spec/utopia/content/markup_spec.rb
+- spec/utopia/content/namespace_spec.rb
 - spec/utopia/content/node/ordered/first.xnode
 - spec/utopia/content/node/ordered/index.xnode
 - spec/utopia/content/node/ordered/links.yaml
@@ -448,7 +460,7 @@ files:
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
 - spec/utopia/content/response_spec.rb
-- spec/utopia/content/tag_spec.rb
+- spec/utopia/content/tags_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/content_spec/_heading.xnode
@@ -472,7 +484,6 @@ files:
 - spec/utopia/controller/respond_spec/api/controller.rb
 - spec/utopia/controller/respond_spec/errors/controller.rb
 - spec/utopia/controller/respond_spec/errors/file-not-found.xnode
-- spec/utopia/controller/respond_spec/rewrite/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/controller/variables_spec.rb
@@ -540,6 +551,9 @@ signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files:
+- spec/mock_node.rb
+- spec/spec_helper.rb
+- spec/utopia/content/document_spec.rb
 - spec/utopia/content/link_spec.rb
 - spec/utopia/content/links/foo/index.xnode
 - spec/utopia/content/links/foo/links.yaml
@@ -558,6 +572,7 @@ test_files:
 - spec/utopia/content/localized/two.en.xnode
 - spec/utopia/content/localized/two.zh.xnode
 - spec/utopia/content/markup_spec.rb
+- spec/utopia/content/namespace_spec.rb
 - spec/utopia/content/node/ordered/first.xnode
 - spec/utopia/content/node/ordered/index.xnode
 - spec/utopia/content/node/ordered/links.yaml
@@ -567,7 +582,7 @@ test_files:
 - spec/utopia/content/node/related/links.yaml
 - spec/utopia/content/node_spec.rb
 - spec/utopia/content/response_spec.rb
-- spec/utopia/content/tag_spec.rb
+- spec/utopia/content/tags_spec.rb
 - spec/utopia/content_spec.rb
 - spec/utopia/content_spec.ru
 - spec/utopia/content_spec/_heading.xnode
@@ -591,7 +606,6 @@ test_files:
 - spec/utopia/controller/respond_spec/api/controller.rb
 - spec/utopia/controller/respond_spec/errors/controller.rb
 - spec/utopia/controller/respond_spec/errors/file-not-found.xnode
-- spec/utopia/controller/respond_spec/rewrite/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/controller/variables_spec.rb