grape 0.6.0 → 0.6.1

data/spec/grape/exceptions/missing_mime_type_spec.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
 require 'spec_helper'
+
 describe Grape::Exceptions::MissingMimeType do
   describe "#message" do
 
@@ -8,17 +8,11 @@ describe Grape::Exceptions::MissingMimeType do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
-        "missing mime type for new_json"
-      )
+      error.message.should include "missing mime type for new_json"
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
-        "or add your own with content_type :new_json, 'application/new_json' "
-      )
+      error.message.should include "or add your own with content_type :new_json, 'application/new_json' "
     end
   end
-
-
 end

data/spec/grape/middleware/auth/basic_spec.rb

@@ -6,26 +6,26 @@ describe Grape::Middleware::Auth::Basic do
   def app
     Rack::Builder.new do |b|
       b.use Grape::Middleware::Error
-      b.use(Grape::Middleware::Auth::Basic) do |u,p| 
+      b.use(Grape::Middleware::Auth::Basic) do |u, p|
         u && p && u == p
       end
-      b.run lambda{|env| [200, {}, ["Hello there."]]}
+      b.run lambda { |env| [200, {}, ["Hello there."]] }
     end
   end
-  
+
   it 'throws a 401 if no auth is given' do
-    @proc = lambda{ false }
+    @proc = lambda { false }
     get '/whatever'
     last_response.status.should == 401
   end
-  
+
   it 'authenticates if given valid creds' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','admin')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin', 'admin')
     last_response.status.should == 200
   end
-  
+
   it 'throws a 401 is wrong auth is given' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','wrong')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin', 'wrong')
     last_response.status.should == 401
   end
 end

data/spec/grape/middleware/auth/digest_spec.rb

@@ -9,12 +9,12 @@ RSpec::Matchers.define :be_challenge do
 end
 
 class Test < Grape::API
-  http_digest({:realm => 'Test Api', :opaque => 'secret'}) do |username|
-    {'foo' => 'bar'}[username]
+  http_digest(realm: 'Test Api', opaque: 'secret') do |username|
+    { 'foo' => 'bar' }[username]
   end
 
   get '/test' do
-    [{:hey => 'you'},{:there => 'bar'},{:foo => 'baz'}]
+    [{ hey: 'you' }, { there: 'bar' }, { foo: 'baz' }]
   end
 end
 
@@ -22,12 +22,12 @@ describe Grape::Middleware::Auth::Digest do
   def app
     Test
   end
-  
+
   it 'is a digest authentication challenge' do
     get '/test'
     last_response.should be_challenge
   end
-  
+
   it 'throws a 401 if no auth is given' do
     get '/test'
     last_response.status.should == 401

data/spec/grape/middleware/auth/oauth2_spec.rb

@@ -2,88 +2,88 @@ require 'spec_helper'
 
 describe Grape::Middleware::Auth::OAuth2 do
   class FakeToken
+    attr_accessor :token
+
     def self.verify(token)
       FakeToken.new(token) if %w(g e).include?(token[0..0])
     end
-    
+
     def initialize(token)
-      self.token = token
+      @token = token
     end
-    
+
     def expired?
-      self.token[0..0] == 'e'
+      @token[0..0] == 'e'
     end
-    
+
     def permission_for?(env)
       env['PATH_INFO'] == '/forbidden' ? false : true
     end
-    
-    attr_accessor :token
   end
 
   def app
     Rack::Builder.app do
-      use Grape::Middleware::Auth::OAuth2, :token_class => 'FakeToken'
-      run lambda{|env| [200, {}, [ (env['api.token'].token rescue '') ]]}
+      use Grape::Middleware::Auth::OAuth2, token_class: 'FakeToken'
+      run lambda { |env| [200, {}, [(env['api.token'].token if env['api.token'])]] }
     end
   end
-  
+
   context 'with the token in the query string' do
     context 'and a valid token' do
       before { get '/awesome?oauth_token=g123' }
-      
+
       it 'sets env["api.token"]' do
         last_response.body.should == 'g123'
       end
     end
-    
+
     context 'and an invalid token' do
       before do
         @err = catch :error do
           get '/awesome?oauth_token=b123'
         end
       end
-      
+
       it 'throws an error' do
         @err[:status].should == 401
       end
-      
+
       it 'sets the WWW-Authenticate header in the response' do
         @err[:headers]['WWW-Authenticate'].should == "OAuth realm='OAuth API', error='invalid_token'"
       end
     end
   end
-  
+
   context 'with an expired token' do
     before do
       @err = catch :error do
         get '/awesome?oauth_token=e123'
       end
     end
