grape 0.5.0 → 0.6.0

data/spec/grape/entity_spec.rb

@@ -25,7 +25,7 @@ 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")
+      entity.stub(:represent).and_return("Hiya")
 
       subject.represent Object, :with => entity
       subject.get '/example' do
@@ -37,7 +37,7 @@ describe Grape::Entity do
 
     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")
+      entity.stub(:represent).and_return("Hiya")
 
       class TestObject; end
       class FakeCollection
@@ -62,7 +62,7 @@ describe Grape::Entity do
 
     it 'pulls a representation from the class ancestor if it exists' do
       entity = Class.new(Grape::Entity)
-      entity.stub!(:represent).and_return("Hiya")
+      entity.stub(:represent).and_return("Hiya")
 
       subclass = Class.new(Object)
 
@@ -77,7 +77,7 @@ describe Grape::Entity do
     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!")
+      entity.stub(:represent).and_return("Auto-detect!")
 
       some_model.const_set :Entity, entity
 
@@ -91,7 +91,7 @@ describe Grape::Entity do
     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!")
+      entity.stub(:represent).and_return("Auto-detect!")
 
       some_model.const_set :Entity, entity
 

data/spec/grape/middleware/base_spec.rb

@@ -6,7 +6,7 @@ describe Grape::Middleware::Base do
 
   before do
     # Keep it one object for testing.
-    subject.stub!(:dup).and_return(subject)
+    subject.stub(:dup).and_return(subject)
   end
 
   it 'has the app as an accessor' do

data/spec/grape/middleware/formatter_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Grape::Middleware::Formatter do
   subject{ Grape::Middleware::Formatter.new(app) }
-  before{ subject.stub!(:dup).and_return(subject) }
+  before{ subject.stub(:dup).and_return(subject) }
 
   let(:app){ lambda{|env| [200, {}, [@body || { "foo" => "bar" }]]} }
 
@@ -37,7 +37,7 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'error handling' do
-    let(:formatter) { stub(:formatter) }
+    let(:formatter) { double(:formatter) }
     before do
       Grape::Formatter::Base.stub(:formatter_for) { formatter }
     end
