grape-app 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c509d2bc4e8421335786540ce1ce6bd49bbca8a9eb81d5bbf055470673e18b
-  data.tar.gz: 57d532273f4f2d23e1df5b49333f8b2b3e960e4cb5b05d30ac2ac23b8a236463
+  metadata.gz: 0c4a05ef1c03ec244f8f99896b795bde1b89ce280af80c46558fb9dc09a26b40
+  data.tar.gz: 3bfca4ffb992d3c0b9407215ae3cf08c538be22c6337d86125dcc1d2cf65bec4
 SHA512:
-  metadata.gz: 9fb0973200c7ce7cc03c80549821ed029cc5b122db181cb8599f348fa47b436f6816ddd019619804de57491c58151a81b0bcfb76769b048522ca2dae327ae76d
-  data.tar.gz: 2c0fe0493ce4c06971be0033d3199a19dce3645bccdec36bb1fac8b05076955ce955aac63d0eab6a3efbde918a391fbcda32facaa5c0e97290caeae62f9313e2
+  metadata.gz: ee63d58b3fcea0b099e749a82bf945753f50077c41ddefb833ea2c40b5aaedd6243b52296846b85117836f2c985e4eaa33aa402fe5ffe99e862106c1f99c25ba
+  data.tar.gz: 3e8a010d81aaf298110440a18da811d3829ebe6a6a915db16b05c0d96fabe7b53cbc79b3be227943f39b58185e3a81983d153087071f3170c16b41277969357b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-app (0.8.4)
+    grape-app (0.8.5)
       activesupport
       grape (>= 1.2)
       grape-entity
@@ -13,12 +13,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activesupport (6.0.1)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -32,70 +32,96 @@ GEM
     builder (3.2.4)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
+    dry-configurable (0.11.3)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.0.6)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-types (1.3.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
     equalizer (0.0.11)
-    grape (1.2.5)
+    grape (1.3.0)
       activesupport
       builder
+      dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-      virtus (>= 1.0.0)
-    grape-entity (0.7.1)
-      activesupport (>= 4.0)
+    grape-entity (0.8.0)
+      activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jaro_winkler (1.5.4)
-    minitest (5.13.0)
+    minitest (5.14.0)
     multi_json (1.14.1)
-    mustermann (1.0.3)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-grape (1.0.1)
+      mustermann (>= 1.0.0)
     parallel (1.19.1)
-    parser (2.6.5.0)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.2.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-cors (1.1.0)
+    rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-ssl-enforcer (0.2.9)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.77.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    sqlite3 (1.4.1)
-    thor (0.20.3)
+    ruby2_keywords (0.0.2)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -115,6 +141,7 @@ DEPENDENCIES
   rspec
   rubocop
   sqlite3
+  virtus
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

data/grape-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'grape-app'
-  s.version       = '0.8.4'
+  s.version       = '0.8.5'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Standalone Grape API apps)
@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'virtus'
 end

data/lib/grape/app.rb

@@ -10,9 +10,8 @@ require 'zeitwerk'
 
 class Grape::App < Grape::API
   class << self
-
     # Run initializers
-    def init!(root=nil)
+    def init!(root = nil)
       @root = Pathname.new(root) if root
 
       # Require bundle

data/lib/grape/app/cli.rb

@@ -24,14 +24,13 @@ module Grape::App::CLI
     def init_lib
       empty_directory File.join(name, 'lib', name)
     end
-
   end
 
   class Runner < Thor
     register Builder, :new, 'new NAME', 'create a new application'
 
     desc 'console ENV', 'Launch console'
-    def console(env='development')
+    def console(env = 'development')
       ENV['GRAPE_ENV'] = env
       require File.expand_path('config/environment', Dir.pwd)
 

data/lib/grape/app/configuration.rb

@@ -1,5 +1,4 @@
 class Grape::App::Configuration < ActiveSupport::InheritableOptions
-
   def middleware(&block)
     self[:middleware] ||= []
     self[:middleware].push(block) if block
@@ -22,5 +21,4 @@ class Grape::App::Configuration < ActiveSupport::InheritableOptions
       end
     end
   end
-
 end

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

@@ -17,14 +17,13 @@ module Grape::App::Helpers::Caching
   #     article
   #   end
   #
