jellyfish 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e0c9e8624941bd890772891cbccf23e550239f1f02789f52090d2835c46fb19
-  data.tar.gz: 586e35d54a86bfe6b9b4215259366eccaca536e5cb953251ead0c96f50010c02
+  metadata.gz: 968788d7fa1a13e68a134a03948a619f2b09e3fb231208db5967039d0bcbaedf
+  data.tar.gz: 15e289eafd91bcc1a29ad3a45aae8eb791f5afa4c638bf5d7faec4452ecc8133
 SHA512:
-  metadata.gz: 611380d2aedcac5ff8c85ab3ce00ea429d8151334628ef3bd216dd30606e7816178e6b8b3253e99dc8915f479ed9c3f93f0598e9bcc89101ddd15e681a3f1fbb
-  data.tar.gz: d3f4b682cb5913ba369b6e9e1ceb1b6a2bd20c5dc397e5d230c7741ab9c45dbbe0921e866ce1ec9acc4606d7e5253d6ef77146bb77537e6ffa7e3d5ea818d519
+  metadata.gz: 3cf801046630e4fb7752a0c673689b6d4fc137dc33113d740583dd96d2d4c36ad49423b220f4930e1d14e316c8183cc5adac28e6a9240f04f2f443f69ed6a665
+  data.tar.gz: 499291e4a77a571352ad48ea54c667539d1800d12eaa8299fb8ba4f3dfdfe0cc014e10eb3975a573bb1eceafa5749910d73bdaab1bf37d3543b71c067c8e9cc8

data/CHANGES.md

@@ -1,5 +1,14 @@
 # CHANGES
 
+## Jellyfish 1.2.1 -- 2018-07-21
+
+### Bugs fixed
+
+* Fixed mapping with host in some cases (longest match goes first)
+* Fixed scheme matching with https. Now it won't try to map against https
+  because it's not that easy to implement and this is how `Rack::URLMap`
+  works anyway.
+
 ## Jellyfish 1.2.0 -- 2018-07-14
 
 ### Incompatible changes

data/jellyfish.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: jellyfish 1.2.0 ruby lib
+# stub: jellyfish 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jellyfish".freeze
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   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-07-14"
+  s.date = "2018-07-21"
   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 = [

data/lib/jellyfish/builder.rb

@@ -29,7 +29,7 @@ module Jellyfish
     end
 
     def map path, to: nil, host: nil, &block
-      key = if host then "http://#{host}/#{path}" else path end
+      key = if host then "http://#{File.join(host, path)}" else path end
       (@map ||= {})[key] = [block, to]
     end
 

data/lib/jellyfish/urlmap.rb

@@ -1,4 +1,6 @@
 
+require 'uri'
+
 module Jellyfish
   class URLMap
     def initialize mapped_not_chomped
@@ -6,7 +8,7 @@ module Jellyfish
       keys = mapped.keys
       @no_host = !keys.any?{ |k| match?(k, %r{\Ahttps?://}) }
 
-      string = keys.sort_by{ |k| -k.size }.
+      string = sort_keys(keys).
         map{ |k| build_regexp(k) }.
         join('|')
 
@@ -36,7 +38,7 @@ module Jellyfish
                 else
                   File.join(host, script_name)
                 end
-              "#{env['rack.url_scheme']}://#{host_with_path}"
+              "http://#{host_with_path}"
             else
               script_name
             end
@@ -87,5 +89,13 @@ module Jellyfish
         string =~ regexp
       end
     end
+
+    def sort_keys keys
+      keys.sort_by do |k|
+        uri = URI.parse(k)
+
+        [-uri.path.to_s.size, -uri.host.to_s.size]
+      end
+    end
   end
 end

data/lib/jellyfish/version.rb

@@ -1,4 +1,4 @@
 
 module Jellyfish
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/test/test_listen.rb

@@ -8,8 +8,11 @@ describe Jellyfish::URLMap do
   lam = lambda{ |env| [200, {}, ["lam #{env['HTTP_HOST']}"]] }
   ram = lambda{ |env| [200, {}, ["ram #{env['HTTP_HOST']}"]] }
 
-  def call app, host, path='/'
-    get('/', app, 'HTTP_HOST' => host, 'PATH_INFO' => path).dig(-1, 0)
+  def call app, host, path: '/', scheme: 'http'
+    get('/', app,
+      'HTTP_HOST' => host,
+      'PATH_INFO' => path,
+      'rack.url_scheme' => scheme).dig(-1, 0)
   end
 
   would 'map host' do
@@ -25,6 +28,58 @@ describe Jellyfish::URLMap do
     expect(call(app, 'lust')).eq 'ram lust'
   end
 
+  would 'map host with path' do
+    app = Jellyfish::Builder.app do
+      map '/path', host: 'host' do
+        run lam
+      end
+
+      map '/path' do
+        run ram
+      end
+    end
+
+    expect(call(app, 'host', path: '/path')).eq 'lam host'
+    expect(call(app, 'lust', path: '/path')).eq 'ram lust'
+  end
+
+  would 'map longest path first' do
+    app = Jellyfish::Builder.app do
+      map '/long/path' do
+        run lam
+      end
+
+      map '/', host: 'super-long-host' do
+        run ram
+      end
+    end
+
+    expect(call(app, 'super-long-host', path: '/long/path')).
+      eq 'lam super-long-host'
+  end
+
+  would 'map host with http or https' do
+    app = Jellyfish::Builder.app do
+      map '/', host: 'host' do
+        run lam
+      end
+    end
+
+    expect(call(app, 'host')).eq 'lam host'
+    expect(call(app, 'host', scheme: 'https')).eq 'lam host'
+  end
+
+  would 'map http with http or https' do
+    app = Jellyfish::Builder.app do
+      map 'http://host/' do
+        run lam
+      end
+    end
+
+    expect(call(app, 'host')).eq 'lam host'
+    expect(call(app, 'host', scheme: 'https')).eq 'lam host'
+  end
+
   would 'listen' do
     app = Jellyfish::Builder.app do
       listen 'host' do
@@ -56,9 +111,9 @@ describe Jellyfish::URLMap do
       end
     end
 
-    expect(call(app, 'host', '/host')).eq 'lam host'
-    expect(call(app, 'lust', '/lust')).eq 'ram lust'
-    expect(call(app, 'boom', '/host')).eq nil
-    expect(call(app, 'boom', '/lust')).eq nil
+    expect(call(app, 'host', path: '/host')).eq 'lam host'
+    expect(call(app, 'lust', path: '/lust')).eq 'ram lust'
+    expect(call(app, 'boom', path: '/host')).eq nil
+    expect(call(app, 'boom', path: '/lust')).eq nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Pico web framework for building API-centric web applications.