grape 0.9.0 → 0.10.0

data/spec/grape/entity_spec.rb

@@ -31,7 +31,7 @@ describe Grape::Entity do
 
     it 'pulls a representation from the class options if it exists' do
       entity = Class.new(Grape::Entity)
-      allow(entity).to receive(:represent).and_return("Hiya")
+      allow(entity).to receive(:represent).and_return('Hiya')
 
       subject.represent Object, with: entity
       subject.get '/example' do
@@ -43,7 +43,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)
-      allow(entity).to receive(:represent).and_return("Hiya")
+      allow(entity).to receive(:represent).and_return('Hiya')
 
       class TestObject
       end
@@ -64,15 +64,15 @@ describe Grape::Entity do
       end
 
       get '/example'
-      expect(last_response.body).to eq("Hiya")
+      expect(last_response.body).to eq('Hiya')
 
       get '/example2'
-      expect(last_response.body).to eq("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)
-      allow(entity).to receive(:represent).and_return("Hiya")
+      allow(entity).to receive(:represent).and_return('Hiya')
 
       subclass = Class.new(Object)
 
@@ -87,7 +87,7 @@ describe Grape::Entity do
     it 'automatically uses Klass::Entity if that exists' do
       some_model = Class.new
       entity = Class.new(Grape::Entity)
-      allow(entity).to receive(:represent).and_return("Auto-detect!")
+      allow(entity).to receive(:represent).and_return('Auto-detect!')
 
       some_model.const_set :Entity, entity
 
@@ -101,7 +101,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)
-      allow(entity).to receive(:represent).and_return("Auto-detect!")
+      allow(entity).to receive(:represent).and_return('Auto-detect!')
 
       some_model.const_set :Entity, entity
 
@@ -129,7 +129,7 @@ describe Grape::Entity do
       some_relation = Class.new
       some_model = Class.new
 
-      allow(entity).to receive(:represent).and_return("Auto-detect!")
+      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)
 
@@ -168,10 +168,9 @@ describe Grape::Entity do
     end
 
     [:json, :serializable_hash].each do |format|
-
       it 'presents with #{format}' do
         entity = Class.new(Grape::Entity)
-        entity.root "examples", "example"
+        entity.root 'examples', 'example'
         entity.expose :id
 
         subject.format format
@@ -192,7 +191,7 @@ describe Grape::Entity do
 
       it 'presents with #{format} collection' do
         entity = Class.new(Grape::Entity)
-        entity.root "examples", "example"
+        entity.root 'examples', 'example'
         entity.expose :id
 
         subject.format format
@@ -211,12 +210,11 @@ describe Grape::Entity do
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('{"examples":[{"id":1},{"id":2}]}')
       end
-
     end
 
     it 'presents with xml' do
       entity = Class.new(Grape::Entity)
-      entity.root "examples", "example"
+      entity.root 'examples', 'example'
       entity.expose :name
 
       subject.format :xml
@@ -225,14 +223,14 @@ describe Grape::Entity do
         c = Class.new do
           attr_reader :name
           def initialize(args)
-            @name = args[:name] || "no name set"
+            @name = args[:name] || 'no name set'
           end
         end
-        present c.new(name: "johnnyiller"), with: entity
+        present c.new(name: 'johnnyiller'), with: entity
       end
       get '/example'
       expect(last_response.status).to eq(200)
-      expect(last_response.headers['Content-type']).to eq("application/xml")
+      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>
@@ -245,7 +243,7 @@ XML
 
     it 'presents with json' do
       entity = Class.new(Grape::Entity)
-      entity.root "examples", "example"
+      entity.root 'examples', 'example'
       entity.expose :name
 
       subject.format :json
@@ -254,14 +252,14 @@ XML
         c = Class.new do
           attr_reader :name
           def initialize(args)
-            @name = args[:name] || "no name set"
+            @name = args[:name] || 'no name set'
           end
         end
-        present c.new(name: "johnnyiller"), with: entity
+        present c.new(name: 'johnnyiller'), with: entity
       end
       get '/example'
       expect(last_response.status).to eq(200)
