grape-app 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a02f28a09a9bf9ac9f5222de88c553958c3984017e2b589dd0ad2f1850503513
-  data.tar.gz: 869efcb8480678cff8924d6001cf3342cf0ae9558577a7d856ed572e8d3e2eef
+  metadata.gz: 74079cb85645ce520a781a57a58de041ea2fd7d99d6a8fbbb2f8666a98cd1c2e
+  data.tar.gz: 1cf09f82decf2ca06f82857d6865eeb1e0e0271a4abaf701bba1aa3018097c5b
 SHA512:
-  metadata.gz: b989f27b49f52f4247518dc5bb485de10d08149ca7da7eb912a53b8e6875bc68d82f8798bbd4d7e086e934b73523fbb384ff1359bc193153fe8f9baf59fa6180
-  data.tar.gz: 01d7a80d34def80bf67e85b55ebd47b274c16b0acb384bd86ea41fca9b5fa99da305966d700824a1113e900e4cc11b03907f28c13e0751baf23ecfec17fca8bb
+  metadata.gz: 77ae37fd42d9e2fd696801599fccc387bcd39c081f53d2fd4995c59b166cff43041b4ca0fa35cd7187e37775cd0441f15cab3212adb355306ef3ff59da12feca
+  data.tar.gz: 544d948b260b034f26bdc7dc11e2b7961186ed6f0ce3fabacbc16fe890f3b85ecab4a32ea578fc578009053a1f43570987b2adff2e972cbb968b7c24704b99e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-app (0.10.0)
+    grape-app (0.10.1)
       activesupport
       grape (>= 1.2)
       grape-entity
@@ -14,24 +14,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.0.1)
-      activesupport (= 7.0.1)
+    activejob (7.0.3)
+      activesupport (= 7.0.3)
       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)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    dry-configurable (0.14.0)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
     dry-container (0.9.0)
@@ -61,19 +61,19 @@ GEM
     grape-entity (0.10.1)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
-    i18n (1.9.1)
+    i18n (1.10.0)
       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-grape (1.0.2)
       mustermann (>= 1.0.0)
     openssl (3.0.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-cors (1.1.1)
@@ -83,43 +83,43 @@ GEM
       rack (>= 1.0, < 3)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.5.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)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.25.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.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)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 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-ast (1.18.0)
+      parser (>= 3.1.1.0)
     rubocop-bsm (0.6.0)
       rubocop (~> 1.0)
       rubocop-performance
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.13.2)
+    rubocop-performance (1.14.1)
       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-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -145,4 +145,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.3.4
+   2.3.9

data/grape-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'grape-app'
-  s.version       = '0.10.0'
+  s.version       = '0.10.1'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Standalone Grape API apps)
@@ -9,7 +9,6 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
 
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
-  s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.executables   = ['grape-app']
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 2.7'

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

@@ -23,11 +23,10 @@ namespace :db do
 
   desc 'Create a new migration using NAME'
   task migration: :environment do
-    abort 'No NAME specified. Example usage: `rake db:migration NAME=create_widgets`' unless ENV['NAME']
+    name = ENV.fetch('NAME', nil)
+    abort 'No NAME specified. Example usage: `rake db:migration NAME=create_widgets`' unless name
 
     migrations_path = ActiveRecord::Migrator.migrations_paths.first
-
-    name = ENV['NAME']
     path = File.join(migrations_path, "#{Time.now.utc.strftime('%Y%m%d%H%M%S')}_#{name}.rb")
 
     ar_version = [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR].join('.')

data/lib/grape/app.rb

@@ -62,7 +62,7 @@ class Grape::App < Grape::API
 
     # @return [ActiveSupport::StringInquirer] env name
     def env
-      @env ||= ActiveSupport::StringInquirer.new(ENV['GRAPE_ENV'] || ENV['RACK_ENV'] || 'development')
+      @env ||= ActiveSupport::StringInquirer.new(ENV.fetch('GRAPE_ENV') { ENV.fetch('RACK_ENV', 'development') })
     end
 
     # @return [Zeitwerk::Loader] loader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-app
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -285,19 +285,6 @@ files:
 - lib/grape/app/templates/db/seeds.rb
 - lib/grape/app/templates/spec/spec_helper.rb
 - 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
-- spec/scenario/app/api/posts.rb
-- spec/scenario/app/api/v1.rb
-- spec/scenario/config/database.yml
-- spec/scenario/config/environments/test.rb
-- spec/scenario/config/locales/en.yml
-- spec/scenario/lib/my_lib.rb
-- spec/spec_helper.rb
 homepage: https://github.com/bsm/grape-app
 licenses:
 - MIT
@@ -318,21 +305,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 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
-- spec/scenario/app/api/posts.rb
-- spec/scenario/app/api/v1.rb
-- spec/scenario/config/database.yml
-- spec/scenario/config/environments/test.rb
-- spec/scenario/config/locales/en.yml
-- spec/scenario/lib/my_lib.rb
-- spec/spec_helper.rb
+test_files: []

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

