utopia 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 281493fd02c38ac70b4717044a5cc1cf6e75a77891a824705bfb4535d43ab0e6
-  data.tar.gz: 2b6a12707192d90030e2bc9ef07dd34aa799d0fa416fdeda1c7910eadc7ded1d
+  metadata.gz: 76b2bddad99a2b2de5f470d20cad43effd23ec9cada64002a7adf737cda1a359
+  data.tar.gz: 4f65e88162e376b6bba06910de4cd71fe62fa8aa5a4afd3f800ee36c6622d182
 SHA512:
-  metadata.gz: d60e658394b717982b04177ff3ae04b4ffb9207b4f7f8a4b797136c3b5debc46b1d088c4766cfc3234f5ee85d6a9d3b654f6f88ad3fe0db1f550b5eff7b1efdf
-  data.tar.gz: 998b66866873427ac342f3abe04e9b8c67172a3fb9d232633ad096af6af915ba4564ac9656c6d4be3c376362784ca7bacc0d56ad8d4697fb1c3ec15b504fd034
+  metadata.gz: fbb318c33f6dfc0ba5a7ba7cd17e59d5c940a582fce3f3c62e1cead4afc2551a0d82cb837d4de6be676e79ff37ffbacb176762f8937ef94413a4518f409df7a7
+  data.tar.gz: 7c3ea554b35fe6dffed5ec37e9e1950b92335bb5b7a65a09b0384f195f24cf249da460178747ab8f5d8f859fb39e5cb65b251da6455b1e8b05f9856a65c42bc9

data/.travis.yml

@@ -11,10 +11,10 @@ before_install:
   # I don't know why I need to install this on travis in order for tests to function.
   - gem install bundler samovar
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
   - jruby-head
   - ruby-head
 env: COVERAGE=true BENCHMARK=true

data/lib/utopia/controller/respond.rb

@@ -165,10 +165,15 @@ module Utopia
 				end
 			end
 			
-			# Invokes super. If a response is generated, format it based on the Accept: header.
+			# Invokes super. If a response is generated, format it based on the Accept: header, unless the content type was already specified.
 			def process!(request, path)
 				if response = super
-					response = self.class.response_for(self, request, path, response)
+					headers = response[1]
+					
+					# Don't try to convert the response if a content type was explicitly specified.
+					unless headers[Rack::CONTENT_TYPE]
+						response = self.class.response_for(self, request, path, response)
+					end
 					
 					response
 				end

data/lib/utopia/version.rb

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

data/spec/utopia/controller/respond_spec.rb

@@ -110,6 +110,16 @@ module Utopia::Controller::RespondSpec
 			expect(last_response.body).to be == '{"message":"File not found"}'
 		end
 		
+		it 'should get html response' do
+			header 'Accept', '*/*'
+			
+			get '/html/hello-world'
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.headers['Content-Type']).to be == 'text/html'
+			expect(last_response.body).to be == '<p>Hello World</p>'
+		end
+		
 		it "should get version 1 response" do
 			header 'Accept', 'application/json;version=1'
 			

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

@@ -0,0 +1,10 @@
+
+prepend Respond, Actions
+
+# Respond with json:
+respond.with_json
+
+# This method should return HTML, even thought this controller responds with JSON.
+on 'hello-world' do
+	succeed! content: "<p>Hello World</p>", :type => 'text/html'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -667,6 +667,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/html/controller.rb
 - spec/utopia/controller/respond_spec/rewrite/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
@@ -792,6 +793,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/html/controller.rb
 - spec/utopia/controller/respond_spec/rewrite/controller.rb
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb