jellyfish 0.6.0 → 0.8.0

data/test/test_inheritance.rb

@@ -0,0 +1,88 @@
+
+require 'jellyfish/test'
+
+describe 'Inheritance' do
+  behaves_like :jellyfish
+
+  should 'inherit routes' do
+    sup = Class.new{
+      include Jellyfish
+      get('/0'){ 'a' }
+    }
+    app = Class.new(sup){
+      get('/1'){ 'b' }
+    }.new
+
+    [['/0', 'a'], ['/1', 'b']].each do |(path, expect)|
+      _, _, body = get(path, app)
+      body.should.eq [expect]
+    end
+
+    _, _, body = get('/0', sup.new)
+    body.should.eq ['a']
+    status, _, _ = get('/1', sup.new)
+    status.should.eq 404
+
+    sup      .routes['get'].size.should.eq 1
+    app.class.routes['get'].size.should.eq 2
+  end
+
+  should 'inherit handlers' do
+    sup = Class.new{
+      include Jellyfish
+      handle(TypeError){ 'a' }
+      get('/type') { raise TypeError     }
+      get('/argue'){ raise ArgumentError }
+    }
+    app = Class.new(sup){
+      handle(ArgumentError){ 'b' }
+    }.new
+
+    [['/type', 'a'], ['/argue', 'b']].each do |(path, expect)|
+      _, _, body = get(path, app)
+      body.should.eq [expect]
+    end
+
+    sup      .handlers.size.should.eq 1
+    app.class.handlers.size.should.eq 2
+  end
+
+  should 'inherit controller' do
+    sup = Class.new{
+      include Jellyfish
+      controller_include Module.new{ def f; 'a'; end }
+      get('/0'){ f }
+    }
+    app = Class.new(sup){
+      get('/1'){ f }
+    }.new
+
+    [['/0', 'a'], ['/1', 'a']].each do |(path, expect)|
+      _, _, body = get(path, app)
+      body.should.eq [expect]
+    end
+
+    sup      .controller_include.size.should.eq 1
+    app.class.controller_include.size.should.eq 1
+  end
+
+  should 'inherit handle_exceptions' do
+    sup = Class.new{
+      include Jellyfish
+      handle_exceptions false
+    }
+    app = Class.new(sup)
+
+    sup.handle_exceptions.should.eq false
+    app.handle_exceptions.should.eq false
+
+    sup.handle_exceptions true
+    sup.handle_exceptions.should.eq true
+    app.handle_exceptions.should.eq false
+
+    sup.handle_exceptions false
+    app.handle_exceptions true
+    sup.handle_exceptions.should.eq false
+    app.handle_exceptions.should.eq true
+  end
+end

metadata

@@ -1,51 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Pico web framework for building API-centric web applications.
-
-  For Rack applications or Rack middlewares. Under 200 lines of code.'
+description: |-
+  Pico web framework for building API-centric web applications.
+  For Rack applications or Rack middlewares. Around 200 lines of code.
 email:
 - godfat (XD) godfat.org
 executables: []
@@ -61,13 +56,14 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- example/config.ru
-- example/rainbows.rb
-- example/server.sh
 - jellyfish.gemspec
 - jellyfish.png
 - lib/jellyfish.rb
+- lib/jellyfish/chunked_body.rb
+- lib/jellyfish/multi_actions.rb
 - lib/jellyfish/newrelic.rb
+- lib/jellyfish/normalized_params.rb
+- lib/jellyfish/normalized_path.rb
 - lib/jellyfish/public/302.html
 - lib/jellyfish/public/404.html
 - lib/jellyfish/public/500.html
@@ -77,30 +73,41 @@ files:
 - task/.gitignore
 - task/gemgem.rb
 - test/sinatra/test_base.rb
+- test/sinatra/test_chunked_body.rb
+- test/sinatra/test_error.rb
+- test/sinatra/test_multi_actions.rb
+- test/sinatra/test_routing.rb
+- test/test_from_readme.rb
+- test/test_inheritance.rb
 homepage: https://github.com/godfat/jellyfish
-licenses: []
+licenses:
+- Apache License 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pico web framework for building API-centric web applications.
 test_files:
 - test/sinatra/test_base.rb
-has_rdoc: 
+- test/sinatra/test_chunked_body.rb
+- test/sinatra/test_error.rb
+- test/sinatra/test_multi_actions.rb
+- test/sinatra/test_routing.rb
+- test/test_from_readme.rb
+- test/test_inheritance.rb

data/example/config.ru

@@ -1,118 +0,0 @@
-
-require 'jellyfish'
-
-Overheat = Class.new(RuntimeError)
-
-class Tank
-  include Jellyfish
-  handle_exceptions false
-
-  get '/' do
-    "Jelly Kelly\n"
-  end
-
-  get %r{^/(?<id>\d+)$} do |match|
-    "Jelly ##{match[:id]}\n"
-  end
-
-  post '/' do
-    headers       'X-Jellyfish-Life' => '100'
-    headers_merge 'X-Jellyfish-Mana' => '200'
-    body "Jellyfish 100/200\n"
-    status 201
-    'return is ignored if body has already been set'
-  end
-
-  get '/env' do
-    "#{env.inspect}\n"
-  end
-
-  get '/lookup' do
-    found "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}/"
-  end
-
-  get '/crash' do
-    raise 'crash'
-  end
-
-  handle NameError do |e|
-    status 403
-    "No one hears you: #{e.backtrace.first}\n"
-  end
-
-  get '/yell' do
-    yell
-  end
-
-  class Matcher
-    def match path
-      path.reverse == 'match/'
-    end
-  end
-  get Matcher.new do |match|
-    "#{match}\n"
-  end
-
-  class Body
-    def each
-      if Object.const_defined?(:Rainbows)
-        (0..4).each{ |i| yield "#{i}\n"; Rainbows.sleep(0.1) }
-      else
-        yield "You need Rainbows + FiberSpawn (or so) for this\n"
-      end
-    end
-  end
-  get '/chunked' do
-    Body.new
-  end
-
-  get '/overheat' do
-    raise Overheat
-  end
-
-  # get a hint that use `next' instead;
-  get '/return' do; return; end
-  get '/break'  do; break ; end
-  get '/next'   do; next  ; end # this works
-end
-
-class Heater
-  include Jellyfish
-  handle Overheat do
-    status 500
-    "It's overheated\n"
-  end
-
-  get '/status' do
-    temperature
-  end
-
-  get %r{^/sinatra/(?<id>\d+)$} do
-    "#{params[:id]}\n"
-  end
-
-  def controller; Controller; end
-  class Controller < Jellyfish::Controller
-    include Jellyfish::Sinatra
-    include Jellyfish::NewRelic
-    def temperature
-      "30\u{2103}\n"
-    end
-  end
-end
-
-HugeTank = Rack::Builder.new do
-  use Rack::Chunked # order does matter, need to check Content-Length first
-  use Rack::ContentLength
-  use Rack::ContentType, 'text/plain'
-  use Heater
-  run Tank.new
-end
-
-require 'cgi' # newrelic needs this
-require 'new_relic/rack/developer_mode'
-use NewRelic::Rack::DeveloperMode
-
-run HugeTank
-
-NewRelic::Agent.manual_start(:developer_mode => true)

data/example/rainbows.rb

@@ -1,4 +0,0 @@
-
-Rainbows! do
-  use :FiberSpawn
-end

data/example/server.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rainbows -Ilib -c example/rainbows.rb example/config.ru