-  def fresh_when(object=nil, etag: nil, last_modified: nil, **cache_control)
+  def fresh_when(object = nil, etag: nil, last_modified: nil, last_modified_field: :updated_at, **cache_control)
     etag ||= object
-    last_modified ||= object.try(:updated_at) || object.try(:maximum, :updated_at)
-
+    last_modified = object.try(last_modified_field) || object.try(:maximum, last_modified_field) if last_modified.nil?
     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) unless cache_control.empty?
+    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
@@ -49,7 +48,7 @@ module Grape::App::Helpers::Caching
   #     stats = article.really_expensive_call if stale?(article)
   #   end
   #
-  def stale?(object=nil, **freshness_opts)
+  def stale?(object = nil, **freshness_opts)
     fresh_when(object, **freshness_opts)
     true
   end

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

@@ -6,7 +6,7 @@ module Grape::App::Helpers::RespondWith
   end
 
   # @param [ActiveRecord::Base] record validated record
-  def respond_with(record, opts={})
+  def respond_with(record, opts = {})
     unless record.errors.empty?
       opts[:with] = Errors
       status 400

data/lib/grape/app/tasks/databases.rake

@@ -11,7 +11,6 @@ ActiveRecord::Tasks::DatabaseTasks.tap do |config|
 end
 
 namespace :db do
-
   Rake::Task['load_config'].clear
 
   task load_config: :environment do
@@ -47,5 +46,4 @@ namespace :db do
     desc 'Prepare test DB'
     task :prepare
   end
-
 end

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

@@ -30,6 +30,14 @@ RSpec.describe Grape::App::Helpers::Caching do
     expect(last_response.status).to eq(200)
   end
 
+  it 'should handle fresh_when for records that were never updated' do
+    get '/articles/never_updated'
+    expect(last_response.status).to eq(200)
+    expect(last_response.headers).to include(
+      'Last-Modified' => 'Fri, 05 Jan 2018 11:25:00 GMT',
+    )
+  end
+
   it 'should support cache-control' do
     get '/articles?public=true'
     expect(last_response.status).to eq(200)
@@ -51,6 +59,7 @@ RSpec.describe Grape::App::Helpers::Caching do
       'id'         => 1,
       'title'      => 'Welcome',
       'updated_at' => '2018-01-05 11:25:10 UTC',
+      'created_at' => '2018-01-05 11:25:00 UTC',
     )
 
     get '/articles/1', {}, 'HTTP_IF_NONE_MATCH' => last_response.headers['ETag']

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

@@ -9,6 +9,7 @@ RSpec.describe Grape::App::Helpers::Params do
     post '/articles', title: 'Today', fresh: true, id: 1234, updated_at: Time.now
     expect(last_response.status).to eq(201)
     expect(JSON.parse(last_response.body)).to eq(
+      'created_at' => nil,
       'id'         => 9,
       'title'      => 'Today',
       'updated_at' => '2018-01-05 11:25:15 UTC',

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 ENV['RACK_ENV'] ||= 'test'
 require 'grape-app'
 require 'rack/test'
+require 'virtus'
 
 class Article
   include Virtus.model
@@ -13,8 +14,8 @@ class Article
     end
 
     def each
-      yield Article.new(id: 1, title: 'Welcome', updated_at: Time.at(1515151510).utc)
-      yield Article.new(id: 2, title: 'Bye', updated_at: Time.at(1515151520).utc)
+      yield Article.new(id: 1, title: 'Welcome', updated_at: Time.at(1515151510).utc, created_at: Time.at(1515151500).utc)
+      yield Article.new(id: 2, title: 'Bye', updated_at: Time.at(1515151520).utc, created_at: Time.at(1515151500).utc)
     end
   end
 
@@ -25,6 +26,7 @@ class Article
   attribute :id
   attribute :title
   attribute :updated_at
+  attribute :created_at
 
   def to_param
     id.to_s
@@ -44,6 +46,13 @@ class TestAPI < Grape::API
     scope.map(&:to_hash)
   end
 
+  get '/articles/never_updated' do
+    article = Article.all.first
+    article.updated_at = nil
+
+    fresh_when(article, last_modified_field: :created_at)
+  end
+
   get '/articles/:id' do
     article = Article.all.first
     article.to_hash if stale?(article, stale_if_error: 5, extras: { a: 1, b: 2 })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - info@blacksquaremedia.com
@@ -284,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Standalone Grape API apps