grape 0.6.0 → 0.6.1

data/spec/shared/versioning_examples.rb

@@ -3,7 +3,7 @@ shared_examples_for 'versioning' 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"
@@ -14,9 +14,9 @@ shared_examples_for 'versioning' do
     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
 
@@ -96,11 +96,11 @@ 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

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/versioned_helpers.rb

@@ -26,13 +26,13 @@ def versioned_headers(options)
   when :header
     {
       'HTTP_ACCEPT' => [
-        "application/vnd.#{options[:vendor]}-#{options[:version]}",
+        "application/vnd.#{options[:vendor] }-#{options[:version] }",
         options[:format]
-      ].compact.join("+")
+     ].compact.join("+")
     }
   when :accept_version_header
     {
-      'HTTP_ACCEPT_VERSION' => "#{options[:version]}"
+      'HTTP_ACCEPT_VERSION' => "#{options[:version] }"
     }
   else
     raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
@@ -40,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 }
   end
   get path, params, headers
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +243,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -250,6 +251,7 @@ files:
 - Guardfile
 - LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
 - grape.gemspec
 - lib/grape.rb
@@ -261,6 +263,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
@@ -305,6 +308,7 @@ files:
 - 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
@@ -333,6 +337,7 @@ files:
 - 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
@@ -391,6 +396,7 @@ test_files:
 - 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