agoo 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2816b985fc556221634cd9002ddf9a2fd2a33c5e0ddc09c897ef8d9c686afc
-  data.tar.gz: c99f5e5679c4b837dfd3ff2bbed6425905c1d41295666c82e5d0779811a2a202
+  metadata.gz: 69a2baa46cde1aaa305d41b6396ce5e78ffc207d0225b910faf280e2beb18749
+  data.tar.gz: b8ff1ffd30767c254ba0849d3e90593a0ccd687fe15db9b211c21fe4b8d5f98b
 SHA512:
-  metadata.gz: 5eacde94a5ec77f4901fafc4bc6e2424729b4edbfbe40c9151f16fbb84ef354f7400ad463fd8b7c91120c40b65e7a86f734aafbd3657a7138b71a259a35eccd1
-  data.tar.gz: 0c649ea6946255f17903b623dc8fd3767e0a712355bc4556d2a2a511017e8abfefaf4f3acff7fddd57fe3714559ff6ecdd5134fcbe104bde900a688d97c8322d
+  metadata.gz: 6d120ee1e1008a9d0fb0382b4f56af522b8eb3e553258632089596d5e506eab7d7d03f221b7275a9f1268e132d4281e0bf0210dd35e69da105d5f12ab1cf7c75
+  data.tar.gz: 2f90130a772f81b444c27ff5d3d4e148de5d8bf971a01d30b93edb9405ca6dc8a0fd57ef7ad4d4cccd3b7501049985dfd4a9945350556e7be1b66d9eb4592cb5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+### 2.0.5 - 2018-05-06
+
+- Changed to putting all the path on the `REQUEST_PATH` variable instead of the `SCRIPT_NAME` to accomodate Rails which only uses the `REQUEST_PATH`.
+
+- Duplicated all `HTTP_` variables to use an all upper case key in addition to the Rack spec simple concatenation to make Rails middleware work. There seems to be an undocumented agreement that all keys will be uppercase.
+
 ### 2.0.4 - 2018-05-06
 
 - Fix allocation bug.

data/ext/agoo/request.c

@@ -1,6 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
 #include <stdio.h>
+#include <ctype.h>
 
 #include "debug.h"
 #include "con.h"
@@ -109,10 +110,7 @@ req_script_name(Req r) {
     if (NULL == r) {
 	rb_raise(rb_eArgError, "Request is no longer valid.");
     }
-    if (0 == r->path.len || (1 == r->path.len && '/' == *r->path.start)) {
-	return empty_val;
-    }
-    return rb_str_new(r->path.start, r->path.len);
+    return empty_val;
 }
 
 /* Document-method: script_name
@@ -136,7 +134,11 @@ req_path_info(Req r) {
     if (0 == r->path.len || (1 == r->path.len && '/' == *r->path.start)) {
 	return slash_val;
     }
-    return empty_val;
+
+    if (0 == r->path.len || (1 == r->path.len && '/' == *r->path.start)) {
+	return empty_val;
+    }
+    return rb_str_new(r->path.start, r->path.len);
 }
 
 /* Document-method: path_info
@@ -383,7 +385,7 @@ add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen)
     } else {
 	char	hkey[1024];
 	char	*k = hkey;
-
+	
 	strcpy(hkey, "HTTP_");
 	k = hkey + 5;
 	if ((int)(sizeof(hkey) - 5) <= klen) {
@@ -393,6 +395,11 @@ add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen)
 	hkey[klen + 5] = '\0';
     
 	rb_hash_aset(hh, rb_str_new(hkey, klen + 5), rb_str_new(val, vlen));
+	// Contrary to the Rack spec, Rails expects all upper case keys so add those as well.
+	for (k = hkey + 5; '\0' != *k; k++) {
+	    *k = toupper(*k);
+	}
+	rb_hash_aset(hh, rb_str_new(hkey, klen + 5), rb_str_new(val, vlen));
     }
 }
 

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/test/base_handler_test.rb

@@ -38,7 +38,7 @@ class BaseHandlerTest < Minitest::Test
     end
 
     def on_request(req, res)
-      res.body = "#{@name} - #{req.script_name}"
+      res.body = "#{@name} - #{req.path_info}"
     end
   end
 
@@ -98,10 +98,10 @@ class BaseHandlerTest < Minitest::Test
       "HTTP_Accept" => "application/json",
       "HTTP_Accept-Encoding" => "*",
       "HTTP_User-Agent" => "Ruby",
-      "PATH_INFO" => "",
+      "PATH_INFO" => "/tellme",
       "QUERY_STRING" => "a=1",
       "REQUEST_METHOD" => "GET",
-      "SCRIPT_NAME" => "/tellme",
+      "SCRIPT_NAME" => "",
       "SERVER_NAME" => "localhost",
       "SERVER_PORT" => "6470",
       "rack.errors" => nil,

data/test/rack_handler_test.rb

@@ -90,10 +90,10 @@ class RackHandlerTest < Minitest::Test
       "HTTP_Accept" => "application/json",
       "HTTP_Accept-Encoding" => "*",
       "HTTP_User-Agent" => "Ruby",
-      "PATH_INFO" => "",
+      "PATH_INFO" => "/tellme",
       "QUERY_STRING" => "a=1",
       "REQUEST_METHOD" => "GET",
-      "SCRIPT_NAME" => "/tellme",
+      "SCRIPT_NAME" => "",
       "SERVER_NAME" => "localhost",
       "SERVER_PORT" => "6467",
       "rack.errors" => nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Peter Ohler