jellyfish 1.0.0 → 1.0.1

data/test/test_from_readme.rb

@@ -1,12 +1,14 @@
 
 require 'jellyfish/test'
 require 'uri'
+require 'stringio'
 
 describe 'from README.md' do
   after do
     [:Tank, :Heater, :Protector].each do |const|
       Object.send(:remove_const, const) if Object.const_defined?(const)
     end
+    Muack.verify
   end
 
   readme = File.read(
@@ -15,22 +17,26 @@ describe 'from README.md' do
     /### ([^\n]+).+?``` ruby\n(.+?)\n```\n\n<!---(.+?)-->/m)
 
   codes.each.with_index do |(title, code, test), index|
-    if title =~ /NewRelic/i
-      warn "Skip NewRelic Test" unless Bacon.kind_of?(Bacon::TestUnitOutput)
-      next
-    end
+    next if title =~ /NewRelic/i
 
-    should "pass from README.md #%02d #{title}" % index do
+    would "pass from README.md #%02d #{title}" % index do
       method_path, expect = test.strip.split("\n", 2)
       method, path        = method_path.split(' ')
       uri                 = URI.parse(path)
       pinfo, query        = uri.path, uri.query
 
+      sock = nil
       status, headers, body = File.open(File::NULL) do |input|
         Rack::Builder.app{ eval(code) }.call(
           'REQUEST_METHOD' => method, 'PATH_INFO'  => pinfo,
-          'QUERY_STRING'   => query , 'rack.input' => input,
-          'SCRIPT_NAME'    => '')
+          'QUERY_STRING'   => query , 'SCRIPT_NAME'=> ''   ,
+          'rack.input'     => input ,
+          'rack.hijack'    => lambda{
+            sock = StringIO.new
+            # or TypeError: no implicit conversion of StringIO into IO
+            mock(IO).select([sock]){ [[sock], [], []] }
+            sock
+          })
       end
 
       body.extend(Enumerable)

data/test/test_inheritance.rb

@@ -2,9 +2,9 @@
 require 'jellyfish/test'
 
 describe 'Inheritance' do
-  behaves_like :jellyfish
+  paste :jellyfish
 
