grape-app 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28f6b7de85ab1f92ac5b216e20c087d3ec2bf42d2a1248eb29080b7857b8a84d
-  data.tar.gz: 9881ddbbf2a478bb08aea7fe96d4b495c40530b50e2d4809e8275d6b354e3b62
+  metadata.gz: a02f28a09a9bf9ac9f5222de88c553958c3984017e2b589dd0ad2f1850503513
+  data.tar.gz: 869efcb8480678cff8924d6001cf3342cf0ae9558577a7d856ed572e8d3e2eef
 SHA512:
-  metadata.gz: 7825c7dfca1769b0e8248ed3e573a3269680f2d223dd33d00e64c955e4d45533baf4892329e9684b31f1ca1657ec45ffe12823908d3feb164cef140b9caeac42
-  data.tar.gz: 418375f83c0020d081dc40a05bfb92272a1173d06e53a70c14360c6b44ffc045d105c928e65530864add0853b90fac060c7ffa238e800870f47024a2b59e5350
+  metadata.gz: b989f27b49f52f4247518dc5bb485de10d08149ca7da7eb912a53b8e6875bc68d82f8798bbd4d7e086e934b73523fbb384ff1359bc193153fe8f9baf59fa6180
+  data.tar.gz: 01d7a80d34def80bf67e85b55ebd47b274c16b0acb384bd86ea41fca9b5fa99da305966d700824a1113e900e4cc11b03907f28c13e0751baf23ecfec17fca8bb

data/.github/workflows/test.yml

@@ -12,6 +12,9 @@ jobs:
     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

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    grape-app (0.9.0)
+    grape-app (0.10.0)
       activesupport
       grape (>= 1.2)
       grape-entity
+      openssl
       rack-cors (>= 1.1)
       rack-ssl-enforcer
       thor
@@ -13,6 +14,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activejob (7.0.1)
+      activesupport (= 7.0.1)
+      globalid (>= 0.3.6)
     activemodel (7.0.1)
       activesupport (= 7.0.1)
     activerecord (7.0.1)
@@ -45,6 +49,8 @@ GEM
       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
@@ -55,7 +61,7 @@ GEM
     grape-entity (0.10.1)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    i18n (1.9.0)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
     multi_json (1.15.0)
@@ -63,6 +69,7 @@ GEM
       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)
@@ -82,16 +89,16 @@ GEM
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    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.2)
+    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.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -121,12 +128,13 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activejob
   activerecord
   bundler
   grape-app!
@@ -137,4 +145,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.5
+   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.9.0'
+  s.version       = '0.10.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Standalone Grape API apps)
@@ -17,11 +17,13 @@ Gem::Specification.new do |s|
   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'

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,12 +7,6 @@ if defined?(ActiveRecord)
     configurations[Grape::App.env.to_s] ||= {}
     configurations[Grape::App.env.to_s]['url'] ||= ENV['DATABASE_URL']
   end
-
-  if ActiveRecord.respond_to?(:default_timezone=)
-    ActiveRecord.default_timezone = :utc
-  else
-    ActiveRecord::Base.default_timezone = :utc
-  end
   ActiveRecord::Base.configurations = configurations
   ActiveRecord::Base.establish_connection(Grape::App.env.to_sym)
 

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.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

data/spec/grape/app_spec.rb

@@ -32,7 +32,37 @@ RSpec.describe Grape::App 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 'reads env specific initializers' do

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ ENV['RACK_ENV'] ||= 'test'
 require 'grape-app'
 require 'rack/test'
 require 'active_record'
+require 'active_job'
 
 ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
 ActiveRecord::Base.establish_connection :test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-27 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
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  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'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +248,8 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
+- Gemfile.rails6
+- Gemfile.rails6.lock
 - LICENSE
 - README.md
 - Rakefile