grape-app 0.8.3 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3327dc14503a28d7ea05a7c3f01f4350b4686ea180c3fd7a5daee5d44d5cdff4
-  data.tar.gz: 5eeb48e23593ea6d26aa37e0ae7b590cc7ccaa2c3a1c5c70302247c1a4f0eb97
+  metadata.gz: ba29de5fd70e82430c9bedfe0381fbabf43cd420d16c416e162582926f7bbec1
+  data.tar.gz: 71f550566eb3fccf9d66baf45c2e987bef0876a48daf139aac0eedf0746f350e
 SHA512:
-  metadata.gz: f13cf9a87bd44430d26f2ac32ca0f2d552d71fd87c20382a009ca19ee0e3c9a2678806096faf016761b03fdb7c5e6ca8259bb2ae07dffd9e5162081026a560d0
-  data.tar.gz: bd165a05e7d5a6a3603c22e25966d56d4bb4992f92ce4232c6008ec68d3404efd249d55e2dc5c9cae2d5c09dd246e42ba05f510c46056acfcfcf707cbbeae3f7
+  metadata.gz: 74835d8b690aacee9164288561974a4954823cb9cac45206e93927c17fbde803f2b13a8bbab437fea84470c36cf518d17c20b00e3459702c965e9c74522ddfd5
+  data.tar.gz: 97cbb35a1ade9fb541759efc71789163161c2bf255b36a94febe0ba1698a364d333dbec8a30a8e923d6f2ecbce80edffa164557737d071ae6a8016db2bde94f4

data/.github/workflows/test.yml

@@ -0,0 +1,21 @@
+name: Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.rubocop.yml

@@ -1,8 +1,14 @@
-inherit_from:
-  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
 
 AllCops:
-  TargetRubyVersion: "2.5"
+  TargetRubyVersion: "2.6"
 Metrics/ParameterLists:
   Exclude:
     - lib/grape/app/helpers/caching.rb
+Rake/Desc:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-app (0.8.3)
+    grape-app (0.8.8)
       activesupport
       grape (>= 1.2)
       grape-entity
@@ -13,95 +13,122 @@ 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.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    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)
-    builder (3.2.3)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    equalizer (0.0.11)
-    grape (1.2.5)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    dry-configurable (0.12.1)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5.0)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.5.0)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.1.1)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-types (1.5.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    grape (1.5.3)
       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.9.0)
+      activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    i18n (1.7.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    jaro_winkler (1.5.4)
-    minitest (5.13.0)
-    multi_json (1.14.1)
-    mustermann (1.0.3)
-    mustermann-grape (1.0.0)
-      mustermann (~> 1.0.0)
-    parallel (1.19.1)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    rack (2.0.7)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-grape (1.0.1)
+      mustermann (>= 1.0.0)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
     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)
-    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-expectations (3.9.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.77.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.12.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       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)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.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)
-    zeitwerk (2.2.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-bsm (0.5.6)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.10.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    sqlite3 (1.4.2)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -113,8 +140,8 @@ DEPENDENCIES
   rack-test
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sqlite3
 
 BUNDLED WITH
-   2.0.2
+   2.2.5

data/grape-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'grape-app'
-  s.version       = '0.8.3'
+  s.version       = '0.8.8'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Standalone Grape API apps)
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.executables   = ['grape-app']
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.6'
 
   s.add_dependency 'activesupport'
   s.add_dependency 'grape', '>= 1.2'
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
 end

data/lib/grape/app.rb

@@ -8,11 +8,10 @@ require 'rack/cors'
 require 'rack/ssl-enforcer'
 require 'zeitwerk'
 
-class Grape::App < Grape::API::Instance
+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
@@ -73,11 +72,19 @@ class Grape::App < Grape::API::Instance
       config = self.config
       @middleware ||= Rack::Builder.new do
         use Rack::Cors, &config.cors if config.cors
-        use Rack::SslEnforcer if config.force_ssl
+
+        if config.force_ssl.is_a?(Hash)
+          use Rack::SslEnforcer, **config.force_ssl
+        elsif config.force_ssl
+          use Rack::SslEnforcer
+        end
+
         config.middleware.each do |block|
           instance_eval(&block)
         end
 
+        use Grape::App::Middleware::ConnectionManagement if defined?(ActiveRecord)
+
         run Grape::App
       end
     end
