grape 1.2.3 → 1.2.4

data/spec/grape/endpoint_spec.rb

@@ -472,12 +472,12 @@ describe Grape::Endpoint do
       expect(last_response.status).to eq(200)
     end
 
-    it 'does not include aliased missing attributes if that option is passed' do
+    it 'does not include renamed missing attributes if that option is passed' do
       subject.params do
-        optional :aliased_original, as: :aliased
+        optional :renamed_original, as: :renamed
       end
       subject.get '/declared' do
-        error! 'expected nil', 400 if declared(params, include_missing: false).key?(:aliased)
+        error! 'expected nil', 400 if declared(params, include_missing: false).key?(:renamed)
         ''
       end
 
@@ -1089,6 +1089,36 @@ describe Grape::Endpoint do
       expect(last_response.headers['X-Custom']).to eq('value')
     end
 
+    it 'merges additional headers with headers set before call' do
+      subject.before do
+        header 'X-Before-Test', 'before-sample'
+      end
+
+      subject.get '/hey' do
+        header 'X-Test', 'test-sample'
+        error!({ 'dude' => 'rad' }, 403, 'X-Error' => 'error')
+      end
+
+      get '/hey.json'
+      expect(last_response.headers['X-Before-Test']).to eq('before-sample')
+      expect(last_response.headers['X-Test']).to eq('test-sample')
+      expect(last_response.headers['X-Error']).to eq('error')
+    end
+
+    it 'does not merges additional headers with headers set after call' do
+      subject.after do
+        header 'X-After-Test', 'after-sample'
+      end
+
+      subject.get '/hey' do
+        error!({ 'dude' => 'rad' }, 403, 'X-Error' => 'error')
+      end
+
+      get '/hey.json'
+      expect(last_response.headers['X-Error']).to eq('error')
+      expect(last_response.headers['X-After-Test']).to be_nil
+    end
+
     it 'sets the status code for the endpoint' do
       memoized_endpoint = nil
 
@@ -1492,6 +1522,9 @@ describe Grape::Endpoint do
         have_attributes(name: 'endpoint_run_filters.grape', payload: { endpoint: a_kind_of(Grape::Endpoint),
                                                                        filters: [],
                                                                        type: :after }),
