jellyfish 0.9.2 → 1.0.0

data/test/sinatra/test_error.rb

@@ -94,27 +94,54 @@ describe 'Sinatra mapped_error_test.rb' do
     body.should.eq ["she's there."]
   end
 
-  should 'never raises Jellyfish::NotFound beyond the application' do
+  should 'catch Jellyfish::NotFound' do
     app = Class.new{
       include Jellyfish
-      get('/'){ raise Jellyfish::NotFound }
+      get('/'){ not_found }
     }.new
 
     status, _, _ = get('/', app)
     status.should.eq 404
   end
 
-  should 'cascade for subclasses of Jellyfish::NotFound' do
+  should 'handle subclasses of Jellyfish::NotFound' do
     e   = Class.new(Jellyfish::NotFound)
     app = Class.new{
       include Jellyfish
-      get('/'){ raise e }
+      get('/'){ halt e.new }
     }.new
 
     status, _, _ = get('/', app)
     status.should.eq 404
   end
 
+  should 'no longer cascade with Jellyfish::NotFound' do
+    app = Class.new{
+      include Jellyfish
+      get('/'){ not_found }
+    }.new(Class.new{
+      include Jellyfish
+      get('/'){ 'never'.should.eq 'reach' }
+    })
+
+    status, _, _ = get('/', app)
+    status.should.eq 404
+  end
+
+  should 'cascade with Jellyfish::Cascade' do
+    app = Class.new{
+      include Jellyfish
+      get('/'){ cascade }
+    }.new(Class.new{
+      include Jellyfish
+      get('/'){ 'reach' }
+    }.new)
+
+    status, _, body = get('/', app)
+    status.should.eq 200
+    body  .should.eq ['reach']
+  end
+
   should 'inherit error mappings from base class' do
     sup = Class.new{
       include Jellyfish

data/test/test_from_readme.rb

@@ -29,7 +29,8 @@ describe 'from README.md' do
       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)
+          'QUERY_STRING'   => query , 'rack.input' => input,
+          'SCRIPT_NAME'    => '')
       end
 
       body.extend(Enumerable)

data/test/test_log.rb

@@ -0,0 +1,42 @@
+
+require 'jellyfish/test'
+require 'muack'
+
+include Muack::API
+
+describe Jellyfish do
+  behaves_like :jellyfish
+
+  after do
+    Muack.verify
+  end
+
+  app = Class.new{
+    include Jellyfish
+    get('/log')      { log('hi') }
+    get('/log_error'){
+      log_error(stub(RuntimeError.new).backtrace{ ['backtrace'] }.object)
+    }
+    def self.name
+      'Name'
+    end
+  }.new
+
+  def mock_log
+    log = []
+    mock(log).puts(is_a(String)){ |msg| log << msg }
+    log
+  end
+
+  should "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
+    log = mock_log
+    get('/log_error', app, 'rack.errors' => log)
+    log.should.eq ['[Name] #<RuntimeError: RuntimeError> ["backtrace"]']
+  end
+end

data/test/test_misc.rb

@@ -0,0 +1,24 @@
+
+require 'jellyfish/test'
+
+describe Jellyfish do
+  behaves_like :jellyfish
+
+  app = Class.new{
+    include Jellyfish
+    get
+  }.new
+
+  should 'match wildcard' do
+    get('/a', app).should.eq [200, {}, ['']]
+    get('/b', app).should.eq [200, {}, ['']]
+  end
+
+  should 'accept to_path body' do
+    a = Class.new{
+      include Jellyfish
+      get{ File.open(__FILE__) }
+    }.new
+    get('/', a).last.to_path.should.eq __FILE__
+  end
+end

data/test/test_swagger.rb