@@ -103,3 +110,4 @@ end
 require 'grape/app/configuration'
 require 'grape/app/helpers'
 require 'grape/app/inflector'
+require 'grape/app/middleware'

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/middleware.rb

@@ -0,0 +1,5 @@
+module Grape::App::Middleware
+  extend ActiveSupport::Autoload
+
+  autoload :ConnectionManagement
+end

data/lib/grape/app/middleware/connection_management.rb

@@ -0,0 +1,12 @@
+class Grape::App::Middleware::ConnectionManagement
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    @app.call(env)
+  rescue ::ActiveRecord::StatementInvalid
+    ::ActiveRecord::Base.clear_active_connections!
+    raise
+  end
+end

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
@@ -34,12 +33,12 @@ namespace :db do
     ar_version = [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR].join('.')
 
     FileUtils.mkdir_p(migrations_path)
-    File.write path, <<-MIGRATION.strip_heredoc
+    File.write path, <<~RUBY
       class #{name.camelize} < ActiveRecord::Migration[#{ar_version}]
         def change
         end
       end
-    MIGRATION
+    RUBY
     puts path
   end
 
@@ -47,5 +46,4 @@ namespace :db do
     desc 'Prepare test DB'
     task :prepare
   end
-
 end

data/lib/grape/app/templates/app/api/v1.rb

@@ -1,4 +1,4 @@
-class API::V1 < Grape::API::Instance
+class API::V1 < Grape::API
   version 'v1'
   prefix  'api'
   format  :json
@@ -9,7 +9,7 @@ class API::V1 < Grape::API::Instance
   #   error_response message: e.message, status: 404
   # end
 
-  # Mount components
+  # Mount components:
+  #
   # mount API::Posts
-
 end

data/lib/grape/app/templates/config/environments/production.rb

@@ -1,6 +1,8 @@
 Grape::App.configure do |config|
-  # Force SSL
-  # config.force_ssl = true
+  # Force SSL, please see https://github.com/tobmatth/rack-ssl-enforcer
+  # for configuration options.
+  #
+  # config.force_ssl = { strict: true }
 
   # CORS is disabled by default, please see https://github.com/cyu/rack-cors
   # for configuration options.

data/lib/grape/app/templates/spec/spec_helper.rb

@@ -12,7 +12,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with :truncation
   end
-  config.around :each do |example|
+  config.around do |example|
     DatabaseCleaner.cleaning { example.run }
   end
 

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

@@ -3,14 +3,46 @@ require 'spec_helper'
 RSpec.describe Grape::App::Helpers::Caching do
   include Rack::Test::Methods
 
-  let(:app) { TestAPI }
+  let :app do
+    helper = described_class
+    Class.new(Grape::API) do
+      format :json
 
-  it 'should handle fresh-when' do
+      helpers helper
+
+      get '/articles' do
+        scope = Article.order(:id)
+        opts  = params[:public] ? { public: params[:public] } : {}
+        fresh_when(scope, **opts)
+        scope.to_a
+      end
+
+      get '/articles/never_updated' do
+        article = Article.first
+        article.updated_at = nil
+
+        fresh_when(article, last_modified_field: :created_at)
+      end
+
+      get '/articles/:id' do
+        article = Article.first
+        article if stale?(article, stale_if_error: 5, extras: { a: 1, b: 2 })
+      end
+    end
+  end
+  let(:created_at) { Time.at(1515151500).utc }
+
+  before do
+    Article.create! title: 'Welcome', created_at: created_at, updated_at: created_at + 10
+    Article.create! title: 'Bye', created_at: created_at, updated_at: created_at + 20
+  end
+
+  it 'handles fresh-when' do
     get '/articles'
     expect(last_response.status).to eq(200)
     expect(last_response.headers).to include(
       'Content-Type'  => 'application/json',
-      'ETag'          => '975ca8804565c1a569450d61090b2743',
+      'ETag'          => 'a5f6c4b024510c9835d8d70cbd3ed00c',
       'Last-Modified' => 'Fri, 05 Jan 2018 11:25:20 GMT',
     )
     expect(JSON.parse(last_response.body).size).to eq(2)
@@ -30,7 +62,15 @@ RSpec.describe Grape::App::Helpers::Caching do
     expect(last_response.status).to eq(200)
   end
 