-      expect(last_response.headers['Content-type']).to eq("application/json")
+      expect(last_response.headers['Content-type']).to eq('application/json')
       expect(last_response.body).to eq('{"example":{"name":"johnnyiller"}}')
     end
 
@@ -272,35 +270,38 @@ XML
       subject.use Rack::JSONP
 
       entity = Class.new(Grape::Entity)
-      entity.root "examples", "example"
+      entity.root 'examples', 'example'
       entity.expose :name
 
-      # Rack::JSONP expects a standard JSON response
+      # Rack::JSONP expects a standard JSON response in UTF-8 format
       subject.format :json
+      subject.formatter :json, lambda { |object, _|
+        object.to_json.encode('utf-8')
+      }
 
       subject.get '/example' do
         c = Class.new do
           attr_reader :name
           def initialize(args)
-            @name = args[:name] || "no name set"
+            @name = args[:name] || 'no name set'
           end
         end
 
-        present c.new(name: "johnnyiller"), with: entity
+        present c.new(name: 'johnnyiller'), with: entity
       end
 
       get '/example?callback=abcDef'
       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"}})')
+      expect(last_response.headers['Content-type']).to eq('application/javascript')
+      expect(last_response.body).to include 'abcDef({"example":{"name":"johnnyiller"}})'
     end
 
-    context "present with multiple entities" do
-      it "present with multiple entities using optional symbol" do
+    context 'present with multiple entities' do
+      it 'present with multiple entities using optional symbol' do
         user = Class.new do
           attr_reader :name
           def initialize(args)
-            @name = args[:name] || "no name set"
+            @name = args[:name] || 'no name set'
           end
         end
         user1 = user.new(name: 'user1')
@@ -317,13 +318,12 @@ XML
         end
         get '/example'
         expect_response_json = {
-          "page"  => 1,
-          "user1" => { "name" => "user1" },
-          "user2" => { "name" => "user2" }
+          'page'  => 1,
+          'user1' => { 'name' => 'user1' },
+          'user2' => { 'name' => 'user2' }
         }
         expect(JSON(last_response.body)).to eq(expect_response_json)
       end
-
     end
   end
 end

data/spec/grape/exceptions/invalid_formatter_spec.rb

@@ -2,17 +2,15 @@
 require 'spec_helper'
 
 describe Grape::Exceptions::InvalidFormatter do
-  describe "#message" do
+  describe '#message' do
     let(:error) do
       described_class.new(String, 'xml')
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "cannot convert String to xml"
+        'cannot convert String to xml'
       )
     end
-
   end
-
 end

data/spec/grape/exceptions/invalid_versioner_option_spec.rb

@@ -2,17 +2,15 @@
 require 'spec_helper'
 
 describe Grape::Exceptions::InvalidVersionerOption do
-  describe "#message" do
+  describe '#message' do
     let(:error) do
-      described_class.new("headers")
+      described_class.new('headers')
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "Unknown :using for versioner: headers"
+        'Unknown :using for versioner: headers'
       )
     end
-
   end
-
 end

data/spec/grape/exceptions/missing_mime_type_spec.rb

@@ -1,17 +1,16 @@
 require 'spec_helper'
 
 describe Grape::Exceptions::MissingMimeType do
-  describe "#message" do
-
+  describe '#message' do
     let(:error) do
-      described_class.new("new_json")
+      described_class.new('new_json')
     end
 
-    it "contains the problem in the message" do
-      expect(error.message).to include "missing mime type for new_json"
+    it 'contains the problem in the message' do
+      expect(error.message).to include 'missing mime type for new_json'
     end
 
-    it "contains the resolution in the message" do
+    it 'contains the resolution in the message' do
       expect(error.message).to include "or add your own with content_type :new_json, 'application/new_json' "
     end
   end

data/spec/grape/exceptions/missing_option_spec.rb

@@ -2,17 +2,15 @@
 require 'spec_helper'
 
 describe Grape::Exceptions::MissingOption do
-  describe "#message" do
+  describe '#message' do
     let(:error) do
       described_class.new(:path)
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "You must specify :path options."
+        'You must specify :path options.'
       )
     end
-
   end
-
 end

data/spec/grape/exceptions/unknown_options_spec.rb

