grape 1.3.2 → 1.5.2

data/spec/integration/eager_load/eager_load_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+require 'grape'
+
+describe Grape do
+  it 'eager_load!' do
+    require 'grape/eager_load'
+    expect { Grape.eager_load! }.to_not raise_error
+  end
+
+  it 'compile!' do
+    expect { Class.new(Grape::API).compile! }.to_not raise_error
+  end
+end

data/spec/shared/versioning_examples.rb

@@ -7,7 +7,7 @@ shared_examples_for 'versioning' do
     subject.get :hello do
       "Version: #{request.env['api.version']}"
     end
-    versioned_get '/hello', 'v1', macro_options
+    versioned_get '/hello', 'v1', **macro_options
     expect(last_response.body).to eql 'Version: v1'
   end
 
@@ -18,7 +18,7 @@ shared_examples_for 'versioning' do
     subject.get :hello do
       "Version: #{request.env['api.version']}"
     end
-    versioned_get '/hello', 'v1', macro_options.merge(prefix: 'api')
+    versioned_get '/hello', 'v1', **macro_options.merge(prefix: 'api')
     expect(last_response.body).to eql 'Version: v1'
   end
 
@@ -34,14 +34,14 @@ shared_examples_for 'versioning' do
       end
     end
 
-    versioned_get '/awesome', 'v1', macro_options
+    versioned_get '/awesome', 'v1', **macro_options
     expect(last_response.status).to eql 404
 
-    versioned_get '/awesome', 'v2', macro_options
+    versioned_get '/awesome', 'v2', **macro_options
     expect(last_response.status).to eql 200
-    versioned_get '/legacy', 'v1', macro_options
+    versioned_get '/legacy', 'v1', **macro_options
     expect(last_response.status).to eql 200
-    versioned_get '/legacy', 'v2', macro_options
+    versioned_get '/legacy', 'v2', **macro_options
     expect(last_response.status).to eql 404
   end
 
@@ -51,11 +51,11 @@ shared_examples_for 'versioning' do
       'I exist'
     end
 
-    versioned_get '/awesome', 'v1', macro_options
+    versioned_get '/awesome', 'v1', **macro_options
     expect(last_response.status).to eql 200
-    versioned_get '/awesome', 'v2', macro_options
+    versioned_get '/awesome', 'v2', **macro_options
     expect(last_response.status).to eql 200
-    versioned_get '/awesome', 'v3', macro_options
+    versioned_get '/awesome', 'v3', **macro_options
     expect(last_response.status).to eql 404
   end
 
@@ -74,10 +74,10 @@ shared_examples_for 'versioning' do
           end
         end
 
-        versioned_get '/version', 'v2', macro_options
+        versioned_get '/version', 'v2', **macro_options
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('v2')
-        versioned_get '/version', 'v1', macro_options
+        versioned_get '/version', 'v1', **macro_options
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('version v1')
       end
@@ -98,11 +98,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)
         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)
+        versioned_get '/version', 'v2', **macro_options.merge(prefix: subject.prefix)
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('v2')
       end
@@ -131,11 +131,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)
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq('v1-version')
 
-      versioned_get '/version', 'v2', macro_options.merge(prefix: subject.prefix)
+      versioned_get '/version', 'v2', **macro_options.merge(prefix: subject.prefix)
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq('v2-version')
     end
@@ -148,7 +148,7 @@ shared_examples_for 'versioning' do
     subject.get :api_version_with_version_param do
       params[:version]
     end
-    versioned_get '/api_version_with_version_param?version=1', 'v1', macro_options
+    versioned_get '/api_version_with_version_param?version=1', 'v1', **macro_options
     expect(last_response.body).to eql '1'
   end
 
@@ -183,13 +183,13 @@ shared_examples_for 'versioning' do
 
     context 'v1' do
       it 'finds endpoint' do
-        versioned_get '/version', 'v1', macro_options
+        versioned_get '/version', 'v1', **macro_options
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('v1')
       end
 
       it 'finds catch all' do
-        versioned_get '/whatever', 'v1', macro_options
+        versioned_get '/whatever', 'v1', **macro_options
         expect(last_response.status).to eq(200)
         expect(last_response.body).to end_with 'whatever'
       end
@@ -197,13 +197,13 @@ shared_examples_for 'versioning' do
 
     context 'v2' do
       it 'finds endpoint' do
-        versioned_get '/version', 'v2', macro_options
+        versioned_get '/version', 'v2', **macro_options
         expect(last_response.status).to eq(200)
         expect(last_response.body).to eq('v2')
       end
 
       it 'finds catch all' do
-        versioned_get '/whatever', 'v2', macro_options
+        versioned_get '/whatever', 'v2', **macro_options
         expect(last_response.status).to eq(200)
         expect(last_response.body).to end_with 'whatever'
       end

data/spec/spec_helper.rb

@@ -20,17 +20,7 @@ eager_load!
 # so it should be set to true here as well to reflect that.
 I18n.enforce_available_locales = true
 
-module Chunks
-  def read_chunks(body)
-    buffer = []
-    body.each { |chunk| buffer << chunk }
-
-    buffer
-  end
-end
-
 RSpec.configure do |config|
-  config.include Chunks
   config.include Rack::Test::Methods
   config.include Spec::Support::Helpers
   config.raise_errors_for_deprecations!

data/spec/support/chunks.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Chunks
+  def read_chunks(body)
+    buffer = []
+    body.each { |chunk| buffer << chunk }
+
+    buffer
+  end
+end
+
+RSpec.configure do |config|
+  config.include Chunks
+end