-  should 'inherit routes' do
+  would 'inherit routes' do
     sup = Class.new{
       include Jellyfish
       get('/0'){ 'a' }
@@ -27,7 +27,7 @@ describe 'Inheritance' do
     app.class.routes['get'].size.should.eq 2
   end
 
-  should 'inherit handlers' do
+  would 'inherit handlers' do
     sup = Class.new{
       include Jellyfish
       handle(TypeError){ 'a' }
@@ -47,7 +47,7 @@ describe 'Inheritance' do
     app.class.handlers.size.should.eq 2
   end
 
-  should 'inherit controller' do
+  would 'inherit controller' do
     sup = Class.new{
       include Jellyfish
       controller_include Module.new{ def f; 'a'; end }
@@ -66,7 +66,7 @@ describe 'Inheritance' do
     app.class.controller_include.size.should.eq 1
   end
 
-  should 'inherit handle_exceptions' do
+  would 'inherit handle_exceptions' do
     sup = Class.new{
       include Jellyfish
       handle_exceptions false

data/test/test_log.rb

@@ -1,11 +1,8 @@
 
 require 'jellyfish/test'
-require 'muack'
-
-include Muack::API
 
 describe Jellyfish do
-  behaves_like :jellyfish
+  paste :jellyfish
 
   after do
     Muack.verify
@@ -15,7 +12,8 @@ describe Jellyfish do
     include Jellyfish
     get('/log')      { log('hi') }
     get('/log_error'){
-      log_error(stub(RuntimeError.new).backtrace{ ['backtrace'] }.object)
+      log_error(
+        Muack::API.stub(RuntimeError.new).backtrace{ ['backtrace'] }.object)
     }
     def self.name
       'Name'
@@ -28,13 +26,13 @@ describe Jellyfish do
     log
   end
 
-  should "log to env['rack.errors']" do
+  would "log to env['rack.errors']" do
     log = mock_log
     get('/log', app, 'rack.errors' => log)
     log.should.eq ['[Name] hi']
   end
 
-  should "log_error to env['rack.errors']" 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"]']

data/test/test_misc.rb

@@ -2,23 +2,33 @@
 require 'jellyfish/test'
 
 describe Jellyfish do
-  behaves_like :jellyfish
+  paste :jellyfish
 
   app = Class.new{
     include Jellyfish
+    handle_exceptions false
+    get('/boom'){ halt 'string' }
     get
   }.new
 
-  should 'match wildcard' do
+  would 'match wildcard' do
     get('/a', app).should.eq [200, {}, ['']]
     get('/b', app).should.eq [200, {}, ['']]
   end
 
-  should 'accept to_path body' do
+  would 'accept to_path body' do
     a = Class.new{
       include Jellyfish
       get{ File.open(__FILE__) }
     }.new
     get('/', a).last.to_path.should.eq __FILE__
   end
+
+  would 'raise TypeError if we try to respond non-Response or non-Rack' do
+    begin
+      get('/boom', app)
+    rescue TypeError => e
+      e.message.should.include? '"string"'
+    end
+  end
 end

data/test/test_swagger.rb

@@ -2,7 +2,7 @@
 require 'jellyfish/test'
 
 describe Jellyfish do
-  behaves_like :jellyfish
+  paste :jellyfish
 
   app = Rack::Builder.app do
     eval File.read("#{File.dirname(__FILE__)}/../config.ru")
@@ -12,7 +12,7 @@ describe Jellyfish do
     hash.inject({}){ |r, (k, v)| r[k.to_s] = v; r }
   end
 
-  should '/swagger' do
+  would '/swagger' do
     status, headers, body = get('/swagger', app)
     status                 .should.eq 200
     headers['Content-Type'].should.eq 'application/json; charset=utf-8'
@@ -24,7 +24,7 @@ describe Jellyfish do
       [{'path' => '/users'}, {'path' => '/posts'}]
   end
 
-  should '/swagger/users' do
+  would '/swagger/users' do
     status, headers, body = get('/swagger/users', app)
     status                 .should.eq 200
     res = Jellyfish::Json.decode(body.to_a.join)
@@ -87,12 +87,12 @@ describe Jellyfish do
 
   swagger = Jellyfish::Swagger.new(Class.new{include Jellyfish})
 
-  should 'swagger_path' do
+  would 'swagger_path' do
     swagger.send(:swagger_path, '/')          .should.eq '/'
     swagger.send(:swagger_path, '/users/{id}').should.eq '/users'
   end
 
-  should 'nickname' do
+  would 'nickname' do
     swagger.send(:nickname, '/')                    .should.eq '/'
     swagger.send(:nickname, '/users/{id}')          .should.eq '/users/{id}'
     swagger.send(:nickname, %r{\A/users/(?<id>\d+)}).should.eq '/users/{id}'
@@ -100,14 +100,14 @@ describe Jellyfish do
     swagger.send(:nickname, %r{/(?<a>\d)/(?<b>\w)$}).should.eq '/{a}/{b}'
   end
 
-  should 'notes' do
+  would 'notes' do
     swagger.send(:notes, :summary => 'summary', :notes => 'notes').
       should.eq 'summary<br>notes'
     swagger.send(:notes, :summary => 'summary').
       should.eq 'summary'
   end
 
-  should 'path_parameters' do
+  would 'path_parameters' do
     swagger.send(:path_parameters, %r{/(?<a>\d)/(?<b>\w)/(?<c>\d)$},
                  :parameters => {:c => {:type => 'hash'}}).
       should.eq([{:name => 'a', :type => 'integer',
@@ -118,7 +118,7 @@ describe Jellyfish do
                   :required => true, :paramType => 'path'}])
   end
 
-  should 'query_parameters' do
+  would 'query_parameters' do
     swagger.send(:query_parameters,
                  :parameters => {:c => {:type => 'hash'}}).
       should.eq([:name => 'c', :type => 'hash',

data/test/test_threads.rb

@@ -1,8 +1,5 @@
 
 require 'jellyfish/test'
-require 'muack'
-
-include Muack::API
 
 describe Jellyfish do
   after do
@@ -16,7 +13,7 @@ describe Jellyfish do
 
   exp = RuntimeError.new
 
-  should "no RuntimeError: can't add a new key into hash during iteration" do
+  would "no RuntimeError: can't add a new key into hash during iteration" do
     # make static ancestors so that we could stub it
     ancestors = RuntimeError.ancestors
     stub(RuntimeError).ancestors{ancestors}

data/test/test_websocket.rb

@@ -0,0 +1,44 @@
+
+require 'jellyfish/test'
+require 'stringio'
+
+describe Jellyfish do
+  after do
+    Muack.verify
+  end
+
+  app = Class.new do
+    include Jellyfish
+    controller_include Jellyfish::WebSocket
+    get '/echo' do
+      switch_protocol do |msg|
+        ws_write(msg)
+      end
+      ws_write('ping')
+      ws_start
+    end
+  end.new
+
+  def create_env
+    sock = StringIO.new
+    mock(IO).select([sock]) do # or EOFError, not sure why?
+      sock << WebSocket::Message.new('pong').to_data * 2
+      [[sock], [], []]
+    end
+    [{'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/echo',
+      'rack.hijack' => lambda{ sock }}, sock]
+  end
+
+  would 'ping pong' do
+    env, sock = create_env
+    app.call(env)
+    sock.string.should.eq <<-HTTP.chomp
+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
+    HTTP
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Pico web framework for building API-centric web applications.
@@ -45,6 +45,7 @@ files:
 - lib/jellyfish/swagger.rb
 - lib/jellyfish/test.rb
 - lib/jellyfish/version.rb
+- lib/jellyfish/websocket.rb
 - public/css/screen.css
 - public/index.html
 - public/js/shred.bundle.js
@@ -64,6 +65,7 @@ files:
 - test/test_misc.rb
 - test/test_swagger.rb
 - test/test_threads.rb
+- test/test_websocket.rb
 homepage: https://github.com/godfat/jellyfish
 licenses:
 - Apache License 2.0
@@ -84,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Pico web framework for building API-centric web applications.
@@ -100,3 +102,4 @@ test_files:
 - test/test_misc.rb
 - test/test_swagger.rb
 - test/test_threads.rb
+- test/test_websocket.rb