utopia 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f4fb0f0dd6620a3397cc71850c5042353de35d
-  data.tar.gz: ba6be29fd0f357af7c92478009134a3b55209026
+  metadata.gz: ea079ab122d29c56750a675d963b90ef916f5eac
+  data.tar.gz: c9b2cc7c6224f2d298c519af4a07d5f78fee8633
 SHA512:
-  metadata.gz: 5cc836f964b89833ebb853f727417db22362b0e7e6be3129529669a25e69a00872e90f8b2ba0a26a9e4ae041c7ec2c13b0e1162c84b255098be6c2bf84717431
-  data.tar.gz: 80ac68148e79498b3f971c6596ea06ba389870a416a35fe4aa722aadb26fb50907a3563c8e12412da75b053ab5451508b7af1b8eb6490a30421c88e650f315a8
+  metadata.gz: fb8391a52441f77e987fae432167b8b4c826e9c2856ac0e3facc96cc9e4b18ceae665df604fbeafe079542da2cffa6242125f3c6f6035b46bdceb4842d3e9598
+  data.tar.gz: 12752a420f331461d35b47292a88f58f0134a5664ebfa76dea992e47f4e4824557074e417f07c030cc2fe1c3c2502b3bdbd63c39db36042dde9b49942a2780f1

data/Gemfile

@@ -2,12 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in utopia.gemspec
 gemspec
-
-group :test do
-	gem "rake"
-	gem "minitest"
-end
-
-group :development do
-	gem "thin"
-end

data/Rakefile

@@ -1,9 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-	t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

data/lib/utopia/middleware/controller.rb

@@ -35,14 +35,6 @@ end
 module Utopia
 	module Middleware
 		class Controller
-			module Direct
-				def process!(path, request)
-					return nil unless path.dirname == self.class.uri_path
-
-					passthrough(path, request)
-				end
-			end
-			
 			CONTROLLER_RB = "controller.rb"
 
 			class Variables
@@ -224,8 +216,14 @@ module Utopia
 					# Utopia::LOG.debug([status, headers, body].inspect)
 					return [status, headers, body]
 				end
-
+				
+				def direct?(path)
+					path.dirname == self.class.uri_path
+				end
+				
 				def process!(path, request)
+					return nil unless direct?(path)
+					
 					passthrough(path, request)
 				end
 				
@@ -321,6 +319,5 @@ module Utopia
 				return @app.call(env)
 			end
 		end
-
 	end
 end

data/lib/utopia/version.rb

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

data/spec/utopia/middleware/content_spec.rb

@@ -0,0 +1,88 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'rack/mock'
+require 'utopia/middleware/content'
+
+module Utopia::Middleware::ContentSpec
+	APP = lambda {|env| [404, [], []]}
+	
+	class TestDelegate
+		def initialize
+			@events = []
+		end
+		
+		attr :events
+		
+		def method_missing(*args)
+			@events << args
+		end
+	end
+	
+	describe Utopia::Middleware::Content::Processor do
+		it "should parse single tag" do
+			delegate = TestDelegate.new
+			processor = Utopia::Middleware::Content::Processor.new(delegate)
+			
+			processor.parse %Q{<foo></foo>}
+			
+			foo_tag = Utopia::Tag.new("foo")
+			expected_events = [
+				[:tag_begin, foo_tag],
+				[:tag_end, foo_tag],
+			]
+			
+			expect(delegate.events).to be == expected_events
+		end
+		
+		it "should parse and escape text" do
+			delegate = TestDelegate.new
+			processor = Utopia::Middleware::Content::Processor.new(delegate)
+			
+			processor.parse %Q{<foo>Bob &amp; Barley<!-- Comment --><![CDATA[Hello & World]]></foo>}
+			
+			foo_tag = Utopia::Tag.new("foo")
+			expected_events = [
+				[:tag_begin, foo_tag],
+				[:cdata, "Bob &amp; Barley"],
+				[:cdata, "<!-- Comment -->"],
+				[:cdata, "Hello &amp; World"],
+				[:tag_end, foo_tag],
+			]
+			
+			expect(delegate.events).to be == expected_events
+		end
+	end
+	
+	describe Utopia::Middleware::Content do
+		it "Should parse file and expand variables" do
+			root = File.expand_path("../content_root", __FILE__)
+			content = Utopia::Middleware::Content.new(APP, :root => root)
+		
+			path = Utopia::Path.create('/index')
+			node = content.lookup_node(path)
+			expect(node).to be_kind_of Utopia::Middleware::Content::Node
+		
+			output = StringIO.new
+			node.process!({}, output, {})
+			expect(output.string).to be == %Q{<h1>Hello World</h1>}
+		end
+	end
+end

data/{test/test_controller_middleware.rb → spec/utopia/middleware/controller_spec.rb}

@@ -18,15 +18,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'minitest/autorun'
-
 require 'rack/mock'
 require 'utopia/middleware/controller'
 
-class TestControllerMiddleware < MiniTest::Test
+module Utopia::Middleware::ControllerSpec
 	APP = lambda {|env| [404, [], []]}
 	
 	class TestController < Utopia::Middleware::Controller::Base
+		def direct?(path)
+			true
+		end
+		
 		def on_success(path, request)
 			success!
 		end
@@ -48,20 +50,21 @@ class TestControllerMiddleware < MiniTest::Test
 		end
 	end
 	
-	def test_controller_response
-		variables = Utopia::Middleware::Controller::Variables.new
-		request = Rack::Request.new("utopia.controller" => variables)
-		middleware = MockControllerMiddleware.new
-		controller = TestController.new(middleware)
+	describe Utopia::Middleware::Controller do
+		it "should call controller methods" do
+			variables = Utopia::Middleware::Controller::Variables.new
+			request = Rack::Request.new("utopia.controller" => variables)
+			middleware = MockControllerMiddleware.new
+			controller = TestController.new(middleware)
 		
