jellyfish 1.1.1 → 1.2.0

data/test/test_from_readme.rb

@@ -4,6 +4,8 @@ require 'uri'
 require 'stringio'
 
 describe 'from README.md' do
+  paste :stringio
+
   after do
     [:Tank, :Heater, :Protector].each do |const|
       Object.send(:remove_const, const) if Object.const_defined?(const)
@@ -11,20 +13,17 @@ describe 'from README.md' do
     Muack.verify
   end
 
-  readme = File.read(
-             "#{File.dirname(File.expand_path(__FILE__))}/../README.md")
+  readme = File.read("#{__dir__}/../README.md")
   codes  = readme.scan(
     /### ([^\n]+).+?``` ruby\n(.+?)\n```\n\n<!---(.+?)-->/m)
 
   codes.each.with_index do |(title, code, test), index|
-    next if title =~ /NewRelic/i
-
     would "pass from README.md #%02d #{title}" % index do
       app = Rack::Builder.app{ eval(code) }
 
       test.split("\n\n").each do |t|
         method_path, expect = t.strip.split("\n", 2)
-        method, path        = method_path.split(' ')
+        method, path, host  = method_path.split(' ')
         uri                 = URI.parse(path)
         pinfo, query        = uri.path, uri.query
 
@@ -32,11 +31,15 @@ describe 'from README.md' do
         status, headers, body = File.open(File::NULL) do |input|
           app.call(
             'HTTP_VERSION'   => 'HTTP/1.1',
-            'REQUEST_METHOD' => method, 'PATH_INFO'  => pinfo,
-            'QUERY_STRING'   => query , 'SCRIPT_NAME'=> ''   ,
-            'rack.input'     => input ,
+            'REQUEST_METHOD' => method,
+            'HTTP_HOST'      => host,
+            'PATH_INFO'      => pinfo,
+            'SCRIPT_NAME'    => '',
+            'QUERY_STRING'   => query,
+            'rack.input'     => input,
+            'rack.url_scheme'=> 'http',
             'rack.hijack'    => lambda{
-              sock = StringIO.new
+              sock = new_stringio
               # or TypeError: no implicit conversion of StringIO into IO
               mock(IO).select([sock]){ [[sock], [], []] }
               sock
@@ -44,7 +47,7 @@ describe 'from README.md' do
         end
 
         if hijack = headers.delete('rack.hijack')
-          sock = StringIO.new
+          sock = new_stringio
           hijack.call(sock)
           body = sock.string.each_line("\n\n")
         end

data/test/test_listen.rb

@@ -0,0 +1,64 @@
+
+require 'jellyfish/test'
+require 'jellyfish/urlmap'
+
+describe Jellyfish::URLMap do
+  paste :jellyfish
+
+  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)
+  end
+
+  would 'map host' do
+    app = Jellyfish::Builder.app do
+      map '/', host: 'host' do
+        run lam
+      end
+
+      run ram
+    end
+
+    expect(call(app, 'host')).eq 'lam host'
+    expect(call(app, 'lust')).eq 'ram lust'
+  end
+
+  would 'listen' do
+    app = Jellyfish::Builder.app do
+      listen 'host' do
+        run lam
+      end
+
+      listen 'lust' do
+        run ram
+      end
+    end
+
+    expect(call(app, 'host')).eq 'lam host'
+    expect(call(app, 'lust')).eq 'ram lust'
+    expect(call(app, 'boom')).eq nil
+  end
+
+  would 'nest' do
+    app = Jellyfish::Builder.app do
+      listen 'host' do
+        map '/host' do
+          run lam
+        end
+      end
+
+      listen 'lust' do
+        map '/lust' do
+          run ram
+        end
+      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
+  end
+end

data/test/test_rewrite.rb

@@ -3,10 +3,12 @@ require 'jellyfish/test'
 require 'jellyfish/urlmap'
 
 describe Jellyfish::Rewrite do
+  paste :jellyfish
+
   lam = lambda{ |env| [200, {}, [env['PATH_INFO']]] }
 
-  def call app, env={}
-    app.call({'SCRIPT_NAME' => ''}.merge(env)).last.first
+  def call app, path
+    get(path, app).dig(-1, 0)
   end
 
   would 'map to' do
@@ -16,7 +18,7 @@ describe Jellyfish::Rewrite do
       end
     end
 
-    expect(call(app, 'PATH_INFO' => '/from')).eq '/to'
+    expect(call(app, '/from')).eq '/to'
   end
 
   would 'rewrite and fallback' do
@@ -31,8 +33,8 @@ describe Jellyfish::Rewrite do
       end
     end
 
-    expect(call(app, 'PATH_INFO' => '/from'      )).eq ''
-    expect(call(app, 'PATH_INFO' => '/from/inner')).eq '/to/inner'
-    expect(call(app, 'PATH_INFO' => '/from/outer')).eq '/to/outer'
+    expect(call(app, '/from'      )).eq ''
+    expect(call(app, '/from/inner')).eq '/to/inner'
+    expect(call(app, '/from/outer')).eq '/to/outer'
   end
 end

data/test/test_websocket.rb

@@ -2,7 +2,9 @@
 require 'jellyfish/test'
 require 'stringio'
 
-describe Jellyfish do
+describe Jellyfish::WebSocket do
+  paste :stringio
+
   after do
     Muack.verify
   end
@@ -21,6 +23,7 @@ describe Jellyfish do
 
   def create_env
     sock = StringIO.new
+    sock.set_encoding('ASCII-8BIT')
     mock(IO).select([sock]) do # or EOFError, not sure why?
       sock << WebSocket::Message.new('pong').to_data * 2
       [[sock], [], []]
@@ -32,13 +35,13 @@ describe Jellyfish do
   would 'ping pong' do
     env, sock = create_env
     app.call(env)
-    sock.string.should.eq <<-HTTP.chomp
+    sock.string.should.eq <<-HTTP.chomp.force_encoding('ASCII-8BIT')
 HTTP/1.1 101 Switching Protocols\r
 Upgrade: websocket\r
 Connection: Upgrade\r
 Sec-WebSocket-Accept: Kfh9QIsMVZcl6xEPYxPHzW8SZ8w=\r
 \r
-\x81\u0004ping\x81\u0004pong\x81\u0004pong
+\x81\x04ping\x81\x04pong\x81\x04pong
     HTTP
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Pico web framework for building API-centric web applications.
@@ -35,12 +35,10 @@ files:
 - bench/bench_builder.rb
 - config.ru
 - jellyfish.gemspec
-- jellyfish.png
 - lib/jellyfish.rb
 - lib/jellyfish/builder.rb
 - lib/jellyfish/chunked_body.rb
 - lib/jellyfish/json.rb
-- lib/jellyfish/newrelic.rb
 - lib/jellyfish/normalized_params.rb
 - lib/jellyfish/normalized_path.rb
 - lib/jellyfish/public/302.html
@@ -61,6 +59,7 @@ files:
 - test/sinatra/test_routing.rb
 - test/test_from_readme.rb
 - test/test_inheritance.rb
+- test/test_listen.rb
 - test/test_log.rb
 - test/test_misc.rb
 - test/test_rewrite.rb
@@ -68,7 +67,7 @@ files:
 - test/test_websocket.rb
 homepage: https://github.com/godfat/jellyfish
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -86,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Pico web framework for building API-centric web applications.
@@ -99,6 +98,7 @@ test_files:
 - test/sinatra/test_routing.rb
 - test/test_from_readme.rb
 - test/test_inheritance.rb
+- test/test_listen.rb
 - test/test_log.rb
 - test/test_misc.rb
 - test/test_rewrite.rb

data/lib/jellyfish/newrelic.rb

@@ -1,24 +0,0 @@
-
-require 'jellyfish'
-require 'rack/request'
-require 'new_relic/agent/instrumentation/controller_instrumentation'
-
-module Jellyfish
-  module NewRelic
-    include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-
-    def block_call argument, block
-      path = if argument.respond_to?(:regexp)
-               argument.regexp
-             else
-               argument
-             end.to_s[1..-1]
-      name = "#{env['REQUEST_METHOD']} #{path}"
-
-      perform_action_with_newrelic_trace(:category => :rack  ,
-                                         :name     => name   ,
-                                         :request  => request,
-                                         :params   => request.params){super}
-    end
-  end
-end