-  it 'should support cache-control' do
+  it 'handles 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 'supports cache-control' do
     get '/articles?public=true'
     expect(last_response.status).to eq(200)
     expect(last_response.headers).to include(
@@ -38,26 +78,27 @@ RSpec.describe Grape::App::Helpers::Caching do
     )
   end
 
-  it 'should handle stale? (with cache-control)' do
+  it 'handles stale? (with cache-control)' do
     get '/articles/1'
     expect(last_response.status).to eq(200)
     expect(last_response.headers).to include(
       'Cache-Control' => 'private, stale-if-error=5, a=1, b=2',
       'Content-Type'  => 'application/json',
-      'ETag'          => 'c4ca4238a0b923820dcc509a6f75849b',
+      'ETag'          => '0154407bafc97186a494a05e0652ff61',
       'Last-Modified' => 'Fri, 05 Jan 2018 11:25:10 GMT',
     )
     expect(JSON.parse(last_response.body)).to eq(
       'id'         => 1,
       'title'      => 'Welcome',
-      'updated_at' => '2018-01-05 11:25:10 UTC',
+      'updated_at' => '2018-01-05T11:25:10.000Z',
+      'created_at' => '2018-01-05T11:25:00.000Z',
     )
 
     get '/articles/1', {}, 'HTTP_IF_NONE_MATCH' => last_response.headers['ETag']
     expect(last_response.status).to eq(304)
     expect(last_response.headers).to include(
       'Cache-Control' => 'private, stale-if-error=5, a=1, b=2',
-      'ETag'          => 'c4ca4238a0b923820dcc509a6f75849b',
+      'ETag'          => '0154407bafc97186a494a05e0652ff61',
       'Last-Modified' => 'Fri, 05 Jan 2018 11:25:10 GMT',
     )
   end

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

@@ -3,15 +3,32 @@ require 'spec_helper'
 RSpec.describe Grape::App::Helpers::Params do
   include Rack::Test::Methods
 
-  let(:app) { TestAPI }
+  let :app do
+    helper = described_class
+    Class.new(Grape::API) do
+      format :json
 
-  it 'should limit params' do
-    post '/articles', title: 'Today', fresh: true, id: 1234, updated_at: Time.now
+      helpers helper
+
+      params do
+        optional :title
+      end
+      post '/articles' do
+        attrs = { id: 9, updated_at: Time.at(1515151515).utc }
+        attrs.update(declared_params)
+        Article.new(attrs)
+      end
+    end
+  end
+
+  it 'limits params' do
+    post '/articles', title: 'Today', 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',
+      'updated_at' => '2018-01-05T11:25:15.000Z',
     )
   end
 end

data/spec/grape/app/middleware/connection_management_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+RSpec.describe Grape::App::Middleware::ConnectionManagement do
+  include Rack::Test::Methods
+
+  let :app do
+    failing = ->(_) { raise(ActiveRecord::StatementInvalid) }
+    middleware = described_class
+    Rack::Builder.new do
+      use middleware
+      run failing
+    end
+  end
+
+  it 'clears active connections' do
+    ActiveRecord::Base.connection
+    expect(ActiveRecord::Base.connection_handler).to be_active_connections
+
+    expect { get '/' }.to raise_error(ActiveRecord::StatementInvalid)
+    expect(ActiveRecord::Base.connection_handler).not_to be_active_connections
+  end
+end

data/spec/grape/app_spec.rb

@@ -4,37 +4,38 @@ RSpec.describe Grape::App do
   include Rack::Test::Methods
 
   subject { described_class }
+
   before  { subject.init! File.expand_path('../scenario', __dir__) }
 
   def app
     subject.middleware
   end
 
-  it 'should have an env' do
+  it 'has an env' do
     expect(subject.env).to be_instance_of(ActiveSupport::StringInquirer)
     expect(subject.env).to eq('test')
   end
 
-  it 'should have an root' do
+  it 'has an root' do
     expect(subject.root).to be_instance_of(Pathname)
   end
 
-  it 'should be an API instance' do
-    expect(subject).to be < Grape::API::Instance
+  it 'is an API instance' do
+    expect(subject).to be < Grape::API
   end
 
-  it 'should init with default time zone' do
+  it 'inits with default time zone' do
     expect(Time.zone.name).to eq('UTC')
     expect(Thread.new { Time.zone }.value.name).to eq('UTC')
   end
 
