grape 0.9.0 → 0.10.0

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

@@ -9,7 +9,7 @@ describe Grape::Middleware::Auth::Strategies do
       Rack::Builder.new do |b|
         b.use Grape::Middleware::Error
         b.use(Grape::Middleware::Auth::Base, type: :http_basic, proc: proc)
-        b.run lambda { |env| [200, {}, ["Hello there."]] }
+        b.run lambda { |env| [200, {}, ['Hello there.']] }
       end
     end
 
@@ -34,8 +34,8 @@ describe Grape::Middleware::Auth::Strategies do
     RSpec::Matchers.define :be_challenge do
       match do |actual_response|
         actual_response.status == 401 &&
-            actual_response['WWW-Authenticate'] =~ /^Digest / &&
-            actual_response.body.empty?
+          actual_response['WWW-Authenticate'] =~ /^Digest / &&
+          actual_response.body.empty?
       end
     end
 
@@ -66,16 +66,15 @@ describe Grape::Middleware::Auth::Strategies do
     end
 
     it 'authenticates if given valid creds' do
-      digest_authorize "foo", "bar"
+      digest_authorize 'foo', 'bar'
       get '/test'
       expect(last_response.status).to eq(200)
     end
 
     it 'throws a 401 if given invalid creds' do
-      digest_authorize "bar", "foo"
+      digest_authorize 'bar', 'foo'
       get '/test'
       expect(last_response.status).to eq(401)
     end
   end
-
 end

data/spec/grape/middleware/exception_spec.rb

@@ -2,12 +2,11 @@ require 'spec_helper'
 require 'active_support/core_ext/hash'
 
 describe Grape::Middleware::Error do
-
   # raises a text exception
   class ExceptionApp
     class << self
       def call(env)
-        raise "rain!"
+        fail 'rain!'
       end
     end
   end
@@ -16,11 +15,11 @@ describe Grape::Middleware::Error do
   class ErrorHashApp
     class << self
       def error!(message, status)
-        throw :error, message: { error: message, detail: "missing widget" }, status: status
+        throw :error, message: { error: message, detail: 'missing widget' }, status: status
       end
 
       def call(env)
-        error!("rain!", 401)
+        error!('rain!', 401)
       end
     end
   end
@@ -33,7 +32,7 @@ describe Grape::Middleware::Error do
       end
 
       def call(env)
-        error!("Access Denied", 401)
+        error!('Access Denied', 401)
       end
     end
   end
@@ -45,7 +44,7 @@ describe Grape::Middleware::Error do
   class CustomErrorApp
     class << self
       def call(env)
-        raise CustomError, status: 400, message: 'failed validation'
+        fail CustomError, status: 400, message: 'failed validation'
       end
     end
   end
@@ -69,7 +68,7 @@ describe Grape::Middleware::Error do
         run ExceptionApp
       end
       get '/'
-      expect(last_response.body).to eq("rain!")
+      expect(last_response.body).to eq('rain!')
     end
 
     it 'defaults to a 500 status' do
@@ -161,9 +160,9 @@ describe Grape::Middleware::Error do
         use Grape::Middleware::Error, rescue_all: true,
                                       format: :custom,
                                       error_formatters: {
-                                        custom: lambda { |message, backtrace, options, env|
+                                        custom: lambda do |message, backtrace, options, env|
                                           { custom_formatter: message }.inspect
-                                        }
+                                        end
                                       }
         run ExceptionApp
       end
@@ -192,6 +191,5 @@ describe Grape::Middleware::Error do
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('failed validation')
     end
-
   end
 end

data/spec/grape/middleware/formatter_spec.rb

@@ -4,11 +4,11 @@ describe Grape::Middleware::Formatter do
   subject { Grape::Middleware::Formatter.new(app) }
   before { allow(subject).to receive(:dup).and_return(subject) }
 
-  let(:app) { lambda { |env| [200, {}, [@body || { "foo" => "bar" }]] } }
+  let(:app) { lambda { |env| [200, {}, [@body || { 'foo' => 'bar' }]] } }
 
   context 'serialization' do
     it 'looks at the bodies for possibly serializable data' do
-      @body = { "abc" => "def" }
+      @body = { 'abc' => 'def' }
       _, _, bodies = *subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json')
       bodies.each { |b| expect(b).to eq(MultiJson.dump(@body)) }
     end
@@ -36,10 +36,10 @@ describe Grape::Middleware::Formatter do
     end
 
     it 'calls #to_xml if the content type is xml' do