@@ -172,7 +172,7 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'input' do
-    [ "POST", "PATCH", "PUT" ].each do |method|
+    [ "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

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

@@ -274,4 +274,29 @@ describe Grape::Middleware::Versioner::Header do
       subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json').first.should == 200
     end
   end
+
+  context 'when multiple versions are specified' do
+    before do
+      @options[:versions] = ['v1', 'v2']
+    end
+
+    it 'succeeds with v1' do
+      subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json').first.should == 200
+    end
+
+    it 'succeeds with v2' do
+      subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v2+json').first.should == 200
+    end
+
+    it 'fails with another version' do
+      expect {
+        subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v3+json')
+      }.to throw_symbol(
+        :error,
+        :status => 406,
+        :headers => {'X-Cascade' => 'pass'},
+        :message => 'API vendor or version not found.'
+      )
+    end
+  end
 end

data/spec/grape/path_spec.rb

@@ -0,0 +1,219 @@
+require 'spec_helper'
+
+module Grape
+  describe Path do
+
+    describe "#initialize" do
+      it "remembers the path" do
+        path = Path.new('/:id', anything, anything)
+        expect(path.raw_path).to eql('/:id')
+      end
+
+      it "remembers the namespace" do
+        path = Path.new(anything, '/users', anything)
+        expect(path.namespace).to eql('/users')
+      end
+
+      it "remebers the settings" do
+        path = Path.new(anything, anything, foo: 'bar')
+        expect(path.settings).to eql(foo: 'bar')
+      end
+    end
+
+    describe "#mount_path" do
+      it "is nil when no mount path setting exists" do
+        path = Path.new(anything, anything, {})
+        expect(path.mount_path).to be_nil
+      end
+
+      it "is nil when the mount path is nil" do
+        path = Path.new(anything, anything, mount_path: nil)
+        expect(path.mount_path).to be_nil
+      end
+
+      it "splits the mount path" do
+        path = Path.new(anything, anything, mount_path: 'foo/bar')
+        expect(path.mount_path).to eql(['foo', 'bar'])
+      end
+    end
+
+    describe "#root_prefix" do
+      it "is nil when no root prefix setting exists" do
+        path = Path.new(anything, anything, {})
+        expect(path.root_prefix).to be_nil
+      end
+
+      it "is nil when the mount path is nil" do
+        path = Path.new(anything, anything, root_prefix: nil)
+        expect(path.root_prefix).to be_nil
+      end
+
+      it "splits the mount path" do
+        path = Path.new(anything, anything, root_prefix: 'hello/world')
+        expect(path.root_prefix).to eql(['hello', 'world'])
+      end
+    end
+
+    describe "#uses_path_versioning?" do
+      it "is false when the version setting is nil" do
+        path = Path.new(anything, anything, version: nil)
+        expect(path.uses_path_versioning?).to be_false
+      end
+
+      it "is false when the version option is header" do
+        path = Path.new(anything, anything, {
+          version: 'v1',
+          version_options: { using: :header }
+        })
+
+        expect(path.uses_path_versioning?).to be_false
+      end
+
+      it "is true when the version option is path" do
+        path = Path.new(anything, anything, {
+          version: 'v1',
+          version_options: { using: :path }
+        })
+
+        expect(path.uses_path_versioning?).to be_true
+      end
+    end
+
+    describe "#has_namespace?" do
+      it "is false when the namespace is nil" do
+        path = Path.new(anything, nil, anything)
+        expect(path).not_to have_namespace
+      end
+
+      it "is false when the namespace starts with whitespace" do
+        path = Path.new(anything, ' /foo', anything)
+        expect(path).not_to have_namespace
+      end
+
+      it "is false when the namespace is the root path" do
+        path = Path.new(anything, '/', anything)
+        expect(path).not_to have_namespace
+      end
+
+      it "is true otherwise" do
+        path = Path.new(anything, '/world', anything)
+        expect(path).to have_namespace
+      end
+    end
+
+    describe "#has_path?" do
+      it "is false when the path is nil" do
+        path = Path.new(nil, anything, anything)
+        expect(path).not_to have_path
+      end
+
+      it "is false when the path starts with whitespace" do
+        path = Path.new(' /foo', anything, anything)
+        expect(path).not_to have_path
+      end
+
+      it "is false when the path is the root path" do
+        path = Path.new('/', anything, anything)
+        expect(path).not_to have_path
+      end
+
+      it "is true otherwise" do
+        path = Path.new('/hello', anything, anything)
+        expect(path).to have_path
+      end
+    end
+
+    describe "#path" do
+      context "mount_path" do
+        it "is not included when it is nil" do
+          path = Path.new(nil, nil, { mount_path: '/foo/bar' })
+          expect(path.path).to eql '/foo/bar'
+        end
+
+        it "is included when it is not nil" do
+          path = Path.new(nil, nil, {})
+          expect(path.path).to eql('/')
+        end
+      end
+
+      context "root_prefix" do
+        it "is not included when it is nil" do
+          path = Path.new(nil, nil, {})
+          expect(path.path).to eql('/')
+        end
+
+        it "is included after the mount path" do
+          path = Path.new(nil, nil, {
+            mount_path: '/foo',
+            root_prefix: '/hello'
+          })
+
+          expect(path.path).to eql('/foo/hello')
+        end
+      end
+
+      it "uses the namespace after the mount path and root prefix" do
+        path = Path.new(nil, 'namespace', {
+          mount_path: '/foo',
+          root_prefix: '/hello'
+        })
+
+        expect(path.path).to eql('/foo/hello/namespace')
+      end
+
+      it "uses the raw path after the namespace" do
+        path = Path.new('raw_path', 'namespace', {
+          mount_path: '/foo',
+          root_prefix: '/hello'
+        })
+
+        expect(path.path).to eql('/foo/hello/namespace/raw_path')
+      end
+    end
+
+    describe "#suffix" do
+      context "when path versioning is used" do
+        it "includes a '/'" do
+          path = Path.new(nil, nil, {})
+          path.stub(:uses_path_versioning?) { true }
+
+          expect(path.suffix).to eql('(/.:format)')
+        end
+      end
+
+      context "when path versioning is not used" do
+        it "does not include a '/' when the path has a namespace" do
+          path = Path.new(nil, 'namespace', {})
+          path.stub(:uses_path_versioning?) { true }
+
+          expect(path.suffix).to eql('(.:format)')
+        end
+
+        it "does not include a '/' when the path has a path" do
+          path = Path.new('/path', nil, {})
+          path.stub(:uses_path_versioning?) { true }
+
+          expect(path.suffix).to eql('(.:format)')
+        end
+
+        it "includes a '/' otherwise" do
+          path = Path.new(nil, nil, {})
+          path.stub(:uses_path_versioning?) { true }
+
+          expect(path.suffix).to eql('(/.:format)')
+        end
+      end
+    end
+
+    describe "#path_with_suffix" do
+      it "combines the path and suffix" do
+        path = Path.new(nil, nil, {})
+        path.stub(:path) { '/the/path' }
+        path.stub(:suffix) { 'suffix' }
+
+        expect(path.path_with_suffix).to eql('/the/pathsuffix')
+      end
+    end
+
+  end
+end

data/spec/grape/validations/coerce_spec.rb

@@ -6,26 +6,44 @@ describe Grape::Validations::CoerceValidator do
   def app; subject end
 
   describe 'coerce' do
-    it "i18n error on malformed input" do
-      I18n.load_path << File.expand_path('../zh-CN.yml',__FILE__)
-      I18n.reload!
-      I18n.locale = :'zh-CN'
-      subject.params { requires :age, :type => Integer }
-      subject.get '/single' do 'int works'; end
 
-      get '/single', :age => '43a'
-      last_response.status.should == 400
-      last_response.body.should == '年龄格式不正确'
-      I18n.locale = :en
+    context "i18n" do
+
+      after :each do
+        I18n.locale = :en
+      end
+
+      it "i18n error on malformed input" do
+        I18n.load_path << File.expand_path('../zh-CN.yml',__FILE__)
+        I18n.reload!
+        I18n.locale = :'zh-CN'
+        subject.params { requires :age, :type => Integer }
+        subject.get '/single' do 'int works'; end
+
+        get '/single', :age => '43a'
+        last_response.status.should == 400
+        last_response.body.should == '年龄格式不正确'
+      end
+
+      it 'gives an english fallback error when default locale message is blank' do
+        I18n.locale = :'pt-BR'
+        subject.params { requires :age, :type => Integer }
+        subject.get '/single' do 'int works'; end
+
+        get '/single', :age => '43a'
+        last_response.status.should == 400
+        last_response.body.should == 'age is invalid'
+      end
 
     end
+
     it 'error on malformed input' do
       subject.params { requires :int, :type => Integer }
       subject.get '/single' do 'int works'; end
 
       get '/single', :int => '43a'
       last_response.status.should == 400
-      last_response.body.should == 'invalid parameter: int'
+      last_response.body.should == 'int is invalid'
 
       get '/single', :int => '43'
       last_response.status.should == 200
@@ -38,7 +56,7 @@ describe Grape::Validations::CoerceValidator do
 
       get 'array', { :ids => ['1', '2', 'az'] }
       last_response.status.should == 400
-      last_response.body.should == 'invalid parameter: ids'
+      last_response.body.should == 'ids is invalid'
 
       get 'array', { :ids => ['1', '2', '890'] }
       last_response.status.should == 200
@@ -60,7 +78,7 @@ describe Grape::Validations::CoerceValidator do
 
         get '/user', :user => "32"
         last_response.status.should == 400
-        last_response.body.should == 'invalid parameter: user'
+        last_response.body.should == 'user is invalid'
 
         get '/user', :user => { :id => 32, :name => 'Bob' }
         last_response.status.should == 200

data/spec/grape/validations/presence_spec.rb

@@ -66,13 +66,13 @@ describe Grape::Validations::PresenceValidator do
   it 'validates id' do
     post '/'
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: id"}'
+    last_response.body.should == '{"error":"id is missing"}'
 
     io = StringIO.new('{"id" : "a56b"}')
     post '/', {}, 'rack.input' => io,
       'CONTENT_TYPE' => 'application/json',
       'CONTENT_LENGTH' => io.length
-    last_response.body.should == '{"error":"invalid parameter: id"}'
+    last_response.body.should == '{"error":"id is invalid"}'
     last_response.status.should == 400
 
     io = StringIO.new('{"id" : 56}')
@@ -86,11 +86,11 @@ describe Grape::Validations::PresenceValidator do
   it 'validates name, company' do
     get('/')
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: name"}'
+    last_response.body.should == '{"error":"name is missing"}'
 
     get('/', :name => "Bob")
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: company"}'
+    last_response.body.should == '{"error":"company is missing"}'
 
     get('/', :name => "Bob", :company => "TestCorp")
     last_response.status.should == 200
@@ -100,11 +100,11 @@ describe Grape::Validations::PresenceValidator do
   it 'validates nested parameters' do
     get('/nested')
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: user[first_name]"}'
+    last_response.body.should == '{"error":"user[first_name] is missing"}'
 
     get('/nested', :user => {:first_name => "Billy"})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: user[last_name]"}'
+    last_response.body.should == '{"error":"user[last_name] is missing"}'
 
     get('/nested', :user => {:first_name => "Billy", :last_name => "Bob"})
     last_response.status.should == 200
@@ -114,27 +114,27 @@ describe Grape::Validations::PresenceValidator do
   it 'validates triple nested parameters' do
     get('/nested_triple')
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
+    last_response.body.should == '{"error":"admin[admin_name] is missing, admin[super][user][first_name] is missing"}'
 
     get('/nested_triple', :user => {:first_name => "Billy"})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
+    last_response.body.should == '{"error":"admin[admin_name] is missing, admin[super][user][first_name] is missing"}'
 
     get('/nested_triple', :admin => {:super => {:first_name => "Billy"}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
+    last_response.body.should == '{"error":"admin[admin_name] is missing, admin[super][user][first_name] is missing"}'
 
     get('/nested_triple', :super => {:user => {:first_name => "Billy", :last_name => "Bob"}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
+    last_response.body.should == '{"error":"admin[admin_name] is missing, admin[super][user][first_name] is missing"}'
 
     get('/nested_triple', :admin => {:super => {:user => {:first_name => "Billy"}}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
+    last_response.body.should == '{"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"}}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin[super][user][last_name]"}'
+    last_response.body.should == '{"error":"admin[super][user][last_name] is missing"}'
 
     get('/nested_triple', :admin => { :admin_name => 'admin', :super => {:user => {:first_name => "Billy", :last_name => "Bob"}}})
     last_response.status.should == 200