grape 1.2.5 → 1.4.0

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/integration/multi_json/json_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Json do

data/spec/integration/multi_xml/xml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Xml do

data/spec/shared/versioning_examples.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples_for 'versioning' do
   it 'sets the API version' do
     subject.format :txt

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support'))
@@ -12,17 +14,33 @@ Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
   require file
 end
 
+eager_load!
+
 # The default value for this setting is true in a standard Rails app,
 # 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!
   config.filter_run_when_matching :focus
+  config.warnings = true
 
   config.before(:each) { Grape::Util::InheritableSetting.reset_global! }
+
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = '.rspec_status'
 end
 
 require 'coveralls'

data/spec/support/basic_auth_encode_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spec
   module Support
     module Helpers

data/spec/support/content_type_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spec
   module Support
     module Helpers

data/spec/support/eager_load.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Grape uses autoload https://api.rubyonrails.org/classes/ActiveSupport/Autoload.html.
+# When a class/module get added to the list, ActiveSupport doesn't check whether it really exists.
+# This method loads all classes/modules defined via autoload to be sure only existing
+# classes/modules were listed.
+def eager_load!(scope = Grape)
+  # get modules
+  scope.constants.each do |const_name|
+    const = scope.const_get(const_name)
+
+    next unless const.respond_to?(:eager_load!)
+
+    const.eager_load!
+
+    # check its modules, they might need to be loaded as well.
+    eager_load!(const)
+  end
+end

data/spec/support/endpoint_faker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spec
   module Support
     class EndpointFaker

data/spec/support/file_streamer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FileStreamer
   def initialize(file_path)
     @file_path = file_path

data/spec/support/integer_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spec
   module Support
     module Helpers

data/spec/support/versioned_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Versioning
 module Spec
   module Support
@@ -19,7 +21,7 @@ module Spec
         end
       end
 
-      def versioned_headers(options)
+      def versioned_headers(**options)
         case options[:using]
         when :path
           {}  # no-op
@@ -43,7 +45,7 @@ module Spec
 
       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))