@@ -1,105 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Grape::App::Helpers::Caching do
-  include Rack::Test::Methods
-
-  let :app do
-    helper = described_class
-    Class.new(Grape::API) do
-      format :json
-
-      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'          => 'a5f6c4b024510c9835d8d70cbd3ed00c',
-      'Last-Modified' => 'Fri, 05 Jan 2018 11:25:20 GMT',
-    )
-    expect(JSON.parse(last_response.body).size).to eq(2)
-
-    get '/articles', {}, 'HTTP_IF_NONE_MATCH' => last_response.headers['ETag']
-    expect(last_response.status).to eq(304)
-    get '/articles', {}, 'HTTP_IF_MODIFIED_SINCE' => 'Fri, 05 Jan 2018 11:25:20 GMT'
-    expect(last_response.status).to eq(304)
-    get '/articles', {}, 'HTTP_IF_NONE_MATCH' => last_response.headers['ETag'], 'HTTP_IF_MODIFIED_SINCE' => 'Fri, 05 Jan 2018 11:25:21 GMT'
-    expect(last_response.status).to eq(304)
-
-    get '/articles', {}, 'HTTP_IF_MODIFIED_SINCE' => 'Fri, 05 Jan 2018 11:25:19 GMT'
-    expect(last_response.status).to eq(200)
-    get '/articles', {}, 'HTTP_IF_MODIFIED_SINCE' => 'Fri, 05 Jan 2018 11:25:19 GMT', 'HTTP_IF_NONE_MATCH' => last_response.headers['ETag']
-    expect(last_response.status).to eq(200)
-    get '/articles', {}, 'HTTP_IF_MODIFIED_SINCE' => 'Fri, 05 Jan 2018 11:25:20 GMT', 'HTTP_IF_NONE_MATCH' => 'other'
-    expect(last_response.status).to eq(200)
-  end
-
-  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(
-      'Cache-Control' => 'public',
-    )
-  end
-
-  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'          => '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-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'          => '0154407bafc97186a494a05e0652ff61',
-      'Last-Modified' => 'Fri, 05 Jan 2018 11:25:10 GMT',
-    )
-  end
-end

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

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Grape::App::Helpers::Params do
-  include Rack::Test::Methods
-
-  let :app do
-    helper = described_class
-    Class.new(Grape::API) do
-      format :json
-
-      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-05T11:25:15.000Z',
-    )
-  end
-end

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

@@ -1,22 +0,0 @@
-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

@@ -1,102 +0,0 @@
-require 'spec_helper'
-
-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 'has an env' do
-    expect(subject.env).to be_instance_of(ActiveSupport::StringInquirer)
-    expect(subject.env).to eq('test')
-  end
-
-  it 'has an root' do
-    expect(subject.root).to be_instance_of(Pathname)
-  end
-
-  it 'is an API instance' do
-    expect(subject).to be < Grape::API
-  end
-
-  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 '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_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
-    expect(subject.config).to include(
-      :test_specific,
-      :raise_on_missing_translations,
-      :cors,
-      :middleware,
-    )
-  end
-
-  it 'prepares middleware' do
-    expect(subject.middleware).to be_instance_of(Rack::Builder)
-    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 'applies middleware' do
-    header 'Origin', 'test.host'
-    get '/v1/ok'
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq(%({"status":"OK"}))
-    expect(last_response.headers).to include(
-      'Access-Control-Allow-Origin' => '*',
-      'X-MyApp'                     => 'true',
-    )
-
-    header 'Origin', 'test.host'
-    get '/v1/failing'
-    expect(last_response).to be_bad_request
-    expect(last_response.body).to eq(%({"error":"bad request"}))
-    expect(last_response.headers).to include(
-      'Access-Control-Allow-Origin' => '*',
-      'X-MyApp'                     => 'true',
-    )
-  end
-end

data/spec/scenario/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', require: 'active_record'
-gem 'grape-app', path: '../../'

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

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

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

@@ -1,18 +0,0 @@
-class API::V1 < Grape::API
-  version 'v1'
-  format  :json
-
-  rescue_from MyLib::BadRequest do |e|
-    error!({ error: e }, 400)
-  end
-
-  get '/ok' do
-    { status: 'OK' }
-  end
-
-  get '/failing' do
-    raise MyLib::BadRequest, 'bad request'
-  end
-
-  mount API::Posts
-end

data/spec/scenario/app/api.rb

@@ -1,7 +0,0 @@
-module API
-end
-
-# Mount root API to app
-Grape::App.instance_eval do
-  mount API::V1
-end

data/spec/scenario/config/database.yml

@@ -1,3 +0,0 @@
-test:
-  adapter: "sqlite3"
-  database: ":memory:"

data/spec/scenario/config/environments/test.rb

@@ -1,16 +0,0 @@
-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
-    allow do
-      origins '*'
-      resource '*', headers: :any, methods: %i[get post options]
-    end
-  end
-  c.middleware do
-    use MyLib::Middleware
-  end
-end

data/spec/scenario/config/locales/en.yml

@@ -1,2 +0,0 @@
-en:
-  hi: hello

data/spec/scenario/lib/my_lib.rb

@@ -1,16 +0,0 @@
-class MyLib
-  class BadRequest < StandardError
-  end
-
-  class Middleware
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      status, headers, body = @app.call(env)
-      headers['X-MyApp'] = 'true'
-      [status, headers, body]
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,17 +0,0 @@
-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
-ActiveRecord::Base.connection.instance_eval do
-  create_table :articles do |t|
-    t.string :title
-    t.timestamps
-  end
-end
-
-class Article < ActiveRecord::Base
-end