-		result = controller.process!(Utopia::Path["/success"], request)
-		assert_equal [200, {}, []], result
+			result = controller.process!(Utopia::Path["/success"], request)
+			expect(result).to be == [200, {}, []]
 		
-		result = controller.process!(Utopia::Path["/failure"], request)
-		assert_equal [400, {}, ["Bad Request"]], result
+			result = controller.process!(Utopia::Path["/failure"], request)
+			expect(result).to be == [400, {}, ["Bad Request"]]
 		
-		result = controller.process!(Utopia::Path["/variable"], request)
-		assert_equal({"variable"=>:value}, variables.to_hash)
+			result = controller.process!(Utopia::Path["/variable"], request)
+			expect(variables.to_hash).to be == {"variable"=>:value}
+		end
 	end
 end
-

data/{test/test_path.rb → spec/utopia/path_spec.rb}

@@ -18,14 +18,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'minitest/autorun'
 require 'utopia/path'
 
-class TestPath < MiniTest::Test
-	def test_absolute_path_concatenation
-		root = Utopia::Path["/"]
-		
-		assert root.absolute?
-		assert_equal Utopia::Path["/foo/bar"], (root + Utopia::Path["foo/bar"])
+module Utopia::PathSpec
+	describe Utopia::Path do
+		it "should concatenate absolute paths" do
+			root = Utopia::Path["/"]
+			
+			expect(root).to be_absolute
+			expect(root + Utopia::Path["foo/bar"]).to be == Utopia::Path["/foo/bar"]
+		end
 	end
 end

data/utopia.gemspec

@@ -23,10 +23,15 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency "trenni", "~> 1.3.0"
-	spec.add_dependency "mime-types", "~> 1.16"
+	spec.add_dependency "mime-types", "~> 2.0"
 	
 	spec.add_dependency "rack", "~> 1.5"
 	spec.add_dependency "rack-cache", "~> 1.2.0"
 	
-	spec.add_dependency "mail", "~> 2.5.4"
+	spec.add_dependency "mail", "~> 2.6.1"
+	
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "rspec", "~> 3.0.0"
+	spec.add_development_dependency "thin"
+	spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "\t\tUtopia is a website generation framework which provides a robust
   set of tools\n\t\tto build highly complex dynamic websites. It uses the filesystem
   heavily for\n\t\tcontent and provides frameworks for interacting with files and
@@ -149,11 +205,11 @@ files:
 - lib/utopia/tags/override.rb
 - lib/utopia/time_store.rb
 - lib/utopia/version.rb
-- test/content_root/_heading.xnode
-- test/content_root/index.xnode
-- test/test_content_middleware.rb
-- test/test_controller_middleware.rb
-- test/test_path.rb
+- spec/utopia/middleware/content_root/_heading.xnode
+- spec/utopia/middleware/content_root/index.xnode
+- spec/utopia/middleware/content_spec.rb
+- spec/utopia/middleware/controller_spec.rb
+- spec/utopia/path_spec.rb
 - utopia.gemspec
 homepage: https://github.com/ioquatix/utopia
 licenses: []
@@ -179,8 +235,8 @@ signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files:
-- test/content_root/_heading.xnode
-- test/content_root/index.xnode
-- test/test_content_middleware.rb
-- test/test_controller_middleware.rb
-- test/test_path.rb
+- spec/utopia/middleware/content_root/_heading.xnode
+- spec/utopia/middleware/content_root/index.xnode
+- spec/utopia/middleware/content_spec.rb
+- spec/utopia/middleware/controller_spec.rb
+- spec/utopia/path_spec.rb

data/test/test_content_middleware.rb

@@ -1,87 +0,0 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'minitest/autorun'
-
-require 'rack/mock'
-require 'utopia/middleware/content'
-
-class TestContentMiddleware < MiniTest::Test
-	APP = lambda {|env| [404, [], []]}
-	
-	class TestDelegate
-		def initialize
-			@events = []
-		end
-		
-		attr :events
-		
-		def method_missing(*args)
-			@events << args
-		end
-	end
-	
-	def test_processor_events_single_tag
-		delegate = TestDelegate.new
-		processor = Utopia::Middleware::Content::Processor.new(delegate)
-		
-		processor.parse %Q{<foo></foo>}
-		
-		foo_tag = Utopia::Tag.new("foo")
-		expected_events = [
-			[:tag_begin, foo_tag],
-			[:tag_end, foo_tag],
-		]
-		
-		assert_equal expected_events, delegate.events
-	end
-	
-	def test_processor_events_text
-		delegate = TestDelegate.new
-		processor = Utopia::Middleware::Content::Processor.new(delegate)
-		
-		processor.parse %Q{<foo>Bob &amp; Barley<!-- Comment --><![CDATA[Hello & World]]></foo>}
-		
-		foo_tag = Utopia::Tag.new("foo")
-		expected_events = [
-			[:tag_begin, foo_tag],
-			[:cdata, "Bob &amp; Barley"],
-			[:cdata, "<!-- Comment -->"],
-			[:cdata, "Hello &amp; World"],
-			[:tag_end, foo_tag],
-		]
-		
-		assert_equal expected_events, delegate.events
-	end
-	
-	def test_content_xnode
-		root = File.expand_path("../content_root", __FILE__)
-		content = Utopia::Middleware::Content.new(APP, :root => root)
-		
-		path = Utopia::Path.create('/index')
-		node = content.lookup_node(path)
-		assert_equal Utopia::Middleware::Content::Node, node.class
-		
-		output = StringIO.new
-		node.process!({}, output, {})
-		assert_equal %Q{<h1>Hello World</h1>}, output.string
-	end
-end
-