woah 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d82c3f80800e51ad922187916a7d818af057d76b16ab42ba98be5429a2f27b
-  data.tar.gz: c3b6f727f5d2e9e2bd4a45af2b7f2409f10fb47ee1bb0c145db17eec3727bf5d
+  metadata.gz: b373c366351b1f33c918ffa6cc3ee146f8c9754cebbe829fa2af1e68cdddb0bc
+  data.tar.gz: 96ccbe51c94b82e599921e4cd5e3e6d39b952ee3b04a11e6fab86d38cd34753d
 SHA512:
-  metadata.gz: 1cedfb0abbfffeb861369f8885aa80fa1fa0bcd58ad9847489b27e083b2736189eae8912e66399092c8b70029695cecb42b83e6ead64e538890eeabcb56c7d4d
-  data.tar.gz: dd7d5428fffcd5328751a86443d7624040f33319d5d48390c69ffeb8315f23a3f53d98c89d647e805e1ce022c95129420ace8ac9fb6f12e66c9919684cc4f98c
+  metadata.gz: 0663f9e05e1e27a8ba09dee02bbfe623377b95c6806100d576debc0cec2587e1983b1ad77e952162b63f65f64f0cd959df7b21fc60a9aae52e5e5ca165debcb1
+  data.tar.gz: 48b773cc5248397bf2b0393251e9adda278a7165a9e82effa127c8e0ce6b8de1a811d444bf2efeb9a85864f4fc9baa244c8f012c96021924a526b8d4f424aba6

data/README.md