+        headers = versioned_headers(**version_options.merge(version: version_name))
         params = {}
         if version_options[:using] == :param
           params = { version_options[:parameter] => version_name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Bleigh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mustermann-grape
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '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
 description: A Ruby framework for rapid API development with great conventions.
 email:
 - michael@intridea.com
@@ -113,6 +113,7 @@ files:
 - lib/grape/api/helpers.rb
 - lib/grape/api/instance.rb
 - lib/grape/config.rb
+- lib/grape/content_types.rb
 - lib/grape/cookies.rb
 - lib/grape/dsl/api.rb
 - lib/grape/dsl/callbacks.rb
@@ -157,7 +158,6 @@ files:
 - lib/grape/exceptions/validation_array_errors.rb
 - lib/grape/exceptions/validation_errors.rb
 - lib/grape/extensions/active_support/hash_with_indifferent_access.rb
-- lib/grape/extensions/deep_hash_with_indifferent_access.rb
 - lib/grape/extensions/deep_mergeable_hash.rb
 - lib/grape/extensions/deep_symbolize_hash.rb
 - lib/grape/extensions/hash.rb
@@ -197,17 +197,18 @@ 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/content_types.rb
+- lib/grape/util/cache.rb
 - lib/grape/util/endpoint_configuration.rb
 - lib/grape/util/env.rb
 - lib/grape/util/inheritable_setting.rb
 - lib/grape/util/inheritable_values.rb
 - lib/grape/util/json.rb
 - lib/grape/util/lazy_block.rb
+- lib/grape/util/lazy_object.rb
 - lib/grape/util/lazy_value.rb
 - lib/grape/util/registrable.rb
 - lib/grape/util/reverse_stackable_values.rb
@@ -220,14 +221,17 @@ files:
 - lib/grape/validations/params_scope.rb
 - lib/grape/validations/single_attribute_iterator.rb
 - lib/grape/validations/types.rb
+- lib/grape/validations/types/array_coercer.rb
 - lib/grape/validations/types/build_coercer.rb
 - lib/grape/validations/types/custom_type_coercer.rb
 - 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/json.rb
 - lib/grape/validations/types/multiple_type_coercer.rb
+- lib/grape/validations/types/primitive_coercer.rb
+- lib/grape/validations/types/set_coercer.rb
 - lib/grape/validations/types/variant_collection_coercer.rb
-- lib/grape/validations/types/virtus_collection_patch.rb
 - lib/grape/validations/validator_factory.rb
 - lib/grape/validations/validators/all_or_none.rb
 - lib/grape/validations/validators/allow_blank.rb
@@ -249,6 +253,7 @@ files:
 - spec/grape/api/deeply_included_options_spec.rb
 - spec/grape/api/defines_boolean_in_params_spec.rb
 - spec/grape/api/inherited_helpers_spec.rb
+- spec/grape/api/instance_spec.rb
 - spec/grape/api/invalid_format_spec.rb
 - spec/grape/api/namespace_parameters_in_route_spec.rb
 - spec/grape/api/nested_helpers_spec.rb
@@ -327,6 +332,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
@@ -342,12 +350,14 @@ 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/content_type_helpers.rb
+- spec/support/eager_load.rb
 - spec/support/endpoint_faker.rb
 - spec/support/file_streamer.rb
 - spec/support/integer_helpers.rb
@@ -355,8 +365,12 @@ files:
 homepage: https://github.com/ruby-grape/grape
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/ruby-grape/grape/issues
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.4.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/1.4.0
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.4.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -364,19 +378,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
 test_files:
 - spec/spec_helper.rb
+- spec/integration/eager_load/eager_load_spec.rb
 - spec/integration/multi_xml/xml_spec.rb
 - spec/integration/multi_json/json_spec.rb
 - spec/shared/versioning_examples.rb
@@ -385,6 +400,7 @@ test_files:
 - spec/support/file_streamer.rb
 - spec/support/versioned_helpers.rb
 - spec/support/content_type_helpers.rb
+- spec/support/eager_load.rb
 - spec/support/integer_helpers.rb
 - spec/grape/middleware/error_spec.rb
 - spec/grape/middleware/globals_spec.rb
@@ -429,6 +445,9 @@ test_files:
 - spec/grape/presenters/presenter_spec.rb
 - spec/grape/validations/single_attribute_iterator_spec.rb
 - spec/grape/validations/attributes_iterator_spec.rb
+- spec/grape/validations/types/primitive_coercer_spec.rb
+- spec/grape/validations/types/set_coercer_spec.rb
+- spec/grape/validations/types/array_coercer_spec.rb
 - spec/grape/validations/params_scope_spec.rb
 - spec/grape/validations/instance_behaivour_spec.rb
 - spec/grape/validations/multiple_attributes_iterator_spec.rb
@@ -458,6 +477,7 @@ test_files:
 - spec/grape/api/defines_boolean_in_params_spec.rb
 - spec/grape/api/invalid_format_spec.rb
 - spec/grape/api/required_parameters_in_route_spec.rb
+- spec/grape/api/instance_spec.rb
 - spec/grape/api/namespace_parameters_in_route_spec.rb
 - spec/grape/api/recognize_path_spec.rb
 - spec/grape/api/shared_helpers_exactly_one_of_spec.rb

data/lib/grape/extensions/deep_hash_with_indifferent_access.rb

@@ -1,18 +0,0 @@
-module Grape
-  module Extensions
-    module DeepHashWithIndifferentAccess
-      def self.deep_hash_with_indifferent_access(object)
-        case object
-        when ::Hash
-          object.inject(::ActiveSupport::HashWithIndifferentAccess.new) do |new_hash, (key, value)|
-            new_hash.merge!(key => deep_hash_with_indifferent_access(value))
-          end
-        when ::Array
-          object.map { |element| deep_hash_with_indifferent_access(element) }
-        else
-          object
-        end
-      end
-    end
-  end
-end

data/lib/grape/util/content_types.rb

@@ -1,26 +0,0 @@
-module Grape
-  module ContentTypes
-    # Content types are listed in order of preference.
-    CONTENT_TYPES = { # rubocop:disable Style/MutableConstant
-      xml: 'application/xml',
-      serializable_hash: 'application/json',
-      json: 'application/json',
-      binary: 'application/octet-stream',
-      txt: 'text/plain'
-    }
-
-    def self.content_types_for_settings(settings)
-      return if settings.blank?
-
-      settings.each_with_object({}) { |value, result| result.merge!(value) }
-    end
-
-    def self.content_types_for(from_settings)
-      if from_settings.present?
-        from_settings
-      else
-        Grape::ContentTypes::CONTENT_TYPES
-      end
-    end
-  end
-end

data/lib/grape/validations/types/virtus_collection_patch.rb

@@ -1,16 +0,0 @@
-require 'virtus/attribute/collection'
-
-# See https://github.com/solnic/virtus/pull/343
-# This monkey-patch fixes type validation for collections,
-# ensuring that type assertions are applied to collection
-# members.
-#
-# This patch duplicates the code in the above pull request.
-# Once the request, or equivalent functionality, has been
-# published into the +virtus+ gem this file should be deleted.
-Virtus::Attribute::Collection.class_eval do
-  # @api public
-  def value_coerced?(value)
-    super && value.all? { |item| member_type.value_coerced? item }
-  end
-end