utopia 1.9.10 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93b751226f2a2d2f1223e3d130350cad98d3e7e
-  data.tar.gz: 6ead01dad6ec80dd6c8008eca8138a66d818c15b
+  metadata.gz: 9d1fd4dea2d181c046c412089844360517e6f423
+  data.tar.gz: 2a778d65e0224bdb6415e5db6c3967e417913749
 SHA512:
-  metadata.gz: d7ad52b27e644c19d6c23e8dcccdddfd7105e6e0ae95a684bcd95c2b9267daf196dca2e0b3bdd6349a877d37743940c0a211f3faebed29336ebf282ec43b3ffa
-  data.tar.gz: 6cf337b69acecb40bc163b552b9ded754028d4f7b57a22771065ce6a3b48253da731542e78cc8cbcaa0a3337c15b3656ee7b0a53b4fcb2b8cb0a8489ae81b975
+  metadata.gz: 460ef64a197ce840c44b42cc0239249fc003e039daa5cec56b8676882b3a5b63e1b7d7a433c20f5a01a7d62f2117a46887f871267265091205d07bc44725d453
+  data.tar.gz: c26adcc4d5cba8e030ed842e6d329caec9f118565e328520135b635641cee559a67726dc459371c57f71c41f792f5f23751de0f26016112c3c341bbb1ebf8556

data/documentation/public/_static

@@ -1 +1 @@
-../../setup/site/public/_static
+documentation/public/../../setup/site/public/_static

data/documentation/tasks

@@ -1 +1 @@
-../setup/site/tasks
+documentation/../setup/site/tasks

data/lib/utopia/redirection.rb

@@ -49,10 +49,16 @@ module Utopia
 				super
 			end
 			
+			CONTENT_TYPE = 'Content-Type'.freeze
+			
+			def unhandled_error?(response)
+				response[0] >= 400 && !response[1].include?(CONTENT_TYPE)
+			end
+			
 			def call(env)
 				response = @app.call(env)
 				
-				if response[0] >= 400 and location = @codes[response[0]]
+				if unhandled_error?(response) && location = @codes[response[0]]
 					error_request = env.merge(Rack::PATH_INFO => location, Rack::REQUEST_METHOD => Rack::GET)
 					error_response = @app.call(error_request)
 

data/lib/utopia/version.rb

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

data/spec/utopia/controller/respond_spec.rb

@@ -138,5 +138,25 @@ module Utopia::Controller::RespondSpec
 			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
 			expect(last_response.body).to be == '{}'
 		end
+		
+		it "should give record as JSON" do
+			header 'Accept', 'application/json'
+			
+			get '/rewrite/2/show'
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
+			expect(last_response.body).to be == '{"id":2,"foo":"bar"}'
+		end
+		
+		it "should give error as JSON" do
+			header 'Accept', 'application/json'
+			
+			get '/rewrite/1/show'
+			
+			expect(last_response.status).to be == 404
+			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
+			expect(last_response.body).to be == '{"message":"Could not find record"}'
+		end
 	end
 end

data/spec/utopia/controller/respond_spec.ru

@@ -1,4 +1,7 @@
 
+use Utopia::Redirection::Errors,
+	404 => '/fail'
+
 use Utopia::Controller,
 	root: File.expand_path('respond_spec', __dir__),
 	base: Utopia::Controller::Base

data/spec/utopia/controller/respond_spec/rewrite/controller.rb

@@ -0,0 +1,12 @@
+
+prepend Respond, Rewrite, Actions
+
+respond.with_json
+
+rewrite.extract_prefix id: Integer do |request|
+	fail! :not_found, message: "Could not find record" if @id == 1
+end
+
+on 'show' do
+	succeed! content: {id: @id, foo: 'bar'}
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.9.10
+  version: 1.9.11
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -472,6 +472,7 @@ 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
@@ -534,7 +535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
@@ -590,6 +591,7 @@ 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