-    
+
     it { @err[:status].should == 401 }
     it { @err[:headers]['WWW-Authenticate'].should == "OAuth realm='OAuth API', error='expired_token'" }
   end
-  
-  %w(HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION REDIRECT_X_HTTP_AUTHORIZATION).each do |head|  
+
+  %w(HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION REDIRECT_X_HTTP_AUTHORIZATION).each do |head|
     context 'with the token in the #{head} header' do
       before { get '/awesome', {}, head => 'OAuth g123' }
       it { last_response.body.should == 'g123' }
     end
   end
-  
+
   context 'with the token in the POST body' do
-    before { post '/awesome', {'oauth_token' => 'g123'} }
-    it { last_response.body.should == 'g123'}
+    before { post '/awesome', { 'oauth_token' => 'g123' } }
+    it { last_response.body.should == 'g123' }
   end
-  
+
   context 'when accessing something outside its scope' do
     before do
       @err = catch :error do
         get '/forbidden?oauth_token=g123'
       end
     end
-    
+
     it { @err[:headers]['WWW-Authenticate'].should == "OAuth realm='OAuth API', error='insufficient_scope'" }
     it { @err[:status].should == 403 }
   end

data/spec/grape/middleware/base_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Base do
-  subject { Grape::Middleware::Base.new(  blank_app) }
-  let(:blank_app) { lambda{|_| [200, {}, 'Hi there.']} }
+  subject { Grape::Middleware::Base.new(blank_app) }
+  let(:blank_app) { lambda { |_| [200, {}, 'Hi there.'] } }
 
   before do
     # Keep it one object for testing.
@@ -31,7 +31,7 @@ describe Grape::Middleware::Base do
       subject.should_receive(:after)
     end
 
-    after{ subject.call!({}) }
+    after { subject.call!({}) }
   end
 
   it 'is able to access the response' do
@@ -41,13 +41,13 @@ describe Grape::Middleware::Base do
 
   context 'options' do
     it 'persists options passed at initialization' do
-      Grape::Middleware::Base.new(blank_app, {:abc => true}).options[:abc].should be_true
+      Grape::Middleware::Base.new(blank_app, abc: true).options[:abc].should be_true
     end
 
     context 'defaults' do
       class ExampleWare < Grape::Middleware::Base
         def default_options
-          {:monkey => true}
+          { monkey: true }
         end
       end
 
@@ -56,7 +56,7 @@ describe Grape::Middleware::Base do
       end
 
       it 'overrides default options when provided' do
-        ExampleWare.new(blank_app, :monkey => false).options[:monkey].should be_false
+        ExampleWare.new(blank_app, monkey: false).options[:monkey].should be_false
       end
     end
   end

data/spec/grape/middleware/error_spec.rb

@@ -2,48 +2,44 @@ require 'spec_helper'
 
 describe Grape::Middleware::Error do
   class ErrApp
-    class << self    
+    class << self
       attr_accessor :error
       attr_accessor :format
-      
+
       def call(env)
-        throw :error, self.error
+        throw :error, error
       end
     end
   end
-  
+
   def app
     Rack::Builder.app do
-      use Grape::Middleware::Error, :default_message => 'Aww, hamburgers.'
+      use Grape::Middleware::Error, default_message: 'Aww, hamburgers.'
       run ErrApp
     end
   end
-  
+
   it 'sets the status code appropriately' do
-    ErrApp.error = {:status => 410}
+    ErrApp.error = { status: 410 }
     get '/'
     last_response.status.should == 410
   end
-  
+
   it 'sets the error message appropriately' do
-    ErrApp.error = {:message => 'Awesome stuff.'}
+    ErrApp.error = { message: 'Awesome stuff.' }
     get '/'
     last_response.body.should == 'Awesome stuff.'
   end
-  
+
   it 'defaults to a 403 status' do
     ErrApp.error = {}
     get '/'
     last_response.status.should == 403
   end
-  
+
   it 'has a default message' do
     ErrApp.error = {}
     get '/'
     last_response.body.should == 'Aww, hamburgers.'
   end
-  
-  context 'with formatting' do
-    
-  end
 end

data/spec/grape/middleware/exception_spec.rb

@@ -15,9 +15,10 @@ describe Grape::Middleware::Error do
   # raises a hash error
   class ErrorHashApp
     class << self
-      def error!(message, status=403)
-        throw :error, :message => { :error => message, :detail => "missing widget" }, :status => status
+      def error!(message, status = 403)
+        throw :error, message: { error: message, detail: "missing widget" }, status: status
       end
