grape-app 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2653ff42bb7e4d7527dc37ee765b60771421264fed7f642da7d5e780dd320867
-  data.tar.gz: 9b97f22526ad5c62d2c0ac80fd992befa2d6047714c11136f693ed64166c71e4
+  metadata.gz: 3327dc14503a28d7ea05a7c3f01f4350b4686ea180c3fd7a5daee5d44d5cdff4
+  data.tar.gz: 5eeb48e23593ea6d26aa37e0ae7b590cc7ccaa2c3a1c5c70302247c1a4f0eb97
 SHA512:
-  metadata.gz: a053a2c7fb948f990c0f8e4a796d7a60e9225a190bbaa6ff9a04f87dd7eb2c23f6f182ca103bea31064de9dc29efb16cea2b013096d83ee0bed8e11161796a62
-  data.tar.gz: c20d7146f3a8a4aa34ee74449db4b6991215558e78cc9347be3cd4d9cfdb34a517905c17685340ac7a53abe4f8ad6b27376b16f9ca911da7e55b72e089192ae3
+  metadata.gz: f13cf9a87bd44430d26f2ac32ca0f2d552d71fd87c20382a009ca19ee0e3c9a2678806096faf016761b03fdb7c5e6ca8259bb2ae07dffd9e5162081026a560d0
+  data.tar.gz: bd165a05e7d5a6a3603c22e25966d56d4bb4992f92ce4232c6008ec68d3404efd249d55e2dc5c9cae2d5c09dd246e42ba05f510c46056acfcfcf707cbbeae3f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-app (0.8.2)
+    grape-app (0.8.3)
       activesupport
       grape (>= 1.2)
       grape-entity
@@ -37,7 +37,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     equalizer (0.0.11)
-    grape (1.2.4)
+    grape (1.2.5)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -56,7 +56,7 @@ GEM
     mustermann (1.0.3)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
-    parallel (1.19.0)
+    parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     rack (2.0.7)
@@ -82,7 +82,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (0.76.0)
+    rubocop (0.77.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -101,7 +101,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    zeitwerk (2.2.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/grape-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'grape-app'
-  s.version       = '0.8.2'
+  s.version       = '0.8.3'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Standalone Grape API apps)

data/lib/grape/app/helpers/caching.rb

@@ -24,7 +24,7 @@ module Grape::App::Helpers::Caching
     etag = ActiveSupport::Digest.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))
     header 'ETag', etag
     header 'Last-Modified', last_modified.httpdate if last_modified
-    cache_control(cache_control)
+    cache_control(cache_control) unless cache_control.empty?
 
     if_modified_since = headers['If-Modified-Since']
     if_modified_since = Time.rfc2822(if_modified_since) rescue nil if if_modified_since # rubocop:disable Style/RescueModifier

data/spec/grape/app/helpers/caching_spec.rb

@@ -9,7 +9,6 @@ RSpec.describe Grape::App::Helpers::Caching do
     get '/articles'
     expect(last_response.status).to eq(200)
     expect(last_response.headers).to include(
-      'Cache-Control' => 'public',
       'Content-Type'  => 'application/json',
       'ETag'          => '975ca8804565c1a569450d61090b2743',
       'Last-Modified' => 'Fri, 05 Jan 2018 11:25:20 GMT',
@@ -31,6 +30,14 @@ RSpec.describe Grape::App::Helpers::Caching do
     expect(last_response.status).to eq(200)
   end
 
+  it 'should support cache-control' do
+    get '/articles?public=true'
+    expect(last_response.status).to eq(200)
+    expect(last_response.headers).to include(
+      'Cache-Control' => 'public',
+    )
+  end
+
   it 'should handle stale? (with cache-control)' do
     get '/articles/1'
     expect(last_response.status).to eq(200)

data/spec/spec_helper.rb

@@ -39,7 +39,8 @@ class TestAPI < Grape::API::Instance
 
   get '/articles' do
     scope = Article.all
-    fresh_when(scope, public: true)
+    opts  = params[:public] ? { public: params[:public] } : {}
+    fresh_when(scope, **opts)
     scope.map(&:to_hash)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Standalone Grape API apps