jellyfish 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e3fc2a04dd1e7b37c37958f0b25b2d6191832cc366709d041e1300ef1af439f
-  data.tar.gz: 1d8b6a8eba52d898fe154e66953185bf54df5cf0b8de447ae1d6642b7c01a0e6
+  metadata.gz: a2ac4c1c5b9beff9266516aa120e637e7c1b3d09010e0f0cf0df7b8728e26646
+  data.tar.gz: 8cd5fff611eea7b8fc454aa8a4d2a844225cf2904d6fcf46dacfc118f9090d84
 SHA512:
-  metadata.gz: 78344e08eb017faf0215752156b32049ff28f400c7056da95b2956258c3fa4f6295042c8063dab78e3ca67b6948f5eccbf69905b24deb72bd09c96d25fa8c542
-  data.tar.gz: e1d4b4abd422e3b77d23e60b4a8ddf3484bcfc394b90530101f046676f63eb83b0629f2a21323c27a563a97d2ab77c057456939194c68916eca7bfae52b3169d
+  metadata.gz: 87587d0f02f1896aa15fb8b72daf2e1cd22b129a89f277680f56ada903778ff2d23c86765273a6199e97c85563e458225a8079bd97e660b4085103b548d99a78
+  data.tar.gz: 35071bfc020d030e952c2023a3bfb7c8cdcf9723194bb8f70212e4cb01b0dc74105a9ccfd93e4c7921f94b37c10049e74e42322cc0532447b87c8e90ceacfd38

data/.gitlab-ci.yml

@@ -0,0 +1,41 @@
+
+stages:
+  - test
+
+.test:
+  stage: test
+  image: ruby:${RUBY_VERSION}-bullseye
+  variables:
+    GIT_DEPTH: "1"
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_PATHS: task
+    # websocket_parser does not work with frozen string literal
+    # RUBYOPT: --enable-frozen-string-literal
+  before_script:
+    - bundle install --retry=3
+    - unset CI # Coverage doesn't work well with frozen literal
+  script:
+    - ruby -vr bundler/setup -S rake test
+
+ruby:3.0:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.0'
+
+ruby:3.1:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.1'
+
+ruby:3.2:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.2'
+
+jruby:latest:
+  extends:
+    - .test
+  image: jruby:latest

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "task"]
 	path = task
-	url = git://github.com/godfat/gemgem.git
+	url = https://github.com/godfat/gemgem.git

data/CHANGES.md

@@ -1,5 +1,20 @@
 # CHANGES
 
+## Jellyfish 1.4.0 -- 2023-02-22
+
+### Incompatible changes
+
+* Adopted Rack 3. Technically, just lower the cases for headers.
+* Internal strings are all frozen now.
+* `log` and `log_error` now takes the `env` for the second argument,
+  rather than the error stream.
+* `handle` now takes the `env` for the third argument,
+  rather than the error stream.
+
+### Enhancements
+
+* The default error logging will now also show `env['PATH_INFO']`.
+
 ## Jellyfish 1.3.1 -- 2018-11-11
 
 ### Bugs fixed

data/Gemfile

@@ -11,7 +11,3 @@ gem 'websocket_parser'
 
 gem 'simplecov', :require => false if ENV['COV']
 gem 'coveralls', :require => false if ENV['CI']
-
-platform :rbx do
-  gem 'rubysl-singleton' # used in rake
-end

data/README.md

@@ -1,6 +1,6 @@
-# Jellyfish [![Build Status](https://secure.travis-ci.org/godfat/jellyfish.png?branch=master)](http://travis-ci.org/godfat/jellyfish) [![Coverage Status](https://coveralls.io/repos/github/godfat/jellyfish/badge.png)](https://coveralls.io/github/godfat/jellyfish) [![Join the chat at https://gitter.im/godfat/jellyfish](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/godfat/jellyfish)
+# Jellyfish [![Pipeline status](https://gitlab.com/godfat/jellyfish/badges/master/pipeline.svg)](https://gitlab.com/godfat/jellyfish/-/pipelines)
 