@@ -2,17 +2,15 @@
 require 'spec_helper'
 
 describe Grape::Exceptions::UnknownOptions do
-  describe "#message" do
+  describe '#message' do
     let(:error) do
       described_class.new([:a, :b])
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "unknown options: "
+        'unknown options: '
       )
     end
-
   end
-
 end

data/spec/grape/exceptions/unknown_validator_spec.rb

@@ -2,17 +2,15 @@
 require 'spec_helper'
 
 describe Grape::Exceptions::UnknownValidator do
-  describe "#message" do
+  describe '#message' do
     let(:error) do
       described_class.new('gt_10')
     end
 
-    it "contains the problem in the message" do
+    it 'contains the problem in the message' do
       expect(error.message).to include(
-        "unknown validator: gt_10"
+        'unknown validator: gt_10'
       )
     end
-
   end
-
 end

data/spec/grape/exceptions/validation_errors_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 require 'ostruct'
 
 describe Grape::Exceptions::ValidationErrors do
-  let(:validation_message) { "FooBar is invalid" }
+  let(:validation_message) { 'FooBar is invalid' }
   let(:validation_error) { OpenStruct.new(params: [validation_message]) }
 
-  context "message" do
-    context "is not repeated" do
+  context 'message' do
+    context 'is not repeated' do
       let(:error) do
         described_class.new(errors: [validation_error, validation_error])
       end
@@ -41,8 +41,8 @@ describe Grape::Exceptions::ValidationErrors do
       get '/exactly_one_of', beer: 'string', wine: 'anotherstring'
       expect(last_response.status).to eq(400)
       expect(JSON.parse(last_response.body)).to eq([
-        "params" => ["beer", "wine"],
-        "messages" => ["are mutually exclusive"]
+        'params' => %w(beer wine),
+        'messages' => ['are mutually exclusive']
       ])
     end
   end

data/spec/grape/loading_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Grape::API do
+  let(:jobs_api) do
+    Class.new(Grape::API) do
+      namespace :one do
+        namespace :two do
+          namespace :three do
+            get :one do
+            end
+            get :two do
+            end
+          end
+        end
+      end
+    end
+  end
+
+  let(:combined_api) do
+    JobsApi = jobs_api
+    Class.new(Grape::API) do
+      version :v1, using: :accept_version_header, cascade: true
+      mount JobsApi
+    end
+  end
+
+  subject do
+    CombinedApi = combined_api
+    Class.new(Grape::API) do
+      format :json
+      mount CombinedApi => '/'
+    end
+  end
+
+  def app
+    subject
+  end
+
+  it 'execute first request in reasonable time' do
+    started = Time.now
+    get '/mount1/nested/test_method'
+    expect(Time.now - started).to be < 5
+  end
+end

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

@@ -4,16 +4,13 @@ require 'base64'
 describe Grape::Middleware::Auth::Base do
   subject do
     Class.new(Grape::API) do
-
       http_basic realm: 'my_realm' do |user, password|
         user && password && user == password
       end
       get '/authorized' do
         'DONE'
       end
-
     end
-
   end
 
   def app
@@ -30,5 +27,4 @@ describe Grape::Middleware::Auth::Base do
     get '/authorized', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin', 'wrong')
     expect(last_response.status).to eq(401)
   end
-
 end

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

@@ -6,9 +6,9 @@ describe Grape::Middleware::Auth::DSL do
   let(:block) { ->() {} }
   let(:settings) do
     {
-      opaque: "secret",
+      opaque: 'secret',
       proc: block,
-      realm: "API Authorization",
+      realm: 'API Authorization',
       type: :http_digest
     }
   end
@@ -33,7 +33,6 @@ describe Grape::Middleware::Auth::DSL do
       expect(subject.auth).to eq(settings.merge(realm: 'super_secret'))
       expect(subject.auth.object_id).not_to eq(first_settings.object_id)
     end
-
   end
 
   describe '.http_basic' do
@@ -49,5 +48,4 @@ describe Grape::Middleware::Auth::DSL do
       expect(subject.auth).to eq(realm: 'my_realm', type: :http_digest, proc: block, opaque: 'my_opaque')
     end
   end
-
 end