woah 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9301cad20ebaf896c239f25ade186b723f9f01a09493557590fbaff7da1bb610
-  data.tar.gz: 7165d88451d5d03d397e38602818ac2d972b7b4384e6cbaa97dd1419024c9c7c
+  metadata.gz: cb45f60031e5467ff757e5095e822a7bef583a6225840bfc917b2795afd40bc3
+  data.tar.gz: 63afa8fe95815849bdd0f2362336cc21d50ebb902e3b8c424d6891c586f3a3da
 SHA512:
-  metadata.gz: aa9663c853c588d9c2bf66f2b2be756233e4b5a76e7d795fe65fdec9adfc1aa0f3619e76693db42a70ab49162aaaa5446b7966114f64438caf7c4fd550d5452e
-  data.tar.gz: b562426f30b5b5a0aa0123a0e34fbfe5ed196d59a8e46dc683e48833dd1f9ae55e828b033fca637329ca9c00921382e9aa64ce612904364ef72658a9dbd247b8
+  metadata.gz: 29cb1e9b4287a3ee58d25c1db92138d7eb1572e6665bcefcfc4679908639d8af4a5d0d3b7a1e01b906fcbc2d3ae8584fc1530737e66d8e098f4472d4c85acb45
+  data.tar.gz: 39c4fa1fa939c57a4ccc44eeb27e5c46689995a4394691d7f51c0300aade6d0772ae881bc11ec25c55ce0251ccaf2d86259bcc2ba90770897b2ea536c43fdd5a

data/README.md

@@ -1,6 +1,7 @@
 # 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&service=github)](https://coveralls.io/github/knarka/woah?branch=master)
+[![Code Climate](https://codeclimate.com/github/knarka/woah/badges/gpa.svg)](https://codeclimate.com/github/knarka/woah)
 [![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.
@@ -89,7 +90,7 @@ class MyApp < Woah::Base
 end
 ```
 
-Now, visiting `/greet/Socrates` will greet you with your own name. Wonderful. By the way, you may have noticed the regex here is delimited by `%r{}`, 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.
+Now, visiting `/greet/Socrates` will greet you with your own name (assuming your name is Socrates). Wonderful. By the way, you may have noticed the regex here is delimited by `%r{}`, 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:
 

data/lib/woah/base.rb

@@ -5,13 +5,12 @@ module Woah
 	class Base
 		@@before = nil
 		@@after = nil
-		@@match = nil
-		@@request = nil
 		@@routes = []
 
 		def initialize
 			@@override = {}
 			@@match = nil
+			@@request = nil
 			@@response = nil
 		end
 
@@ -47,7 +46,7 @@ module Woah
 
 		# Resolves and executes a round
 		# @param path [String, Regexp] the path to respond to
-		# @param method [String] the HHTP method to use
+		# @param method [String] the HTTP method to use
 		# @return [Hash] the route's response
 		def resolve_route(path, method)
 			route = @@routes.select { |r| r.matches?(method, path) }[0]
@@ -72,15 +71,15 @@ module Woah
 			end
 
 			# Get this show on the road.
-			# @host [String] the host to use
-			# @port [Integer] the port to use
+			# @param host [String] the host to use
+			# @param port [Integer] the port to use
 			def run!(host = '0.0.0.0', port = 4422)
 				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
 			# @param path [String, Regexp] the path to respond to
-			# @param method [String] the HHTP method to use
+			# @param method [String] the HTTP method to use
 			# @raise [ArgumentError] if `method` is not a valid HTTP method
 			def on(path, method = 'GET', &action)
 				unless %w[DELETE GET HEAD OPTIONS PATCH POST PUT].include? method
@@ -131,25 +130,12 @@ module Woah
 			# @param key [String] the name of the cookie
 			# @param value [nil, :delete, String]
 			def cookie(key, value = nil)
-				# Read cookie
 				if value.nil?
-					@@request.env['HTTP_COOKIE']&.split('; ')&.each do |c|
-						s = c.split('=')
-						return s[1] if s[0] == key
-					end
-					nil # if not found
-
-				# Delete cookie
+					read_cookie key
 				elsif value == :delete
-					@@override[:headers] = {}
-					Rack::Utils.delete_cookie_header! @@override[:headers], key
-
-				# Set cookie
+					del_cookie key
 				elsif value.is_a? String
-					@@override[:headers] = {}
-					Rack::Utils.set_cookie_header! @@override[:headers], key, value
-
-				# Invalid argument
+					set_cookie key, value
 				else
 					raise ArgumentError, 'Value should be either nil, :delete, or a string'
 				end
@@ -164,6 +150,26 @@ module Woah
 			def request
 				@@request
 			end
+
+			private
+
+			def read_cookie(key)
+				@@request.env['HTTP_COOKIE']&.split('; ')&.each do |c|
+					s = c.split('=')
+					return s[1] if s[0] == key
+				end
+				nil # if not found
+			end
+
+			def del_cookie(key)
+				@@override[:headers] ||= {}
+				Rack::Utils.delete_cookie_header! @@override[:headers], key
+			end
+
+			def set_cookie(key, value)
+				@@override[:headers] ||= {}
+				Rack::Utils.set_cookie_header! @@override[:headers], key, value
+			end
 		end
 	end
 end

data/lib/woah/route.rb

@@ -7,6 +7,7 @@ module Woah
 
 		def initialize(path, method, &action)
 			raise 'only strings and regexps are valid paths' unless [String, Regexp].include? path.class
+
 			@path = path
 			@method = method
 			@action = action

data/lib/woah/version.rb

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

data/test/test_helper.rb

@@ -16,5 +16,6 @@ require_relative 'test_app'
 
 Dir.foreach('test/') do |test|
 	next if ['.', '..'].include? test
+
 	require_relative test
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woah
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - knarka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
-description: "Woah! is a minimal web framework built on Rack. It's primary\n\tdesign
-  goal is to be unobtrusive, and to just let you do your thing, dude."
+        version: 2.0.6
+description: "Woah! is a minimal web framework built on Rack designed to let you just
+  do your\n\tthing."
 email: knarka@airmail.cc
 executables: []
 extensions: []