-      @body = "string"
+      @body = 'string'
       @body.instance_eval do
         def to_xml
-          "<bar/>"
+          '<bar/>'
         end
       end
 
@@ -54,24 +54,23 @@ describe Grape::Middleware::Formatter do
     end
 
     it 'rescues formatter-specific exceptions' do
-      allow(formatter).to receive(:call) { raise Grape::Exceptions::InvalidFormatter.new(String, 'xml') }
+      allow(formatter).to receive(:call) { fail Grape::Exceptions::InvalidFormatter.new(String, 'xml') }
 
-      expect {
+      expect do
         catch(:error) { subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json') }
-      }.to_not raise_error
+      end.to_not raise_error
     end
 
     it 'does not rescue other exceptions' do
-      allow(formatter).to receive(:call) { raise StandardError }
+      allow(formatter).to receive(:call) { fail StandardError }
 
-      expect {
+      expect do
         catch(:error) { subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json') }
-      }.to raise_error
+      end.to raise_error
     end
   end
 
   context 'detection' do
-
     it 'uses the xml extension if one is provided' do
       subject.call('PATH_INFO' => '/info.xml')
       expect(subject.env['api.format']).to eq(:xml)
@@ -186,8 +185,8 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'input' do
-    ["POST", "PATCH", "PUT", "DELETE"].each do |method|
-      ["application/json", "application/json; charset=utf-8"].each do |content_type|
+    %w(POST PATCH PUT DELETE).each do |method|
+      ['application/json', 'application/json; charset=utf-8'].each do |content_type|
         context content_type do
           it 'parses the body from #{method} and copies values into rack.request.form_hash' do
             io = StringIO.new('{"is_boolean":true,"string":"thing"}')
@@ -215,7 +214,7 @@ describe Grape::Middleware::Formatter do
         expect(subject.env['rack.request.form_hash']['is_boolean']).to be true
         expect(subject.env['rack.request.form_hash']['string']).to eq('thing')
       end
-      it "rewinds IO" do
+      it 'rewinds IO' do
         io = StringIO.new('{"is_boolean":true,"string":"thing"}')
         io.read
         subject.call(
@@ -254,5 +253,4 @@ describe Grape::Middleware::Formatter do
       end
     end
   end
-
 end

data/spec/grape/middleware/versioner/accept_version_header_spec.rb

@@ -30,9 +30,9 @@ describe Grape::Middleware::Versioner::AcceptVersionHeader do
     end
 
     it 'fails with 406 Not Acceptable if version is not supported' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT_VERSION' => 'v2').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -59,9 +59,9 @@ describe Grape::Middleware::Versioner::AcceptVersionHeader do
     end
 
     it 'fails with 406 Not Acceptable if header is not set' do
-      expect {
+      expect do
         subject.call({}).last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -70,9 +70,9 @@ describe Grape::Middleware::Versioner::AcceptVersionHeader do
     end
 
     it 'fails with 406 Not Acceptable if header is empty' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT_VERSION' => '').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -93,9 +93,9 @@ describe Grape::Middleware::Versioner::AcceptVersionHeader do
     end
 
     it 'fails with 406 Not Acceptable if header is not set' do
-      expect {
+      expect do
         subject.call({}).last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: {},
@@ -104,9 +104,9 @@ describe Grape::Middleware::Versioner::AcceptVersionHeader do
     end
 
     it 'fails with 406 Not Acceptable if header is empty' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT_VERSION' => '').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: {},

data/spec/grape/middleware/versioner/header_spec.rb

@@ -84,9 +84,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if vendor is invalid' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => 'application/vnd.othervendor+json').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -112,9 +112,9 @@ describe Grape::Middleware::Versioner::Header do
       end
 
       it 'fails with 406 Not Acceptable if vendor is invalid' do
-        expect {
+        expect do
           subject.call('HTTP_ACCEPT' => 'application/vnd.othervendor-v1+json').last
-        }.to throw_symbol(
+        end.to throw_symbol(
           :error,
           status: 406,
           headers: { 'X-Cascade' => 'pass' },
@@ -142,9 +142,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if version is invalid' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v2+json').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -171,9 +171,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if header is not set' do
-      expect {
+      expect do
         subject.call({}).last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -182,9 +182,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if header is empty' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => '').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -193,9 +193,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if type is a range' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => '*/*').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -204,9 +204,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if subtype is a range' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => 'application/*').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },
@@ -227,9 +227,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if header is not set' do
-      expect {
+      expect do
         subject.call({}).last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: {},
@@ -238,9 +238,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if header is empty' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => '').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: {},
@@ -249,9 +249,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if type is a range' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => '*/*').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: {},
@@ -260,9 +260,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with 406 Not Acceptable if subtype is a range' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => 'application/*').last
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: {},
@@ -277,7 +277,7 @@ describe Grape::Middleware::Versioner::Header do
 
   context 'when multiple versions are specified' do
     before do
-      @options[:versions] = ['v1', 'v2']
+      @options[:versions] = %w(v1 v2)
     end
 
     it 'succeeds with v1' do
@@ -289,9 +289,9 @@ describe Grape::Middleware::Versioner::Header do
     end
 
     it 'fails with another version' do
-      expect {
+      expect do
         subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v3+json')
-      }.to throw_symbol(
+      end.to throw_symbol(
         :error,
         status: 406,
         headers: { 'X-Cascade' => 'pass' },

data/spec/grape/middleware/versioner/param_spec.rb

@@ -1,48 +1,47 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Param do
-
   let(:app) { lambda { |env| [200, env, env['api.version']] } }
   subject { Grape::Middleware::Versioner::Param.new(app, @options || {}) }
 
   it 'sets the API version based on the default param (apiver)' do
-    env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1" })
-    expect(subject.call(env)[1]["api.version"]).to eq('v1')
+    env = Rack::MockRequest.env_for('/awesome', params: { 'apiver' => 'v1' })
+    expect(subject.call(env)[1]['api.version']).to eq('v1')
   end
 
   it 'cuts (only) the version out of the params' do
-    env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1", "other_param" => "5" })
+    env = Rack::MockRequest.env_for('/awesome', params: { 'apiver' => 'v1', 'other_param' => '5' })
     env['rack.request.query_hash'] = Rack::Utils.parse_nested_query(env['QUERY_STRING'])
-    expect(subject.call(env)[1]['rack.request.query_hash']["apiver"]).to be_nil
-    expect(subject.call(env)[1]['rack.request.query_hash']["other_param"]).to eq("5")
+    expect(subject.call(env)[1]['rack.request.query_hash']['apiver']).to be_nil
+    expect(subject.call(env)[1]['rack.request.query_hash']['other_param']).to eq('5')
   end
 
   it 'provides a nil version if no version is given' do
-    env = Rack::MockRequest.env_for("/")
+    env = Rack::MockRequest.env_for('/')
     expect(subject.call(env).last).to be_nil
   end
 
   context 'with specified parameter name' do
     before { @options = { parameter: 'v' } }
     it 'sets the API version based on the custom parameter name' do
-      env = Rack::MockRequest.env_for("/awesome", params: { "v" => "v1" })
-      expect(subject.call(env)[1]["api.version"]).to eq("v1")
+      env = Rack::MockRequest.env_for('/awesome', params: { 'v' => 'v1' })
+      expect(subject.call(env)[1]['api.version']).to eq('v1')
     end
     it 'does not set the API version based on the default param' do
-      env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1" })
-      expect(subject.call(env)[1]["api.version"]).to be_nil
+      env = Rack::MockRequest.env_for('/awesome', params: { 'apiver' => 'v1' })
+      expect(subject.call(env)[1]['api.version']).to be_nil
     end
   end
 
   context 'with specified versions' do
-    before { @options = { versions: ['v1', 'v2'] } }
+    before { @options = { versions: %w(v1 v2) } }
     it 'throws an error if a non-allowed version is specified' do
-      env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v3" })
+      env = Rack::MockRequest.env_for('/awesome', params: { 'apiver' => 'v3' })
       expect(catch(:error) { subject.call(env) }[:status]).to eq(404)
     end
     it 'allows versions that have been specified' do
-      env = Rack::MockRequest.env_for("/awesome", params: { "apiver" => "v1" })
-      expect(subject.call(env)[1]["api.version"]).to eq('v1')
+      env = Rack::MockRequest.env_for('/awesome', params: { 'apiver' => 'v1' })
+      expect(subject.call(env)[1]['api.version']).to eq('v1')
     end
   end
 
@@ -51,8 +50,7 @@ describe Grape::Middleware::Versioner::Param do
       versions: ['v1'],
       version_options: { using: :header }
     }
-    env = Rack::MockRequest.env_for("/awesome", params: {})
+    env = Rack::MockRequest.env_for('/awesome', params: {})
     expect(subject.call(env).first).to eq(200)
   end
-
 end