jellyfish 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9e1adde462fe63f752d02b74395426c74022f9e8fb920ecf089a4b3bb20624
-  data.tar.gz: 2c4fea5a52568b9bd153c95f67c02a722634ad32177733be4c7941686eb9bfed
+  metadata.gz: 9e3fc2a04dd1e7b37c37958f0b25b2d6191832cc366709d041e1300ef1af439f
+  data.tar.gz: 1d8b6a8eba52d898fe154e66953185bf54df5cf0b8de447ae1d6642b7c01a0e6
 SHA512:
-  metadata.gz: 428fb54496fb53eb2efc363f37d0ad2b7b889edb23c3a40a22cd1acc52f20348015b8193a8d92967a9f8da1716903b68ff672ff581e4e68411d8b017b6a6a3ca
-  data.tar.gz: 20db48c00b68b9cb4bb3499e3a0bf8bee223f71f0f48312c16a1eeb21481cb5cb2865a2ec2331412ffcf4e88e9bfa4da4a5bc81e6a2ca206b6df4d8b211b61be
+  metadata.gz: 78344e08eb017faf0215752156b32049ff28f400c7056da95b2956258c3fa4f6295042c8063dab78e3ca67b6948f5eccbf69905b24deb72bd09c96d25fa8c542
+  data.tar.gz: e1d4b4abd422e3b77d23e60b4a8ddf3484bcfc394b90530101f046676f63eb83b0629f2a21323c27a563a97d2ab77c057456939194c68916eca7bfae52b3169d

data/CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## Jellyfish 1.3.1 -- 2018-11-11
+
+### Bugs fixed
+
+* Fixed `Jellyfish::Rewrite` for SCRIPT_NAME when host is also used.
+
 ## Jellyfish 1.3.0 -- 2018-11-11
 
 ### Incompatible changes

data/jellyfish.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: jellyfish 1.3.0 ruby lib
+# stub: jellyfish 1.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jellyfish".freeze
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/jellyfish/builder.rb

@@ -31,7 +31,7 @@ module Jellyfish
 
     def map path, to: nil, host: nil, &block
       key = if host then "http://#{File.join(host, path)}" else path end
-      (@map ||= {})[key] = [block, to]
+      (@map ||= {})[key] = [block, path, to]
     end
 
     def listen host, &block
@@ -56,8 +56,8 @@ module Jellyfish
     private
     def generate_map current_map, app
       mapped = if app then {'' => app} else {} end
-      current_map.each do |path, (block, to)|
-        mapped[path] = self.class.app(app, path, to, &block)
+      current_map.each do |path, (block, from, to)|
+        mapped[path] = self.class.app(app, from, to, &block)
       end
       URLMap.new(mapped)
     end

data/lib/jellyfish/version.rb

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

data/test/test_rewrite.rb

@@ -41,4 +41,18 @@ describe Jellyfish::Rewrite do
     expect(call(app, '/top/from/inner')).eq '/top!/to/inner'
     expect(call(app, '/top/from/outer')).eq '/top!/to/outer'
   end
+
+  would 'map to with host and handle SCRIPT_NAME properly' do
+    app = Jellyfish::Builder.app do
+      map '/path', to: '/path', host: 'host' do
+        run lambda{ |env|
+          [200, {},
+            ["#{env['HTTP_HOST']} #{env['SCRIPT_NAME']} #{env['PATH_INFO']}"]]
+        }
+      end
+    end
+
+    expect(get('/path', app, 'HTTP_HOST' => 'host').dig(-1, -1)).
+      eq 'host  /path'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)