bolognese 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0dacdf04ab9d6bac881314d6769bbe4a32ef487886eb9e40b9c0de0025d3b93
-  data.tar.gz: d208c61ab72eb28be3262692c3080caee9bd793d48129367659120f36bc429bd
+  metadata.gz: af6403c24df2779189b8883a6ac2a649856eefc21021f2a93e5e6ebeee91592a
+  data.tar.gz: 4fab74f8c6e1044c48a3d66fb64ff90ff134cf868b881dcbfc6a91e410fb3fa8
 SHA512:
-  metadata.gz: a24c08c281faaccd79fde6ea90dbdb2341b4291a569095143c06fb5b91fcad02ebd365be08a2cd60db00259b53e7fef030780a879c7f27754aa98f4e7498cfa4
-  data.tar.gz: 938bb5a4c4f05535fae6bb2bae548bf136b6775d070676ba9cddaa42469831c0ec3d6dff223fc111f9b3af7282a3ab2be78500efb964472c836403125d352ccb
+  metadata.gz: edb53a6a6644b9184fec632cb1b6a128d630c403499d19df8ce3e0febbac3a51d3d85d86b3f8a124a5b4fa3f3573022b0d0b633c5b9ced8a9bc416638cd7dfd4
+  data.tar.gz: a3f0b04d4ed508858ea7e7ec896f2182bdd9d7d5773e58e4e97faa8e52bd362cd0688a305b2efec9c614a51564b0927d8270b597ce976322e8650182cab5bc4a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (2.6.0)
+    bolognese (2.6.1)
       activesupport (~> 8.1, >= 8.1.2)
       bibtex-ruby (~> 6.2)
       builder (~> 3.3)

data/lib/bolognese/citeproc_extensions.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# Minimal patch for csl-ruby and citeproc-ruby compatibility
+# Root cause: 'contributor' is not recognized as a names variable in citeproc gem
+# https://github.com/inukshuk/citeproc/blob/121fa4a950b9bd71960e42d20db96bcea1165201/lib/citeproc/variable.rb#L20-L24
+
+module CiteProc
+  class Variable
+    # Unfreeze, modify, and refreeze the fields to add 'contributor' and 'accepted-date'
+    if @fields
+      # Unfreeze the fields hash temporarily
+      fields_dup = @fields.dup
+      
+      # Add contributor to names (make a new unfrozen array)
+      fields_dup[:names] = (@fields[:names] + [:contributor]).uniq
+      
+      # Add accepted-date to dates (make a new unfrozen array)
+      fields_dup[:date] = (@fields[:date] + [:'accepted-date']).uniq
+      
+      # Rebuild the types mapping - only use actual type keys, not aliases like :all, :any, etc.
+      types_hash = Hash[*[:date, :names, :number, :text].map { |k| fields_dup[k].map { |n| [n, k] } }.flatten]
+      
+      # Update the class instance variables
+      @fields = fields_dup
+      @types = Hash.new { |h,k| h.fetch(k.to_sym, nil) }.merge(types_hash).freeze
+      
+      # Rebuild @factories from the new @types
+      # This maps each field name to its Variable subclass (Names, Date, Text, Number)
+      @factories = Hash.new { |h,k| h.fetch(k.to_s.intern, CiteProc::Variable) }.merge(
+        Hash[*@types.map { |field_name, type|
+          [field_name, CiteProc.const_get(type.to_s.capitalize)]
+        }.flatten]
+      ).freeze
+      
+      # Recreate the aliases
+      @fields[:name] = @fields[:names]
+      @fields[:dates] = @fields[:date]
+      @fields[:numbers] = @fields[:number]
+      
+      # Recreate :all and :any
+      @fields[:all] = @fields[:any] =
+        [:date, :names, :text, :number].reduce([]) { |s,a| s.concat(@fields[a]) }.sort
+      
+      # Refreeze fields
+      @fields.freeze
+    end
+  end
+end

data/lib/bolognese/metadata_utils.rb

@@ -139,19 +139,28 @@ module Bolognese
         author = to_citeproc(creators)
       end
 
-      if types["resourceTypeGeneral"] == "Software" && version_info.present?
-        type = "book"
+      if types["resourceTypeGeneral"] == "Software"
+        type = "software"
       else
         type = types["citeproc"]
       end
 
+      # Filter out contributors who are already creators, editors, or translators to avoid duplication
+      creator_names = Array.wrap(creators).map { |c| c["name"] || [c["givenName"], c["familyName"]].compact.join(" ") }.compact
+      unique_contributors = Array.wrap(contributors).reject do |c|
+        contributor_name = c["name"] || [c["givenName"], c["familyName"]].compact.join(" ")
+        creator_names.include?(contributor_name) ||
+        c["contributorType"] == "Editor" ||
+        c["contributorType"] == "Translator"
+      end
+
       {
         "type" => type,
         "id" => normalize_doi(doi),
         "categories" => Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.presence,
         "language" => language,
         "author" => author,
-        "contributor" => to_citeproc(contributors),
+        "contributor" => unique_contributors.presence ? to_citeproc(unique_contributors) : nil,
         "editor" => contributors ? to_citeproc(contributors.select { |c| c["contributorType"] == "Editor" }) : nil,
         "translator" => contributors ? to_citeproc(contributors.select { |c| c["contributorType"] == "Translator" }) : nil,
         "issued" => get_date(dates, "Issued") ? get_date_parts(get_date(dates, "Issued")) : get_date_parts(publication_year.to_s),

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

data/lib/bolognese.rb

@@ -16,6 +16,7 @@ require 'citeproc'
 require 'csl/styles'
 require 'edtf'
 
+require "bolognese/citeproc_extensions"
 require "bolognese/version"
 require "bolognese/metadata"
 require "bolognese/cli"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Martin Fenner
 bindir: bin
 cert_chain: []
-date: 2026-03-12 00:00:00.000000000 Z
+date: 2026-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -515,6 +515,7 @@ files:
 - lib/bolognese.rb
 - lib/bolognese/array.rb
 - lib/bolognese/author_utils.rb
+- lib/bolognese/citeproc_extensions.rb
 - lib/bolognese/cli.rb
 - lib/bolognese/datacite_utils.rb
 - lib/bolognese/doi_utils.rb