grape 0.2.6 → 0.3.0

data/spec/grape/exceptions/invalid_formatter_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Grape::Exceptions::InvalidFormatter do
+  describe "#message" do
+    let(:error) do
+      described_class.new(String, 'xml')
+    end
+
+    it "contains the problem in the message" do
+      error.message.should include(
+        "cannot convert String to xml"
+      )
+    end
+
+  end
+
+end

data/spec/grape/exceptions/invalid_versioner_option_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Grape::Exceptions::InvalidVersionerOption do
+  describe "#message" do
+    let(:error) do
+      described_class.new("headers")
+    end
+
+    it "contains the problem in the message" do
+      error.message.should include(
+        "Unknown :using for versioner: headers"
+      )
+    end
+
+  end
+
+end

data/spec/grape/exceptions/missing_mime_type_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'spec_helper'
+describe Grape::Exceptions::MissingMimeType do
+  describe "#message" do
+
+    let(:error) do
+      described_class.new("new_json")
+    end
+
+    it "contains the problem in the message" do
+      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' "
+      )
+    end
+  end
+
+
+end

data/spec/grape/exceptions/missing_option_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Grape::Exceptions::MissingOption do
+  describe "#message" do
+    let(:error) do
+      described_class.new(:path)
+    end
+
+    it "contains the problem in the message" do
+      error.message.should include(
+        "You must specify :path options."
+      )
+    end
+
+  end
+
+end

data/spec/grape/exceptions/unknown_options_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Grape::Exceptions::UnknownOptions do
+  describe "#message" do
+    let(:error) do
+      described_class.new([:a, :b])
+    end
+
+    it "contains the problem in the message" do
+      error.message.should include(
+        "unknown options: "
+      )
+    end
+
+  end
+
+end

data/spec/grape/exceptions/unknown_validator_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Grape::Exceptions::UnknownValidator do
+  describe "#message" do
+    let(:error) do
+      described_class.new('gt_10')
+    end
+
+    it "contains the problem in the message" do
+      error.message.should include(
+        "unknown validator: gt_10"
+      )
+    end
+
+  end
+
+end

data/spec/grape/middleware/formatter_spec.rb

@@ -4,7 +4,7 @@ describe Grape::Middleware::Formatter do
   subject{ Grape::Middleware::Formatter.new(app) }
   before{ subject.stub!(:dup).and_return(subject) }
 
-  let(:app){ lambda{|env| [200, {}, [@body]]} }
+  let(:app){ lambda{|env| [200, {}, [@body || { "foo" => "bar" }]]} }
 
   context 'serialization' do
     it 'looks at the bodies for possibly serializable data' do
@@ -37,6 +37,7 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'detection' do
+
     it 'uses the extension if one is provided' do
       subject.call({'PATH_INFO' => '/info.xml'})
       subject.env['api.format'].should == :xml
@@ -45,9 +46,9 @@ describe Grape::Middleware::Formatter do
     end
 
     it 'uses the format parameter if one is provided' do
-      subject.call({'PATH_INFO' => '/somewhere','QUERY_STRING' => 'format=json'})
+      subject.call({'PATH_INFO' => '/info','QUERY_STRING' => 'format=json'})
       subject.env['api.format'].should == :json
-      subject.call({'PATH_INFO' => '/somewhere','QUERY_STRING' => 'format=xml'})
+      subject.call({'PATH_INFO' => '/info','QUERY_STRING' => 'format=xml'})
       subject.env['api.format'].should == :xml
     end
 
@@ -148,43 +149,48 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'input' do
-    [ "application/json", "application/json; charset=utf-8" ].each do |content_type|
-      it 'parses the body from a POST/PUT and put the contents into rack.request.form_hash for #{content_type}' do
-        io = StringIO.new('{"is_boolean":true,"string":"thing"}')
-        subject.call({
-          'PATH_INFO' => '/info',
-          'REQUEST_METHOD' => 'POST',
-          'CONTENT_TYPE' => content_type,
-          'rack.input' => io,
-          'CONTENT_LENGTH' => io.length
-        })
-        subject.env['rack.request.form_hash']['is_boolean'].should be_true
-        subject.env['rack.request.form_hash']['string'].should == 'thing'
+    [ "POST", "PATCH", "PUT" ].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"}')
+            subject.call({
+              'PATH_INFO' => '/info',
+              'REQUEST_METHOD' => method,
+              'CONTENT_TYPE' => content_type,
+              'rack.input' => io,
+              'CONTENT_LENGTH' => io.length
+            })
+            subject.env['rack.request.form_hash']['is_boolean'].should be_true
+            subject.env['rack.request.form_hash']['string'].should == 'thing'
+          end
+        end
       end