-by Lin Jen-Shin ([godfat](http://godfat.org))
+by Lin Jen-Shin ([godfat](https://godfat.org))
 
 ![logo](https://github.com/godfat/jellyfish/raw/master/jellyfish.png)
 
@@ -8,7 +8,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 
 * [github](https://github.com/godfat/jellyfish)
 * [rubygems](https://rubygems.org/gems/jellyfish)
-* [rdoc](http://rdoc.info/github/godfat/jellyfish)
+* [rdoc](https://rubydoc.info/github/godfat/jellyfish)
 * [issues](https://github.com/godfat/jellyfish/issues) (feel free to ask for support)
 
 ## DESCRIPTION:
@@ -42,7 +42,7 @@ Check [jellyfish-contrib][] for extra extensions.
 * Simple
 * Modular
 * No templates (You could use [tilt](https://github.com/rtomayko/tilt))
-* No ORM (You could use [sequel](http://sequel.jeremyevans.net/))
+* No ORM (You could use [sequel](https://sequel.jeremyevans.net))
 * No `dup` in `call`
 * Regular expression routes, e.g. `get %r{^/(?<id>\d+)$}`
 * String routes, e.g. `get '/'`
@@ -56,7 +56,7 @@ Because Sinatra is too complex and inconsistent for me.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby), Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
@@ -84,7 +84,7 @@ run Tank.new
 <!---
 GET /
 [200,
- {'Content-Length' => '12', 'Content-Type' => 'text/plain'},
+ {'content-length' => '12', 'content-type' => 'text/plain'},
  ["Jelly Kelly\n"]]
 -->
 
@@ -106,7 +106,7 @@ run Tank.new
 <!---
 GET /123
 [200,
- {'Content-Length' => '11', 'Content-Type' => 'text/plain'},
+ {'content-length' => '11', 'content-type' => 'text/plain'},
  ["Jelly #123\n"]]
 -->
 
@@ -133,7 +133,7 @@ run Tank.new
 <!---
 GET /hctam
 [200,
- {'Content-Length' => '5', 'Content-Type' => 'text/plain'},
+ {'content-length' => '5', 'content-type' => 'text/plain'},
  ["true\n"]]
 -->
 
@@ -159,7 +159,7 @@ run Tank.new
 <!---
 POST /
 [201,
- {'Content-Length' => '18', 'Content-Type' => 'text/plain',
+ {'content-length' => '18', 'content-type' => 'text/plain',
   'X-Jellyfish-Life' => '100', 'X-Jellyfish-Mana' => '200'},
  ["Jellyfish 100/200\n"]]
 -->
@@ -185,8 +185,8 @@ body = File.read("#{File.dirname(
   File.expand_path(__FILE__))}/../lib/jellyfish/public/302.html").
   gsub('VAR_URL', 'http://host/')
 [302,
- {'Content-Length' => body.bytesize.to_s, 'Content-Type' => 'text/html',
-  'Location' => 'http://host/'},
+ {'content-length' => body.bytesize.to_s, 'content-type' => 'text/html',
+  'location' => 'http://host/'},
  [body]]
 -->
 
@@ -210,7 +210,7 @@ GET /crash
 body = File.read("#{File.dirname(
   File.expand_path(__FILE__))}/../lib/jellyfish/public/500.html")
 [500,
- {'Content-Length' => body.bytesize.to_s, 'Content-Type' => 'text/html'},
+ {'content-length' => body.bytesize.to_s, 'content-type' => 'text/html'},
  [body]]
 -->
 
@@ -244,7 +244,7 @@ body = case RUBY_ENGINE
          "No one hears you: (eval):9:in `block in <class:Tank>'\n"
        end
 [403,
- {'Content-Length' => body.bytesize.to_s, 'Content-Type' => 'text/plain'},
+ {'content-length' => body.bytesize.to_s, 'content-type' => 'text/plain'},
  [body]]
 -->
 
@@ -267,7 +267,7 @@ run Tank.new
 <!---
 GET /
 [404,
- {'Content-Length' => '18', 'Content-Type' => 'text/plain'},
+ {'content-length' => '18', 'content-type' => 'text/plain'},
  ["You found nothing."]]
 -->
 
@@ -293,7 +293,7 @@ run Tank.new
 <!---
 GET /
 [404,
- {'Content-Length' => '18', 'Content-Type' => 'text/plain'},
+ {'content-length' => '18', 'content-type' => 'text/plain'},
  ["You found nothing."]]
 -->
 
@@ -315,7 +315,7 @@ run Tank.new
 <!---
 GET /report?name=godfat
 [200,
- {'Content-Length' => '20', 'Content-Type' => 'text/plain'},
+ {'content-length' => '20', 'content-type' => 'text/plain'},
  ["Your name is godfat\n"]]
 -->
 
@@ -341,7 +341,7 @@ run Tank.new
 <!---
 GET /report
 [200,
- {'Content-Length' => '3', 'Content-Type' => 'text/plain'},
+ {'content-length' => '3', 'content-type' => 'text/plain'},
  ["OK\n"]]
 -->
 
@@ -374,7 +374,7 @@ run Heater.new
 <!---
 GET /status
 [200,
- {'Content-Length' => '6', 'Content-Type' => 'text/plain'},
+ {'content-length' => '6', 'content-type' => 'text/plain'},
  ["30\u{2103}\n"]]
 -->
 
@@ -406,7 +406,7 @@ run Heater.new
 <!---
 GET /status
 [200,
- {'Content-Length' => '6', 'Content-Type' => 'text/plain'},
+ {'content-length' => '6', 'content-type' => 'text/plain'},
  ["30\u{2103}\n"]]
 -->
 
@@ -438,7 +438,7 @@ run Tank.new
 <!---
 GET /123
 [200,
- {'Content-Length' => '13', 'Content-Type' => 'text/plain'},
+ {'content-length' => '13', 'content-type' => 'text/plain'},
  ["Jelly jumps.\n"]]
 -->
 
@@ -554,13 +554,13 @@ GET /m/x
 [200, {}, ["m\n"]]
 
 GET /
-[200, {'Content-Length' => '2'}, ["/\n"]]
+[200, {'content-length' => '2'}, ["/\n"]]
 
 GET /x
-[200, {'Content-Length' => '2'}, ["/\n"]]
+[200, {'content-length' => '2'}, ["/\n"]]
 
 GET /ab
-[200, {'Content-Length' => '2'}, ["/\n"]]
+[200, {'content-length' => '2'}, ["/\n"]]
 -->
 
 You could try a stupid benchmark yourself:
@@ -807,7 +807,7 @@ run Tank.new
 <!---
 GET /123
 [200,
- {'Content-Length' => '11', 'Content-Type' => 'text/plain'},
+ {'content-length' => '11', 'content-type' => 'text/plain'},
  ["Jelly #123\n"]]
 -->
 
@@ -831,7 +831,7 @@ run Tank.new
 <!---
 GET /%E5%9B%A7
 [200,
- {'Content-Length' => '16', 'Content-Type' => 'text/plain'},
+ {'content-length' => '16', 'content-type' => 'text/plain'},
  ["/%E5%9B%A7=/\u{56e7}\n"]]
 -->
 
@@ -862,7 +862,7 @@ run Tank.new
 <!---
 GET /123
 [200,
- {'Content-Length' => '18', 'Content-Type' => 'text/plain'},
+ {'content-length' => '18', 'content-type' => 'text/plain'},
  ["Jelly #123 jumps.\n"]]
 -->
 
@@ -896,7 +896,7 @@ run Tank.new
 <!---
 GET /
 [200,
- {'Content-Length' => '12', 'Content-Type' => 'text/plain'},
+ {'content-length' => '12', 'content-type' => 'text/plain'},
  ["Jelly Kelly\n"]]
 -->
 
@@ -934,7 +934,7 @@ run Tank.new
 <!---
 GET /status
 [200,
- {'Content-Length' => '25', 'Content-Type' => 'text/plain',
+ {'content-length' => '25', 'content-type' => 'text/plain',
   'X-Temperature'  => "30\u{2103}"},
  ["See header X-Temperature\n"]]
 -->
@@ -980,7 +980,7 @@ run Tank.new
 <!---
 GET /status
 [200,
- {'Content-Length' => '1', 'Content-Type' => 'text/plain',
+ {'content-length' => '1', 'content-type' => 'text/plain',
   'X-Temperature'  => "35\u{2103}"},
  ["\n"]]
 -->
@@ -1013,7 +1013,7 @@ run Tank.new
 <!---
 GET /status
 [200,
- {'Content-Length' => '6', 'Content-Type' => 'text/plain'},
+ {'content-length' => '6', 'content-type' => 'text/plain'},
  ["30\u{2103}\n"]]
 -->
 
@@ -1048,7 +1048,7 @@ run HugeTank
 <!---
 GET /status
 [200,
- {'Content-Length' => '6', 'Content-Type' => 'text/plain'},
+ {'content-length' => '6', 'content-type' => 'text/plain'},
  ["30\u{2103}\n"]]
 -->
 
@@ -1081,7 +1081,7 @@ run Tank.new
 <!---
 GET /
 [200,
- {'Content-Length' => '29', 'Content-Type' => 'text/plain'},
+ {'content-length' => '29', 'content-type' => 'text/plain'},
  ["Protected: Oops, tank broken\n"]]
 -->
 
@@ -1099,7 +1099,6 @@ class Tank
     }
   end
 end
-use Rack::Chunked
 use Rack::ContentType, 'text/plain'
 run Tank.new
 ```
@@ -1107,9 +1106,8 @@ run Tank.new
 <!---
 GET /chunked
 [200,
- {'Content-Type' => 'text/plain', 'Transfer-Encoding' => 'chunked'},
- ["2\r\n0\n\r\n", "2\r\n1\n\r\n", "2\r\n2\n\r\n",
-  "2\r\n3\n\r\n", "2\r\n4\n\r\n", "0\r\n\r\n"]]
+ {'content-type' => 'text/plain'},
+ ["0\n", "1\n", "2\n", "3\n", "4\n"]]
 -->
 
 ### Chunked transfer encoding (streaming) with custom body
@@ -1126,7 +1124,6 @@ class Tank
     Body.new
   end
 end
-use Rack::Chunked
 use Rack::ContentType, 'text/plain'
 run Tank.new
 ```
@@ -1134,9 +1131,8 @@ run Tank.new
 <!---
 GET /chunked
 [200,
- {'Content-Type' => 'text/plain', 'Transfer-Encoding' => 'chunked'},
- ["2\r\n0\n\r\n", "2\r\n1\n\r\n", "2\r\n2\n\r\n",
-  "2\r\n3\n\r\n", "2\r\n4\n\r\n", "0\r\n\r\n"]]
+ {'content-type' => 'text/plain'},
+ ["0\n", "1\n", "2\n", "3\n", "4\n"]]
 -->
 
 ### Server Sent Event (SSE)
@@ -1150,7 +1146,7 @@ class Tank
     end
   end
   get '/sse' do
-    headers_merge('Content-Type' => 'text/event-stream')
+    headers_merge('content-type' => 'text/event-stream')
     Body.new
   end
 end
@@ -1160,7 +1156,7 @@ run Tank.new
 <!---
 GET /sse
 [200,
- {'Content-Type' => 'text/event-stream'},
+ {'content-type' => 'text/event-stream'},
  ["data: 0\n\n", "data: 1\n\n", "data: 2\n\n", "data: 3\n\n", "data: 4\n\n"]]
 -->
 
@@ -1171,7 +1167,7 @@ class Tank
   include Jellyfish
   get '/sse' do
     headers_merge(
-      'Content-Type' => 'text/event-stream',
+      'content-type' => 'text/event-stream',
       'rack.hijack'  => lambda do |sock|
         (0..4).each do |i|
           sock.write("data: #{i}\n\n")
@@ -1186,7 +1182,7 @@ run Tank.new
 <!---
 GET /sse
 [200,
- {'Content-Type' => 'text/event-stream'},
+ {'content-type' => 'text/event-stream'},
  ["data: 0\n\n", "data: 1\n\n", "data: 2\n\n", "data: 3\n\n", "data: 4\n\n"]]
 -->
 
@@ -1201,9 +1197,9 @@ EventMachine is basically dead, we could see if there would be a
 [Celluloid-IO][] based web server production ready in the future,
 so that we could take the advantage of event based approach.
 
-[hijack]: http://www.rubydoc.info/github/rack/rack/file/SPEC#Hijacking
-[Rainbows!]: http://rainbows.bogomips.org/
-[Puma]: http://puma.io/
+[hijack]: https://github.com/rack/rack/blob/main/SPEC.rdoc#label-Hijacking
+[Rainbows!]: https://yhbt.net/rainbows/
+[Puma]: https://puma.io
 [Celluloid-IO]: https://github.com/celluloid/celluloid-io
 
 ``` ruby
@@ -1244,13 +1240,13 @@ HTTP
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2012-2018, Lin Jen-Shin (godfat)
+Copyright (c) 2012-2023, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-<http://www.apache.org/licenses/LICENSE-2.0>
+<https://www.apache.org/licenses/LICENSE-2.0>
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

data/config.ru

@@ -7,7 +7,7 @@ class Jelly
 
   controller_include Module.new{
     def dispatch
-      headers_merge 'Content-Type' => 'application/json; charset=utf-8',
+      headers_merge 'content-type' => 'application/json; charset=utf-8',
                     'Access-Control-Allow-Origin' => '*'
       super
     end
@@ -59,7 +59,6 @@ end
 
 App = Jellyfish::Builder.app do
   use Rack::CommonLogger
-  use Rack::Chunked
   use Rack::ContentLength
   use Rack::Deflater
 

data/jellyfish.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: jellyfish 1.3.1 ruby lib
+# stub: jellyfish 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jellyfish".freeze
-  s.version = "1.3.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2018-11-11"
+  s.date = "2023-02-22"
   s.description = "Pico web framework for building API-centric web applications.\nFor Rack applications or Rack middleware. Around 250 lines of code.\n\nCheck [jellyfish-contrib][] for extra extensions.\n\n[jellyfish-contrib]: https://github.com/godfat/jellyfish-contrib".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
   ".gitignore".freeze,
+  ".gitlab-ci.yml".freeze,
   ".gitmodules".freeze,
-  ".travis.yml".freeze,
   "CHANGES.md".freeze,
   "Gemfile".freeze,
   "LICENSE".freeze,
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   "test/test_websocket.rb".freeze]
   s.homepage = "https://github.com/godfat/jellyfish".freeze
   s.licenses = ["Apache-2.0".freeze]
-  s.rubygems_version = "2.7.8".freeze
+  s.rubygems_version = "3.4.3".freeze
   s.summary = "Pico web framework for building API-centric web applications.".freeze
   s.test_files = [
   "test/rack/test_builder.rb".freeze,

data/lib/jellyfish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jellyfish
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/lib/jellyfish.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Jellyfish
   autoload :VERSION , 'jellyfish/version'
@@ -15,7 +16,7 @@ module Jellyfish
 
   class Response < RuntimeError
     def headers
-      @headers ||= {'Content-Type' => 'text/html'}
+      @headers ||= {'content-type' => 'text/html'}
     end
 
     def body
@@ -29,7 +30,7 @@ module Jellyfish
     attr_reader :url
     def initialize url; @url = url                             ; end
     def status        ; 302                                    ; end
-    def headers       ; super.merge('Location' => url)         ; end
+    def headers       ; super.merge('location' => url)         ; end
     def body          ; super.map{ |b| b.gsub('VAR_URL', url) }; end
   end
 
@@ -55,8 +56,8 @@ module Jellyfish
       raise
     end
 
-    def log     message; jellyfish.log(    message, env['rack.errors']); end
-    def log_error error; jellyfish.log_error(error, env['rack.errors']); end
+    def log     message; jellyfish.log(    message, env); end
+    def log_error error; jellyfish.log_error(error, env); end
     def request   ; @request ||= Rack::Request.new(env); end
     def halt *args; throw(:halt, *args)                ; end
     def cascade   ;  halt(Jellyfish::Cascade)          ; end
@@ -190,7 +191,7 @@ module Jellyfish
     when Cascade
       cascade(ctrl, env)
     when Response
-      handle(ctrl, res, env['rack.errors'])
+      handle(ctrl, res, env)
     when Array
       res
     when NilClass # make sure we return rack triple
@@ -199,47 +200,48 @@ module Jellyfish
       raise TypeError.new("Expect the response to be a Jellyfish::Response" \
         " or Rack triple (Array), but got: #{res.inspect}")
     end
-  rescue => e
-    handle(ctrl, e, env['rack.errors'])
+  rescue => error
+    handle(ctrl, error, env)
   end
 
-  def log_error e, stderr
-    return unless stderr
-    stderr.puts("[#{self.class.name}] #{e.inspect} #{e.backtrace}")
+  def log_error error, env
+    env['rack.errors']&.
+      puts("[#{self.class.name}] #{error.inspect}" \
+           " for #{env['PATH_INFO'] || '/'} #{error.backtrace}")
   end
 
-  def log msg, stderr
-    return unless stderr
-    stderr.puts("[#{self.class.name}] #{msg}")
+  def log msg, env
+    env['rack.errors']&.
+      puts("[#{self.class.name}] #{msg}")
   end
 
   private
   def cascade ctrl, env
     app.call(env)
-  rescue => e
-    handle(ctrl, e, env['rack.errors'])
+  rescue => error
+    handle(ctrl, error, env)
   end
 
-  def handle ctrl, e, stderr=nil
-    if handler = best_handler(e)
-      ctrl.block_call(e, handler)
+  def handle ctrl, error, env
+    if handler = best_handler(error)
+      ctrl.block_call(error, handler)
     elsif !self.class.handle_exceptions
-      raise e
-    elsif e.kind_of?(Response) # InternalError ends up here if no handlers
-      [e.status, e.headers, e.body]
+      raise error
+    elsif error.kind_of?(Response) # InternalError ends up here if no handlers
+      [error.status, error.headers, error.body]
     else # fallback and see if there's any InternalError handler
-      log_error(e, stderr)
-      handle(ctrl, InternalError.new)
+      log_error(error, env)
+      handle(ctrl, InternalError.new, env)
     end
   end
 
-  def best_handler e
+  def best_handler error
     handlers = self.class.handlers
-    if handlers.key?(e.class)
-      handlers[e.class]
+    if handlers.key?(error.class)
+      handlers[error.class]
     else # or find the nearest match and cache it
-      ancestors         = e.class.ancestors
-      handlers[e.class] = handlers.dup. # thread safe iteration
+      ancestors = error.class.ancestors
+      handlers[error.class] = handlers.dup. # thread safe iteration
         inject([nil, Float::INFINITY]){ |(handler, val), (klass, block)|
           idx = ancestors.index(klass) || Float::INFINITY # lower is better
           if idx < val then [block, idx] else [handler, val] end }.first

data/task/README.md

@@ -13,11 +13,11 @@ Provided tasks:
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby), Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
-    git submodule add git://github.com/godfat/gemgem.git task
+    git submodule add https://github.com/godfat/gemgem.git task
 
 And in Rakefile:
 
@@ -39,13 +39,13 @@ end
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2017, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2023, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-<http://www.apache.org/licenses/LICENSE-2.0>
+<https://www.apache.org/licenses/LICENSE-2.0>
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

data/task/gemgem.rb

@@ -42,6 +42,7 @@ module Gemgem
 
   def gem_install
     require 'rubygems/commands/install_command'
+    require 'rubygems/package'
     # read ~/.gemrc
     Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
     Gem::Command.extra_args = Gem.configuration[:gem]
@@ -51,7 +52,8 @@ module Gemgem
     cmd.handle_options([])
 
     # install
-    install = Gem::Installer.new(gem_path, cmd.options)
+    gem_package = Gem::Package.new(gem_path)
+    install = Gem::Installer.new(gem_package, cmd.options)
     install.install
     puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
   end

data/test/rack/test_builder.rb

@@ -28,10 +28,10 @@ describe Jellyfish::Builder do
   would "supports mapping" do
     app = builder_to_app do
       map '/' do |outer_env|
-        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['root']] }
+        run lambda { |inner_env| [200, {"content-type" => "text/plain"}, ['root']] }
       end
       map '/sub' do
-        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['sub']] }
+        run lambda { |inner_env| [200, {"content-type" => "text/plain"}, ['sub']] }
       end
     end
     Rack::MockRequest.new(app).get("/").body.to_s.should.eq 'root'
@@ -56,7 +56,7 @@ describe Jellyfish::Builder do
         'secret' == password
       end
 
-      run lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hi Boss']] }
+      run lambda { |env| [200, {"content-type" => "text/plain"}, ['Hi Boss']] }
     end
 
     response = Rack::MockRequest.new(app).get("/")
@@ -84,9 +84,9 @@ describe Jellyfish::Builder do
   would "can mix map and run for endpoints" do
     app = builder_to_app do
       map '/sub' do
-        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['sub']] }
+        run lambda { |inner_env| [200, {"content-type" => "text/plain"}, ['sub']] }
       end
-      run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['root']] }
+      run lambda { |inner_env| [200, {"content-type" => "text/plain"}, ['root']] }
     end
 
     Rack::MockRequest.new(app).get("/").body.to_s.should.eq 'root'
@@ -123,7 +123,7 @@ describe Jellyfish::Builder do
         def call(env)
           raise "bzzzt"  if @called > 0
         @called += 1
-          [200, {'Content-Type' => 'text/plain'}, ['OK']]
+          [200, {'content-type' => 'text/plain'}, ['OK']]
         end
       end
 

data/test/rack/test_urlmap.rb

@@ -8,9 +8,9 @@ describe Jellyfish::URLMap do
   would "dispatches paths correctly" do
     app = lambda { |env|
       [200, {
-        'X-ScriptName' => env['SCRIPT_NAME'],
-        'X-PathInfo' => env['PATH_INFO'],
-        'Content-Type' => 'text/plain'
+        'x-scriptname' => env['SCRIPT_NAME'],
+        'x-pathinfo' => env['PATH_INFO'],
+        'content-type' => 'text/plain'
       }, [""]]
     }
     map = Rack::Lint.new(Jellyfish::URLMap.new({
@@ -27,102 +27,102 @@ describe Jellyfish::URLMap do
 
     res = Rack::MockRequest.new(map).get("/foo")
     res.should.ok?
-    res["X-ScriptName"].should.eq "/foo"
-    res["X-PathInfo"].should.eq ""
+    res["x-scriptname"].should.eq "/foo"
+    res["x-pathinfo"].should.eq ""
 
     res = Rack::MockRequest.new(map).get("/foo/")
     res.should.ok?
-    res["X-ScriptName"].should.eq "/foo"
-    res["X-PathInfo"].should.eq "/"
+    res["x-scriptname"].should.eq "/foo"
+    res["x-pathinfo"].should.eq "/"
 
     res = Rack::MockRequest.new(map).get("/foo/bar")
     res.should.ok?
-    res["X-ScriptName"].should.eq "/foo/bar"
-    res["X-PathInfo"].should.eq ""
+    res["x-scriptname"].should.eq "/foo/bar"
+    res["x-pathinfo"].should.eq ""
 
     res = Rack::MockRequest.new(map).get("/foo/bar/")
     res.should.ok?
-    res["X-ScriptName"].should.eq "/foo/bar"
-    res["X-PathInfo"].should.eq "/"
+    res["x-scriptname"].should.eq "/foo/bar"
+    res["x-pathinfo"].should.eq "/"
 
     res = Rack::MockRequest.new(map).get("/foo///bar//quux")
     res.status.should.eq 200
     res.should.ok?
-    res["X-ScriptName"].should.eq "/foo/bar"
-    res["X-PathInfo"].should.eq "//quux"
+    res["x-scriptname"].should.eq "/foo/bar"
+    res["x-pathinfo"].should.eq "//quux"
 
     res = Rack::MockRequest.new(map).get("/foo/quux", "SCRIPT_NAME" => "/bleh")
     res.should.ok?
-    res["X-ScriptName"].should.eq "/bleh/foo"
-    res["X-PathInfo"].should.eq "/quux"
+    res["x-scriptname"].should.eq "/bleh/foo"
+    res["x-pathinfo"].should.eq "/quux"
 
     res = Rack::MockRequest.new(map).get("/bar", 'HTTP_HOST' => 'foo.org')
     res.should.ok?
-    res["X-ScriptName"].should.eq "/bar"
-    res["X-PathInfo"].should.empty?
+    res["x-scriptname"].should.eq "/bar"
+    res["x-pathinfo"].should.empty?
 
     res = Rack::MockRequest.new(map).get("/bar/", 'HTTP_HOST' => 'foo.org')
     res.should.ok?
-    res["X-ScriptName"].should.eq "/bar"
-    res["X-PathInfo"].should.eq '/'
+    res["x-scriptname"].should.eq "/bar"
+    res["x-pathinfo"].should.eq '/'
   end
 
   would "dispatches hosts correctly" do
     map = Rack::Lint.new(Jellyfish::URLMap.new("http://foo.org/" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "foo.org",
-                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              { "content-type" => "text/plain",
+                                "x-position" => "foo.org",
+                                "x-host" => env["HTTP_HOST"] || env["SERVER_NAME"],
                               }, [""]]},
                            "http://subdomain.foo.org/" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "subdomain.foo.org",
-                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              { "content-type" => "text/plain",
+                                "x-position" => "subdomain.foo.org",
+                                "x-host" => env["HTTP_HOST"] || env["SERVER_NAME"],
                               }, [""]]},
                            "http://bar.org/" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "bar.org",
-                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              { "content-type" => "text/plain",
+                                "x-position" => "bar.org",
+                                "x-host" => env["HTTP_HOST"] || env["SERVER_NAME"],
                               }, [""]]},
                            "/" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "default.org",
-                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              { "content-type" => "text/plain",
+                                "x-position" => "default.org",
+                                "x-host" => env["HTTP_HOST"] || env["SERVER_NAME"],
                               }, [""]]}
                            ))
 
     res = Rack::MockRequest.new(map).get("/")
     res.should.ok?
-    res["X-Position"].should.eq "default.org"
+    res["x-position"].should.eq "default.org"
 
     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "bar.org")
     res.should.ok?
-    res["X-Position"].should.eq "bar.org"
+    res["x-position"].should.eq "bar.org"
 
     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "foo.org")
     res.should.ok?
-    res["X-Position"].should.eq "foo.org"
+    res["x-position"].should.eq "foo.org"
 
     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "subdomain.foo.org", "SERVER_NAME" => "foo.org")
     res.should.ok?
-    res["X-Position"].should.eq "subdomain.foo.org"
+    res["x-position"].should.eq "subdomain.foo.org"
 
     res = Rack::MockRequest.new(map).get("http://foo.org/")
     res.should.ok?
-    res["X-Position"].should.eq "foo.org"
+    res["x-position"].should.eq "foo.org"
 
     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "example.org")
     res.should.ok?
-    res["X-Position"].should.eq "default.org"
+    res["x-position"].should.eq "default.org"
 
     res = Rack::MockRequest.new(map).get("/",
                                          "HTTP_HOST" => "example.org:9292",
                                          "SERVER_PORT" => "9292")
     res.should.ok?
-    res["X-Position"].should.eq "default.org"
+    res["x-position"].should.eq "default.org"
   end
 
   would "be nestable" do
@@ -130,10 +130,10 @@ describe Jellyfish::URLMap do
       Jellyfish::URLMap.new("/bar" =>
         Jellyfish::URLMap.new("/quux" =>  lambda { |env|
                            [200,
-                            { "Content-Type" => "text/plain",
-                              "X-Position" => "/foo/bar/quux",
-                              "X-PathInfo" => env["PATH_INFO"],
-                              "X-ScriptName" => env["SCRIPT_NAME"],
+                            { "content-type" => "text/plain",
+                              "x-position" => "/foo/bar/quux",
+                              "x-pathinfo" => env["PATH_INFO"],
+                              "x-scriptname" => env["SCRIPT_NAME"],
                             }, [""]]}
                          ))))
 
@@ -142,97 +142,97 @@ describe Jellyfish::URLMap do
 
     res = Rack::MockRequest.new(map).get("/foo/bar/quux")
     res.should.ok?
-    res["X-Position"].should.eq "/foo/bar/quux"
-    res["X-PathInfo"].should.eq ""
-    res["X-ScriptName"].should.eq "/foo/bar/quux"
+    res["x-position"].should.eq "/foo/bar/quux"
+    res["x-pathinfo"].should.eq ""
+    res["x-scriptname"].should.eq "/foo/bar/quux"
   end
 
   would "route root apps correctly" do
     map = Rack::Lint.new(Jellyfish::URLMap.new("/" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "root",
-                                "X-PathInfo" => env["PATH_INFO"],
-                                "X-ScriptName" => env["SCRIPT_NAME"]
+                              { "content-type" => "text/plain",
+                                "x-position" => "root",
+                                "x-pathinfo" => env["PATH_INFO"],
+                                "x-scriptname" => env["SCRIPT_NAME"]
                               }, [""]]},
                            "/foo" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "foo",
-                                "X-PathInfo" => env["PATH_INFO"],
-                                "X-ScriptName" => env["SCRIPT_NAME"]
+                              { "content-type" => "text/plain",
+                                "x-position" => "foo",
+                                "x-pathinfo" => env["PATH_INFO"],
+                                "x-scriptname" => env["SCRIPT_NAME"]
                               }, [""]]}
                            ))
 
     res = Rack::MockRequest.new(map).get("/foo/bar")
     res.should.ok?
-    res["X-Position"].should.eq "foo"
-    res["X-PathInfo"].should.eq "/bar"
-    res["X-ScriptName"].should.eq "/foo"
+    res["x-position"].should.eq "foo"
+    res["x-pathinfo"].should.eq "/bar"
+    res["x-scriptname"].should.eq "/foo"
 
     res = Rack::MockRequest.new(map).get("/foo")
     res.should.ok?
-    res["X-Position"].should.eq "foo"
-    res["X-PathInfo"].should.eq ""
-    res["X-ScriptName"].should.eq "/foo"
+    res["x-position"].should.eq "foo"
+    res["x-pathinfo"].should.eq ""
+    res["x-scriptname"].should.eq "/foo"
 
     res = Rack::MockRequest.new(map).get("/bar")
     res.should.ok?
-    res["X-Position"].should.eq "root"
-    res["X-PathInfo"].should.eq "/bar"
-    res["X-ScriptName"].should.eq ""
+    res["x-position"].should.eq "root"
+    res["x-pathinfo"].should.eq "/bar"
+    res["x-scriptname"].should.eq ""
 
     res = Rack::MockRequest.new(map).get("")
     res.should.ok?
-    res["X-Position"].should.eq "root"
-    res["X-PathInfo"].should.eq "/"
-    res["X-ScriptName"].should.eq ""
+    res["x-position"].should.eq "root"
+    res["x-pathinfo"].should.eq "/"
+    res["x-scriptname"].should.eq ""
   end
 
   would "not squeeze slashes" do
     map = Rack::Lint.new(Jellyfish::URLMap.new("/" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "root",
-                                "X-PathInfo" => env["PATH_INFO"],
-                                "X-ScriptName" => env["SCRIPT_NAME"]
+                              { "content-type" => "text/plain",
+                                "x-position" => "root",
+                                "x-pathinfo" => env["PATH_INFO"],
+                                "x-scriptname" => env["SCRIPT_NAME"]
                               }, [""]]},
                            "/foo" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "foo",
-                                "X-PathInfo" => env["PATH_INFO"],
-                                "X-ScriptName" => env["SCRIPT_NAME"]
+                              { "content-type" => "text/plain",
+                                "x-position" => "foo",
+                                "x-pathinfo" => env["PATH_INFO"],
+                                "x-scriptname" => env["SCRIPT_NAME"]
                               }, [""]]}
                            ))
 
     res = Rack::MockRequest.new(map).get("/http://example.org/bar")
     res.should.ok?
-    res["X-Position"].should.eq "root"
-    res["X-PathInfo"].should.eq "/http://example.org/bar"
-    res["X-ScriptName"].should.eq ""
+    res["x-position"].should.eq "root"
+    res["x-pathinfo"].should.eq "/http://example.org/bar"
+    res["x-scriptname"].should.eq ""
   end
 
   would "not be case sensitive with hosts" do
     map = Rack::Lint.new(Jellyfish::URLMap.new("http://example.org/" => lambda { |env|
                              [200,
-                              { "Content-Type" => "text/plain",
-                                "X-Position" => "root",
-                                "X-PathInfo" => env["PATH_INFO"],
-                                "X-ScriptName" => env["SCRIPT_NAME"]
+                              { "content-type" => "text/plain",
+                                "x-position" => "root",
+                                "x-pathinfo" => env["PATH_INFO"],
+                                "x-scriptname" => env["SCRIPT_NAME"]
                               }, [""]]}
                            ))
 
     res = Rack::MockRequest.new(map).get("http://example.org/")
     res.should.ok?
-    res["X-Position"].should.eq "root"
-    res["X-PathInfo"].should.eq "/"
-    res["X-ScriptName"].should.eq ""
+    res["x-position"].should.eq "root"
+    res["x-pathinfo"].should.eq "/"
+    res["x-scriptname"].should.eq ""
 
     res = Rack::MockRequest.new(map).get("http://EXAMPLE.ORG/")
     res.should.ok?
-    res["X-Position"].should.eq "root"
-    res["X-PathInfo"].should.eq "/"
-    res["X-ScriptName"].should.eq ""
+    res["x-position"].should.eq "root"
+    res["x-pathinfo"].should.eq "/"
+    res["x-scriptname"].should.eq ""
   end
 end

data/test/sinatra/test_base.rb

@@ -38,7 +38,7 @@ describe 'Sinatra base_test.rb' do
 
   describe 'Jellyfish as a Rack middleware' do
     inner_app ||= lambda{ |env|
-      [210, {'X-Downstream' => 'true'}, ['Hello from downstream']]
+      [210, {'x-downstream' => 'true'}, ['Hello from downstream']]
     }
 
     app = Class.new{
@@ -55,7 +55,7 @@ describe 'Sinatra base_test.rb' do
       end
 
       get '/explicit-forward' do
-        headers_merge 'X-Middleware' => 'true'
+        headers_merge 'x-middleware' => 'true'
         status, headers, _ = jellyfish.app.call(env)
         self.status  status
         self.headers headers
@@ -80,14 +80,14 @@ describe 'Sinatra base_test.rb' do
     would 'forward requests downstream when no matching route found' do
       status, headers, body = get('/missing', app)
       status                 .should.eq 210
-      headers['X-Downstream'].should.eq 'true'
+      headers['x-downstream'].should.eq 'true'
       body                   .should.eq ['Hello from downstream']
     end
 
     would 'call the downstream app directly and return result' do
       status, headers, body = get('/low-level-forward', app)
       status                 .should.eq 210
-      headers['X-Downstream'].should.eq 'true'
+      headers['x-downstream'].should.eq 'true'
       body                   .should.eq ['Hello from downstream']
     end
 
@@ -96,8 +96,8 @@ describe 'Sinatra base_test.rb' do
         get('/explicit-forward', Rack::ContentLength.new(app))
 
       status                   .should.eq 210
-      headers['X-Downstream']  .should.eq 'true'
-      headers['Content-Length'].should.eq '28'
+      headers['x-downstream']  .should.eq 'true'
+      headers['content-length'].should.eq '28'
       body.to_a                .should.eq ['Hello after explicit forward']
     end
   end

data/test/sinatra/test_routing.rb

@@ -70,7 +70,7 @@ describe 'Sinatra routing_test.rb' do
     app = Class.new{
       include Jellyfish
       get{
-        self.headers 'Content-Type' => 'text/plain'
+        self.headers 'content-type' => 'text/plain'
         status, headers, body = jellyfish.app.call(env)
         self.status  status
         self.body    body
@@ -79,7 +79,7 @@ describe 'Sinatra routing_test.rb' do
     }.new(Class.new{
       include Jellyfish
       handle Jellyfish::NotFound do
-        headers_merge 'Content-Type' => 'text/html'
+        headers_merge 'content-type' => 'text/html'
         status 404
         '<h1>Not Found</h1>'
       end
@@ -87,7 +87,7 @@ describe 'Sinatra routing_test.rb' do
 
     status, headers, body = get('/foo', app)
     status                 .should.eq 404
-    headers['Content-Type'].should.eq 'text/html'
+    headers['content-type'].should.eq 'text/html'
     body                   .should.eq ['<h1>Not Found</h1>']
   end
 

data/test/test_from_readme.rb

@@ -30,7 +30,7 @@ describe 'from README.md' do
         sock = nil
         status, headers, body = File.open(File::NULL) do |input|
           app.call(
-            'HTTP_VERSION'   => 'HTTP/1.1',
+            'SERVER_PROTOCOL'=> 'HTTP/1.1',
             'REQUEST_METHOD' => method,
             'HTTP_HOST'      => host,
             'PATH_INFO'      => pinfo,

data/test/test_log.rb

@@ -22,6 +22,7 @@ describe Jellyfish do
 
   def mock_log
     log = []
+    log.singleton_class.send(:public, :puts)
     mock(log).puts(is_a(String)){ |msg| log << msg }
     log
   end
@@ -35,6 +36,6 @@ describe Jellyfish do
   would "log_error to env['rack.errors']" do
     log = mock_log
     get('/log_error', app, 'rack.errors' => log)
-    log.should.eq ['[Name] #<RuntimeError: RuntimeError> ["backtrace"]']
+    log.should.eq ['[Name] #<RuntimeError: RuntimeError> for /log_error ["backtrace"]']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Pico web framework for building API-centric web applications.
@@ -24,8 +24,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".gitmodules"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -69,7 +69,7 @@ homepage: https://github.com/godfat/jellyfish
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,9 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.4.3
+signing_key:
 specification_version: 4
 summary: Pico web framework for building API-centric web applications.
 test_files:

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-language: ruby
-
-install: 'gem install bundler; bundle install --retry=3'
-script: 'ruby -vr bundler/setup -S rake test'
-
-matrix:
-  include:
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: ruby-head
-    - rvm: jruby
-      env: JRUBY_OPTS=--debug
-    - rvm: rbx
-
-  allow_failures:
-    - rvm: rbx