utopia 0.11.5 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWI3NDM0Y2E3NDI3ZTUxMzg3Njc2NGM0ODUyNDJhYWViNzkyZDc3OQ==
+    ZmQ5MzEwYTYwZjY3NDI0MzUzYmIwYmYyODUxNDg2ODM0N2M2YjM4Yg==
   data.tar.gz: !binary |-
-    MmM1MTA3ZGVlZWMwMWZmZDU3Y2Q5Y2FlMmIxNDNmMjkxNDBlN2JiNA==
+    ZDk3OTk2ZjQ4NzY3NzZhOTIwZWFhY2E0ZGY2MGQ3MGRkOTE3M2Q4MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWU5ZTBkOTlhZTExYjM2NzA5NzUzZjg1YjUxNDhjOTJjNmE1NTRjYTNlZTU2
-    Njc5YTdlNzAxZTg2YTk5YWE2NzUzYmZjM2Y3MjY5ODUyNGY3MDNjOTEzMGM5
-    YmUzNzg3Zjk1YTJhNGNlM2YxNTMyNDk0NDQxYjE0OGMyMmJkNjU=
+    ZTU0ODE1MGI1YjBjMTY5NWRmZTBmMzYyNTk0ZDZmYTFmZjcyNWEzNzY1NTM1
+    NjYyZWIyNGYyZjlhODk1NTM1MGRjMTgzNWQzMGJmNjBlMzYzNDZmODBlM2Jm
+    ODE1YjUyOGQ4OTkzMDM0NmE4Yzc1OWZlYzAzNWQzNWNlZWI4YmE=
   data.tar.gz: !binary |-
-    ZTVlMmE0OWM2YWFlMmQwZGM3ZWU0NTM2NTgwOThhNGRkNmEwZmQ3ZmU3MTAw
-    ZDE3NzlhN2MyOTFjZjkyNTY4Y2UxMmRkYjg1NzA5ZTkwNzE4NWU5YWZlOTA3
-    NDJhYjVhN2E1OWUzMmE4YWY0NjczYTU5OGE3YzZkMzk0MzViNjY=
+    MDU2M2E4NTZiMGMyMjhhYjhlMTdmNmQwNGEyYTYyYjA5Y2RhOGRkYjdhY2Jm
+    OTBiYTczMTEwNDg5MDk1ZTY0NWNlMGY2Y2MxNGJkMjE1ZmU5NzIyYjVhOWM5
+    MWI3NzdmNTE0N2EyYzU2NjJjOWI5NjE3YWVlOWU0ZmY1MzVlYjY=

data/.travis.yml

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

data/lib/utopia/middleware/controller.rb

@@ -166,7 +166,7 @@ module Utopia
 					@_controller.app.call(env)
 				end
 
-				def respond! (*args)
+				def respond!(*args)
 					throw :response, args
 				end
 
@@ -182,6 +182,10 @@ module Utopia
 					respond! error
 				end
 
+				def success!(*args)
+					respond! :success, *args
+				end
+
 				def respond_with(*args)
 					return args[0] if args[0] == nil || Array === args[0]
 

data/lib/utopia/version.rb

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

data/test/test_controller_middleware.rb

@@ -0,0 +1,66 @@
+# 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 'test/unit'
+require 'rack/mock'
+require 'utopia/middleware/controller'
+
+class TestControllerMiddleware < Test::Unit::TestCase
+	APP = lambda {|env| [404, [], []]}
+	
+	class TestController < Utopia::Middleware::Controller::Base
+		def on_success(path, request)
+			success!
+		end
+		
+		def on_failure(path, request)
+			fail!
+		end
+		
+		def on_variable(path, request)
+			@variable = :value
+		end
+	end
+	
+	class MockControllerMiddleware
+		attr :env
+		
+		def call(env)
+			@env = env
+		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)
+		
+		result = controller.process!(Utopia::Path["/success"], request)
+		assert_equal [200, {}, []], result
+		
+		result = controller.process!(Utopia::Path["/failure"], request)
+		assert_equal [400, {}, ["Bad Request"]], result
+		
+		result = controller.process!(Utopia::Path["/variable"], request)
+		assert_equal({"variable"=>:value}, variables.to_hash)
+	end
+end
+

data/utopia.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
 		structure representing the website.
 	EOF
 	gem.summary       = %q{Utopia is a framework for building dynamic content-driven websites.}
-	gem.homepage      = ""
+	gem.homepage      = "https://github.com/ioquatix/utopia"
 
 	gem.files         = `git ls-files`.split($/)
 	gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -152,9 +152,10 @@ 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
 - utopia.gemspec
-homepage: ''
+homepage: https://github.com/ioquatix/utopia
 licenses: []
 metadata: {}
 post_install_message: 
@@ -181,4 +182,5 @@ 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