-    end
-    it 'parses the body from an xml POST/PUT and put the contents into rack.request.from_hash' do
-      io = StringIO.new('<thing><name>Test</name></thing>')
-      subject.call({
-        'PATH_INFO' => '/info.xml',
-        'REQUEST_METHOD' => 'POST',
-        'CONTENT_TYPE' => 'application/xml',
-        'rack.input' => io,
-        'CONTENT_LENGTH' => io.length
-      })
-      subject.env['rack.request.form_hash']['thing']['name'].should == 'Test'
-    end
-    [ Rack::Request::FORM_DATA_MEDIA_TYPES, Rack::Request::PARSEABLE_DATA_MEDIA_TYPES ].flatten.each do |content_type|
-      it "ignores #{content_type}" do
-        io = StringIO.new('name=Other+Test+Thing')
+      it 'parses the body from an xml #{method} and copies values into rack.request.from_hash' do
+        io = StringIO.new('<thing><name>Test</name></thing>')
         subject.call({
-          'PATH_INFO' => '/info',
-          'REQUEST_METHOD' => 'POST',
-          'CONTENT_TYPE' => content_type,
+          'PATH_INFO' => '/info.xml',
+          'REQUEST_METHOD' => method,
+          'CONTENT_TYPE' => 'application/xml',
           'rack.input' => io,
           'CONTENT_LENGTH' => io.length
         })
-        subject.env['rack.request.form_hash'].should be_nil
+        subject.env['rack.request.form_hash']['thing']['name'].should == 'Test'
+      end
+      [ Rack::Request::FORM_DATA_MEDIA_TYPES, Rack::Request::PARSEABLE_DATA_MEDIA_TYPES ].flatten.each do |content_type|
+        it "ignores #{content_type}" do
+          io = StringIO.new('name=Other+Test+Thing')
+          subject.call({
+            'PATH_INFO' => '/info',
+            'REQUEST_METHOD' => method,
+            'CONTENT_TYPE' => content_type,
+            'rack.input' => io,
+            'CONTENT_LENGTH' => io.length
+          })
+          subject.env['rack.request.form_hash'].should be_nil
+        end
       end
     end
   end
+
 end

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

@@ -49,21 +49,23 @@ describe Grape::Middleware::Versioner::Header do
       status.should == 200
     end
 
-    context 'when version is set' do
-      before do
-        @options[:versions] = ['v1']
-      end
+    [ 'v1', :v1 ].each do |version|
+      context 'when version is set to #{version{' do
+        before do
+          @options[:versions] = [ version ]
+        end
 
-      it 'is set' do
-        status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json')
-        env['api.format'].should eql 'json'
-        status.should == 200
-      end
+        it 'is set' do
+          status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json')
+          env['api.format'].should eql 'json'
+          status.should == 200
+        end
 
-      it 'is nil if not provided' do
-        status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1')
-        env['api.format'].should eql nil
-        status.should == 200
+        it 'is nil if not provided' do
+          status, _, env =  subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1')
+          env['api.format'].should eql nil
+          status.should == 200
+        end
       end
     end
   end
@@ -88,7 +90,7 @@ describe Grape::Middleware::Versioner::Header do
         :error,
         :status => 406,
         :headers => {'X-Cascade' => 'pass'},
-        :message => 'API vendor or version not found'
+        :message => 'API vendor or version not found.'
       )
     end
 
@@ -116,7 +118,7 @@ describe Grape::Middleware::Versioner::Header do
           :error,
           :status => 406,
           :headers => {'X-Cascade' => 'pass'},
-          :message => 'API vendor or version not found'
+          :message => 'API vendor or version not found.'
         )
       end
     end
@@ -146,7 +148,7 @@ describe Grape::Middleware::Versioner::Header do
         :error,
         :status => 406,
         :headers => {'X-Cascade' => 'pass'},
-        :message => 'API vendor or version not found'
+        :message => 'API vendor or version not found.'
       )
     end
   end
@@ -175,7 +177,7 @@ describe Grape::Middleware::Versioner::Header do
         :error,
         :status => 406,
         :headers => {'X-Cascade' => 'pass'},
-        :message => 'Accept header must be set'
+        :message => 'Accept header must be set.'
       )
     end
 
@@ -186,7 +188,7 @@ describe Grape::Middleware::Versioner::Header do
         :error,
         :status => 406,
         :headers => {'X-Cascade' => 'pass'},
-        :message => 'Accept header must be set'
+        :message => 'Accept header must be set.'
       )
     end
 
@@ -197,7 +199,7 @@ describe Grape::Middleware::Versioner::Header do
         :error,
         :status => 406,
         :headers => {'X-Cascade' => 'pass'},
-        :message => 'Accept header must not contain ranges ("*")'
+        :message => 'Accept header must not contain ranges ("*").'
       )
     end
 
@@ -208,7 +210,63 @@ describe Grape::Middleware::Versioner::Header do
         :error,
         :status => 406,
         :headers => {'X-Cascade' => 'pass'},
-        :message => 'Accept header must not contain ranges ("*")'
+        :message => 'Accept header must not contain ranges ("*").'
+      )
+    end
+
+    it 'succeeds if proper header is set' do
+      subject.call('HTTP_ACCEPT' => 'application/vnd.vendor-v1+json').first.should == 200
+    end
+  end
+
+  context 'when :strict and :cascade=>false are set' do
+    before do
+      @options[:versions] = ['v1']
+      @options[:version_options][:strict] = true
+      @options[:version_options][:cascade] = false
+    end
+
+    it 'fails with 406 Not Acceptable if header is not set' do
+      expect {
+        env = subject.call({}).last
+      }.to throw_symbol(
+        :error,
+        :status => 406,
+        :headers => {},
+        :message => 'Accept header must be set.'
+      )
+    end
+
+    it 'fails with 406 Not Acceptable if header is empty' do
+      expect {
+        env = subject.call('HTTP_ACCEPT' => '').last
+      }.to throw_symbol(
+        :error,
+        :status => 406,
+        :headers => {},
+        :message => 'Accept header must be set.'
+      )
+    end
+
+    it 'fails with 406 Not Acceptable if type is a range' do
+      expect {
+        env = subject.call('HTTP_ACCEPT' => '*/*').last
+      }.to throw_symbol(
+        :error,
+        :status => 406,
+        :headers => {},
+        :message => 'Accept header must not contain ranges ("*").'
+      )
+    end
+
+    it 'fails with 406 Not Acceptable if subtype is a range' do
+      expect {
+        env = subject.call('HTTP_ACCEPT' => 'application/*').last
+      }.to throw_symbol(
+        :error,
+        :status => 406,
+        :headers => {},
+        :message => 'Accept header must not contain ranges ("*").'
       )
     end
 

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

@@ -17,7 +17,7 @@ describe Grape::Middleware::Versioner::Path do
   end
 
   context 'with a pattern' do
-    before{ @options = {:pattern => /v./i} }
+    before { @options = {:pattern => /v./i} }
     it 'sets the version if it matches' do
       subject.call('PATH_INFO' => '/v1/awesome').last.should == 'v1'
     end
@@ -27,14 +27,18 @@ describe Grape::Middleware::Versioner::Path do
     end
   end
 
-  context 'with specified versions' do
-    before{ @options = {:versions => ['v1', 'v2']}}
-    it 'throws an error if a non-allowed version is specified' do
-      catch(:error){subject.call('PATH_INFO' => '/v3/awesome')}[:status].should == 404
-    end
+  [ [ 'v1', 'v2'], [ :v1, :v2 ], [ :v1, 'v2' ], [ 'v1', :v2 ] ].each do |versions|
+    context 'with specified versions as #{versions}' do
+      before { @options = { :versions => versions } }
+
+      it 'throws an error if a non-allowed version is specified' do
+        catch(:error){subject.call('PATH_INFO' => '/v3/awesome')}[:status].should == 404
+      end
 
-    it 'allows versions that have been specified' do
-      subject.call('PATH_INFO' => '/v1/asoasd').last.should == 'v1'
+      it 'allows versions that have been specified' do
+        subject.call('PATH_INFO' => '/v1/asoasd').last.should == 'v1'
+      end
     end
   end
+
 end

data/spec/grape/validations/coerce_spec.rb

@@ -8,6 +8,7 @@ describe Grape::Validations::CoerceValidator do
   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

data/spec/grape/validations/presence_spec.rb

@@ -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: first_name"}'
+    last_response.body.should == '{"error":"missing parameter: user[first_name]"}'
 
     get('/nested', :user => {:first_name => "Billy"})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: last_name"}'
+    last_response.body.should == '{"error":"missing parameter: user[last_name]"}'
 
     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_name"}'
+    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
 
     get('/nested_triple', :user => {:first_name => "Billy"})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin_name"}'
+    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
 
     get('/nested_triple', :admin => {:super => {:first_name => "Billy"}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin_name"}'
+    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
 
     get('/nested_triple', :super => {:user => {:first_name => "Billy", :last_name => "Bob"}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin_name"}'
+    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
 
     get('/nested_triple', :admin => {:super => {:user => {:first_name => "Billy"}}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: admin_name"}'
+    last_response.body.should == '{"error":"missing parameter: admin[admin_name]"}'
 
     get('/nested_triple', :admin => { :admin_name => 'admin', :super => {:user => {:first_name => "Billy"}}})
     last_response.status.should == 400
-    last_response.body.should == '{"error":"missing parameter: last_name"}'
+    last_response.body.should == '{"error":"missing parameter: admin[super][user][last_name]"}'
 
     get('/nested_triple', :admin => { :admin_name => 'admin', :super => {:user => {:first_name => "Billy", :last_name => "Bob"}}})
     last_response.status.should == 200