diff --git a/.circleci/config.yml b/.circleci/config.yml index fbc20f4..4f01191 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,23 +36,54 @@ jobs: workflows: ci: jobs: - # Ruby 2.7 + - bundle_lint_test: + name: ruby3-2_rails7-0 + ruby_version: 3.2.0 + rails_version: 7.0.4.1 + - bundle_lint_test: + name: ruby3-2_rails6-1 + ruby_version: 3.2.0 + rails_version: 6.1.7.1 + - bundle_lint_test: + name: ruby3-2_rails6-0 + ruby_version: 3.2.0 + rails_version: 6.0.6.1 + - bundle_lint_test: + name: ruby3-1_rails7-0 + ruby_version: 3.1.3 + rails_version: 7.0.4.1 + - bundle_lint_test: + name: ruby3-1_rails6-1 + ruby_version: 3.1.3 + rails_version: 6.1.7.1 + - bundle_lint_test: + name: ruby3-1_rails6-0 + ruby_version: 3.1.3 + rails_version: 6.0.6.1 + - bundle_lint_test: + name: ruby3-0_rails7-0 + ruby_version: 3.0.5 + rails_version: 7.0.4.1 + - bundle_lint_test: + name: ruby3-0_rails6-1 + ruby_version: 3.0.5 + rails_version: 6.1.7.1 + - bundle_lint_test: + name: ruby3-0_rails6-0 + ruby_version: 3.0.5 + rails_version: 6.0.6.1 - bundle_lint_test: name: ruby2-7_rails6-1 ruby_version: 2.7.7 - rails_version: 6.1.6.1 + rails_version: 6.1.7.1 - bundle_lint_test: name: ruby2-7_rails6-0 ruby_version: 2.7.7 - rails_version: 6.0.2 + rails_version: 6.0.6.1 - bundle_lint_test: name: ruby2-7_rails5-2 ruby_version: 2.7.7 - rails_version: 5.2.4 - - bundle_lint_test: - name: ruby2-7_rails5-1 - ruby_version: 2.7.7 - rails_version: 5.1.7 + rails_version: 5.2.8.1 nightly: triggers: @@ -63,19 +94,51 @@ workflows: only: - main jobs: + - bundle_lint_test: + name: ruby3-2_rails7-0 + ruby_version: 3.2.0 + rails_version: 7.0.4.1 + - bundle_lint_test: + name: ruby3-2_rails6-1 + ruby_version: 3.2.0 + rails_version: 6.1.7.1 + - bundle_lint_test: + name: ruby3-2_rails6-0 + ruby_version: 3.2.0 + rails_version: 6.0.6.1 + - bundle_lint_test: + name: ruby3-1_rails7-0 + ruby_version: 3.1.3 + rails_version: 7.0.4.1 + - bundle_lint_test: + name: ruby3-1_rails6-1 + ruby_version: 3.1.3 + rails_version: 6.1.7.1 + - bundle_lint_test: + name: ruby3-1_rails6-0 + ruby_version: 3.1.3 + rails_version: 6.0.6.1 + - bundle_lint_test: + name: ruby3-0_rails7-0 + ruby_version: 3.0.5 + rails_version: 7.0.4.1 + - bundle_lint_test: + name: ruby3-0_rails6-1 + ruby_version: 3.0.5 + rails_version: 6.1.7.1 + - bundle_lint_test: + name: ruby3-0_rails6-0 + ruby_version: 3.0.5 + rails_version: 6.0.6.1 - bundle_lint_test: name: ruby2-7_rails6-1 ruby_version: 2.7.7 - rails_version: 6.1.6.1 + rails_version: 6.1.7.1 - bundle_lint_test: name: ruby2-7_rails6-0 ruby_version: 2.7.7 - rails_version: 6.0.2 + rails_version: 6.0.6.1 - bundle_lint_test: name: ruby2-7_rails5-2 ruby_version: 2.7.7 - rails_version: 5.2.4 - - bundle_lint_test: - name: ruby2-7_rails5-1 - ruby_version: 2.7.7 - rails_version: 5.1.7 + rails_version: 5.2.8.1 diff --git a/.rubocop.yml b/.rubocop.yml index a656be9..da25730 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -12,3 +12,9 @@ Naming/FileName: Metrics/BlockLength: Exclude: - 'spec/**/*.rb' + +Style/FrozenStringLiteralComment: + Enabled: false + +Rails/RakeEnvironment: + Enabled: false diff --git a/Gemfile b/Gemfile index 80ee2e9..94ed72a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' group :development, :test do - gem 'bixby', '~> 1.0' gem 'pry' unless ENV['CI'] gem 'pry-byebug' unless ENV['CI'] gem 'rspec_junit_formatter' diff --git a/hydra-pcdm.gemspec b/hydra-pcdm.gemspec index aec7e0a..30ab62c 100644 --- a/hydra-pcdm.gemspec +++ b/hydra-pcdm.gemspec @@ -19,13 +19,14 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.add_dependency 'active-fedora', '>= 10', '< 14' + spec.add_dependency 'active-fedora', '>= 10', '< 15' spec.add_dependency 'mime-types', '>= 1' spec.add_dependency 'rdf-vocab', '<=3.1.4' + spec.add_development_dependency 'bixby', '>= 5.0.2' spec.add_development_dependency 'coveralls_reborn', '~> 0.24' - spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1' + spec.add_development_dependency 'fcrepo_wrapper' spec.add_development_dependency 'rake' spec.add_development_dependency 'rspec' - spec.add_development_dependency 'solr_wrapper', '~> 0.4' + spec.add_development_dependency 'solr_wrapper' end diff --git a/spec/hydra/pcdm/models/file_spec.rb b/spec/hydra/pcdm/models/file_spec.rb index dd8f3b6..73d4517 100644 --- a/spec/hydra/pcdm/models/file_spec.rb +++ b/spec/hydra/pcdm/models/file_spec.rb @@ -8,7 +8,7 @@ it 'sets an RDF type' do file.content = 'stuff' expect(file.save).to be true - expect(reloaded.metadata_node.query(predicate: RDF.type, object: Hydra::PCDM::Vocab::PCDMTerms.File).map(&:object)).to eq [Hydra::PCDM::Vocab::PCDMTerms.File] + expect(reloaded.metadata_node.query([nil, RDF.type, Hydra::PCDM::Vocab::PCDMTerms.File]).map(&:object)).to eq [Hydra::PCDM::Vocab::PCDMTerms.File] end end