grape 0.7.0 → 0.8.0

data/spec/shared/versioning_examples.rb

@@ -6,7 +6,7 @@ shared_examples_for 'versioning' do
       "Version: #{request.env['api.version'] }"
     end
     versioned_get '/hello', 'v1', macro_options
-    last_response.body.should eql "Version: v1"
+    expect(last_response.body).to eql "Version: v1"
   end
 
   it 'adds the prefix before the API version' do
@@ -17,7 +17,7 @@ shared_examples_for 'versioning' do
       "Version: #{request.env['api.version'] }"
     end
     versioned_get '/hello', 'v1', macro_options.merge(prefix: 'api')
-    last_response.body.should eql "Version: v1"
+    expect(last_response.body).to eql "Version: v1"
   end
 
   it 'is able to specify version as a nesting' do
@@ -33,14 +33,14 @@ shared_examples_for 'versioning' do
     end
 
     versioned_get '/awesome', 'v1', macro_options
-    last_response.status.should eql 404
+    expect(last_response.status).to eql 404
 
     versioned_get '/awesome', 'v2', macro_options
-    last_response.status.should eql 200
+    expect(last_response.status).to eql 200
     versioned_get '/legacy', 'v1', macro_options
-    last_response.status.should eql 200
+    expect(last_response.status).to eql 200
     versioned_get '/legacy', 'v2', macro_options
-    last_response.status.should eql 404
+    expect(last_response.status).to eql 404
   end
 
   it 'is able to specify multiple versions' do
@@ -50,11 +50,11 @@ shared_examples_for 'versioning' do
     end
 
     versioned_get '/awesome', 'v1', macro_options
-    last_response.status.should eql 200
+    expect(last_response.status).to eql 200
     versioned_get '/awesome', 'v2', macro_options
-    last_response.status.should eql 200
+    expect(last_response.status).to eql 200
     versioned_get '/awesome', 'v3', macro_options
-    last_response.status.should eql 404
+    expect(last_response.status).to eql 404
   end
 
   context 'with different versions for the same endpoint' do
@@ -73,11 +73,11 @@ shared_examples_for 'versioning' do
         end
 
         versioned_get '/version', 'v2', macro_options
-        last_response.status.should == 200
-        last_response.body.should == 'v2'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('v2')
         versioned_get '/version', 'v1', macro_options
-        last_response.status.should == 200
-        last_response.body.should == 'version v1'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('version v1')
       end
     end
 
@@ -97,12 +97,12 @@ shared_examples_for 'versioning' do
         end
 
         versioned_get '/version', 'v1', macro_options.merge(prefix: subject.prefix)
-        last_response.status.should == 200
-        last_response.body.should == 'version v1'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('version v1')
 
         versioned_get '/version', 'v2', macro_options.merge(prefix: subject.prefix)
-        last_response.status.should == 200
-        last_response.body.should == 'v2'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq('v2')
       end
     end
   end
@@ -115,7 +115,7 @@ shared_examples_for 'versioning' do
       params[:version]
     end
     versioned_get '/api_version_with_version_param?version=1', 'v1', macro_options
-    last_response.body.should eql '1'
+    expect(last_response.body).to eql '1'
   end
 
 end

data/spec/spec_helper.rb

@@ -8,11 +8,12 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup :default, :test
 
+require 'json'
 require 'rack/test'
-require 'pry'
 require 'base64'
 require 'cookiejar'
 require 'json'
+require 'mime/types'
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
   require file

metadata

@@ -1,209 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rack-mount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -224,14 +224,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby framework for rapid API development with great conventions.
@@ -256,6 +256,7 @@ files:
 - Rakefile
 - UPGRADING.md
 - grape.gemspec
+- grape.png
 - lib/grape.rb
 - lib/grape/api.rb
 - lib/grape/cookies.rb
@@ -309,6 +310,8 @@ files:
 - lib/grape/validations.rb
 - lib/grape/validations/coerce.rb
 - lib/grape/validations/default.rb
+- lib/grape/validations/exactly_one_of.rb
+- lib/grape/validations/mutual_exclusion.rb
 - lib/grape/validations/presence.rb
 - lib/grape/validations/regexp.rb
 - lib/grape/validations/values.rb
@@ -339,6 +342,8 @@ files:
 - spec/grape/util/hash_stack_spec.rb
 - spec/grape/validations/coerce_spec.rb
 - spec/grape/validations/default_spec.rb
+- spec/grape/validations/exactly_one_of_spec.rb
+- spec/grape/validations/mutual_exclusion_spec.rb
 - spec/grape/validations/presence_spec.rb
 - spec/grape/validations/regexp_spec.rb
 - spec/grape/validations/values_spec.rb
@@ -359,19 +364,57 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: grape
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
-test_files: []
+test_files:
+- spec/grape/api_spec.rb
+- spec/grape/endpoint_spec.rb
+- spec/grape/entity_spec.rb
+- spec/grape/exceptions/invalid_formatter_spec.rb
+- spec/grape/exceptions/invalid_versioner_option_spec.rb
+- spec/grape/exceptions/missing_mime_type_spec.rb
+- spec/grape/exceptions/missing_option_spec.rb
+- spec/grape/exceptions/unknown_options_spec.rb
+- spec/grape/exceptions/unknown_validator_spec.rb
+- spec/grape/exceptions/validation_errors_spec.rb
+- spec/grape/middleware/auth/basic_spec.rb
+- spec/grape/middleware/auth/digest_spec.rb
+- spec/grape/middleware/auth/oauth2_spec.rb
+- spec/grape/middleware/base_spec.rb
+- spec/grape/middleware/error_spec.rb
+- spec/grape/middleware/exception_spec.rb
+- spec/grape/middleware/formatter_spec.rb
+- spec/grape/middleware/versioner/accept_version_header_spec.rb
+- spec/grape/middleware/versioner/header_spec.rb
+- spec/grape/middleware/versioner/param_spec.rb
+- spec/grape/middleware/versioner/path_spec.rb
+- spec/grape/middleware/versioner_spec.rb
+- spec/grape/path_spec.rb
+- spec/grape/util/hash_stack_spec.rb
+- spec/grape/validations/coerce_spec.rb
+- spec/grape/validations/default_spec.rb
+- spec/grape/validations/exactly_one_of_spec.rb
+- spec/grape/validations/mutual_exclusion_spec.rb
+- spec/grape/validations/presence_spec.rb
+- spec/grape/validations/regexp_spec.rb
+- spec/grape/validations/values_spec.rb
+- spec/grape/validations/zh-CN.yml
+- spec/grape/validations_spec.rb
+- spec/shared/versioning_examples.rb
+- spec/spec_helper.rb
+- spec/support/basic_auth_encode_helpers.rb
+- spec/support/content_type_helpers.rb
+- spec/support/versioned_helpers.rb
 has_rdoc: