Add Ruby 3.1 to CI
Also fixes the unquoted 3.0, which needs to be quoted to avoid truncation Addresses a few Rubocop issues and an active_support require issue on Rails 7 w/Zeitwerk
This commit is contained in:
parent
44cf8495ea
commit
826a8c4323
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -4,10 +4,10 @@ on: [push, pull_request]
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
tests:
|
tests:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
ruby: [2.4, 2.7, 3.0, truffleruby-head]
|
ruby: [2.4, 2.7, '3.0', 3.1, truffleruby-head]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@master
|
- uses: actions/checkout@master
|
||||||
|
|||||||
@ -42,6 +42,9 @@ Performance/TimesMap:
|
|||||||
Exclude:
|
Exclude:
|
||||||
- 'spec/**/**.rb'
|
- 'spec/**/**.rb'
|
||||||
|
|
||||||
|
Gemspec/RequiredRubyVersion:
|
||||||
|
Enabled: false
|
||||||
|
|
||||||
# TODO: Fix these...
|
# TODO: Fix these...
|
||||||
Style/Documentation:
|
Style/Documentation:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|||||||
@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
|
|||||||
|
|
||||||
gem.summary = 'Fast JSON:API serialization library'
|
gem.summary = 'Fast JSON:API serialization library'
|
||||||
gem.description = 'Fast, simple and easy to use '\
|
gem.description = 'Fast, simple and easy to use '\
|
||||||
'JSON:API serialization library (also known as fast_jsonapi).'
|
'JSON:API serialization library (also known as fast_jsonapi).'
|
||||||
gem.homepage = 'https://github.com/jsonapi-serializer/jsonapi-serializer'
|
gem.homepage = 'https://github.com/jsonapi-serializer/jsonapi-serializer'
|
||||||
gem.licenses = ['Apache-2.0']
|
gem.licenses = ['Apache-2.0']
|
||||||
gem.files = Dir['lib/**/*']
|
gem.files = Dir['lib/**/*']
|
||||||
@ -33,4 +33,5 @@ Gem::Specification.new do |gem|
|
|||||||
gem.add_development_dependency('rubocop-rspec')
|
gem.add_development_dependency('rubocop-rspec')
|
||||||
gem.add_development_dependency('simplecov')
|
gem.add_development_dependency('simplecov')
|
||||||
gem.add_development_dependency('sqlite3')
|
gem.add_development_dependency('sqlite3')
|
||||||
|
gem.metadata['rubygems_mfa_required'] = 'true'
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'active_support'
|
||||||
require 'active_support/time'
|
require 'active_support/time'
|
||||||
require 'active_support/concern'
|
require 'active_support/concern'
|
||||||
require 'active_support/inflector'
|
require 'active_support/inflector'
|
||||||
@ -133,9 +134,7 @@ module FastJsonapi
|
|||||||
def reflected_record_type
|
def reflected_record_type
|
||||||
return @reflected_record_type if defined?(@reflected_record_type)
|
return @reflected_record_type if defined?(@reflected_record_type)
|
||||||
|
|
||||||
@reflected_record_type ||= begin
|
@reflected_record_type ||= (name.split('::').last.chomp('Serializer').underscore.to_sym if name&.end_with?('Serializer'))
|
||||||
name.split('::').last.chomp('Serializer').underscore.to_sym if name&.end_with?('Serializer')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_key_transform(transform_name)
|
def set_key_transform(transform_name)
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'active_support'
|
||||||
require 'active_support/concern'
|
require 'active_support/concern'
|
||||||
require 'digest/sha1'
|
require 'digest/sha1'
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
require 'active_support'
|
||||||
require 'active_support/notifications'
|
require 'active_support/notifications'
|
||||||
|
|
||||||
module JSONAPI
|
module JSONAPI
|
||||||
|
|||||||
1
spec/fixtures/_user.rb
vendored
1
spec/fixtures/_user.rb
vendored
@ -1,3 +1,4 @@
|
|||||||
|
require 'active_support'
|
||||||
require 'active_support/cache'
|
require 'active_support/cache'
|
||||||
|
|
||||||
class User
|
class User
|
||||||
|
|||||||
1
spec/fixtures/actor.rb
vendored
1
spec/fixtures/actor.rb
vendored
@ -1,3 +1,4 @@
|
|||||||
|
require 'active_support'
|
||||||
require 'active_support/cache'
|
require 'active_support/cache'
|
||||||
require 'jsonapi/serializer/instrumentation'
|
require 'jsonapi/serializer/instrumentation'
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,7 @@ SimpleCov.start do
|
|||||||
end
|
end
|
||||||
SimpleCov.minimum_coverage 90
|
SimpleCov.minimum_coverage 90
|
||||||
|
|
||||||
|
require 'active_support'
|
||||||
require 'active_support/core_ext/object/json'
|
require 'active_support/core_ext/object/json'
|
||||||
require 'jsonapi/serializer'
|
require 'jsonapi/serializer'
|
||||||
require 'ffaker'
|
require 'ffaker'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user