-  it 'should configure i18n' do
+  it 'configures i18n' do
     expect(I18n.load_path).to include(subject.root.join('config', 'locales', 'en.yml').to_s)
     expect(I18n.default_locale).to eq(:en)
     expect(I18n.exception_handler).to be_instance_of(Proc)
   end
 
-  it 'should read env specific initializers' do
+  it 'reads env specific initializers' do
     expect(subject.config).to include(
       :test_specific,
       :raise_on_missing_translations,
@@ -43,13 +44,13 @@ RSpec.describe Grape::App do
     )
   end
 
-  it 'should prepare middleware' do
+  it 'prepares middleware' do
     expect(subject.middleware).to be_instance_of(Rack::Builder)
-    expect(subject.middleware.send(:instance_variable_get, :@use).size).to eq(2)
+    expect(subject.middleware.send(:instance_variable_get, :@use).size).to eq(3)
     expect(subject.middleware.send(:instance_variable_get, :@run)).to be(subject)
   end
 
-  it 'should apply middleware' do
+  it 'applies middleware' do
     header 'Origin', 'test.host'
     get '/v1/ok'
     expect(last_response).to be_ok

data/spec/scenario/app/api/posts.rb

@@ -1,4 +1,4 @@
-class API::Posts < Grape::API::Instance
+class API::Posts < Grape::API
   get '/posts' do
     []
   end

data/spec/scenario/app/api/v1.rb

@@ -1,4 +1,4 @@
-class API::V1 < Grape::API::Instance
+class API::V1 < Grape::API
   version 'v1'
   format  :json
 

data/spec/spec_helper.rb

@@ -1,61 +1,16 @@
 ENV['RACK_ENV'] ||= 'test'
 require 'grape-app'
 require 'rack/test'
-
-class Article
-  include Virtus.model
-
-  class Scope
-    include Enumerable
-
-    def maximum(*)
-      map(&:updated_at).max
-    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)
-    end
-  end
-
-  def self.all
-    Scope.new
-  end
-
-  attribute :id
-  attribute :title
-  attribute :updated_at
-
-  def to_param
-    id.to_s
+require 'active_record'
+
+ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
+ActiveRecord::Base.establish_connection :test
+ActiveRecord::Base.connection.instance_eval do
+  create_table :articles do |t|
+    t.string :title
+    t.timestamps
   end
 end
 
-class TestAPI < Grape::API::Instance
-  format :json
-
-  helpers Grape::App::Helpers::Caching
-  helpers Grape::App::Helpers::Params
-
-  get '/articles' do
-    scope = Article.all
-    opts  = params[:public] ? { public: params[:public] } : {}
-    fresh_when(scope, **opts)
-    scope.map(&:to_hash)
-  end
-
-  get '/articles/:id' do
-    article = Article.all.first
-    article.to_hash if stale?(article, stale_if_error: 5, extras: { a: 1, b: 2 })
-  end
-
-  params do
-    requires :title
-    optional :fresh
-  end
-  post '/articles' do
-    attrs = { id: 9, updated_at: Time.at(1515151515).utc }
-    attrs.update(declared_params)
-    Article.new(attrs).to_hash
-  end
+class Article < ActiveRecord::Base
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.8
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -215,9 +215,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -236,6 +236,8 @@ files:
 - lib/grape/app/inflector.rb
 - lib/grape/app/initializers/post.rb
 - lib/grape/app/initializers/pre.rb
+- lib/grape/app/middleware.rb
+- lib/grape/app/middleware/connection_management.rb
 - lib/grape/app/tasks.rb
 - lib/grape/app/tasks/core.rake
 - lib/grape/app/tasks/databases.rake
@@ -255,6 +257,7 @@ files:
 - lib/grape_app.rb
 - spec/grape/app/helpers/caching_spec.rb
 - spec/grape/app/helpers/params_spec.rb
+- spec/grape/app/middleware/connection_management_spec.rb
 - spec/grape/app_spec.rb
 - spec/scenario/Gemfile
 - spec/scenario/app/api.rb
@@ -277,20 +280,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Standalone Grape API apps
 test_files:
 - spec/grape/app/helpers/caching_spec.rb
 - spec/grape/app/helpers/params_spec.rb
+- spec/grape/app/middleware/connection_management_spec.rb
 - spec/grape/app_spec.rb
 - spec/scenario/Gemfile
 - spec/scenario/app/api.rb

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-before_install:
-  - gem install bundler