jellyfish 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30753a754648b5b6d9a72d9165c763b3e4db9383
-  data.tar.gz: dc78ee33ce6341c19ff571bb78ab2485ef5f2fbd
+  metadata.gz: 1bbff880b25384a19ae38417f6318fa77b8bbc4b
+  data.tar.gz: 391a9abc638194dfb1ac7f662b57659ccba104bd
 SHA512:
-  metadata.gz: aa1d7ff64073a23ffb0b8d4d218e5e2f3ec898c102ad2ee7786c2af062792be705b2941ca98f7fc3e59b095ec88945b3788b065eb22b48e00eae041be930843e
-  data.tar.gz: 1f33f9aa6f449b034e81c1fb33e30e91c91a580e1310230e487649606add2afeaddf13fa10ea9a9daac1dc878797a390d6211e7486315ff9ee19b34012acb225
+  metadata.gz: e1ce357a54f83f8e3f28d28e49b493ef15e7702cc28198b8d6a75d29e7983d062b8685dcdee5bb3f61d8c05b2fa3af833c656c9a24f4f8d11b1e4aa9f2f9254f
+  data.tar.gz: cbeb51d8505790c6cd404a1f3e464afbcfe5e1e8077af069a1896eb4f77a33578aadcf30d2d73708c4d9fd724a394667038e0623304f49800d78e55db454a4ed

data/CHANGES.md

@@ -1,5 +1,20 @@
 # CHANGES
 
+## Jellyfish 0.9.0
+
+### Enhancements for Jellyfish core
+
+* We no longer use exceptions to control the flow. Use
+  `halt(InternalError.new)` instead. However, raising exceptions
+  would still work. Just prefer to use `halt` if you would like
+  some performance boost.
+
+### Incompatible changes
+
+* If you're raising `NotFound` instead of using `forward` in your app,
+  it would no longer forward the request but show a 404 page. Always
+  use `forward` if you intend to forward the request.
+
 ## Jellyfish 0.8.0
 
 ### Incompatible changes

data/README.md

@@ -13,7 +13,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 ## DESCRIPTION:
 
 Pico web framework for building API-centric web applications.
-For Rack applications or Rack middlewares. Around 200 lines of code.
+For Rack applications or Rack middlewares. Around 250 lines of code.
 
 ## DESIGN:
 
@@ -45,7 +45,7 @@ Because Sinatra is too complex and inconsistent for me.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, Rubinius and JRuby.
+* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
 
 ## INSTALLATION:
 

data/jellyfish.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "jellyfish"
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-06-15"
-  s.description = "Pico web framework for building API-centric web applications.\nFor Rack applications or Rack middlewares. Around 200 lines of code."
+  s.date = "2013-07-11"
+  s.description = "Pico web framework for building API-centric web applications.\nFor Rack applications or Rack middlewares. Around 250 lines of code."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
   ".gitignore",
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/godfat/jellyfish"
   s.licenses = ["Apache License 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.0.4"
   s.summary = "Pico web framework for building API-centric web applications."
   s.test_files = [
   "test/sinatra/test_base.rb",

data/lib/jellyfish.rb

@@ -11,6 +11,7 @@ module Jellyfish
   autoload :ChunkedBody, 'jellyfish/chunked_body'
 
   GetValue = Object.new
+  Identity = lambda{|_|_}
 
   class Response < RuntimeError
     def headers
@@ -57,8 +58,8 @@ module Jellyfish
 
     def request   ; @request ||= Rack::Request.new(env); end
     def halt *args; throw(:halt, *args)                ; end
-    def forward   ; raise(Jellyfish::NotFound.new)     ; end
-    def found  url; raise(Jellyfish::   Found.new(url)); end
+    def forward   ;  halt(Jellyfish::NotFound.new)     ; end
+    def found  url;  halt(Jellyfish::   Found.new(url)); end
     alias_method :redirect, :found
 
     def path_info     ; env['PATH_INFO']      || '/'  ; end
@@ -96,7 +97,7 @@ module Jellyfish
 
     private
     def actions
-      routes[request_method.downcase] || raise(Jellyfish::NotFound.new)
+      routes[request_method.downcase] || halt(Jellyfish::NotFound.new)
     end
 
     def dispatch
@@ -108,7 +109,7 @@ module Jellyfish
           match = route.match(path_info)
           break match, block if match
         end
-      } || raise(Jellyfish::NotFound.new)
+      } || halt(Jellyfish::NotFound.new)
     end
 
     def with_each value
@@ -174,16 +175,13 @@ module Jellyfish
 
   def call env
     ctrl = self.class.controller.new(self.class.routes, self)
-    ctrl.call(env)
-  rescue NotFound => e # forward
-    if app
-      begin
-        app.call(env)
-      rescue Exception => e
-        handle(ctrl, e, env['rack.errors'])
-      end
+    case res = catch(:halt){ ctrl.call(env) }
+    when NotFound
+      app && forward(ctrl, env) || handle(ctrl, res)
+    when Response
+      handle(ctrl, res, env['rack.errors'])
     else
-      handle(ctrl, e)
+      res || ctrl.block_call(nil, Identity)
     end
   rescue Exception => e
     handle(ctrl, e, env['rack.errors'])
@@ -200,6 +198,12 @@ module Jellyfish
   end
 
   private
+  def forward ctrl, env
+    app.call(env)
+  rescue Exception => e
+    handle(ctrl, e, env['rack.errors'])
+  end
+
   def handle ctrl, e, stderr=nil
     if handler = best_handler(e)
       ctrl.block_call(e, handler)

data/lib/jellyfish/multi_actions.rb

@@ -5,13 +5,9 @@ require 'jellyfish'
 
 module Jellyfish
   module MultiActions
-    Identity = lambda{|_|_}
-
     def call env
       @env = env
-      catch(:halt){
-        dispatch.inject(nil){ |_, route_block| block_call(*route_block) }
-      } || block_call(nil, Identity) # respond the default if halted
+      dispatch.inject(nil){ |_, route_block| block_call(*route_block) }
     end
 
     def dispatch
@@ -26,7 +22,7 @@ module Jellyfish
       }.compact
 
       if acts.empty?
-        raise(Jellyfish::NotFound.new)
+        halt(Jellyfish::NotFound.new)
       else
         acts
       end

data/lib/jellyfish/version.rb

@@ -1,4 +1,4 @@
 
 module Jellyfish
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/test/sinatra/test_base.rb

@@ -37,37 +37,31 @@ describe 'Sinatra base_test.rb' do
   end
 
   describe 'Jellyfish as a Rack middleware' do
-    behaves_like :jellyfish
-
-    def app
-      @app ||= Class.new{
-        include Jellyfish
-        get '/' do
-          'Hello from middleware'
-        end
-
-        get '/low-level-forward' do
-          status, headers, body = jellyfish.app.call(env)
-          self.status  status
-          self.headers headers
-          body
-        end
-
-        get '/explicit-forward' do
-          headers_merge 'X-Middleware' => 'true'
-          status, headers, _ = jellyfish.app.call(env)
-          self.status  status
-          self.headers headers
-          'Hello after explicit forward'
-        end
-      }.new(inner_app)
-    end
+    inner_app ||= lambda{ |env|
+      [210, {'X-Downstream' => 'true'}, ['Hello from downstream']]
+    }
 
-    def inner_app
-      @inner_app ||= lambda{ |env|
-        [210, {'X-Downstream' => 'true'}, ['Hello from downstream']]
-      }
-    end
+    app = Class.new{
+      include Jellyfish
+      get '/' do
+        'Hello from middleware'
+      end
+
+      get '/low-level-forward' do
+        status, headers, body = jellyfish.app.call(env)
+        self.status  status
+        self.headers headers
+        body
+      end
+
+      get '/explicit-forward' do
+        headers_merge 'X-Middleware' => 'true'
+        status, headers, _ = jellyfish.app.call(env)
+        self.status  status
+        self.headers headers
+        'Hello after explicit forward'
+      end
+    }.new(inner_app)
 
     should 'create a middleware that responds to #call with .new' do
       app.respond_to?(:call).should.eq true
@@ -78,20 +72,20 @@ describe 'Sinatra base_test.rb' do
     end
 
     should 'intercept requests' do
-      status, _, body = get('/')
+      status, _, body = get('/', app)
       status.should.eq 200
       body  .should.eq ['Hello from middleware']
     end
 
     should 'forward requests downstream when no matching route found' do
-      status, headers, body = get('/missing')
+      status, headers, body = get('/missing', app)
       status                 .should.eq 210
       headers['X-Downstream'].should.eq 'true'
       body                   .should.eq ['Hello from downstream']
     end
 
     should 'call the downstream app directly and return result' do
-      status, headers, body = get('/low-level-forward')
+      status, headers, body = get('/low-level-forward', app)
       status                 .should.eq 210
       headers['X-Downstream'].should.eq 'true'
       body                   .should.eq ['Hello from downstream']

data/test/sinatra/test_error.rb

@@ -111,7 +111,7 @@ describe 'Sinatra mapped_error_test.rb' do
       get('/'){ raise e }
     }.new
 
-    status, _, body = get('/', app)
+    status, _, _ = get('/', app)
     status.should.eq 404
   end
 

data/test/sinatra/test_routing.rb

@@ -98,7 +98,7 @@ describe 'Sinatra routing_test.rb' do
       get('/'){ 'worked' }
     }.new
 
-    status, headers, body = get('', app)
+    status, _, body = get('', app)
     status.should.eq 200
     body  .should.eq ['worked']
   end
@@ -300,7 +300,6 @@ describe 'Sinatra routing_test.rb' do
       get '/next' do
         body 'Hello World'
         next
-        'Boo-hoo World'
       end
 
       get '/halt' do
@@ -340,7 +339,6 @@ describe 'Sinatra routing_test.rb' do
       get %r{^/(?<foo>\w+)} do
         params['foo'].should.eq 'bar'
         next
-        'Hello Foo'
       end
 
       get do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -40,7 +40,7 @@ dependencies:
         version: '0'
 description: |-
   Pico web framework for building API-centric web applications.
-  For Rack applications or Rack middlewares. Around 200 lines of code.
+  For Rack applications or Rack middlewares. Around 250 lines of code.
 email:
 - godfat (XD) godfat.org
 executables: []
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.4
 signing_key: 
 specification_version: 4
 summary: Pico web framework for building API-centric web applications.