+
       def call(env)
         error!("rain!", 401)
       end
@@ -27,9 +28,10 @@ describe Grape::Middleware::Error do
   # raises an error!
   class AccessDeniedApp
     class << self
-      def error!(message, status=403)
-        throw :error, :message => message, :status => status
+      def error!(message, status = 403)
+        throw :error, message: message, status: status
       end
+
       def call(env)
         error!("Access Denied", 401)
       end
@@ -37,18 +39,18 @@ describe Grape::Middleware::Error do
   end
 
   # raises a custom error
-  class CustomError < Grape::Exceptions::Base; end
+  class CustomError < Grape::Exceptions::Base
+  end
+
   class CustomErrorApp
     class << self
       def call(env)
-        raise CustomError, :status => 400, :message => 'failed validation'
+        raise CustomError, status: 400, message: 'failed validation'
       end
     end
   end
 
-  def app
-    @app
-  end
+  attr_reader :app
 
   it 'does not trap errors by default' do
     @app ||= Rack::Builder.app do
@@ -61,7 +63,7 @@ describe Grape::Middleware::Error do
   context 'with rescue_all set to true' do
     it 'sets the message appropriately' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => true
+        use Grape::Middleware::Error, rescue_all: true
         run ExceptionApp
       end
       get '/'
@@ -70,7 +72,7 @@ describe Grape::Middleware::Error do
 
     it 'defaults to a 403 status' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => true
+        use Grape::Middleware::Error, rescue_all: true
         run ExceptionApp
       end
       get '/'
@@ -79,7 +81,7 @@ describe Grape::Middleware::Error do
 
     it 'is possible to specify a different default status code' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => true, :default_status => 500
+        use Grape::Middleware::Error, rescue_all: true, default_status: 500
         run ExceptionApp
       end
       get '/'
@@ -88,7 +90,7 @@ describe Grape::Middleware::Error do
 
     it 'is possible to return errors in json format' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => true, :format => :json
+        use Grape::Middleware::Error, rescue_all: true, format: :json
         run ExceptionApp
       end
       get '/'
@@ -97,7 +99,26 @@ describe Grape::Middleware::Error do
 
     it 'is possible to return hash errors in json format' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => true, :format => :json
+        use Grape::Middleware::Error, rescue_all: true, format: :json
+        run ErrorHashApp
+      end
+      get '/'
+      ['{"error":"rain!","detail":"missing widget"}',
+       '{"detail":"missing widget","error":"rain!"}'].should include(last_response.body)
+    end
+
+    it 'is possible to return errors in jsonapi format' do
+      @app ||= Rack::Builder.app do
+        use Grape::Middleware::Error, rescue_all: true, format: :jsonapi
+        run ExceptionApp
+      end
+      get '/'
+      last_response.body.should == '{"error":"rain!"}'
+    end
+
+    it 'is possible to return hash errors in jsonapi format' do
+      @app ||= Rack::Builder.app do
+        use Grape::Middleware::Error, rescue_all: true, format: :jsonapi
         run ErrorHashApp
       end
       get '/'
@@ -107,7 +128,7 @@ describe Grape::Middleware::Error do
 
     it 'is possible to return errors in xml format' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => true, :format => :xml
+        use Grape::Middleware::Error, rescue_all: true, format: :xml
         run ExceptionApp
       end
       get '/'
@@ -116,7 +137,7 @@ describe Grape::Middleware::Error do
 
     it 'is possible to return hash errors in xml format' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => true, :format => :xml
+        use Grape::Middleware::Error, rescue_all: true, format: :xml
         run ErrorHashApp
       end
       get '/'
@@ -126,14 +147,13 @@ describe Grape::Middleware::Error do
 
     it 'is possible to specify a custom formatter' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error,
-          :rescue_all => true,
-          :format => :custom,
-          :error_formatters => {
-            :custom => lambda { |message, backtrace, options, env|
-              { :custom_formatter => message }.inspect
-            }
-          }
+        use Grape::Middleware::Error, rescue_all: true,
+                                      format: :custom,
+                                      error_formatters: {
+                                        custom: lambda { |message, backtrace, options, env|
+                                          { custom_formatter: message }.inspect
+                                        }
+                                      }
         run ExceptionApp
       end
       get '/'
@@ -151,7 +171,7 @@ describe Grape::Middleware::Error do
 
     it 'responds to custom Grape exceptions appropriately' do
       @app ||= Rack::Builder.app do
-        use Grape::Middleware::Error, :rescue_all => false
+        use Grape::Middleware::Error, rescue_all: false
         run CustomErrorApp
       end