@@ -3,7 +3,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/knarka/woah/badge.svg?branch=master)](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 a minimal web framework built on Rack. It's primary design goal is to be unobtrusive, and to just let you do your thing, dude.
+Woah! is an unobtrusive, (extremely) minimal web framework built on Rack.
 
 ## Installation
 `gem install woah`
@@ -54,7 +54,7 @@ class MyApp < Woah::Base
 end
 ```
 
-There's two new blocks here: `before` and `after`. They do things before and after the relevant route gets executed (duh!). This example will increment a counter everytime a page is hit, regardless of what page it is.
+There's two new blocks here: `before` and `after`. They do things before and after the relevant route gets executed. This example will increment a counter everytime a page is hit, regardless of what page it is.
 
 Of course, getting pages isn't everything you can do on the Internet. There's other HTTP verbs as well, like POST. Behold:
 
@@ -87,7 +87,7 @@ Of course, sometimes you want routes to be flexible, and to catch more than one
 require 'woah'
 
 class MyApp < Woah::Base
-	on %{^/greet/(\w+)$} do
+	on %r{^/greet/(\w+)$} do
 		"oh, hello, I didn't see you there #{match[1]}"
 	end
 end
@@ -95,6 +95,40 @@ end
 
 Now, visiting `/greet/Socrates` will greet you with your own name. Wonderful. By the way, you may have noticed we're using `%r{}` to delimit our regex, instead of the more common `//`. This is because of how common slashes are in routes, so it's recommended to use this syntax. You can use slashes to delimit your regex though, if you like. I won't judge you.
 
+Redirects are possible as well:
+
+```ruby
+require 'woah'
+
+class MyApp < Woah::Base
+	on '/' do
+		redirect_to '/landing'
+	end
+
+	on '/landing' do
+		'welcome'
+	end
+end
+```
+
+So are cookies:
+
+```ruby
+require 'woah'
+
+class MyApp < Woah::Base
+	on '/' do
+		cookie['chunky'] || 'no cookie set'
+	end
+
+	on '/set' do
+		cookie['chunky'] = 'bacon'
+	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.
+
 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:
 
 ```ruby

data/lib/woah.rb

@@ -7,6 +7,5 @@ module Woah
 end
 
 require_relative 'woah/base'
-require_relative 'woah/request'
 require_relative 'woah/route'
 require_relative 'woah/version'

data/lib/woah/base.rb

@@ -9,22 +9,34 @@ module Woah
 		@@request = nil
 		@@routes = []
 
-		def call(env)
+		def initialize
 			@@override = {}
 			@@match_data = nil
-			@@request = Request.new env
+			@@response = nil
+		end
+
+		# Answer the phone.
+		# Finds a relevant route for the parameters in env,
+		# and builds a response.
+		def call(env)
+			initialize
+
+			@@request = Rack::Request.new env
 
 			@@before&.call
 
-			response = resolve_route env['REQUEST_METHOD'], env['REQUEST_URI']
+			@@response = resolve_route env['REQUEST_METHOD'], env['REQUEST_URI']
 
 			@@after&.call
 
 			%i[status headers body].each do |r|
-				response[r] = @@override[r] unless @@override[r].nil?
+				@@response[r] = @@override[r] unless @@override[r].nil?
 			end
 
-			response.values
+			# make sure we do not give nil bodies to the server
+			@@response[:body] ||= ''
+
+			@@response.values
 		end
 
 		# Resolves and executes a round
@@ -45,18 +57,15 @@ module Woah
 		end
 
 		class << self
+			def call(env)
+				new.call env
+			end
+
 			# 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
 			end
 
-			# Answer the phone.
-			# Finds a relevant route for the parameters in env,
-			# and builds a response.
-			def call(env)
-				new.call env
-			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
@@ -92,6 +101,22 @@ module Woah
 				@@override[item] = content
 			end
 
+			# Set or read cookies
+			def cookie(key, value = nil)
+				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
+					@@override[:headers] = {}
+					Rack::Utils.set_cookie_header!(@@override[:headers], key, value)
+				end
+			end
+
 			# Get match data from Regexp routes.
 			def match
 				@@match_data

data/lib/woah/version.rb

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

data/test/cookie_test.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class CookieTest < MiniTest::Test
+	def setup
+		@env = {}
+	end
+
+	def test_get_cookie
+		@env['REQUEST_URI'] = '/get_cookie'
+		@env['REQUEST_METHOD'] = 'GET'
+		@env['HTTP_COOKIE'] = 'test=something'
+		response = TestApp.call @env
+
+		assert_equal 200, response[0]
+		assert_equal 'something', response[2]
+	end
+
+	def test_get_nonexistent_cookie
+		@env['REQUEST_URI'] = '/get_cookie'
+		@env['REQUEST_METHOD'] = 'GET'
+		response = TestApp.call @env
+
+		assert_equal 200, response[0]
+		assert_equal '', response[2]
+	end
+
+	def test_set_cookie
+		@env['REQUEST_URI'] = '/set_cookie'
+		@env['REQUEST_METHOD'] = 'GET'
+		response = TestApp.call @env
+
+		assert_equal 200, response[0]
+		assert_equal 'fruit=apple', response[1]['Set-Cookie']
+		assert_equal '', response[2]
+	end
+end

data/test/on_method_test.rb

@@ -70,4 +70,13 @@ class OnMethodTest < MiniTest::Test
 			end
 		end
 	end
+
+	def test_request_object
+		@env['REQUEST_URI'] = '/ip'
+		@env['REQUEST_METHOD'] = 'GET'
+		response = TestApp.call @env
+
+		assert_equal 200, response[0]
+		assert_equal '/ip', response[2]
+	end
 end

data/test/test_app.rb

@@ -23,6 +23,18 @@ class TestApp < Woah::Base
 		@b
 	end
 
+	on '/get_cookie' do
+		cookie 'test'
+	end
+
+	on '/set_cookie' do
+		cookie 'fruit', 'apple'
+	end
+
+	on '/ip' do
+		request.env['REQUEST_URI']
+	end
+
 	after do
 		@b = 'bacon'
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woah
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - knarka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -35,11 +35,11 @@ files:
 - README.md
 - lib/woah.rb
 - lib/woah/base.rb
-- lib/woah/request.rb
 - lib/woah/route.rb
 - lib/woah/version.rb
 - test/basic_verbs_test.rb
 - test/before_after_test.rb
+- test/cookie_test.rb
 - test/on_method_test.rb
 - test/redirect_test.rb
 - test/test_app.rb

data/lib/woah/request.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Woah
-	# Extend Rack's Request object
-	class Request < Rack::Request
-	end
-end