grape 0.9.0 → 0.10.0

data/spec/grape/validations/{at_least_one_of_spec.rb → validators/at_least_one_of_spec.rb}

@@ -4,7 +4,11 @@ describe Grape::Validations::AtLeastOneOfValidator do
   describe '#validate!' do
     let(:scope) do
       Struct.new(:opts) do
-        def params(arg); end
+        def params(arg)
+          arg
+        end
+
+        def required?; end
       end
     end
     let(:at_least_one_of_params) { [:beer, :wine, :grapefruit] }
@@ -46,9 +50,9 @@ describe Grape::Validations::AtLeastOneOfValidator do
       let(:params) { { somethingelse: true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
     end
 

data/spec/grape/validations/{coerce_spec.rb → validators/coerce_spec.rb}

@@ -11,14 +11,12 @@ describe Grape::Validations::CoerceValidator do
   end
 
   describe 'coerce' do
-
-    context "i18n" do
-
+    context 'i18n' do
       after :each do
         I18n.locale = :en
       end
 
-      it "i18n error on malformed input" do
+      it 'i18n error on malformed input' do
         I18n.load_path << File.expand_path('../zh-CN.yml', __FILE__)
         I18n.reload!
         I18n.locale = 'zh-CN'.to_sym
@@ -47,7 +45,6 @@ describe Grape::Validations::CoerceValidator do
         expect(last_response.status).to eq(400)
         expect(last_response.body).to eq('age is invalid')
       end
-
     end
 
     it 'error on malformed input' do
@@ -75,11 +72,11 @@ describe Grape::Validations::CoerceValidator do
         'array int works'
       end
 
-      get 'array', ids: ['1', '2', 'az']
+      get 'array', ids: %w(1 2 az)
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('ids is invalid')
 
-      get 'array', ids: ['1', '2', '890']
+      get 'array', ids: %w(1 2 890)
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq('array int works')
     end
@@ -101,7 +98,7 @@ describe Grape::Validations::CoerceValidator do
           'complex works'
         end
 
-        get '/user', user: "32"
+        get '/user', user: '32'
         expect(last_response.status).to eq(400)
         expect(last_response.body).to eq('user is invalid')
 
@@ -120,7 +117,7 @@ describe Grape::Validations::CoerceValidator do
           params[:int].class
         end
 
-        get '/int', int: "45"
+        get '/int', int: '45'
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('Fixnum')
       end
@@ -133,7 +130,7 @@ describe Grape::Validations::CoerceValidator do
           params[:arry][0].class
         end
 
-        get '/array', arry: ['1', '2', '3']
+        get '/array', arry: %w(1 2 3)
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('Fixnum')
       end
@@ -199,7 +196,7 @@ describe Grape::Validations::CoerceValidator do
           params[:integers][:int].class
         end
 
-        get '/int', integers: { int: "45" }
+        get '/int', integers: { int: '45' }
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('Fixnum')
       end

data/spec/grape/validations/{default_spec.rb → validators/default_spec.rb}

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Grape::Validations::DefaultValidator do
-
   module ValidationsSpec
     module DefaultValidatorSpec
       class API < Grape::API
@@ -73,34 +72,34 @@ describe Grape::Validations::DefaultValidator do
   end
 
   it 'set default value for optional param' do
-    get("/")
+    get('/')
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq({ id: nil, type: 'default-type' }.to_json)
   end
 
   it 'set default values for optional params' do
-    get("/user")
+    get('/user')
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq({ type1: 'default-type1', type2: 'default-type2' }.to_json)
   end
 
   it 'set default values for missing params in the request' do
-    get("/user?type2=value2")
+    get('/user?type2=value2')
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq({ type1: 'default-type1', type2: 'value2' }.to_json)
   end
 
   it 'set default values for optional params and allow to use required fields in the same time' do
-    get("/message?id=1")
+    get('/message?id=1')
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq({ id: '1', type1: 'default-type1', type2: 'default-type2' }.to_json)
   end
 
   it 'sets lambda based defaults at the time of call' do
-    get("/numbers")
+    get('/numbers')
     expect(last_response.status).to eq(200)
     before = JSON.parse(last_response.body)
-    get("/numbers")
+    get('/numbers')
     expect(last_response.status).to eq(200)
     after = JSON.parse(last_response.body)
 
@@ -117,7 +116,6 @@ describe Grape::Validations::DefaultValidator do
   it 'sets default values for grouped arrays' do
     get('/array?array[][name]=name&array[][name]=name2&array[][with_default]=bar2')
     expect(last_response.status).to eq(200)
-    expect(last_response.body).to eq({ array: [{ name: "name", with_default: "default" }, { name: "name2", with_default: "bar2" }] }.to_json)
+    expect(last_response.body).to eq({ array: [{ name: 'name', with_default: 'default' }, { name: 'name2', with_default: 'bar2' }] }.to_json)
   end
-
 end

data/spec/grape/validations/{exactly_one_of_spec.rb → validators/exactly_one_of_spec.rb}

@@ -4,7 +4,11 @@ describe Grape::Validations::ExactlyOneOfValidator do
   describe '#validate!' do
     let(:scope) do
       Struct.new(:opts) do
-        def params(arg); end
+        def params(arg)
+          arg
+        end
+
+        def required?; end
       end
     end
     let(:exactly_one_of_params) { [:beer, :wine, :grapefruit] }
@@ -14,18 +18,18 @@ describe Grape::Validations::ExactlyOneOfValidator do
       let(:params) { { beer: true, wine: true, grapefruit: true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
 
       context 'mixed with other params' do
         let(:mixed_params) { params.merge!(other: true, andanother: true) }
 
         it 'still raises a validation exception' do
-          expect {
+          expect do
             validator.validate! mixed_params
-          }.to raise_error(Grape::Exceptions::Validation)
+          end.to raise_error(Grape::Exceptions::Validation)
         end
       end
     end
@@ -34,9 +38,9 @@ describe Grape::Validations::ExactlyOneOfValidator do
       let(:params) { { beer: true, grapefruit: true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
     end
 
@@ -44,9 +48,9 @@ describe Grape::Validations::ExactlyOneOfValidator do
       let(:params) { { 'beer' => true, 'grapefruit' => true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
     end
 
@@ -54,9 +58,9 @@ describe Grape::Validations::ExactlyOneOfValidator do
       let(:params) { { somethingelse: true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
     end
 

data/spec/grape/validations/{mutual_exclusion_spec.rb → validators/mutual_exclusion_spec.rb}

@@ -4,7 +4,9 @@ describe Grape::Validations::MutualExclusionValidator do
   describe '#validate!' do
     let(:scope) do
       Struct.new(:opts) do
-        def params(arg); end
+        def params(arg)
+          arg
+        end
       end
     end
     let(:mutually_exclusive_params) { [:beer, :wine, :grapefruit] }
@@ -14,18 +16,18 @@ describe Grape::Validations::MutualExclusionValidator do
       let(:params) { { beer: true, wine: true, grapefruit: true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
 
       context 'mixed with other params' do
         let(:mixed_params) { params.merge!(other: true, andanother: true) }
 
         it 'still raises a validation exception' do
-          expect {
+          expect do
             validator.validate! mixed_params
-          }.to raise_error(Grape::Exceptions::Validation)
+          end.to raise_error(Grape::Exceptions::Validation)
         end
       end
     end
@@ -34,9 +36,9 @@ describe Grape::Validations::MutualExclusionValidator do
       let(:params) { { beer: true, grapefruit: true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
     end
 
@@ -44,9 +46,9 @@ describe Grape::Validations::MutualExclusionValidator do
       let(:params) { { 'beer' => true, 'grapefruit' => true } }
 
       it 'raises a validation exception' do
-        expect {
+        expect do
           validator.validate! params
-        }.to raise_error(Grape::Exceptions::Validation)
+        end.to raise_error(Grape::Exceptions::Validation)
       end
     end
 

data/spec/grape/validations/{presence_spec.rb → validators/presence_spec.rb}

@@ -10,22 +10,22 @@ describe Grape::Validations::PresenceValidator do
     subject
   end
 
-  context "without validation" do
+  context 'without validation' do
     before do
       subject.resource :bacons do
         get do
-          "All the bacon"
+          'All the bacon'
         end
       end
     end
     it 'does not validate for any params' do
-      get "/bacons"
+      get '/bacons'
       expect(last_response.status).to eq(200)
-      expect(last_response.body).to eq("All the bacon".to_json)
+      expect(last_response.body).to eq('All the bacon'.to_json)
     end
   end
 
-  context "with a required regexp parameter supplied in the POST body" do
+  context 'with a required regexp parameter supplied in the POST body' do
     before do
       subject.format :json
       subject.params do
@@ -52,13 +52,13 @@ describe Grape::Validations::PresenceValidator do
     end
   end
 
-  context "with a required non-empty string" do
+  context 'with a required non-empty string' do
     before do
       subject.params do
         requires :email, type: String, regexp: /^\S+$/
       end
       subject.get do
-        "Hello"
+        'Hello'
       end
     end
     it 'requires when missing' do
@@ -67,24 +67,24 @@ describe Grape::Validations::PresenceValidator do
       expect(last_response.body).to eq('{"error":"email is missing, email is invalid"}')
     end
     it 'requires when empty' do
-      get '/', email: ""
+      get '/', email: ''
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"email is invalid"}')
     end
-    it "valid when set" do
-      get '/', email: "bob@example.com"
+    it 'valid when set' do
+      get '/', email: 'bob@example.com'
       expect(last_response.status).to eq(200)
-      expect(last_response.body).to eq("Hello".to_json)
+      expect(last_response.body).to eq('Hello'.to_json)
     end
   end
 
-  context "with required parameters and no type" do
+  context 'with required parameters and no type' do
     before do
       subject.params do
         requires :name, :company
       end
       subject.get do
-        "Hello"
+        'Hello'
       end
     end
     it 'validates name, company' do
@@ -92,17 +92,17 @@ describe Grape::Validations::PresenceValidator do
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"name is missing"}')
 
-      get '/', name: "Bob"
+      get '/', name: 'Bob'
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"company is missing"}')
 
-      get '/', name: "Bob", company: "TestCorp"
+      get '/', name: 'Bob', company: 'TestCorp'
       expect(last_response.status).to eq(200)
-      expect(last_response.body).to eq("Hello".to_json)
+      expect(last_response.body).to eq('Hello'.to_json)
     end
   end
 
-  context "with nested parameters" do
+  context 'with nested parameters' do
     before do
       subject.params do
         requires :user, type: Hash do
@@ -111,7 +111,7 @@ describe Grape::Validations::PresenceValidator do
         end
       end
       subject.get '/nested' do
-        "Nested"
+        'Nested'
       end
     end
     it 'validates nested parameters' do
@@ -119,17 +119,17 @@ describe Grape::Validations::PresenceValidator do
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"user is missing, user[first_name] is missing, user[last_name] is missing"}')
 
-      get '/nested', user: { first_name: "Billy" }
+      get '/nested', user: { first_name: 'Billy' }
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"user[last_name] is missing"}')
 
-      get '/nested', user: { first_name: "Billy", last_name: "Bob" }
+      get '/nested', user: { first_name: 'Billy', last_name: 'Bob' }
       expect(last_response.status).to eq(200)
-      expect(last_response.body).to eq("Nested".to_json)
+      expect(last_response.body).to eq('Nested'.to_json)
     end
   end
 
-  context "with triply nested required parameters" do
+  context 'with triply nested required parameters' do
     before do
       subject.params do
         requires :admin, type: Hash do
@@ -143,7 +143,7 @@ describe Grape::Validations::PresenceValidator do
         end
       end
       subject.get '/nested_triple' do
-        "Nested triple"
+        'Nested triple'
       end
     end
     it 'validates triple nested parameters' do
@@ -151,29 +151,29 @@ describe Grape::Validations::PresenceValidator do
       expect(last_response.status).to eq(400)
       expect(last_response.body).to include '{"error":"admin is missing'
 
-      get '/nested_triple', user: { first_name: "Billy" }
+      get '/nested_triple', user: { first_name: 'Billy' }
       expect(last_response.status).to eq(400)
       expect(last_response.body).to include '{"error":"admin is missing'
 
-      get '/nested_triple', admin: { super: { first_name: "Billy" } }
+      get '/nested_triple', admin: { super: { first_name: 'Billy' } }
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"admin[admin_name] is missing, admin[super][user] is missing, admin[super][user][first_name] is missing, admin[super][user][last_name] is missing"}')
 
-      get '/nested_triple', super: { user: { first_name: "Billy", last_name: "Bob" } }
+      get '/nested_triple', super: { user: { first_name: 'Billy', last_name: 'Bob' } }
       expect(last_response.status).to eq(400)
       expect(last_response.body).to include '{"error":"admin is missing'
 
-      get '/nested_triple', admin: { super: { user: { first_name: "Billy" } } }
+      get '/nested_triple', admin: { super: { user: { first_name: 'Billy' } } }
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"admin[admin_name] is missing, admin[super][user][last_name] is missing"}')
 
-      get '/nested_triple', admin: { admin_name: 'admin', super: { user: { first_name: "Billy" } } }
+      get '/nested_triple', admin: { admin_name: 'admin', super: { user: { first_name: 'Billy' } } }
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"admin[super][user][last_name] is missing"}')
 
-      get '/nested_triple', admin: { admin_name: 'admin', super: { user: { first_name: "Billy", last_name: "Bob" } } }
+      get '/nested_triple', admin: { admin_name: 'admin', super: { user: { first_name: 'Billy', last_name: 'Bob' } } }
       expect(last_response.status).to eq(200)
-      expect(last_response.body).to eq("Nested triple".to_json)
+      expect(last_response.body).to eq('Nested triple'.to_json)
     end
   end
 end