@@ -0,0 +1,131 @@
+
+require 'jellyfish/test'
+
+describe Jellyfish do
+  behaves_like :jellyfish
+
+  app = Rack::Builder.app do
+    eval File.read("#{File.dirname(__FILE__)}/../config.ru")
+  end
+
+  def string_keys hash
+    hash.inject({}){ |r, (k, v)| r[k.to_s] = v; r }
+  end
+
+  should '/swagger' do
+    status, headers, body = get('/swagger', app)
+    status                 .should.eq 200
+    headers['Content-Type'].should.eq 'application/json; charset=utf-8'
+    res = Jellyfish::Json.decode(body.to_a.join)
+    res['swaggerVersion'].should.eq '1.2'
+    res['info']          .should.eq string_keys(Jelly.info)
+    res['apiVersion']    .should.eq Jelly.swagger_apiVersion
+    res['apis']          .should.eq \
+      [{'path' => '/users'}, {'path' => '/posts'}]
+  end
+
+  should '/swagger/users' do
+    status, headers, body = get('/swagger/users', app)
+    status                 .should.eq 200
+    res = Jellyfish::Json.decode(body.to_a.join)
+    res['basePath']    .should.eq 'https://localhost:8080'
+    res['resourcePath'].should.eq '/users'
+    res['apis']        .should.eq \
+      [{"path"=>"/users",
+        "operations"=>[{"summary"=>"List users",
+                        "notes"=>"List users<br>Note that we do not really" \
+                                 " have users.",
+                        "path"=>"/users",
+                        "method"=>"GET",
+                        "nickname"=>"/users",
+                        "parameters"=>[]},
+                       {"summary"=>"Create a user",
+                        "notes"=>"Create a user<br>Here we demonstrate how" \
+                                 " to write the swagger doc.",
+                        "parameters"=>[{"type"=>"string",
+                                        "required"=>true,
+                                        "description"=>"The name of the user",
+                                        "name"=>"name",
+                                        "paramType"=>"query"},
+                                       {"type"=>"boolean",
+                                        "description"=>"If the user is sane",
+                                        "name"=>"sane",
+                                        "required"=>false,
+                                        "paramType"=>"query"},
+                                       {"type"=>"string",
+                                        "description"=>"What kind of user",
+                                        "enum"=>["good", "neutral", "evil"],
+                                        "name"=>"type",
+                                        "required"=>false,
+                                        "paramType"=>"query"}],
+                        "responseMessages"=>[{"code"=>400,
+                                              "message"=>"Invalid name"}],
+                        "path"=>"/users",
+                        "method"=>"POST",
+                        "nickname"=>"/users"}]},
+       {"path"=>"/users/{id}",
+        "operations"=>[{"summary"=>"Update a user",
+                        "parameters"=>[{"type"=>"integer",
+                                        "description"=>"The id of the user",
+                                        "name"=>"id",
+                                        "required"=>true,
+                                        "paramType"=>"path"}],
+                        "path"=>"/users",
+                        "method"=>"PUT",
+                        "nickname"=>"/users/{id}",
+                        "notes"=>"Update a user"},
+                       {"path"=>"/users",
+                        "method"=>"DELETE",
+                        "nickname"=>"/users/{id}",
+                        "summary"=>nil,
+                        "notes"=>nil,
+                        "parameters"=>[{"name"=>"id",
+                                        "type"=>"integer",
+                                        "required"=>true,
+                                        "paramType"=>"path"}]}]}]
+  end
+
+  swagger = Jellyfish::Swagger.new(Class.new{include Jellyfish})
+
+  should 'swagger_path' do
+    swagger.send(:swagger_path, '/')          .should.eq '/'
+    swagger.send(:swagger_path, '/users/{id}').should.eq '/users'
+  end
+
+  should '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}'
+    swagger.send(:nickname, %r{^/users/(?<id>\d+)$}).should.eq '/users/{id}'
+    swagger.send(:nickname, %r{/(?<a>\d)/(?<b>\w)$}).should.eq '/{a}/{b}'
+  end
+
+  should '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
+    swagger.send(:path_parameters, %r{/(?<a>\d)/(?<b>\w)/(?<c>\d)$},
+                 :parameters => {:c => {:type => 'hash'}}).
+      should.eq([{:name => 'a', :type => 'integer',
+                  :required => true, :paramType => 'path'},
+                 {:name => 'b', :type => 'string',
+                  :required => true, :paramType => 'path'},
+                 {:name => 'c', :type => 'hash',
+                  :required => true, :paramType => 'path'}])
+  end
+
+  should 'query_parameters' do
+    swagger.send(:query_parameters,
+                 :parameters => {:c => {:type => 'hash'}}).
+      should.eq([:name => 'c', :type => 'hash',
+                 :required => false, :paramType => 'query'])
+    swagger.send(:query_parameters,
+                 :parameters => {:c => {:required => true}}).
+      should.eq([:name => 'c', :type => 'string',
+                 :required => true, :paramType => 'query'])
+  end
+end

data/test/test_threads.rb

@@ -21,7 +21,7 @@ describe Jellyfish do
     ancestors = RuntimeError.ancestors
     stub(RuntimeError).ancestors{ancestors}
     flip = true
-    stub(ancestors).index(anything).proxy.returns do |i|
+    stub(ancestors).index(anything).peek_return do |i|
       if flip
         flip = false
         sleep 0.0001

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: muack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2014-03-17 00:00:00.000000000 Z
+dependencies: []
 description: |-
   Pico web framework for building API-centric web applications.
   For Rack applications or Rack middlewares. Around 250 lines of code.
@@ -61,19 +19,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - TODO.md
+- config.ru
 - jellyfish.gemspec
 - jellyfish.png
 - lib/jellyfish.rb
 - lib/jellyfish/chunked_body.rb
+- lib/jellyfish/json.rb
 - lib/jellyfish/multi_actions.rb
 - lib/jellyfish/newrelic.rb
 - lib/jellyfish/normalized_params.rb
@@ -82,9 +42,16 @@ files:
 - lib/jellyfish/public/404.html
 - lib/jellyfish/public/500.html
 - lib/jellyfish/sinatra.rb
+- lib/jellyfish/swagger.rb
 - lib/jellyfish/test.rb
 - lib/jellyfish/version.rb
-- task/.gitignore
+- public/css/screen.css
+- public/index.html
+- public/js/shred.bundle.js
+- public/js/shred/content.js
+- public/js/swagger-ui.js
+- public/js/swagger.js
+- task/README.md
 - task/gemgem.rb
 - test/sinatra/test_base.rb
 - test/sinatra/test_chunked_body.rb
@@ -93,6 +60,9 @@ files:
 - test/sinatra/test_routing.rb
 - test/test_from_readme.rb
 - test/test_inheritance.rb
+- test/test_log.rb
+- test/test_misc.rb
+- test/test_swagger.rb
 - test/test_threads.rb
 homepage: https://github.com/godfat/jellyfish
 licenses:
@@ -104,17 +74,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pico web framework for building API-centric web applications.
@@ -126,4 +96,7 @@ test_files:
 - test/sinatra/test_routing.rb
 - test/test_from_readme.rb
 - test/test_inheritance.rb
+- test/test_log.rb
+- test/test_misc.rb
+- test/test_swagger.rb
 - test/test_threads.rb

data/task/.gitignore

@@ -1 +0,0 @@
-*.rbc