data/spec/support/versioned_helpers.rb

@@ -6,7 +6,7 @@ module Spec
     module Helpers
       # Returns the path with options[:version] prefixed if options[:using] is :path.
       # Returns normal path otherwise.
-      def versioned_path(options = {})
+      def versioned_path(**options)
         case options[:using]
         when :path
           File.join('/', options[:prefix] || '', options[:version], options[:path])
@@ -43,13 +43,11 @@ module Spec
         end
       end
 
-      def versioned_get(path, version_name, version_options = {})
-        path    = versioned_path(version_options.merge(version: version_name, path: path))
+      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))
         params = {}
-        if version_options[:using] == :param
-          params = { version_options[:parameter] => version_name }
-        end
+        params = { version_options[:parameter] => version_name } if version_options[:using] == :param
         get path, params, headers
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.5.2
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -197,9 +197,9 @@ files:
 - lib/grape/router/attribute_translator.rb
 - lib/grape/router/pattern.rb
 - lib/grape/router/route.rb
-- lib/grape/serve_file/file_body.rb
-- lib/grape/serve_file/file_response.rb
-- lib/grape/serve_file/sendfile_response.rb
+- lib/grape/serve_stream/file_body.rb
+- lib/grape/serve_stream/sendfile_response.rb
+- lib/grape/serve_stream/stream_response.rb
 - lib/grape/util/base_inheritable.rb
 - lib/grape/util/cache.rb
 - lib/grape/util/endpoint_configuration.rb
@@ -227,6 +227,7 @@ files:
 - lib/grape/validations/types/custom_type_collection_coercer.rb
 - lib/grape/validations/types/dry_type_coercer.rb
 - lib/grape/validations/types/file.rb
+- lib/grape/validations/types/invalid_value.rb
 - lib/grape/validations/types/json.rb
 - lib/grape/validations/types/multiple_type_coercer.rb
 - lib/grape/validations/types/primitive_coercer.rb
@@ -282,6 +283,7 @@ files:
 - spec/grape/dsl/routing_spec.rb
 - spec/grape/dsl/settings_spec.rb
 - spec/grape/dsl/validations_spec.rb
+- spec/grape/endpoint/declared_spec.rb
 - spec/grape/endpoint_spec.rb
 - spec/grape/entity_spec.rb
 - spec/grape/exceptions/base_spec.rb
@@ -332,7 +334,9 @@ files:
 - spec/grape/validations/multiple_attributes_iterator_spec.rb
 - spec/grape/validations/params_scope_spec.rb
 - spec/grape/validations/single_attribute_iterator_spec.rb
+- spec/grape/validations/types/array_coercer_spec.rb
 - spec/grape/validations/types/primitive_coercer_spec.rb
+- spec/grape/validations/types/set_coercer_spec.rb
 - spec/grape/validations/types_spec.rb
 - spec/grape/validations/validators/all_or_none_spec.rb
 - spec/grape/validations/validators/allow_blank_spec.rb
@@ -348,11 +352,13 @@ files:
 - spec/grape/validations/validators/values_spec.rb
 - spec/grape/validations/validators/zh-CN.yml
 - spec/grape/validations_spec.rb
+- spec/integration/eager_load/eager_load_spec.rb
 - spec/integration/multi_json/json_spec.rb
 - spec/integration/multi_xml/xml_spec.rb
 - spec/shared/versioning_examples.rb
 - spec/spec_helper.rb
 - spec/support/basic_auth_encode_helpers.rb
+- spec/support/chunks.rb
 - spec/support/content_type_helpers.rb
 - spec/support/eager_load.rb
 - spec/support/endpoint_faker.rb
@@ -364,9 +370,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/ruby-grape/grape/issues
-  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.3.2/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape/1.3.2
-  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.3.2
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.5.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/1.5.2
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.5.2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -382,7 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
@@ -393,6 +399,7 @@ test_files:
 - spec/support/eager_load.rb
 - spec/support/basic_auth_encode_helpers.rb
 - spec/support/file_streamer.rb
+- spec/support/chunks.rb
 - spec/support/endpoint_faker.rb
 - spec/support/integer_helpers.rb
 - spec/grape/api/namespace_parameters_in_route_spec.rb
@@ -415,6 +422,8 @@ test_files:
 - spec/grape/api_remount_spec.rb
 - spec/grape/validations/types_spec.rb
 - spec/grape/validations/attributes_iterator_spec.rb
+- spec/grape/validations/types/array_coercer_spec.rb
+- spec/grape/validations/types/set_coercer_spec.rb
 - spec/grape/validations/types/primitive_coercer_spec.rb
 - spec/grape/validations/validators/regexp_spec.rb
 - spec/grape/validations/validators/default_spec.rb
@@ -459,6 +468,7 @@ test_files:
 - spec/grape/integration/rack_spec.rb
 - spec/grape/integration/rack_sendfile_spec.rb
 - spec/grape/integration/global_namespace_function_spec.rb
+- spec/grape/endpoint/declared_spec.rb
 - spec/grape/presenters/presenter_spec.rb
 - spec/grape/endpoint_spec.rb
 - spec/grape/api_spec.rb
@@ -494,6 +504,7 @@ test_files:
 - spec/grape/named_api_spec.rb
 - spec/grape/loading_spec.rb
 - spec/grape/request_spec.rb
+- spec/integration/eager_load/eager_load_spec.rb
 - spec/integration/multi_xml/xml_spec.rb
 - spec/integration/multi_json/json_spec.rb
 - spec/spec_helper.rb