grape 0.3.0 → 0.7.0

data/spec/shared/versioning_examples.rb

@@ -1,20 +1,22 @@
 shared_examples_for 'versioning' do
   it 'sets the API version' do
+    subject.format :txt
     subject.version 'v1', macro_options
     subject.get :hello do
-      "Version: #{request.env['api.version']}"
+      "Version: #{request.env['api.version'] }"
     end
     versioned_get '/hello', 'v1', macro_options
     last_response.body.should eql "Version: v1"
   end
 
   it 'adds the prefix before the API version' do
+    subject.format :txt
     subject.prefix 'api'
     subject.version 'v1', macro_options
     subject.get :hello do
-      "Version: #{request.env['api.version']}"
+      "Version: #{request.env['api.version'] }"
     end
-    versioned_get '/hello', 'v1', macro_options.merge(:prefix => 'api')
+    versioned_get '/hello', 'v1', macro_options.merge(prefix: 'api')
     last_response.body.should eql "Version: v1"
   end
 
@@ -58,6 +60,7 @@ shared_examples_for 'versioning' do
   context 'with different versions for the same endpoint' do
     context 'without a prefix' do
       it 'allows the same endpoint to be implemented' do
+        subject.format :txt
         subject.version 'v2', macro_options
         subject.get 'version' do
           request.env['api.version']
@@ -79,7 +82,8 @@ shared_examples_for 'versioning' do
     end
 
     context 'with a prefix' do
-      it 'allows the same endpoint to be implemented' do        
+      it 'allows the same endpoint to be implemented' do
+        subject.format :txt
         subject.prefix 'api'
         subject.version 'v2', macro_options
         subject.get 'version' do
@@ -92,14 +96,26 @@ shared_examples_for 'versioning' do
           end
         end
 
-        versioned_get '/version', 'v1', macro_options.merge(:prefix => subject.prefix)
+        versioned_get '/version', 'v1', macro_options.merge(prefix: subject.prefix)
         last_response.status.should == 200
         last_response.body.should == 'version v1'
 
-        versioned_get '/version', 'v2', macro_options.merge(:prefix => subject.prefix)
+        versioned_get '/version', 'v2', macro_options.merge(prefix: subject.prefix)
         last_response.status.should == 200
         last_response.body.should == 'v2'
       end
     end
   end
+
+  it 'does not overwrite version parameter with API version' do
+    subject.format :txt
+    subject.version 'v1', macro_options
+    subject.params { requires :version }
+    subject.get :api_version_with_version_param do
+      params[:version]
+    end
+    versioned_get '/api_version_with_version_param?version=1', 'v1', macro_options
+    last_response.body.should eql '1'
+  end
+
 end

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support'))
 
 require 'grape'
 
-# require 'grape-entity'
-
 require 'rubygems'
 require 'bundler'
 Bundler.setup :default, :test
@@ -14,11 +12,14 @@ require 'rack/test'
 require 'pry'
 require 'base64'
 require 'cookiejar'
+require 'json'
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
   require file
 end
 
+I18n.enforce_available_locales = false
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods
 end

data/spec/support/basic_auth_encode_helpers.rb

@@ -1,4 +1,3 @@
 def encode_basic_auth(username, password)
   "Basic " + Base64.encode64("#{username}:#{password}")
 end
-

data/spec/support/content_type_helpers.rb

@@ -0,0 +1,11 @@
+module ContentTypeHelpers
+  %w(put patch post delete).each do |method|
+    define_method :"#{method}_with_json" do |uri, params = {}, env = {}, &block|
+      params = params.to_json
+      env["CONTENT_TYPE"] ||= "application/json"
+      send(method, uri, params, env, &block)
+    end
+  end
+end
+
+include(ContentTypeHelpers)

data/spec/support/versioned_helpers.rb

@@ -10,6 +10,8 @@ def versioned_path(options = {})
     File.join('/', options[:prefix] || '', options[:path])
   when :header
     File.join('/', options[:prefix] || '', options[:path])
+  when :accept_version_header
+    File.join('/', options[:prefix] || '', options[:path])
   else
     raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
   end
@@ -23,7 +25,14 @@ def versioned_headers(options)
     {}  # no-op
   when :header
     {
-      'HTTP_ACCEPT' => "application/vnd.#{options[:vendor]}-#{options[:version]}+#{options[:format]}"
+      'HTTP_ACCEPT' => [
+        "application/vnd.#{options[:vendor] }-#{options[:version] }",
+        options[:format]
+     ].compact.join("+")
+    }
+  when :accept_version_header
+    {
+      'HTTP_ACCEPT_VERSION' => "#{options[:version] }"
     }
   else
     raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
@@ -31,12 +40,11 @@ def versioned_headers(options)
 end
 
 def versioned_get(path, version_name, version_options = {})
-  path    = versioned_path(version_options.merge(:version => version_name, :path => path))
-  headers = versioned_headers(version_options.merge(:version => version_name))
+  path    = versioned_path(version_options.merge(version: version_name, path: path))
+  headers = versioned_headers(version_options.merge(version: version_name))
   params = {}
   if version_options[:using] == :param
-    params = { version_options[:parameter] => version_name } 
+    params = { version_options[:parameter] => version_name }
   end
   get path, params, headers
 end
-

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rack-mount
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,39 +97,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -222,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -238,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -246,7 +216,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -254,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -262,7 +230,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -276,14 +243,18 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
+- UPGRADING.md
 - grape.gemspec
 - lib/grape.rb
 - lib/grape/api.rb
@@ -294,6 +265,7 @@ files:
 - lib/grape/error_formatter/txt.rb
 - lib/grape/error_formatter/xml.rb
 - lib/grape/exceptions/base.rb
+- lib/grape/exceptions/incompatible_option_values.rb
 - lib/grape/exceptions/invalid_formatter.rb
 - lib/grape/exceptions/invalid_versioner_option.rb
 - lib/grape/exceptions/invalid_with_option_for_represent.rb
@@ -303,12 +275,15 @@ files:
 - lib/grape/exceptions/unknown_options.rb
 - lib/grape/exceptions/unknown_validator.rb
 - lib/grape/exceptions/validation.rb
+- lib/grape/exceptions/validation_errors.rb
 - lib/grape/formatter/base.rb
 - lib/grape/formatter/json.rb
 - lib/grape/formatter/serializable_hash.rb
 - lib/grape/formatter/txt.rb
 - lib/grape/formatter/xml.rb
+- lib/grape/http/request.rb
 - lib/grape/locale/en.yml
+- lib/grape/middleware/auth/base.rb
 - lib/grape/middleware/auth/basic.rb
 - lib/grape/middleware/auth/digest.rb
 - lib/grape/middleware/auth/oauth2.rb
@@ -316,21 +291,27 @@ files:
 - lib/grape/middleware/error.rb
 - lib/grape/middleware/filter.rb
 - lib/grape/middleware/formatter.rb
+- lib/grape/middleware/globals.rb
 - lib/grape/middleware/versioner.rb
+- lib/grape/middleware/versioner/accept_version_header.rb
 - lib/grape/middleware/versioner/header.rb
 - lib/grape/middleware/versioner/param.rb
 - lib/grape/middleware/versioner/path.rb
+- lib/grape/namespace.rb
 - lib/grape/parser/base.rb
 - lib/grape/parser/json.rb
 - lib/grape/parser/xml.rb
+- lib/grape/path.rb
 - lib/grape/route.rb
 - lib/grape/util/content_types.rb
 - lib/grape/util/deep_merge.rb
 - lib/grape/util/hash_stack.rb
 - lib/grape/validations.rb
 - lib/grape/validations/coerce.rb
+- lib/grape/validations/default.rb
 - lib/grape/validations/presence.rb
 - lib/grape/validations/regexp.rb
+- lib/grape/validations/values.rb
 - lib/grape/version.rb
 - spec/grape/api_spec.rb
 - spec/grape/endpoint_spec.rb
@@ -341,6 +322,7 @@ files:
 - 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
@@ -348,80 +330,48 @@ files:
 - 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/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
 homepage: https://github.com/intridea/grape
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1796003249167814741
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1796003249167814741
 requirements: []
 rubyforge_project: grape
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
-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/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/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/util/hash_stack_spec.rb
-- spec/grape/validations/coerce_spec.rb
-- spec/grape/validations/presence_spec.rb
-- spec/grape/validations/regexp_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/versioned_helpers.rb
+test_files: []
 has_rdoc: