grape 1.2.2 → 1.2.3

data/lib/grape.rb

@@ -34,7 +34,6 @@ module Grape
     autoload :Namespace
 
     autoload :Path
-
     autoload :Cookies
     autoload :Validations
     autoload :ErrorFormatter
@@ -194,6 +193,7 @@ module Grape
   end
 end
 
+require 'grape/config'
 require 'grape/util/content_types'
 
 require 'grape/validations/validators/base'
@@ -207,6 +207,7 @@ require 'grape/validations/validators/exactly_one_of'
 require 'grape/validations/validators/mutual_exclusion'
 require 'grape/validations/validators/presence'
 require 'grape/validations/validators/regexp'
+require 'grape/validations/validators/same_as'
 require 'grape/validations/validators/values'
 require 'grape/validations/validators/except_values'
 require 'grape/validations/params_scope'

data/lib/grape/config.rb

@@ -0,0 +1,32 @@
+module Grape
+  module Config
+    class Configuration
+      ATTRIBUTES = %i[
+        param_builder
+      ].freeze
+
+      attr_accessor(*ATTRIBUTES)
+
+      def initialize
+        reset
+      end
+
+      def reset
+        self.param_builder = Grape::Extensions::ActiveSupport::HashWithIndifferentAccess::ParamBuilder
+      end
+    end
+
+    def self.extended(base)
+      def base.configure
+        block_given? ? yield(config) : config
+      end
+
+      def base.config
+        @configuration ||= Grape::Config::Configuration.new
+      end
+    end
+  end
+end
+
+Grape.extend Grape::Config
+Grape.config.reset

data/lib/grape/endpoint.rb

@@ -258,6 +258,7 @@ module Grape
         else
           run_filters before_validations, :before_validation
           run_validators validations, request
+          remove_aliased_params
           run_filters after_validations, :after_validation
           response_object = @block ? @block.call(self) : nil
         end
@@ -319,7 +320,14 @@ module Grape
       Module.new { helpers.each { |mod_to_include| include mod_to_include } }
     end
 
-    private :build_stack, :build_helpers
+    def remove_aliased_params
+      return unless route_setting(:aliased_params)
+      route_setting(:aliased_params).flat_map(&:keys).each do |aliased_param|
+        @params.delete(aliased_param)
+      end
+    end
+
+    private :build_stack, :build_helpers, :remove_aliased_params
 
     def helpers
       lazy_initialize! && @helpers

data/lib/grape/locale/en.yml

@@ -9,6 +9,7 @@ en:
         blank: 'is empty'
         values: 'does not have a valid value'
         except_values: 'has a value not allowed'
+        same_as: 'is not the same as %{parameter}'
         missing_vendor_option:
           problem: 'missing :vendor option.'
           summary: 'when version using header, you must specify :vendor option. '

data/lib/grape/request.rb

@@ -5,7 +5,7 @@ module Grape
     alias rack_params params
 
     def initialize(env, options = {})
-      extend options[:build_params_with] || Grape::Extensions::ActiveSupport::HashWithIndifferentAccess::ParamBuilder
+      extend options[:build_params_with] || Grape.config.param_builder
       super(env)
     end
 

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

@@ -19,7 +19,7 @@ module Grape
           # Rack::Request creates a Hash with filename,
           # content type and an IO object. Do a bit of basic
           # duck-typing.
-          value.is_a?(::Hash) && value.key?(:tempfile)
+          value.is_a?(::Hash) && value.key?(:tempfile) && value[:tempfile].is_a?(Tempfile)
         end
       end
     end

data/lib/grape/validations/validators/as.rb

@@ -8,7 +8,6 @@ module Grape
 
       def validate_param!(attr_name, params)
         params[@alias] = params[attr_name]
-        params.delete(attr_name)
       end
     end
   end

data/lib/grape/validations/validators/same_as.rb

@@ -0,0 +1,23 @@
+module Grape
+  module Validations
+    class SameAsValidator < Base
+      def validate_param!(attr_name, params)
+        confirmation = options_key?(:value) ? @option[:value] : @option
+        return if params[attr_name] == params[confirmation]
+        raise Grape::Exceptions::Validation,
+              params: [@scope.full_name(attr_name)],
+              message: build_message
+      end
+
+      private
+
+      def build_message
+        if options_key?(:message)
+          @option[:message]
+        else
+          format I18n.t(:same_as, scope: 'grape.errors.messages'), parameter: @option
+        end
+      end
+    end
+  end
+end

data/lib/grape/version.rb

@@ -1,4 +1,4 @@
 module Grape
   # The current version of Grape.
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

data/spec/grape/config_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe '.configure' do
+  before do
+    Grape.configure do |config|
+      config.param_builder = 42
+    end
+  end
+
+  after do
+    Grape.config.reset
+  end
+
+  it 'is configured to the new value' do
+    expect(Grape.config.param_builder).to eq 42
+  end
+end

data/spec/grape/request_spec.rb

@@ -62,6 +62,30 @@ module Grape
       end
     end
 
+    describe 'when the param_builder is set to Hashie' do
+      before do
+        Grape.configure do |config|
+          config.param_builder = Grape::Extensions::Hashie::Mash::ParamBuilder
+        end
+      end
+
+      after do
+        Grape.config.reset
+      end
+
+      subject(:request_params) { Grape::Request.new(env, opts).params }
+
+      context 'when the API does not include a specific param builder' do
+        let(:opts) { {} }
+        it { is_expected.to be_a(Hashie::Mash) }
+      end
+
+      context 'when the API includes a specific param builder' do
+        let(:opts) { { build_params_with: Grape::Extensions::Hash::ParamBuilder } }
+        it { is_expected.to be_a(Hash) }
+      end
+    end
+
     describe '#headers' do
       let(:options) do
         default_options.merge(request_headers)

data/spec/grape/validations/params_scope_spec.rb

@@ -155,6 +155,16 @@ describe Grape::Validations::ParamsScope do
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('foo is empty')
     end
+
+    it do
+      subject.params do
+        requires :foo, as: :bar, allow_blank: false
+      end
+      subject.get('/alias-not-blank-with-value') {}
+      get '/alias-not-blank-with-value', foo: 'any'
+
+      expect(last_response.status).to eq(200)
+    end
   end
 
   context 'array without coerce type explicitly given' do

data/spec/grape/validations/validators/coerce_spec.rb

@@ -397,6 +397,10 @@ describe Grape::Validations::CoerceValidator do
         post '/upload', file: 'not a file'
         expect(last_response.status).to eq(400)
         expect(last_response.body).to eq('file is invalid')
+
+        post '/upload', file: { filename: 'fake file', tempfile: '/etc/passwd' }
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('file is invalid')
       end
 
       it 'Nests integers' do

data/spec/grape/validations/validators/same_as_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Grape::Validations::SameAsValidator do
+  module ValidationsSpec
+    module SameAsValidatorSpec
+      class API < Grape::API
+        params do
+          requires :password
+          requires :password_confirmation, same_as: :password
+        end
+        post do
+        end
+
+        params do
+          requires :password
+          requires :password_confirmation, same_as: { value: :password, message: 'not match' }
+        end
+        post '/custom-message' do
+        end
+      end
+    end
+  end
+
+  def app
+    ValidationsSpec::SameAsValidatorSpec::API
+  end
+
+  describe '/' do
+    context 'is the same' do
+      it do
+        post '/', password: '987654', password_confirmation: '987654'
+        expect(last_response.status).to eq(201)
+        expect(last_response.body).to eq('')
+      end
+    end
+
+    context 'is not the same' do
+      it do
+        post '/', password: '123456', password_confirmation: 'whatever'
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('password_confirmation is not the same as password')
+      end
+    end
+  end
+
+  describe '/custom-message' do
+    context 'is the same' do
+      it do
+        post '/custom-message', password: '987654', password_confirmation: '987654'
+        expect(last_response.status).to eq(201)
+        expect(last_response.body).to eq('')
+      end
+    end
+
+    context 'is not the same' do
+      it do
+        post '/custom-message', password: '123456', password_confirmation: 'whatever'
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('password_confirmation not match')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include Spec::Support::Helpers
   config.raise_errors_for_deprecations!
+  config.filter_run_when_matching :focus
 
   config.before(:each) { Grape::Util::InheritableSetting.reset_global! }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,17 +117,23 @@ files:
 - benchmark/simple_with_type_coercer.rb
 - gemfiles/multi_json.gemfile
 - gemfiles/multi_xml.gemfile
+- gemfiles/rack_1.5.2.gemfile.lock
 - gemfiles/rack_edge.gemfile
 - gemfiles/rails_3.gemfile
+- gemfiles/rails_3.gemfile.lock
 - gemfiles/rails_4.gemfile
+- gemfiles/rails_4.gemfile.lock
 - gemfiles/rails_5.gemfile
+- gemfiles/rails_5.gemfile.lock
 - gemfiles/rails_edge.gemfile
+- gemfiles/rails_edge.gemfile.lock
 - grape.gemspec
 - grape.png
 - lib/grape.rb
 - lib/grape/api.rb
 - lib/grape/api/helpers.rb
 - lib/grape/api/instance.rb
+- lib/grape/config.rb
 - lib/grape/cookies.rb
 - lib/grape/dsl/api.rb
 - lib/grape/dsl/callbacks.rb
@@ -249,11 +255,11 @@ files:
 - lib/grape/validations/validators/mutual_exclusion.rb
 - lib/grape/validations/validators/presence.rb
 - lib/grape/validations/validators/regexp.rb
+- lib/grape/validations/validators/same_as.rb
 - lib/grape/validations/validators/values.rb
 - lib/grape/version.rb
-- pkg/grape-0.19.1.gem
-- pkg/grape-1.0.1.gem
-- pkg/grape-1.0.2.gem
+- pkg/grape-1.2.0.gem
+- pkg/grape-1.2.1.gem
 - spec/grape/api/custom_validations_spec.rb
 - spec/grape/api/deeply_included_options_spec.rb
 - spec/grape/api/inherited_helpers_spec.rb
@@ -271,6 +277,7 @@ files:
 - spec/grape/api/shared_helpers_spec.rb
 - spec/grape/api_remount_spec.rb
 - spec/grape/api_spec.rb
+- spec/grape/config_spec.rb
 - spec/grape/dsl/callbacks_spec.rb
 - spec/grape/dsl/configuration_spec.rb
 - spec/grape/dsl/desc_spec.rb
@@ -343,6 +350,7 @@ files:
 - spec/grape/validations/validators/mutual_exclusion_spec.rb
 - spec/grape/validations/validators/presence_spec.rb
 - spec/grape/validations/validators/regexp_spec.rb
+- spec/grape/validations/validators/same_as_spec.rb
 - spec/grape/validations/validators/values_spec.rb
 - spec/grape/validations/validators/zh-CN.yml
 - spec/grape/validations_spec.rb
@@ -376,110 +384,112 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
 test_files:
-- spec/spec_helper.rb
-- spec/integration/multi_xml/xml_spec.rb
-- spec/integration/multi_json/json_spec.rb
 - spec/shared/versioning_examples.rb
-- spec/support/basic_auth_encode_helpers.rb
-- spec/support/endpoint_faker.rb
-- spec/support/file_streamer.rb
-- spec/support/versioned_helpers.rb
-- spec/support/content_type_helpers.rb
-- spec/support/integer_helpers.rb
+- spec/grape/api/shared_helpers_exactly_one_of_spec.rb
+- spec/grape/api/custom_validations_spec.rb
+- spec/grape/api/parameters_modification_spec.rb
+- spec/grape/api/namespace_parameters_in_route_spec.rb
+- spec/grape/api/deeply_included_options_spec.rb
+- spec/grape/api/shared_helpers_spec.rb
+- spec/grape/api/required_parameters_with_invalid_method_spec.rb
+- spec/grape/api/inherited_helpers_spec.rb
+- spec/grape/api/recognize_path_spec.rb
+- spec/grape/api/required_parameters_in_route_spec.rb
+- spec/grape/api/nested_helpers_spec.rb
+- spec/grape/api/routes_with_requirements_spec.rb
+- spec/grape/api/patch_method_helpers_spec.rb
+- spec/grape/api/optional_parameters_in_route_spec.rb
+- spec/grape/api/invalid_format_spec.rb
+- spec/grape/named_api_spec.rb
+- spec/grape/exceptions/validation_spec.rb
+- spec/grape/exceptions/validation_errors_spec.rb
+- spec/grape/exceptions/missing_option_spec.rb
+- spec/grape/exceptions/unknown_options_spec.rb
+- spec/grape/exceptions/missing_mime_type_spec.rb
+- spec/grape/exceptions/base_spec.rb
+- spec/grape/exceptions/invalid_versioner_option_spec.rb
+- spec/grape/exceptions/invalid_response_spec.rb
+- spec/grape/exceptions/body_parse_errors_spec.rb
+- spec/grape/exceptions/unknown_validator_spec.rb
+- spec/grape/exceptions/invalid_formatter_spec.rb
+- spec/grape/exceptions/invalid_accept_header_spec.rb
+- spec/grape/dsl/routing_spec.rb
+- spec/grape/dsl/logger_spec.rb
+- spec/grape/dsl/request_response_spec.rb
+- spec/grape/dsl/validations_spec.rb
+- spec/grape/dsl/desc_spec.rb
+- spec/grape/dsl/headers_spec.rb
+- spec/grape/dsl/configuration_spec.rb
+- spec/grape/dsl/settings_spec.rb
+- spec/grape/dsl/callbacks_spec.rb
+- spec/grape/dsl/parameters_spec.rb
+- spec/grape/dsl/inside_route_spec.rb
+- spec/grape/dsl/middleware_spec.rb
+- spec/grape/dsl/helpers_spec.rb
+- spec/grape/endpoint_spec.rb
+- spec/grape/validations_spec.rb
+- spec/grape/entity_spec.rb
+- spec/grape/extensions/param_builders/hash_spec.rb
+- spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb
+- spec/grape/extensions/param_builders/hashie/mash_spec.rb
+- spec/grape/api_remount_spec.rb
+- spec/grape/parser_spec.rb
+- spec/grape/util/inheritable_setting_spec.rb
+- spec/grape/util/reverse_stackable_values_spec.rb
+- spec/grape/util/stackable_values_spec.rb
+- spec/grape/util/inheritable_values_spec.rb
+- spec/grape/util/strict_hash_configuration_spec.rb
+- spec/grape/config_spec.rb
+- spec/grape/presenters/presenter_spec.rb
+- spec/grape/middleware/versioner/header_spec.rb
+- spec/grape/middleware/versioner/accept_version_header_spec.rb
+- spec/grape/middleware/versioner/param_spec.rb
+- spec/grape/middleware/versioner/path_spec.rb
 - spec/grape/middleware/error_spec.rb
 - spec/grape/middleware/globals_spec.rb
+- spec/grape/middleware/base_spec.rb
 - spec/grape/middleware/formatter_spec.rb
+- spec/grape/middleware/exception_spec.rb
+- spec/grape/middleware/auth/base_spec.rb
 - spec/grape/middleware/auth/strategies_spec.rb
 - spec/grape/middleware/auth/dsl_spec.rb
-- spec/grape/middleware/auth/base_spec.rb
 - spec/grape/middleware/stack_spec.rb
-- spec/grape/middleware/exception_spec.rb
 - spec/grape/middleware/versioner_spec.rb
-- spec/grape/middleware/versioner/accept_version_header_spec.rb
-- spec/grape/middleware/versioner/header_spec.rb
-- spec/grape/middleware/versioner/path_spec.rb
-- spec/grape/middleware/versioner/param_spec.rb
-- spec/grape/middleware/base_spec.rb
-- spec/grape/loading_spec.rb
-- spec/grape/endpoint_spec.rb
-- spec/grape/api_spec.rb
-- spec/grape/util/reverse_stackable_values_spec.rb
-- spec/grape/util/stackable_values_spec.rb
-- spec/grape/util/inheritable_setting_spec.rb
-- spec/grape/util/strict_hash_configuration_spec.rb
-- spec/grape/util/inheritable_values_spec.rb
+- spec/grape/request_spec.rb
+- spec/grape/integration/global_namespace_function_spec.rb
 - spec/grape/integration/rack_spec.rb
 - spec/grape/integration/rack_sendfile_spec.rb
-- spec/grape/integration/global_namespace_function_spec.rb
-- spec/grape/validations_spec.rb
-- spec/grape/entity_spec.rb
-- spec/grape/exceptions/validation_spec.rb
-- spec/grape/exceptions/invalid_accept_header_spec.rb
-- spec/grape/exceptions/missing_option_spec.rb
-- spec/grape/exceptions/invalid_response_spec.rb
-- spec/grape/exceptions/body_parse_errors_spec.rb
-- spec/grape/exceptions/invalid_formatter_spec.rb
-- spec/grape/exceptions/missing_mime_type_spec.rb
-- spec/grape/exceptions/unknown_options_spec.rb
-- spec/grape/exceptions/validation_errors_spec.rb
-- spec/grape/exceptions/unknown_validator_spec.rb
-- spec/grape/exceptions/invalid_versioner_option_spec.rb
-- spec/grape/exceptions/base_spec.rb
-- spec/grape/presenters/presenter_spec.rb
 - spec/grape/validations/attributes_iterator_spec.rb
-- spec/grape/validations/params_scope_spec.rb
-- spec/grape/validations/instance_behaivour_spec.rb
-- spec/grape/validations/types_spec.rb
-- spec/grape/validations/validators/regexp_spec.rb
-- spec/grape/validations/validators/mutual_exclusion_spec.rb
 - spec/grape/validations/validators/exactly_one_of_spec.rb
-- spec/grape/validations/validators/except_values_spec.rb
-- spec/grape/validations/validators/presence_spec.rb
-- spec/grape/validations/validators/all_or_none_spec.rb
-- spec/grape/validations/validators/allow_blank_spec.rb
-- spec/grape/validations/validators/default_spec.rb
 - spec/grape/validations/validators/values_spec.rb
-- spec/grape/validations/validators/at_least_one_of_spec.rb
+- spec/grape/validations/validators/presence_spec.rb
 - spec/grape/validations/validators/coerce_spec.rb
+- spec/grape/validations/validators/at_least_one_of_spec.rb
+- spec/grape/validations/validators/same_as_spec.rb
 - spec/grape/validations/validators/zh-CN.yml
-- spec/grape/extensions/param_builders/hashie/mash_spec.rb
-- spec/grape/extensions/param_builders/hash_spec.rb
-- spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb
-- spec/grape/parser_spec.rb
-- spec/grape/request_spec.rb
-- spec/grape/api/parameters_modification_spec.rb
-- spec/grape/api/patch_method_helpers_spec.rb
-- spec/grape/api/required_parameters_with_invalid_method_spec.rb
-- spec/grape/api/nested_helpers_spec.rb
-- spec/grape/api/invalid_format_spec.rb
-- spec/grape/api/required_parameters_in_route_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
-- spec/grape/api/inherited_helpers_spec.rb
-- spec/grape/api/shared_helpers_spec.rb
-- spec/grape/api/deeply_included_options_spec.rb
-- spec/grape/api/routes_with_requirements_spec.rb
-- spec/grape/api/custom_validations_spec.rb
-- spec/grape/api/optional_parameters_in_route_spec.rb
-- spec/grape/api_remount_spec.rb
-- spec/grape/named_api_spec.rb
-- spec/grape/dsl/request_response_spec.rb
-- spec/grape/dsl/desc_spec.rb
-- spec/grape/dsl/logger_spec.rb
-- spec/grape/dsl/configuration_spec.rb
-- spec/grape/dsl/validations_spec.rb
-- spec/grape/dsl/parameters_spec.rb
-- spec/grape/dsl/helpers_spec.rb
-- spec/grape/dsl/middleware_spec.rb
-- spec/grape/dsl/headers_spec.rb
-- spec/grape/dsl/callbacks_spec.rb
-- spec/grape/dsl/settings_spec.rb
-- spec/grape/dsl/routing_spec.rb
-- spec/grape/dsl/inside_route_spec.rb
+- spec/grape/validations/validators/default_spec.rb
+- spec/grape/validations/validators/regexp_spec.rb
+- spec/grape/validations/validators/all_or_none_spec.rb
+- spec/grape/validations/validators/except_values_spec.rb
+- spec/grape/validations/validators/mutual_exclusion_spec.rb
+- spec/grape/validations/validators/allow_blank_spec.rb
+- spec/grape/validations/params_scope_spec.rb
+- spec/grape/validations/instance_behaivour_spec.rb
+- spec/grape/validations/types_spec.rb
+- spec/grape/api_spec.rb
+- spec/grape/loading_spec.rb
 - spec/grape/path_spec.rb
+- spec/support/file_streamer.rb
+- spec/support/versioned_helpers.rb
+- spec/support/content_type_helpers.rb
+- spec/support/integer_helpers.rb
+- spec/support/basic_auth_encode_helpers.rb
+- spec/support/endpoint_faker.rb
+- spec/spec_helper.rb
+- spec/integration/multi_json/json_spec.rb
+- spec/integration/multi_xml/xml_spec.rb