+        have_attributes(name: 'endpoint_run_filters.grape', payload: { endpoint: a_kind_of(Grape::Endpoint),
+                                                                       filters: [],
+                                                                       type: :finally }),
         have_attributes(name: 'endpoint_run.grape', payload: { endpoint: a_kind_of(Grape::Endpoint),
                                                                env: an_instance_of(Hash) }),
         have_attributes(name: 'format_response.grape', payload: { env: an_instance_of(Hash),
@@ -1518,6 +1551,9 @@ describe Grape::Endpoint do
         have_attributes(name: 'endpoint_run_filters.grape', payload: { endpoint: a_kind_of(Grape::Endpoint),
                                                                        filters: [],
                                                                        type: :after }),
+        have_attributes(name: 'endpoint_run_filters.grape', payload: { endpoint: a_kind_of(Grape::Endpoint),
+                                                                       filters: [],
+                                                                       type: :finally }),
         have_attributes(name: 'format_response.grape', payload: { env: an_instance_of(Hash),
                                                                   formatter: a_kind_of(Module) })
       )

data/spec/grape/validations/params_scope_spec.rb

@@ -121,14 +121,14 @@ describe Grape::Validations::ParamsScope do
     end
   end
 
-  context 'param alias' do
+  context 'param renaming' do
     it do
       subject.params do
         requires :foo, as: :bar
         optional :super, as: :hiper
       end
-      subject.get('/alias') { "#{declared(params)['bar']}-#{declared(params)['hiper']}" }
-      get '/alias', foo: 'any', super: 'any2'
+      subject.get('/renaming') { "#{declared(params)['bar']}-#{declared(params)['hiper']}" }
+      get '/renaming', foo: 'any', super: 'any2'
 
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq('any-any2')
@@ -138,8 +138,8 @@ describe Grape::Validations::ParamsScope do
       subject.params do
         requires :foo, as: :bar, type: String, coerce_with: ->(c) { c.strip }
       end
-      subject.get('/alias-coerced') { "#{params['bar']}-#{params['foo']}" }
-      get '/alias-coerced', foo: ' there we go '
+      subject.get('/renaming-coerced') { "#{params['bar']}-#{params['foo']}" }
+      get '/renaming-coerced', foo: ' there we go '
 
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq('there we go-')
@@ -149,8 +149,8 @@ describe Grape::Validations::ParamsScope do
       subject.params do
         requires :foo, as: :bar, allow_blank: false
       end
-      subject.get('/alias-not-blank') {}
-      get '/alias-not-blank', foo: ''
+      subject.get('/renaming-not-blank') {}
+      get '/renaming-not-blank', foo: ''
 
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('foo is empty')
@@ -160,8 +160,8 @@ describe Grape::Validations::ParamsScope 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'
+      subject.get('/renaming-not-blank-with-value') {}
+      get '/renaming-not-blank-with-value', foo: 'any'
 
       expect(last_response.status).to eq(200)
     end
@@ -532,7 +532,7 @@ describe Grape::Validations::ParamsScope do
       expect(last_response.body).to eq({ a: 'a', b: 'b', c: 'c', d: 'd' }.to_json)
     end
 
-    it 'allows aliasing of dependent parameters' do
+    it 'allows renaming of dependent parameters' do
       subject.params do
         optional :a
         given :a do
@@ -550,7 +550,7 @@ describe Grape::Validations::ParamsScope do
       expect(body.keys).to_not include('b')
     end
 
-    it 'allows aliasing of dependent on parameter' do
+    it 'allows renaming of dependent on parameter' do
       subject.params do
         optional :a, as: :b
         given b: ->(val) { val == 'x' } do
@@ -567,7 +567,7 @@ describe Grape::Validations::ParamsScope do
       expect(last_response.status).to eq 200
     end
 
-    it 'raises an error if the dependent parameter is not the aliased one' do
+    it 'raises an error if the dependent parameter is not the renamed one' do
       expect do
         subject.params do
           optional :a, as: :b
@@ -700,6 +700,26 @@ describe Grape::Validations::ParamsScope do
   end
 
   context 'when validations are dependent on a parameter within an array param' do
+    before do
+      subject.params do
+        requires :foos, type: Array do
+          optional :foo
+          given :foo do
+            requires :bar
+          end
+        end
+      end
+      subject.get('/test') { 'ok' }
+    end
+
+    it 'should pass none Hash params' do
+      get '/test', foos: ['']
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to eq('ok')
+    end
+  end
+
+  context 'when validations are dependent on a parameter within an array param within #declared(params).to_json' do
     before do
       subject.params do
         requires :foos, type: Array do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,7 +126,6 @@ files:
 - 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
@@ -220,10 +219,12 @@ files:
 - lib/grape/serve_file/file_response.rb
 - lib/grape/serve_file/sendfile_response.rb
 - lib/grape/util/content_types.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_value.rb
 - lib/grape/util/registrable.rb
 - lib/grape/util/reverse_stackable_values.rb
 - lib/grape/util/stackable_values.rb
@@ -260,6 +261,7 @@ files:
 - lib/grape/version.rb
 - pkg/grape-1.2.0.gem
 - pkg/grape-1.2.1.gem
+- pkg/grape-1.2.3.gem
 - spec/grape/api/custom_validations_spec.rb
 - spec/grape/api/deeply_included_options_spec.rb
 - spec/grape/api/inherited_helpers_spec.rb

data/gemfiles/rails_edge.gemfile.lock

@@ -1,335 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: bad1041b82df941d588ae2565f62424d88104933
-  specs:
-    actioncable (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      actionview (= 6.0.0.alpha)
-      activejob (= 6.0.0.alpha)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.0.alpha)
-      actionview (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-      globalid (>= 0.3.6)
-    activemodel (6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-    activerecord (6.0.0.alpha)
-      activemodel (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-    activestorage (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      activerecord (= 6.0.0.alpha)
-      marcel (~> 0.3.1)
-    activesupport (6.0.0.alpha)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    rails (6.0.0.alpha)
-      actioncable (= 6.0.0.alpha)
-      actionmailer (= 6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      actionview (= 6.0.0.alpha)
-      activejob (= 6.0.0.alpha)
-      activemodel (= 6.0.0.alpha)
-      activerecord (= 6.0.0.alpha)
-      activestorage (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-      bundler (>= 1.3.0)
-      railties (= 6.0.0.alpha)
-      sprockets-rails (>= 2.0.0)
-    railties (6.0.0.alpha)
-      actionpack (= 6.0.0.alpha)
-      activesupport (= 6.0.0.alpha)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    grape (1.2.3)
-      activesupport
-      builder
-      mustermann-grape (~> 1.0.0)
-      rack (>= 1.3.0)
-      rack-accept
-      virtus (>= 1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    ast (2.4.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    benchmark-ips (2.7.2)
-    builder (3.2.3)
-    claide (1.0.2)
-    claide-plugins (0.9.2)
-      cork
-      nap
-      open4 (~> 1.3)
-    coderay (1.1.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    colored (1.2)
-    colored2 (3.1.2)
-    concurrent-ruby (1.1.3)
-    cookiejar (0.3.3)
-    cork (0.3.0)
-      colored2 (~> 3.1)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    crass (1.0.4)
-    danger (4.0.5)
-      claide (~> 1.0)
-      claide-plugins (>= 0.9.2)
-      colored (~> 1.2)
-      cork (~> 0.1)
-      faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
-      git (~> 1)
-      kramdown (~> 1.5)
-      octokit (~> 4.2)
-      terminal-table (~> 1)
-    danger-changelog (0.2.1)
-      danger-plugin-api (~> 1.0)
-    danger-plugin-api (1.0.0)
-      danger (> 2.0)
-    danger-toc (0.1.3)
-      activesupport
-      danger-plugin-api (~> 1.0)
-      kramdown
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    equalizer (0.0.11)
-    erubi (1.7.1)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
-      faraday (~> 0.8)
-    ffi (1.9.25)
-    formatador (0.2.5)
-    git (1.5.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    grape-entity (0.7.1)
-      activesupport (>= 4.0)
-      multi_json (>= 1.3.2)
-    guard (2.15.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
-    hashie (3.6.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    i18n (1.1.1)
-      concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    json (2.1.0)
-    kramdown (1.17.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    lumberjack (1.0.13)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    maruku (0.7.3)
-    method_source (0.9.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    mustermann (1.0.3)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
-    nap (1.1.0)
-    nenv (0.3.0)
-    netrc (0.11.0)
-    nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    octokit (4.13.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    open4 (1.3.4)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.3)
-    rack (2.0.6)
-    rack-accept (0.4.5)
-      rack (>= 0.4)
-    rack-jsonp (1.3.1)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.51.0)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-grape-danger (0.1.1)
-      danger (~> 4.0.1)
-      danger-changelog (~> 0.2.0)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    shellany (0.0.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    term-ansicolor (1.7.0)
-      tins (~> 1.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tins (1.20.2)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  benchmark-ips
-  bundler
-  cookiejar
-  coveralls
-  danger-toc (~> 0.1.2)
-  grape!
-  grape-entity (~> 0.6)
-  guard
-  guard-rspec
-  guard-rubocop
-  hashie
-  maruku
-  mime-types
-  rack-jsonp
-  rack-test (~> 0.6.3)
-  rails!
-  rake
-  rspec (~> 3.0)
-  rubocop (= 0.51.0)
-  ruby-grape-danger (~> 0.1.0)
-
-BUNDLED WITH
-   1.16.2