grape-app 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b76f380cd6957fb37025cb07c4343471d9fa892f387c9f5110eb5a713f7a5bc
-  data.tar.gz: 34b4f3c1c0912fac71bed2d75448f90bf6aba60ec96300c208c13aca324a19a7
+  metadata.gz: feff7b4ee1c4e672754a8e9e85f4c80016e2414a6f81b10d40cb8cea5ccdc900
+  data.tar.gz: 15ede4a9152b0e274041a1f0a94c0edd9eaaaabc3ca6be7fd28e5a50041f54ed
 SHA512:
-  metadata.gz: f2325d245dba242af124309a3a9193e9c4af1fe17fb9e611650a1230b453b4086a3870073690e60911141e9e10696db9f416c49f530f95d6a9a6e818d70e0822
-  data.tar.gz: c1415686241fffa006cfb36b4518b2342e2fa889e175beae428659acf0b4dbd4a8f934eb89cf734fba729189d640d6377cd3fe6fabebc4d5cc72517c296fbfd0
+  metadata.gz: adf69f2a62a197ac8393abbf00da46b093313900701cbdb9b3ab76cc21e78331c20ebfbbde3131e023a014b0dae76946a6949f275e0bc8cd5fc7f3ea27c552d0
+  data.tar.gz: b5f4919555de644ba358415a2473ef6ea51d290d32acc82b2e52baf6919a245f3e7fa1bc79ec08b9f7c53a0afacc8ac89d4e62d69eb1b549956111f4c7c4769a

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/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.5
   - 2.6
   - 2.7
 before_install:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-app (0.8.6)
+    grape-app (0.8.7)
       activesupport
       grape (>= 1.2)
       grape-entity
@@ -13,17 +13,17 @@ 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)
+    activemodel (6.1.1)
+      activesupport (= 6.1.1)
+    activerecord (6.1.1)
+      activemodel (= 6.1.1)
+      activesupport (= 6.1.1)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -32,25 +32,23 @@ GEM
     builder (3.2.4)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      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.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.6)
+    dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
     dry-types (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
@@ -59,27 +57,27 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     equalizer (0.0.11)
-    grape (1.3.3)
+    grape (1.5.1)
       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.8.2)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    i18n (1.8.3)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    minitest (5.14.1)
-    multi_json (1.14.1)
+    minitest (5.14.3)
+    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)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     rack (2.2.3)
     rack-accept (0.4.5)
@@ -90,47 +88,65 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     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)
+    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.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       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.1)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.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.2.0, < 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.4.0)
+      parser (>= 2.7.1.5)
+    rubocop-bsm (0.5.4)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.9.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.1.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.3)
     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)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.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)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -142,9 +158,9 @@ DEPENDENCIES
   rack-test
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sqlite3
   virtus
 
 BUNDLED WITH
-   2.1.4
+   2.2.5

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.8.7'
   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,7 +27,7 @@ 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'
   s.add_development_dependency 'virtus'
 end

data/lib/grape/app.rb

@@ -72,7 +72,12 @@ 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

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

@@ -5,7 +5,7 @@ RSpec.describe Grape::App::Helpers::Caching do
 
   let(:app) { TestAPI }
 
-  it 'should handle fresh-when' do
+  it 'handles fresh-when' do
     get '/articles'
     expect(last_response.status).to eq(200)
     expect(last_response.headers).to include(
@@ -30,7 +30,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 +38,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,7 +46,7 @@ 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(

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

@@ -5,7 +5,7 @@ RSpec.describe Grape::App::Helpers::Params do
 
   let(:app) { TestAPI }
 
-  it 'should limit params' do
+  it 'limits 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(

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
+  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, :@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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2021-01-19 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:
     - - ">="
@@ -291,7 +291,7 @@ 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:
   - - ">="