utopia 0.12.2 → 0.12.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjM5MDIzOGE4YTMyZDkzNzYzOTQ1ZWZjOGUxYTZmMzhjMGU1ZjY2Mw==
-  data.tar.gz: !binary |-
-    ZTA1MGI2OWUwNGNjN2Y3ODBkZDkwMTA1OGI5NTc4M2Q3MjA0ODlhNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MmViNDIxNmI1MDU2YTQ5OGRkM2EwMmU4ZjhhZGMxMzVhYmE0NTFlZTEzNGYx
-    NzQzNjQ4ZjRhNDUzOGI5NzViMDU2MGUwMjMyYjZmZTZlNDRhYTUxZGZhYTEw
-    OGFiZjZkNWQzYzg2YWVmNjI1YTYyYTliNjU2M2EwNWI4ZGNjMmI=
-  data.tar.gz: !binary |-
-    YjE5YjhjMjAwNzY5YmY4YzRlNjVlZDM0NGZkNjMyMWJiZmU1Y2JkNDU1ZWRh
-    MDU0NzdhYzFlY2IxM2FiOTI1MzI0YTFiZDkzYjVlMTg3NmZiMTUxYzJjNTE1
-    MGQ1N2IwYTg2MzBkMDNhMDRiMjMxNTMzMjM1NDU4NWQzMmQ3N2I=
+SHA1:
+  metadata.gz: 271d2102878ce11155fd1c8905e9093ab8f2b541
+  data.tar.gz: 6b058e1af05e631835443ba824697f665d16db81
+SHA512:
+  metadata.gz: 140ca674a905f79bc81c5227fd1de2215818912027374343d89c73d50219335fd46e86a8d29f5fcb67daa409d8c152d80004e260d1233be68200aa4961c9ceee
+  data.tar.gz: 4bbfe5c730fa0415880285ac28d178b297ea8330fa3c0ba6837eab812ac97b0e2b71ead6753f941275e7d646adb7b77db5d2b19c63fb174e1ffef6147f5bedf9

data/.travis.yml

@@ -1,9 +1,5 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.3"
   - "2.0"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - "2.1"

data/Gemfile

@@ -5,4 +5,9 @@ gemspec
 
 group :test do
 	gem "rake"
+	gem "minitest"
+end
+
+group :development do
+	gem "thin"
 end

data/lib/utopia/middleware/content.rb

@@ -29,7 +29,7 @@ require 'trenni/template'
 
 module Utopia
 	module Middleware
-	
+
 		class Content
 			def initialize(app, options = {})
 				@app = app
@@ -144,6 +144,7 @@ module Utopia
 						end
 						
 						node.process!(request, response, attributes)
+						
 						return response.finish
 					end
 				else

data/lib/utopia/middleware/content/node.rb

@@ -60,9 +60,9 @@ module Utopia
 
 					attr :deferred
 
-					def defer(&block)
+					def defer(value = nil, &block)
 						@deferred << block
-						
+					
 						Tag.closed("deferred", :id => @deferred.size - 1).to_html
 					end
 
@@ -217,6 +217,16 @@ module Utopia
 					current.cdata(text)
 				end
 
+				def deferred_tag(*args, &block)
+					if block_given?
+						current.defer(&block)
+					else
+						current.defer do
+							tag(*args)
+						end
+					end
+				end
+
 				def tag_end(tag = nil)
 					top = current
 

data/lib/utopia/middleware/controller.rb

@@ -218,7 +218,7 @@ module Utopia
 					elsif options[:content]
 						body = [options[:content]]
 					elsif status >= 300
-						body = [Utopia::HTTP::STATUS_DESCRIPTIONS[status] || 'Status #{status}']
+						body = [Utopia::HTTP::STATUS_DESCRIPTIONS[status] || "Status #{status}"]
 					end
 
 					# Utopia::LOG.debug([status, headers, body].inspect)

data/lib/utopia/version.rb

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

data/test/test_content_middleware.rb

@@ -18,11 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'test/unit'
+require 'minitest/autorun'
+
 require 'rack/mock'
 require 'utopia/middleware/content'
 
-class TestContentMiddleware < Test::Unit::TestCase
+class TestContentMiddleware < MiniTest::Test
 	APP = lambda {|env| [404, [], []]}
 	
 	class TestDelegate

data/test/test_controller_middleware.rb

@@ -18,11 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'test/unit'
+require 'minitest/autorun'
+
 require 'rack/mock'
 require 'utopia/middleware/controller'
 
-class TestControllerMiddleware < Test::Unit::TestCase
+class TestControllerMiddleware < MiniTest::Test
 	APP = lambda {|env| [404, [], []]}
 	
 	class TestController < Utopia::Middleware::Controller::Base

data/test/test_path.rb

@@ -18,10 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'utopia/path'
 
-class TestPath < Test::Unit::TestCase
+class TestPath < MiniTest::Test
 	def test_absolute_path_concatenation
 		root = Utopia::Path["/"]
 		
@@ -29,4 +29,3 @@ class TestPath < Test::Unit::TestCase
 		assert_equal Utopia::Path["/foo/bar"], (root + Utopia::Path["foo/bar"])
 	end
 end
-

data/utopia.gemspec

@@ -3,30 +3,30 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'utopia/version'
 
-Gem::Specification.new do |gem|
-	gem.name          = "utopia"
-	gem.version       = Utopia::VERSION
-	gem.authors       = ["Samuel Williams"]
-	gem.email         = ["samuel.williams@oriontransfer.co.nz"]
-	gem.description   = <<-EOF
+Gem::Specification.new do |spec|
+	spec.name          = "utopia"
+	spec.version       = Utopia::VERSION
+	spec.authors       = ["Samuel Williams"]
+	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
+	spec.description   = <<-EOF
 		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 frameworks for interacting with files and directories as
 		structure representing the website.
 	EOF
-	gem.summary       = %q{Utopia is a framework for building dynamic content-driven websites.}
-	gem.homepage      = "https://github.com/ioquatix/utopia"
+	spec.summary       = %q{Utopia is a framework for building dynamic content-driven websites.}
+	spec.homepage      = "https://github.com/ioquatix/utopia"
 
-	gem.files         = `git ls-files`.split($/)
-	gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-	gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-	gem.require_paths = ["lib"]
+	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)/})
+	spec.require_paths = ["lib"]
 
-	gem.add_dependency "trenni", "~> 1.2.0"
-	gem.add_dependency "mime-types"
+	spec.add_dependency "trenni", "~> 1.2.0"
+	spec.add_dependency "mime-types"
 	
-	gem.add_dependency "rack", "~> 1.4"
-	gem.add_dependency "rack-cache"
+	spec.add_dependency "rack", "~> 1.4"
+	spec.add_dependency "rack-cache"
 	
-	gem.add_dependency "mail"
+	spec.add_dependency "mail"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -28,14 +28,14 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,31 +56,31 @@ dependencies:
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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
+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
   directories as\n\t\tstructure representing the website.\n"
@@ -164,17 +164,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
@@ -184,3 +184,4 @@ test_files:
 - test/test_content_middleware.rb
 - test/test_controller_middleware.rb
 - test/test_path.rb
+has_rdoc: