jellyfish 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40f88cf4d0c350c287fe8ed80e3bd06233e2315039fea6e36f21a10434d99ff1
-  data.tar.gz: a9619f0b57d9ad1a277f6913c1782807089c3543bcbda741377664f90fb175f7
+  metadata.gz: 8f9e1adde462fe63f752d02b74395426c74022f9e8fb920ecf089a4b3bb20624
+  data.tar.gz: 2c4fea5a52568b9bd153c95f67c02a722634ad32177733be4c7941686eb9bfed
 SHA512:
-  metadata.gz: 57c9c42a73f08953c5118c1c18cc9703a4528756b167bfb7ff04ef122e939062d8219c1ea5740bcdc9917a770b27715b339680a485ac01dfe9178e0a0409d46c
-  data.tar.gz: c79d13a73c40ed4466381b97c93d8d4d2f1a4d11f89f8e2732b6366915ae0db5ffe863c6e20b6186b6cb1ea1eb8b588d59f30be7e68da516b950ea604c35f724
+  metadata.gz: 428fb54496fb53eb2efc363f37d0ad2b7b889edb23c3a40a22cd1acc52f20348015b8193a8d92967a9f8da1716903b68ff672ff581e4e68411d8b017b6a6a3ca
+  data.tar.gz: 20db48c00b68b9cb4bb3499e3a0bf8bee223f71f0f48312c16a1eeb21481cb5cb2865a2ec2331412ffcf4e88e9bfa4da4a5bc81e6a2ca206b6df4d8b211b61be

data/CHANGES.md

@@ -1,5 +1,18 @@
 # CHANGES
 
+## Jellyfish 1.3.0 -- 2018-11-11
+
+### Incompatible changes
+
+* Interface for `Builder.app`, and `Builder#to_app`, and `Rewrite.new`
+  slightly changed due to fixing the bug in `Rewrite`. You shouldn't use
+  those directly though.
+* Now all strings allocated from Jellyfish are frozen.
+
+### Bugs fixed
+
+* Fixed `Jellyfish::Rewrite`. Should properly handle SCRIPT_NAME.
+
 ## Jellyfish 1.2.2 -- 2018-09-23
 
 ### Bugs fixed

data/jellyfish.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: jellyfish 1.2.2 ruby lib
+# stub: jellyfish 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jellyfish".freeze
-  s.version = "1.2.2"
+  s.version = "1.3.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-09-23"
+  s.date = "2018-11-11"
   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 = [
@@ -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.7".freeze
+  s.rubygems_version = "2.7.8".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/builder.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 
 require 'jellyfish/urlmap'
 
 module Jellyfish
   class Builder
-    def self.app app=nil, to=nil, &block
-      new(app, &block).to_app(to)
+    def self.app app=nil, from=nil, to=nil, &block
+      new(app, &block).to_app(from, to)
     end
 
     def initialize app=nil, &block
@@ -43,11 +44,11 @@ module Jellyfish
       end
     end
 
-    def to_app to=nil
+    def to_app from=nil, to=nil
       run = if @map then generate_map(@map, @run) else @run end
       fail 'missing run or map statement' unless run
       app = @use.inject(run){ |a, m| m.call(a) }
-      result = if to then Rewrite.new(app, to) else app end
+      result = if to then Rewrite.new(app, from, to) else app end
       @warmup.call(result) if @warmup
       result
     end
@@ -56,7 +57,7 @@ module Jellyfish
     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, to, &block)
+        mapped[path] = self.class.app(app, path, to, &block)
       end
       URLMap.new(mapped)
     end

data/lib/jellyfish/chunked_body.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'jellyfish'
 

data/lib/jellyfish/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Jellyfish; end
 module Jellyfish::Json

data/lib/jellyfish/normalized_params.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
 
 require 'jellyfish'
 require 'rack/request'
 
-
 module Jellyfish
   module NormalizedParams
     attr_reader :params

data/lib/jellyfish/normalized_path.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
 
 require 'jellyfish'
 require 'uri'
 
-
 module Jellyfish
   module NormalizedPath
     def path_info

data/lib/jellyfish/rewrite.rb

@@ -1,8 +1,21 @@
+# frozen_string_literal: true
 
 module Jellyfish
-  class Rewrite < Struct.new(:app, :to)
+  class Rewrite < Struct.new(:app, :from, :to)
     def call env
-      app.call(env.merge('PATH_INFO' => "#{to}#{env['PATH_INFO']}"))
+      app.call(env.merge(
+        'SCRIPT_NAME' => delete_suffix(env['SCRIPT_NAME'], from),
+        'PATH_INFO' => "#{to}#{env['PATH_INFO']}"))
+    end
+
+    if ''.respond_to?(:delete_suffix)
+      def delete_suffix str, suffix
+        str.delete_suffix(suffix)
+      end
+    else
+      def delete_suffix str, suffix
+        str.sub(/#{Regexp.escape(suffix)}\z/, '')
+      end
     end
   end
 end

data/lib/jellyfish/test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'pork/auto'
 require 'muack'

data/lib/jellyfish/urlmap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'uri'
 
@@ -46,8 +47,9 @@ module Jellyfish
       end
 
       if app = @mapped[key]
-        app.call(env.merge('PATH_INFO' => path_info[cut_path.size..-1],
-                           'SCRIPT_NAME' => env['SCRIPT_NAME'] + script_name))
+        app.call(env.merge(
+          'SCRIPT_NAME' => env['SCRIPT_NAME'] + script_name,
+          'PATH_INFO' => path_info[cut_path.size..-1]))
       else
         [404, {}, []]
       end

data/lib/jellyfish/version.rb

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

data/lib/jellyfish/websocket.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'jellyfish'
 require 'websocket_parser'

data/test/test_rewrite.rb

@@ -5,7 +5,9 @@ require 'jellyfish/urlmap'
 describe Jellyfish::Rewrite do
   paste :jellyfish
 
-  lam = lambda{ |env| [200, {}, [env['PATH_INFO']]] }
+  lam = lambda do |env|
+    [200, {}, ["#{env['SCRIPT_NAME']}!#{env['PATH_INFO']}"]]
+  end
 
   def call app, path
     get(path, app).dig(-1, 0)
@@ -18,23 +20,25 @@ describe Jellyfish::Rewrite do
       end
     end
 
-    expect(call(app, '/from/here')).eq '/to/here'
+    expect(call(app, '/from/here')).eq '!/to/here'
   end
 
   would 'rewrite and fallback' do
     app = Jellyfish::Builder.app do
-      rewrite '/from/inner' => '/to/inner',
-              '/from/outer' => '/to/outer' do
-        run lam
-      end
-
-      map '/from' do
-        run lam
+      map '/top' do
+        rewrite '/from/inner' => '/to/inner',
+                '/from/outer' => '/to/outer' do
+          run lam
+        end
+
+        map '/from' do
+          run lam
+        end
       end
     end
 
-    expect(call(app, '/from'      )).eq ''
-    expect(call(app, '/from/inner')).eq '/to/inner'
-    expect(call(app, '/from/outer')).eq '/to/outer'
+    expect(call(app, '/top/from/other')).eq '/top/from!/other'
+    expect(call(app, '/top/from/inner')).eq '/top!/to/inner'
+    expect(call(app, '/top/from/outer')).eq '/top!/to/outer'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Pico web framework for building API-centric web applications.
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Pico web framework for building API-centric web applications.