Merge branch 'main' of https://github.com/citation-file-format/ruby-cff into copilot/fix-apa-style-hyphenated-names

Copilot · Copilot · commit ff3277873046 · 2026-03-16T22:08:00.000Z
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install and set up ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: '3.2'
           bundler-cache: true
 
       - name: Run RDoc
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Install and set up ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: '3.2'
         bundler-cache: true
 
     - name: Rubocop
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,12 +8,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: ['3.2', '3.3', '3.4', '4.0', head, jruby, jruby-head, truffleruby, truffleruby-head]
         include:
           - os: macos
-            ruby: '3.0'
+            ruby: '3.2'
           - os: windows
-            ruby: '3.0'
+            ruby: '3.2'
     runs-on: ${{ matrix.os }}-latest
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.os == 'windows' }}
     steps:
@@ -49,7 +49,7 @@ jobs:
     - name: Install and set up ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.4'
         bundler-cache: true
 
     - name: Run isolated tests
@@ -60,7 +60,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        ruby: ['3.1', '3.2', head]
+        ruby: ['3.2', '3.3', '3.4', '4.0', head]
     runs-on: ${{ matrix.os }}-latest
     continue-on-error: true
     steps:
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,19 +1,18 @@
-require:
+plugins:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rake
 
 # Set our base version of ruby and enable all cops.
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.2
   NewCops: enable
 
 # Turn this off for certain files where we have extra documentation
 # towards the end of the file, after a block of private methods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'lib/cff/index.rb'
-    - 'lib/cff/model.rb'
     - 'lib/cff/reference.rb'
 
 # I think 'has_key?' looks better than 'key?'.
@@ -70,3 +69,9 @@ Minitest/MultipleAssertions:
 
 Style/DocumentDynamicEvalDefinition:
   Enabled: true
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
+
+Minitest/EmptyLineBeforeAssertionMethods:
+  Enabled: false
diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ RDoc::Task.new do |r|
   )
   r.options << '--markup=markdown'
   r.options << '--tab-width=2'
-  r.options << "-t Ruby CFF Library (version #{::CFF::VERSION})"
+  r.options << "-t Ruby CFF Library (version #{CFF::VERSION})"
 end
 
 RuboCop::RakeTask.new
diff --git a/cff.gemspec b/cff.gemspec
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,18 +47,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.2'
 
-  spec.add_runtime_dependency 'json_schema', '~> 0.20.4'
-  spec.add_runtime_dependency 'language_list', '~> 1.2.1'
+  spec.add_dependency 'json_schema', '~> 0.20.4'
+  spec.add_dependency 'language_list', '~> 1.2.1'
 
-  spec.add_development_dependency 'minitest', '~> 5.16.0'
+  spec.add_development_dependency 'minitest', '~> 5.27.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rdoc', '~> 6.4.0'
-  spec.add_development_dependency 'rubocop', '~> 1.35.0'
-  spec.add_development_dependency 'rubocop-minitest', '~> 0.21.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.14.0'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  spec.add_development_dependency 'rubocop', '~> 1.85.0'
+  spec.add_development_dependency 'rubocop-minitest', '~> 0.39.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.26.0'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.7.0'
   spec.add_development_dependency 'simplecov', '0.18.3'
   spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
   spec.add_development_dependency 'test_construct', '~> 2.0'
diff --git a/lib/cff/file.rb b/lib/cff/file.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2024 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ def self.open(file)
     # You can choose whether filename validation failure should cause overall
     # validation failure with the `fail_on_filename` parameter (default: true).
     def self.validate(file, fail_on_filename: true)
-      File.read(file).validate(fail_on_filename: fail_on_filename)
+      File.read(file).validate(fail_on_filename:)
     end
 
     # :call-seq:
@@ -129,7 +129,7 @@ def self.validate(file, fail_on_filename: true)
     # You can choose whether filename validation failure should cause overall
     # validation failure with the `fail_on_filename` parameter (default: true).
     def self.validate!(file, fail_on_filename: true)
-      File.read(file).validate!(fail_on_filename: fail_on_filename)
+      File.read(file).validate!(fail_on_filename:)
     end
 
     # :call-seq:
@@ -159,7 +159,7 @@ def self.write(file, cff, comment = '')
     # validation failure with the `fail_on_filename` parameter (default: true).
     def validate(fail_fast: false, fail_on_filename: true)
       valid_filename = (::File.basename(@filename) == CFF_VALID_FILENAME)
-      result = (@index.validate(fail_fast: fail_fast) << valid_filename)
+      result = (@index.validate(fail_fast:) << valid_filename)
       result[0] &&= valid_filename if fail_on_filename
 
       result
@@ -176,7 +176,7 @@ def validate(fail_fast: false, fail_on_filename: true)
     # validation failure with the `fail_on_filename` parameter (default: true).
     def validate!(fail_fast: false, fail_on_filename: true)
       result = validate(
-        fail_fast: fail_fast, fail_on_filename: fail_on_filename
+        fail_fast:, fail_on_filename:
       )
       return if result[0]
 
@@ -223,10 +223,10 @@ def to_yaml # :nodoc:
       @index.to_yaml
     end
 
-    def method_missing(name, *args) # :nodoc:
+    def method_missing(name, *) # :nodoc:
       if @index.respond_to?(name)
-        @dirty = true if name.to_s.end_with?('=') # Remove to_s when Ruby >2.6.
-        @index.send(name, *args)
+        @dirty = true if name.end_with?('=')
+        @index.send(name, *)
       else
         super
       end
diff --git a/lib/cff/formatters/apalike.rb b/lib/cff/formatters/apalike.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ def self.publication_data_from_model(model) # rubocop:disable Metrics
       end
 
       def self.type_and_school_from_model(model, type)
-        type = model.thesis_type == '' ? type : model.thesis_type
+        type = model.thesis_type unless model.thesis_type == ''
         school = model.institution.empty? ? model.authors.first.affiliation : model.institution.name
         "[#{type}, #{school}]"
       end
diff --git a/lib/cff/formatters/bibtex.rb b/lib/cff/formatters/bibtex.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2024 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ class BibTeX < Formatter # :nodoc:
 
       # We need to escape these characters in titles and names, as per
       # https://tex.stackexchange.com/questions/34580/escape-character-in-latex
-      ESCAPE_CHARS = Regexp.new(/([&%$#_{}])/)
+      ESCAPE_CHARS = /([&%$#_{}])/
 
       def self.format(model:, preferred_citation: true) # rubocop:disable Metrics
         model = select_and_check_model(model, preferred_citation)
@@ -86,7 +86,7 @@ def self.publication_data_from_model(model, type, fields)
             fields[field] = l(model.send(field).to_s)
           else
             field = field.chomp('!')
-            fields[field] = send("#{field}_from_model", model)
+            fields[field] = send(:"#{field}_from_model", model)
           end
         end
       end
diff --git a/lib/cff/reference.rb b/lib/cff/reference.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -164,7 +164,7 @@ def self.from_cff(model, type: 'software')
           repository_artifact repository_code url version
         ].each do |field|
           value = model.send(field)
-          ref.send("#{field}=", value.dup) unless value == ''
+          ref.send(:"#{field}=", value.dup) unless value == ''
         end
       end
     end
diff --git a/lib/cff/version.rb b/lib/cff/version.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 ##
 module CFF
   # :nodoc:
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
   DEFAULT_SPEC_VERSION = '1.2.0'
   MIN_VALIDATABLE_VERSION = '1.2.0'
 end
diff --git a/test/citable_test.rb b/test/citable_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ def test_to_methods_present
       # formatter hanging around.
       next if format == :testformatterlabel
 
-      assert_includes(methods, "to_#{format}".to_sym)
+      assert_includes(methods, :"to_#{format}")
     end
   end
 end
diff --git a/test/entity_test.rb b/test/entity_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ def test_simple_fields_set_and_output_correctly
 
     data.each do |method, value|
       assert_equal('', @entity.send(method))
-      @entity.send("#{method}=", value)
+      @entity.send(:"#{method}=", value)
       assert_equal(value, @entity.send(method))
     end
 
@@ -115,7 +115,7 @@ def test_new_with_block
 
     assert_equal('My Company', entity.name)
     assert_equal('+44 (0) 161-234-5678', entity.tel)
-    assert entity.is_a?(::CFF::Entity)
+    assert_kind_of(::CFF::Entity, entity)
   end
 
   def test_empty?
diff --git a/test/formatters/apalike_test.rb b/test/formatters/apalike_test.rb
@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require_relative '../test_helper'
 
 require 'cff/formatters/apalike'
@@ -8,7 +22,7 @@
 class CFFApaFormatterTest < Minitest::Test
   describe 'all apa fixtures' do
     Dir[::File.join(FORMATTER_DIR, '*.cff')].each do |input_file|
-      define_method("test_converter_for_#{File.basename(input_file)}") do
+      define_method(:"test_converter_for_#{File.basename(input_file)}") do
         cff = ::CFF::File.read(input_file)
         output_file = ::File.join(FORMATTED_DIR, "#{File.basename(input_file, '.*')}.apa")
 
diff --git a/test/formatters/bibtex_test.rb b/test/formatters/bibtex_test.rb
@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require_relative '../test_helper'
 
 require 'cff/formatters/bibtex'
@@ -8,7 +22,7 @@
 class CFFBibtexFormatterTest < Minitest::Test
   describe 'all bibtex fixtures' do
     Dir[::File.join(FORMATTER_DIR, '*.cff')].each do |input_file|
-      define_method("test_converter_for_#{File.basename(input_file)}") do
+      define_method(:"test_converter_for_#{File.basename(input_file)}") do
         cff = ::CFF::File.read(input_file)
         output_file = ::File.join(FORMATTED_DIR, "#{File.basename(input_file, '.*')}.bibtex")
 
diff --git a/test/identifier_test.rb b/test/identifier_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.
+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ def test_new_with_block
 
     assert_equal('doi', id.type)
     assert_equal('10.9999/zenodo.1234567', id.value)
-    assert id.is_a?(::CFF::Identifier)
+    assert_kind_of(::CFF::Identifier, id)
   end
 
   def test_new_no_params
diff --git a/test/index_test.rb b/test/index_test.rb
diff --git a/test/person_test.rb b/test/person_test.rb
diff --git a/test/reference_test.rb b/test/reference_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# frozen_string_literal: true`
`2`	`2`
`3`		`-# Copyright (c) 2018-2022 The Ruby Citation File Format Developers.`
	`3`	`+# Copyright (c) 2018-2026 The Ruby Citation File Format Developers.`
`4`	`4`	`#`
`5`	`5`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`# you may not use this file except in compliance with the License.`
`@@ -33,7 +33,7 @@ RDoc::Task.new do \|r\|`
`33`	`33`	`)`
`34`	`34`	`r.options << '--markup=markdown'`
`35`	`35`	`r.options << '--tab-width=2'`
`36`		`- r.options << "-t Ruby CFF Library (version #{::CFF::VERSION})"`
	`36`	`+ r.options << "-t Ruby CFF Library (version #{CFF::VERSION})"`
`37`	`37`	`end`
`38`	`38`
`39`	`39`	`RuboCop::RakeTask.new`