woah 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bab9b463dfcaf3f919b19b5769c6f0bcb44959b657c7123457cc1957b1944522
-  data.tar.gz: b476b1640fd0110f4d6aafd976bfbbd93660959461687cd69e26d0ac9fc11506
+  metadata.gz: 7a7f6211c5dacf60338f865cd7face92231a0cf7e2b2c02301ccb416d5144c0e
+  data.tar.gz: 1c8df2df731ea7c0bb95616a779898ebd355b54da1ee2b01e7155f8a75ac9486
 SHA512:
-  metadata.gz: 6a481cc633be0741d88fd9c416be38bee117f58debc4067e85e459d47a1ff1dd8e8aeaa77e9840cc7df64688b1040ea63a8a7985d9b3e09eb54d14b1b8a4a1fb
-  data.tar.gz: 696a4c82ffff4c346ec815fb0b286aac99f75a04a7193ba6973e0995a87076c763cce57250b6808d61769f59c7c3a8af6664f4ec427212996e2109e0b89201fd
+  metadata.gz: 1909f2ef0ea817668f647971dcca48aee227ca5c64f4754ffa4e1fe23f46513868b1219dde364973d1cc2cb3a8a94661a9eba13b54618586714242ff6461afc4
+  data.tar.gz: 53d7572bb39289c0c4d886ab26cb78bd0f09151bc997230dcbf49de29e6b7bc4c133822cf7197100bcd58e64d56b8daa020a0926c06c93ed8bf7e405b3be46bc

data/README.md

@@ -1,6 +1,6 @@
 # Woah!
 [![Build Status](https://travis-ci.org/knarka/woah.svg?branch=master)](https://travis-ci.org/knarka/woah)
-[![Coverage Status](https://coveralls.io/repos/github/knarka/woah/badge.svg?branch=master)](https://coveralls.io/github/knarka/woah?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/knarka/woah/badge.svg?branch=master&service=github)](https://coveralls.io/github/knarka/woah?branch=master)
 [![Gem Version](https://badge.fury.io/rb/woah.svg)](https://badge.fury.io/rb/woah)
 
 Woah! is an unobtrusive, (extremely) minimal web framework built on Rack.
@@ -124,10 +124,14 @@ class MyApp < Woah::Base
 	on '/set' do
 		cookie 'chunky', 'bacon'
 	end
+
+	on '/del' do
+		cookie 'chunky', :delete
+	end
 end
 ```
 
-Upon first visiting, this page will tell you there's no cookie set. After visiting `/set` however, it'll display `bacon`, as that is now the content of the `chunky` cookie.
+Upon first visiting, this page will tell you there's no cookie set. After visiting `/set` however, it'll display `bacon`, as that is now the content of the `chunky` cookie. Visiting '/del' will delete the cookie again.
 
 We're nearing the end of this little guide already, I'm afraid. However, there's still one more trick you need to see. Look, sometimes, you might disagree with the things Woah! thinks up for you. That's why you can override everything Woah! is about to send, if you so please. Por exemplo:
 

data/lib/woah/base.rb

@@ -29,16 +29,22 @@ module Woah
 
 			@@after&.call
 
-			%i[status headers body].each do |r|
-				@@response[r] = @@override[r] unless @@override[r].nil?
-			end
+			override_values
 
 			# make sure we do not give nil bodies to the server
 			@@response[:body] ||= ''
+			@@response[:body] = [@@response[:body]]
 
 			@@response.values
 		end
 
+		# Applies user overrides
+		def override_values
+			%i[status headers body].each do |r|
+				@@response[r] = @@override[r] unless @@override[r].nil?
+			end
+		end
+
 		# Resolves and executes a round
 		def resolve_route(method, path)
 			route = @@routes.select { |r| r.matches?(method, path) }[0]
@@ -63,12 +69,14 @@ module Woah
 
 			# Get this show on the road.
 			def run!(host = '0.0.0.0', port = 4422)
-				Rack::Handler.pick(%w[thin webrick]).run new, Host: host, Port: port
+				Rack::Handler.pick(%w[thin puma]).run new, Host: host, Port: port
 			end
 
 			# Register new routes. The optional method argument can be used to specify a method.
 			def on(path, method = 'GET', &action)
-				raise 'unknown method' unless %w[DELETE GET HEAD OPTIONS PATCH POST PUT].include? method
+				unless %w[DELETE GET HEAD OPTIONS PATCH POST PUT].include? method
+					raise ArgumentError, 'Unknown method'
+				end
 
 				@@routes.push Route.new(path, method, &action)
 			end
@@ -96,24 +104,38 @@ module Woah
 
 			# Override an item in the response.
 			def set(item, content)
-				raise "unknown item #{item}, cannot override" unless %i[status headers body].include? item
+				unless %i[status headers body].include? item
+					raise ArgumentError, "Unknown item #{item}, cannot override"
+				end
 
 				@@override[item] = content
 			end
 
 			# Set or read cookies
+			# Value should be either: nil, to read a cookie; a string, to set a cookie; or :delete, to
+			# delete a cookie
 			def cookie(key, value = nil)
+				# Read cookie
 				if value.nil?
-					# Read cookie
 					@@request.env['HTTP_COOKIE']&.split('; ')&.each do |c|
 						s = c.split('=')
 						return s[1] if s[0] == key
 					end
 					nil # if not found
-				else
-					# Set cookie
+
+				# Delete cookie
+				elsif value == :delete
 					@@override[:headers] = {}
-					Rack::Utils.set_cookie_header!(@@override[:headers], key, value)
+					Rack::Utils.delete_cookie_header! @@override[:headers], key
+
+				# Set cookie
+				elsif value.is_a? String
+					@@override[:headers] = {}
+					Rack::Utils.set_cookie_header! @@override[:headers], key, value
+
+				# Invalid argument
+				else
+					raise ArgumentError, 'Value should be either nil, :delete, or a string'
 				end
 			end
 

data/lib/woah/version.rb

@@ -2,5 +2,5 @@
 
 module Woah
 	# Woah!'s current version.
-	VERSION = '1.1.1'
+	VERSION = '1.2.0'
 end

data/test/basic_verbs_test.rb

@@ -11,7 +11,7 @@ class BasicVerbsTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal 'hi there!', response[2]
+		assert_equal 'hi there!', response[2][0]
 	end
 
 	def test_post
@@ -20,7 +20,7 @@ class BasicVerbsTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal 'got post!', response[2]
+		assert_equal 'got post!', response[2][0]
 	end
 
 	def test_get_404

data/test/before_after_test.rb

@@ -12,13 +12,13 @@ class BeforeAfterTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal 'chunky', response[2]
+		assert_equal 'chunky', response[2][0]
 
 		@env['REQUEST_URI'] = '/after'
 
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal 'bacon', response[2]
+		assert_equal 'bacon', response[2][0]
 	end
 end

data/test/cookie_test.rb

@@ -12,7 +12,7 @@ class CookieTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal 'something', response[2]
+		assert_equal 'something', response[2][0]
 	end
 
 	def test_get_nonexistent_cookie
@@ -21,7 +21,7 @@ class CookieTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal '', response[2]
+		assert_equal '', response[2][0]
 	end
 
 	def test_set_cookie
@@ -31,6 +31,25 @@ class CookieTest < MiniTest::Test
 
 		assert_equal 200, response[0]
 		assert_equal 'fruit=apple', response[1]['Set-Cookie']
-		assert_equal '', response[2]
+		assert_equal '', response[2][0]
+	end
+
+	def test_set_illegal_cookie
+		@env['REQUEST_URI'] = '/set_illegal_cookie'
+		@env['REQUEST_METHOD'] = 'GET'
+
+		assert_raises ArgumentError do
+			TestApp.call @env
+		end
+	end
+
+	def test_delete_cookie
+		@env['REQUEST_URI'] = '/delete_cookie'
+		@env['REQUEST_METHOD'] = 'GET'
+
+		response = TestApp.call @env
+
+		assert_equal 200, response[0]
+		assert response[1]['Set-Cookie'].include? 'max-age=0'
 	end
 end

data/test/on_method_test.rb

@@ -16,7 +16,7 @@ class OnMethodTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 404, response[0]
-		assert_equal "it's a secret to everybody", response[2]
+		assert_equal "it's a secret to everybody", response[2][0]
 	end
 
 	def test_regexp_path
@@ -46,11 +46,11 @@ class OnMethodTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal 'hi there, Charles', response[2]
+		assert_equal 'hi there, Charles', response[2][0]
 	end
 
 	def test_illegal_method
-		assert_raises RuntimeError do
+		assert_raises ArgumentError do
 			TestApp.on '/', 'BUBBLES' do
 				'oOooo oO oO'
 			end
@@ -64,10 +64,11 @@ class OnMethodTest < MiniTest::Test
 	end
 
 	def test_illegal_set
-		TestApp.on '/nose' do
-			assert_raises RuntimeError do
-				TestApp.set :nose, true
-			end
+		@env['REQUEST_URI'] = '/nose'
+		@env['REQUEST_METHOD'] = 'GET'
+
+		assert_raises ArgumentError do
+			TestApp.call @env
 		end
 	end
 
@@ -77,6 +78,6 @@ class OnMethodTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal '/ip', response[2]
+		assert_equal '/ip', response[2][0]
 	end
 end

data/test/redirect_test.rb

@@ -17,7 +17,7 @@ class RedirectTest < MiniTest::Test
 		response = TestApp.call @env
 
 		assert_equal 200, response[0]
-		assert_equal 'hi there!', response[2]
+		assert_equal 'hi there!', response[2][0]
 		assert_equal 'gone back', $something
 	end
 		# rubocop:enable Style/GlobalVars

data/test/test_app.rb

@@ -31,10 +31,22 @@ class TestApp < Woah::Base
 		cookie 'fruit', 'apple'
 	end
 
+	on '/set_illegal_cookie' do
+		cookie 'one', 1
+	end
+
+	on '/delete_cookie' do
+		cookie 'foo', :delete
+	end
+
 	on '/ip' do
 		request.env['REQUEST_URI']
 	end
 
+	TestApp.on '/nose' do
+		TestApp.set :nose, true
+	end
+
 	after do
 		@b = 'bacon'
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woah
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - knarka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-01 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack