grape 1.0.1 → 1.0.2

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

@@ -9,7 +9,7 @@ describe Grape::Validations::MutualExclusionValidator do
         end
       end
     end
-    let(:mutually_exclusive_params) { [:beer, :wine, :grapefruit] }
+    let(:mutually_exclusive_params) { %i[beer wine grapefruit] }
     let(:validator) { described_class.new(mutually_exclusive_params, {}, false, scope.new) }
 
     context 'when all mutually exclusive params are present' do

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

@@ -159,7 +159,7 @@ describe Grape::Validations::ValuesValidator do
 
         params do
           optional :optional, type: Array do
-            requires :type, values: %w(a b)
+            requires :type, values: %w[a b]
           end
         end
         get '/optional_with_required_values'
@@ -207,7 +207,7 @@ describe Grape::Validations::ValuesValidator do
         end
 
         params do
-          optional :optional, type: Array[String], values: %w(a b c)
+          optional :optional, type: Array[String], values: %w[a b c]
         end
         put '/optional_with_array_of_string_values'
 
@@ -555,7 +555,7 @@ describe Grape::Validations::ValuesValidator do
     end
 
     it 'rejects an array of values if any of them matches except' do
-      get '/except/exclusive', type: %w(valid1 valid2 invalid-type1 valid4)
+      get '/except/exclusive', type: %w[valid1 valid2 invalid-type1 valid4]
       expect(last_response.status).to eq 400
       expect(last_response.body).to eq({ error: 'type has a value not allowed' }.to_json)
     end

data/spec/grape/validations_spec.rb

@@ -63,7 +63,7 @@ describe Grape::Validations do
 
       it 'adds entity documentation to declared params' do
         define_optional_using
-        expect(subject.route_setting(:declared_params)).to eq([:field_a, :field_b])
+        expect(subject.route_setting(:declared_params)).to eq(%i[field_a field_b])
       end
 
       it 'works when field_a and field_b are not present' do
@@ -139,7 +139,7 @@ describe Grape::Validations do
 
       it 'adds entity documentation to declared params' do
         define_requires_all
-        expect(subject.route_setting(:declared_params)).to eq([:required_field, :optional_field])
+        expect(subject.route_setting(:declared_params)).to eq(%i[required_field optional_field])
       end
 
       it 'errors when required_field is not present' do
@@ -174,7 +174,7 @@ describe Grape::Validations do
 
       it 'adds entity documentation to declared params' do
         define_requires_none
-        expect(subject.route_setting(:declared_params)).to eq([:required_field, :optional_field])
+        expect(subject.route_setting(:declared_params)).to eq(%i[required_field optional_field])
       end
 
       it 'errors when required_field is not present' do
@@ -204,7 +204,7 @@ describe Grape::Validations do
 
         it 'adds only the entity documentation to declared params, nothing more' do
           define_requires_all
-          expect(subject.route_setting(:declared_params)).to eq([:required_field, :optional_field])
+          expect(subject.route_setting(:declared_params)).to eq(%i[required_field optional_field])
         end
       end
 
@@ -350,7 +350,7 @@ describe Grape::Validations do
       before do
         subject.params do
           requires :items, type: Hash do
-            requires :key, type: String, values: %w(a b)
+            requires :key, type: String, values: %w[a b]
           end
         end
         subject.get '/required' do
@@ -1058,14 +1058,14 @@ describe Grape::Validations do
           subject.params do
             use :pagination
           end
-          expect(subject.route_setting(:declared_params)).to eq [:page, :per_page]
+          expect(subject.route_setting(:declared_params)).to eq %i[page per_page]
         end
 
         it 'by #use with multiple params' do
           subject.params do
             use :pagination, :period
           end
-          expect(subject.route_setting(:declared_params)).to eq [:page, :per_page, :start_date, :end_date]
+          expect(subject.route_setting(:declared_params)).to eq %i[page per_page start_date end_date]
         end
       end
 
@@ -1073,13 +1073,13 @@ describe Grape::Validations do
         before do
           subject.helpers do
             params :order do |options|
-              optional :order, type: Symbol, values: [:asc, :desc], default: options[:default_order]
+              optional :order, type: Symbol, values: %i[asc desc], default: options[:default_order]
               optional :order_by, type: Symbol, values: options[:order_by], default: options[:default_order_by]
             end
           end
           subject.format :json
           subject.params do
-            use :order, default_order: :asc, order_by: [:name, :created_at], default_order_by: :created_at
+            use :order, default_order: :asc, order_by: %i[name created_at], default_order_by: :created_at
           end
           subject.get '/order' do
             {

data/spec/shared/versioning_examples.rb

@@ -149,4 +149,62 @@ shared_examples_for 'versioning' do
     versioned_get '/api_version_with_version_param?version=1', 'v1', macro_options
     expect(last_response.body).to eql '1'
   end
+
+  context 'with catch-all' do
+    let(:options) { macro_options }
+    let(:v1) do
+      klass = Class.new(Grape::API)
+      klass.version 'v1', options
+      klass.get 'version' do
+        'v1'
+      end
+      klass
+    end
+    let(:v2) do
+      klass = Class.new(Grape::API)
+      klass.version 'v2', options
+      klass.get 'version' do
+        'v2'
+      end
+      klass
+    end
+    before do
+      subject.format :txt
+
+      subject.mount v1
+      subject.mount v2
+
+      subject.route :any, '*path' do
+        params[:path]
+      end
+    end
+
+    context 'v1' do
+      it 'finds endpoint' do
+        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
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to end_with 'whatever'
+      end
+    end
+
+    context 'v2' do
+      it 'finds endpoint' do
+        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
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to end_with 'whatever'
+      end
+    end
+  end
 end

data/spec/support/content_type_helpers.rb

@@ -1,7 +1,7 @@
 module Spec
   module Support
     module Helpers
-      %w(put patch post delete).each do |method|
+      %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'

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mustermann-grape
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rack-accept
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rack-accept
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A Ruby framework for rapid API development with great conventions.
 email:
 - michael@intridea.com
@@ -228,6 +228,7 @@ files:
 - lib/grape/validations/types.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/file.rb
 - lib/grape/validations/types/json.rb
 - lib/grape/validations/types/multiple_type_coercer.rb
@@ -250,6 +251,7 @@ files:
 - lib/grape/validations/validators/values.rb
 - lib/grape/version.rb
 - pkg/grape-0.19.1.gem
+- pkg/grape-1.0.1.gem
 - spec/grape/api/custom_validations_spec.rb
 - spec/grape/api/deeply_included_options_spec.rb
 - spec/grape/api/inherited_helpers_spec.rb
@@ -366,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.