grape-app 0.8.6 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b76f380cd6957fb37025cb07c4343471d9fa892f387c9f5110eb5a713f7a5bc
-  data.tar.gz: 34b4f3c1c0912fac71bed2d75448f90bf6aba60ec96300c208c13aca324a19a7
+  metadata.gz: a02f28a09a9bf9ac9f5222de88c553958c3984017e2b589dd0ad2f1850503513
+  data.tar.gz: 869efcb8480678cff8924d6001cf3342cf0ae9558577a7d856ed572e8d3e2eef
 SHA512:
-  metadata.gz: f2325d245dba242af124309a3a9193e9c4af1fe17fb9e611650a1230b453b4086a3870073690e60911141e9e10696db9f416c49f530f95d6a9a6e818d70e0822
-  data.tar.gz: c1415686241fffa006cfb36b4518b2342e2fa889e175beae428659acf0b4dbd4a8f934eb89cf734fba729189d640d6377cd3fe6fabebc4d5cc72517c296fbfd0
+  metadata.gz: b989f27b49f52f4247518dc5bb485de10d08149ca7da7eb912a53b8e6875bc68d82f8798bbd4d7e086e934b73523fbb384ff1359bc193153fe8f9baf59fa6180
+  data.tar.gz: 01d7a80d34def80bf67e85b55ebd47b274c16b0acb384bd86ea41fca9b5fa99da305966d700824a1113e900e4cc11b03907f28c13e0751baf23ecfec17fca8bb

data/.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.7", "3.0", "3.1"]
+        gemfiles: ["Gemfile", "Gemfile.rails6"]
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    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.7"
 Metrics/ParameterLists:
   Exclude:
     - lib/grape/app/helpers/caching.rb
+Rake/Desc:
+  Enabled: false

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    grape-app (0.8.6)
+    grape-app (0.10.0)
       activesupport
       grape (>= 1.2)
       grape-entity
+      openssl
       rack-cors (>= 1.1)
       rack-ssl-enforcer
       thor
@@ -13,73 +14,64 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activejob (7.0.1)
+      activesupport (= 7.0.1)
+      globalid (>= 0.3.6)
+    activemodel (7.0.1)
+      activesupport (= 7.0.1)
+    activerecord (7.0.1)
+      activemodel (= 7.0.1)
+      activesupport (= 7.0.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
     builder (3.2.4)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.6)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.4.4)
-    dry-configurable (0.11.6)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    dry-configurable (0.14.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-container (0.7.2)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.0.6)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    equalizer (0.0.11)
-    grape (1.3.3)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    grape (1.6.2)
       activesupport
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    grape-entity (0.8.0)
+    grape-entity (0.10.1)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    i18n (1.8.3)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    minitest (5.14.1)
-    multi_json (1.14.1)
+    minitest (5.15.0)
+    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.19.2)
-    parser (2.7.1.4)
+    openssl (3.0.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     rack (2.2.3)
     rack-accept (0.4.5)
@@ -89,62 +81,68 @@ GEM
     rack-ssl-enforcer (0.2.9)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.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.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    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.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.86.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-bsm (0.6.0)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.13.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.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.3.1)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activejob
   activerecord
   bundler
   grape-app!
   rack-test
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sqlite3
-  virtus
 
 BUNDLED WITH
-   2.1.4
+   2.3.4

data/Gemfile.rails6

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activesupport', '~> 6.1'
+gem 'activerecord', '~> 6.1'
+gem 'activejob', '~> 6.1'

data/Gemfile.rails6.lock

@@ -0,0 +1,150 @@
+PATH
+  remote: .
+  specs:
+    grape-app (0.10.0)
+      activesupport
+      grape (>= 1.2)
+      grape-entity
+      openssl
+      rack-cors (>= 1.1)
+      rack-ssl-enforcer
+      thor
+      zeitwerk (>= 2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activejob (6.1.4.4)
+      activesupport (= 6.1.4.4)
+      globalid (>= 0.3.6)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord (6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activesupport (6.1.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      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.9)
+    diff-lcs (1.5.0)
+    dry-configurable (0.14.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
+      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)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    grape (1.6.2)
+      activesupport
+      builder
+      dry-types (>= 1.1)
+      mustermann-grape (~> 1.0.0)
+      rack (>= 1.3.0)
+      rack-accept
+    grape-entity (0.10.1)
+      activesupport (>= 3.0.0)
+      multi_json (>= 1.3.2)
+    i18n (1.9.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.15.0)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-grape (1.0.1)
+      mustermann (>= 1.0.0)
+    openssl (3.0.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    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.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    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.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.25.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-bsm (0.6.0)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.13.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.4.2)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activejob (~> 6.1)
+  activerecord (~> 6.1)
+  activesupport (~> 6.1)
+  bundler
+  grape-app!
+  rack-test
+  rake
+  rspec
+  rubocop-bsm
+  sqlite3
+
+BUNDLED WITH
+   2.3.4

data/grape-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'grape-app'
-  s.version       = '0.8.6'
+  s.version       = '0.10.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Standalone Grape API apps)
@@ -12,22 +12,24 @@ 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.7'
 
   s.add_dependency 'activesupport'
   s.add_dependency 'grape', '>= 1.2'
   s.add_dependency 'grape-entity'
+  s.add_dependency 'openssl'
   s.add_dependency 'rack-cors', '>= 1.1'
   s.add_dependency 'rack-ssl-enforcer'
   s.add_dependency 'thor'
   s.add_dependency 'zeitwerk', '>= 2.1'
 
+  s.add_development_dependency 'activejob'
   s.add_development_dependency 'activerecord'
   s.add_development_dependency 'bundler'
   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'
-  s.add_development_dependency 'virtus'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/grape/app/initializers/post.rb

@@ -1,8 +1,3 @@
-if Grape::App.config.raise_on_missing_translations
-  handler = ->(exception, *) { exception = exception.to_exception if exception.respond_to?(:to_exception); raise exception }
-  I18n.exception_handler = handler
-end
-
 if defined?(ActiveRecord)
   require 'yaml'
   require 'erb'
@@ -12,9 +7,7 @@ if defined?(ActiveRecord)
     configurations[Grape::App.env.to_s] ||= {}
     configurations[Grape::App.env.to_s]['url'] ||= ENV['DATABASE_URL']
   end
-
   ActiveRecord::Base.configurations = configurations
-  ActiveRecord::Base.default_timezone = :utc
   ActiveRecord::Base.establish_connection(Grape::App.env.to_sym)
 
   Grape::App.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement if defined?(ActiveRecord::ConnectionAdapters::ConnectionManagement)

data/lib/grape/app/initializers/pre.rb

@@ -1,6 +1,72 @@
+# Configure ActiveSupport defaults
+# https://github.com/rails/rails/blob/main/railties/lib/rails/application/configuration.rb
+ActiveSupport.tap do |c|
+  c.to_time_preserves_timezone = true
+  c.utc_to_local_returns_utc_offset_times = true
+end
+ActiveSupport::Digest.hash_digest_class = OpenSSL::Digest::SHA256
+ActiveSupport::KeyGenerator.hash_digest_class = OpenSSL::Digest::SHA256 if ActiveSupport::KeyGenerator.respond_to?(:hash_digest_class=)
+ActiveSupport::MessageEncryptor.use_authenticated_message_encryption = true
+ActiveSupport::IsolatedExecutionState.isolation_level = :thread if defined?(ActiveSupport::IsolatedExecutionState)
+Digest::UUID.use_rfc4122_namespaced_uuids = true if Digest::UUID.respond_to?(:use_rfc4122_namespaced_uuids=)
+
 # Set default time-zone
+begin
+  TZInfo::DataSource.get
+rescue TZInfo::DataSourceNotFound => e
+  raise e.exception "tzinfo-data is not present. Please add gem 'tzinfo-data' to your Gemfile and run bundle install"
+end
+require 'active_support/core_ext/time/zones'
 Time.zone_default = Time.find_zone!('UTC')
 
 # Add default I18n paths and set default locale
 I18n.load_path += Dir[Grape::App.root.join('config', 'locales', '*.{rb,yml}').to_s]
 I18n.default_locale = :en
+
+if Grape::App.config.raise_on_missing_translations
+  handler = Class.new(I18n::ExceptionHandler) do
+    def call(exception, *)
+      raise exception.to_exception if exception.is_a?(I18n::MissingTranslation)
+
+      super
+    end
+  end
+  I18n.exception_handler = handler.new
+end
+
+# Configure ActiveRecord defaults
+# https://github.com/rails/rails/blob/main/railties/lib/rails/application/configuration.rb
+if defined?(ActiveRecord)
+  if ActiveRecord.respond_to?(:default_timezone=)
+    ActiveRecord.default_timezone = :utc
+  else
+    ActiveRecord::Base.default_timezone = :utc
+  end
+
+  if ActiveRecord.respond_to?(:legacy_connection_handling=)
+    ActiveRecord.legacy_connection_handling = false
+  else
+    ActiveRecord::Base.legacy_connection_handling = false
+  end
+
+  ActiveRecord.tap do |c|
+    c.verify_foreign_keys_for_fixtures = true if c.respond_to?(:verify_foreign_keys_for_fixtures=)
+  end
+
+  ActiveRecord::Base.tap do |c|
+    c.belongs_to_required_by_default = true
+    c.cache_versioning = true
+    c.collection_cache_versioning = true
+    c.has_many_inversing = true
+    c.partial_inserts = false if c.respond_to?(:partial_inserts=)
+    c.automatic_scope_inversing = true if c.respond_to?(:automatic_scope_inversing=)
+  end
+end
+
+# Configure ActiveJob defaults
+# https://github.com/rails/rails/blob/main/railties/lib/rails/application/configuration.rb
+if defined?(ActiveJob)
+  ActiveJob::Base.tap do |c|
+    c.retry_jitter = 0.15
+  end
+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/middleware.rb

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

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

@@ -9,6 +9,7 @@ class API::V1 < Grape::API
   #   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,16 @@
 Grape::App.configure do |config|
-  # Force SSL
-  # config.force_ssl = true
+  # Eager load code on boot. This eager loads most of your application in
+  # memory, allowing both threaded web servers and those relying on copy on
+  # write to perform better.
+  config.eager_load = true
+
+  # Don't raise errors on missing translations
+  # config.raise_on_missing_translations = false
+
+  # 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.
@@ -18,7 +28,4 @@ Grape::App.configure do |config|
   #   use Rack::ETag
   #   insert_before Rack::Cors, Rack::ContentLength
   # end
-
-  # Don't raise errors on missing translations
-  # config.raise_on_missing_translations = false
 end

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/lib/grape/app.rb

@@ -1,13 +1,16 @@
 require 'bundler/setup'
 require 'pathname'
+require 'openssl'
 require 'grape'
-require 'active_support/string_inquirer'
-require 'active_support/configurable'
-require 'active_support/core_ext/time/zones'
 require 'rack/cors'
 require 'rack/ssl-enforcer'
 require 'zeitwerk'
 
+ENV['RAILS_DISABLE_DEPRECATED_TO_S_CONVERSION'] ||= 'true'
+require 'active_support/all'
+require 'active_support/string_inquirer'
+require 'active_support/configurable'
+
 class Grape::App < Grape::API
   class << self
     # Run initializers
@@ -35,6 +38,7 @@ class Grape::App < Grape::API
 
       # Load app
       require_one 'app', 'api'
+      Zeitwerk::Loader.eager_load_all if Grape::App.config.eager_load
     end
 
     # @return [Grape::App::Configuration] the configuration
@@ -72,11 +76,19 @@ class Grape::App < Grape::API
       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
@@ -102,3 +114,4 @@ end
 require 'grape/app/configuration'
 require 'grape/app/helpers'
 require 'grape/app/inflector'
+require 'grape/app/middleware'

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,7 @@ 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
+  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(
@@ -38,7 +70,7 @@ RSpec.describe Grape::App::Helpers::Caching do
     )
   end
 
-  it 'should support cache-control' do
+  it 'supports cache-control' do
     get '/articles?public=true'
     expect(last_response.status).to eq(200)
     expect(last_response.headers).to include(
@@ -46,27 +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',
-      'created_at' => '2018-01-05 11:25:00 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,16 +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,68 @@ 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
+  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)
+    expect(I18n.exception_handler).to be_a(I18n::ExceptionHandler)
+  end
+
+  it 'configures ActiveSupport' do
+    expect(ActiveSupport.to_time_preserves_timezone).to be(true)
+    expect(ActiveSupport.utc_to_local_returns_utc_offset_times).to be(true)
+    expect(ActiveSupport::Digest.hash_digest_class).to be(OpenSSL::Digest::SHA256)
+    expect(ActiveSupport::MessageEncryptor.use_authenticated_message_encryption).to be(true)
+    if ActiveSupport::VERSION::MAJOR >= 7
+      expect(ActiveSupport::KeyGenerator.hash_digest_class).to be(OpenSSL::Digest::SHA256)
+      expect(ActiveSupport::IsolatedExecutionState.isolation_level).to be(:thread)
+      expect(Digest::UUID.use_rfc4122_namespaced_uuids).to be(true)
+    end
+  end
+
+  it 'configures ActiveRecord' do
+    if ActiveRecord::VERSION::MAJOR >= 7
+      expect(ActiveRecord.default_timezone).to be(:utc)
+      expect(ActiveRecord.legacy_connection_handling).to be(false)
+      expect(ActiveRecord.verify_foreign_keys_for_fixtures).to be(true)
+      expect(ActiveRecord::Base.partial_inserts).to be(false)
+      expect(ActiveRecord::Base.automatic_scope_inversing).to be(true)
+    end
+    expect(ActiveRecord::Base.belongs_to_required_by_default).to be(true)
+    expect(ActiveRecord::Base.cache_versioning).to be(true)
+    expect(ActiveRecord::Base.collection_cache_versioning).to be(true)
+    expect(ActiveRecord::Base.has_many_inversing).to be(true)
+  end
+
+  it 'configures ActiveJob' do
+    expect(ActiveJob::Base.retry_jitter).to eq(0.15)
   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 +74,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/config/environments/test.rb

@@ -1,6 +1,7 @@
 require 'my_lib'
 
 Grape::App.configure do |c|
+  c.eager_load = true
   c.test_specific = true
   c.raise_on_missing_translations = true
   c.cors do

data/spec/spec_helper.rb

@@ -1,70 +1,17 @@
 ENV['RACK_ENV'] ||= 'test'
 require 'grape-app'
 require 'rack/test'
-require 'virtus'
+require 'active_record'
+require 'active_job'
 
-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, 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
-
-  def self.all
-    Scope.new
-  end
-
-  attribute :id
-  attribute :title
-  attribute :updated_at
-  attribute :created_at
-
-  def to_param
-    id.to_s
+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
-  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/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 })
-  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.6
+  version: 0.10.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  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: rack-cors
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -229,11 +243,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- Gemfile.rails6
+- Gemfile.rails6.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -250,6 +266,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
@@ -269,6 +287,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
@@ -282,7 +301,8 @@ files:
 homepage: https://github.com/bsm/grape-app
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -291,20 +311,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 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,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - gem install bundler