grape 0.7.0 → 0.8.0

data/spec/grape/entity_spec.rb

@@ -28,19 +28,19 @@ describe Grape::Entity do
 
     it 'pulls a representation from the class options if it exists' do
       entity = Class.new(Grape::Entity)
-      entity.stub(:represent).and_return("Hiya")
+      allow(entity).to receive(:represent).and_return("Hiya")
 
       subject.represent Object, with: entity
       subject.get '/example' do
         present Object.new
       end
       get '/example'
-      last_response.body.should == 'Hiya'
+      expect(last_response.body).to eq('Hiya')
     end
 
     it 'pulls a representation from the class options if the presented object is a collection of objects' do
       entity = Class.new(Grape::Entity)
-      entity.stub(:represent).and_return("Hiya")
+      allow(entity).to receive(:represent).and_return("Hiya")
 
       class TestObject
       end
@@ -61,15 +61,15 @@ describe Grape::Entity do
       end
 
       get '/example'
-      last_response.body.should == "Hiya"
+      expect(last_response.body).to eq("Hiya")
 
       get '/example2'
-      last_response.body.should == "Hiya"
+      expect(last_response.body).to eq("Hiya")
     end
 
     it 'pulls a representation from the class ancestor if it exists' do
       entity = Class.new(Grape::Entity)
-      entity.stub(:represent).and_return("Hiya")
+      allow(entity).to receive(:represent).and_return("Hiya")
 
       subclass = Class.new(Object)
 
@@ -78,13 +78,13 @@ describe Grape::Entity do
         present subclass.new
       end
       get '/example'
-      last_response.body.should == 'Hiya'
+      expect(last_response.body).to eq('Hiya')
     end
 
     it 'automatically uses Klass::Entity if that exists' do
       some_model = Class.new
       entity = Class.new(Grape::Entity)
-      entity.stub(:represent).and_return("Auto-detect!")
+      allow(entity).to receive(:represent).and_return("Auto-detect!")
 
       some_model.const_set :Entity, entity
 
@@ -92,13 +92,13 @@ describe Grape::Entity do
         present some_model.new
       end
       get '/example'
-      last_response.body.should == 'Auto-detect!'
+      expect(last_response.body).to eq('Auto-detect!')
     end
 
     it 'automatically uses Klass::Entity based on the first object in the collection being presented' do
       some_model = Class.new
       entity = Class.new(Grape::Entity)
-      entity.stub(:represent).and_return("Auto-detect!")
+      allow(entity).to receive(:represent).and_return("Auto-detect!")
 
       some_model.const_set :Entity, entity
 
@@ -106,7 +106,7 @@ describe Grape::Entity do
         present [some_model.new]
       end
       get '/example'
-      last_response.body.should == 'Auto-detect!'
+      expect(last_response.body).to eq('Auto-detect!')
     end
 
     it 'does not run autodetection for Entity when explicitely provided' do
@@ -117,10 +117,30 @@ describe Grape::Entity do
         present some_array, with: entity
       end
 
-      some_array.should_not_receive(:first)
+      expect(some_array).not_to receive(:first)
       get '/example'
     end
 
+    it 'does not use #first method on ActiveRecord::Relation to prevent needless sql query' do
+      entity = Class.new(Grape::Entity)
+      some_relation = Class.new
+      some_model = Class.new
+
+      allow(entity).to receive(:represent).and_return("Auto-detect!")
+      allow(some_relation).to receive(:first)
+      allow(some_relation).to receive(:klass).and_return(some_model)
+
+      some_model.const_set :Entity, entity
+
+      subject.get '/example' do
+        present some_relation
+      end
+
+      expect(some_relation).not_to receive(:first)
+      get '/example'
+      expect(last_response.body).to eq('Auto-detect!')
+    end
+
     it 'autodetection does not use Entity if it is not a presenter' do
       some_model = Class.new
       entity = Class.new
@@ -131,7 +151,7 @@ describe Grape::Entity do
         present some_model
       end
       get '/example'
-      entity.should_not_receive(:represent)
+      expect(entity).not_to receive(:represent)
     end
 
     it 'adds a root key to the output if one is given' do
@@ -161,8 +181,8 @@ describe Grape::Entity do
         end
 
         get '/example'
-        last_response.status.should == 200
-        last_response.body.should == '{"example":{"id":1}}'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('{"example":{"id":1}}')
       end
 
       it 'presents with #{format} collection' do
@@ -183,8 +203,8 @@ describe Grape::Entity do
         end
 
         get '/examples'
-        last_response.status.should == 200
-        last_response.body.should == '{"examples":[{"id":1},{"id":2}]}'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('{"examples":[{"id":1},{"id":2}]}')
       end
 
     end
@@ -206,9 +226,9 @@ describe Grape::Entity do
         present c.new(name: "johnnyiller"), with: entity
       end
       get '/example'
-      last_response.status.should == 200
-      last_response.headers['Content-type'].should == "application/xml"
-      last_response.body.should == <<-XML
+      expect(last_response.status).to eq(200)
+      expect(last_response.headers['Content-type']).to eq("application/xml")
+      expect(last_response.body).to eq <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <hash>
   <example>
@@ -235,9 +255,9 @@ XML
         present c.new(name: "johnnyiller"), with: entity
       end
       get '/example'
-      last_response.status.should == 200
-      last_response.headers['Content-type'].should == "application/json"
-      last_response.body.should == '{"example":{"name":"johnnyiller"}}'
+      expect(last_response.status).to eq(200)
+      expect(last_response.headers['Content-type']).to eq("application/json")
+      expect(last_response.body).to eq('{"example":{"name":"johnnyiller"}}')
     end
 
     it 'presents with jsonp utilising Rack::JSONP' do
@@ -265,9 +285,9 @@ XML
       end
 
       get '/example?callback=abcDef'
-      last_response.status.should == 200
-      last_response.headers['Content-type'].should == "application/javascript"
-      last_response.body.should == 'abcDef({"example":{"name":"johnnyiller"}})'
+      expect(last_response.status).to eq(200)
+      expect(last_response.headers['Content-type']).to eq("application/javascript")
+      expect(last_response.body).to eq('abcDef({"example":{"name":"johnnyiller"}})')
     end
 
     context "present with multiple entities" do
@@ -296,7 +316,7 @@ XML
           "user1" => { "name" => "user1" },
           "user2" => { "name" => "user2" }
         }
-        JSON(last_response.body).should == expect_response_json
+        expect(JSON(last_response.body)).to eq(expect_response_json)
       end
 
     end

data/spec/grape/exceptions/invalid_formatter_spec.rb

@@ -8,7 +8,7 @@ describe Grape::Exceptions::InvalidFormatter do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "cannot convert String to xml"
       )
     end

data/spec/grape/exceptions/invalid_versioner_option_spec.rb

@@ -8,7 +8,7 @@ describe Grape::Exceptions::InvalidVersionerOption do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Unknown :using for versioner: headers"
       )
     end

data/spec/grape/exceptions/missing_mime_type_spec.rb

@@ -8,11 +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"
+      expect(error.message).to 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' "
+      expect(error.message).to include "or add your own with content_type :new_json, 'application/new_json' "
     end
   end
 end

data/spec/grape/exceptions/missing_option_spec.rb

@@ -8,7 +8,7 @@ describe Grape::Exceptions::MissingOption do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "You must specify :path options."
       )
     end

data/spec/grape/exceptions/unknown_options_spec.rb

@@ -8,7 +8,7 @@ describe Grape::Exceptions::UnknownOptions do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "unknown options: "
       )
     end

data/spec/grape/exceptions/unknown_validator_spec.rb

@@ -8,7 +8,7 @@ describe Grape::Exceptions::UnknownValidator do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "unknown validator: gt_10"
       )
     end

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

@@ -16,16 +16,16 @@ describe Grape::Middleware::Auth::Basic do
   it 'throws a 401 if no auth is given' do
     @proc = lambda { false }
     get '/whatever'
-    last_response.status.should == 401
+    expect(last_response.status).to eq(401)
   end
 
   it 'authenticates if given valid creds' do
     get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin', 'admin')
-    last_response.status.should == 200
+    expect(last_response.status).to eq(200)
   end
 
   it 'throws a 401 is wrong auth is given' do
     get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin', 'wrong')
-    last_response.status.should == 401
+    expect(last_response.status).to eq(401)
   end
 end

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

@@ -25,23 +25,23 @@ describe Grape::Middleware::Auth::Digest do
 
   it 'is a digest authentication challenge' do
     get '/test'
-    last_response.should be_challenge
+    expect(last_response).to be_challenge
   end
 
   it 'throws a 401 if no auth is given' do
     get '/test'
-    last_response.status.should == 401
+    expect(last_response.status).to eq(401)
   end
 
   it 'authenticates if given valid creds' do
     digest_authorize "foo", "bar"
     get '/test'
-    last_response.status.should == 200
+    expect(last_response.status).to eq(200)
   end
 
   it 'throws a 401 if given invalid creds' do
     digest_authorize "bar", "foo"
     get '/test'
-    last_response.status.should == 401
+    expect(last_response.status).to eq(401)
   end
 end

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

@@ -33,7 +33,7 @@ describe Grape::Middleware::Auth::OAuth2 do
       before { get '/awesome?access_token=g123' }
 
       it 'sets env["api.token"]' do
-        last_response.body.should == 'g123'
+        expect(last_response.body).to eq('g123')
       end
     end
 
@@ -45,11 +45,11 @@ describe Grape::Middleware::Auth::OAuth2 do
       end
 
       it 'throws an error' do
-        @err[:status].should == 401
+        expect(@err[:status]).to eq(401)
       end
 
       it 'sets the WWW-Authenticate header in the response' do
-        @err[:headers]['WWW-Authenticate'].should == "OAuth realm='OAuth API', error='invalid_grant'"
+        expect(@err[:headers]['WWW-Authenticate']).to eq("OAuth realm='OAuth API', error='invalid_grant'")
       end
     end
   end
@@ -62,11 +62,11 @@ describe Grape::Middleware::Auth::OAuth2 do
     end
 
     it 'throws an error' do
-      @err[:status].should == 401
+      expect(@err[:status]).to eq(401)
     end
 
     it 'sets the WWW-Authenticate header in the response to error' do
-      @err[:headers]['WWW-Authenticate'].should == "OAuth realm='OAuth API', error='invalid_grant'"
+      expect(@err[:headers]['WWW-Authenticate']).to eq("OAuth realm='OAuth API', error='invalid_grant'")
     end
   end
 
@@ -77,7 +77,7 @@ describe Grape::Middleware::Auth::OAuth2 do
       end
 
       it 'sets env["api.token"]' do
-        last_response.body.should == 'g123'
+        expect(last_response.body).to eq('g123')
       end
     end
   end
@@ -88,7 +88,7 @@ describe Grape::Middleware::Auth::OAuth2 do
     end
 
     it 'sets env["api.token"]' do
-      last_response.body.should == 'g123'
+      expect(last_response.body).to eq('g123')
     end
   end
 
@@ -100,11 +100,11 @@ describe Grape::Middleware::Auth::OAuth2 do
     end
 
     it 'throws an error' do
-      @err[:status].should == 403
+      expect(@err[:status]).to eq(403)
     end
 
     it 'sets the WWW-Authenticate header in the response to error' do
-      @err[:headers]['WWW-Authenticate'].should == "OAuth realm='OAuth API', error='insufficient_scope'"
+      expect(@err[:headers]['WWW-Authenticate']).to eq("OAuth realm='OAuth API', error='insufficient_scope'")
     end
   end
 
@@ -120,7 +120,7 @@ describe Grape::Middleware::Auth::OAuth2 do
       before { post '/awesome' }
 
       it 'succeeds anyway' do
-        last_response.status.should == 200
+        expect(last_response.status).to eq(200)
       end
     end
 
@@ -128,7 +128,7 @@ describe Grape::Middleware::Auth::OAuth2 do
       before { get '/awesome?access_token=g123' }
 
       it 'sets env["api.token"]' do
-        last_response.body.should == 'g123'
+        expect(last_response.body).to eq('g123')
       end
     end
   end

data/spec/grape/middleware/base_spec.rb

@@ -6,24 +6,24 @@ describe Grape::Middleware::Base do
 
   before do
     # Keep it one object for testing.
-    subject.stub(:dup).and_return(subject)
+    allow(subject).to receive(:dup).and_return(subject)
   end
 
   it 'has the app as an accessor' do
-    subject.app.should == blank_app
+    expect(subject.app).to eq(blank_app)
   end
 
   it 'calls through to the app' do
-    subject.call({}).should == [200, {}, 'Hi there.']
+    expect(subject.call({})).to eq([200, {}, 'Hi there.'])
   end
 
   context 'callbacks' do
     it 'calls #before' do
-      subject.should_receive(:before)
+      expect(subject).to receive(:before)
     end
 
     it 'calls #after' do
-      subject.should_receive(:after)
+      expect(subject).to receive(:after)
     end
 
     after { subject.call!({}) }
@@ -31,12 +31,12 @@ describe Grape::Middleware::Base do
 
   it 'is able to access the response' do
     subject.call({})
-    subject.response.should be_kind_of(Rack::Response)
+    expect(subject.response).to be_kind_of(Rack::Response)
   end
 
   context 'options' do
     it 'persists options passed at initialization' do
-      Grape::Middleware::Base.new(blank_app, abc: true).options[:abc].should be true
+      expect(Grape::Middleware::Base.new(blank_app, abc: true).options[:abc]).to be true
     end
 
     context 'defaults' do
@@ -47,11 +47,11 @@ describe Grape::Middleware::Base do
       end
 
       it 'persists the default options' do
-        ExampleWare.new(blank_app).options[:monkey].should be true
+        expect(ExampleWare.new(blank_app).options[:monkey]).to be true
       end
 
       it 'overrides default options when provided' do
-        ExampleWare.new(blank_app, monkey: false).options[:monkey].should be false
+        expect(ExampleWare.new(blank_app, monkey: false).options[:monkey]).to be false
       end
     end
   end

data/spec/grape/middleware/error_spec.rb

@@ -22,24 +22,24 @@ describe Grape::Middleware::Error do
   it 'sets the status code appropriately' do
     ErrApp.error = { status: 410 }
     get '/'
-    last_response.status.should == 410
+    expect(last_response.status).to eq(410)
   end
 
   it 'sets the error message appropriately' do
     ErrApp.error = { message: 'Awesome stuff.' }
     get '/'
-    last_response.body.should == 'Awesome stuff.'
+    expect(last_response.body).to eq('Awesome stuff.')
   end
 
   it 'defaults to a 500 status' do
     ErrApp.error = {}
     get '/'
-    last_response.status.should == 500
+    expect(last_response.status).to eq(500)
   end
 
   it 'has a default message' do
     ErrApp.error = {}
     get '/'
-    last_response.body.should == 'Aww, hamburgers.'
+    expect(last_response.body).to eq('Aww, hamburgers.')
   end
 end