citeproc 1.1.0 → 1.3.0

data/lib/citeproc/names.rb

@@ -92,20 +92,19 @@ module CiteProc
     end
 
     # Names quack sorta like a String
-    def_delegators :to_s, :=~, :===, *String.instance_methods(false).reject { |m|
-      m.to_s =~ /^[\W_]|[!=_]$|^(to_s|inspect|replace|first|last|dup|clone)$/
-    }
+    def_delegators :to_s,
+      :to_str,
+      :=~, :===, :match, :match?, :start_with?, :end_with?, :include?,
+      :upcase, :downcase, :capitalize, :sub, :gsub, :split, :strip
 
-    # Delegate bang! methods to each field's value
-    String.instance_methods(false).each do |m|
-      if m.to_s.end_with?('!')
-        define_method(m) do |*arguments, &block|
-          Name.parts.each do |part|
-            p = attributes[part]
-            p.send(m, *arguments, &block) if p.respond_to?(m)
-          end
-          self
+    # Delegate in-place transformations to each field's value
+    [:gsub!, :sub!, :upcase!, :downcase!, :capitalize!, :strip!].each do |m|
+      define_method(m) do |*arguments, &block|
+        Name.parts.each do |part|
+          p = attributes[part]
+          p.send(m, *arguments, &block) if p.respond_to?(m)
         end
+        self
       end
     end
 
@@ -145,6 +144,11 @@ module CiteProc
       !empty? && !literal?
     end
 
+    # @return [Boolean] whether or not the Name has no given, family, or literal name
+    def empty?
+      [given, family, literal].all? { |part| part.nil? || part.empty? }
+    end
+
     # A name is `romanesque' if it contains only romanesque characters. This
     # should be the case for the majority of names written in latin- or
     # greek-based script. It will be false, for example, for names written
@@ -231,7 +235,7 @@ module CiteProc
 
     # @return [Boolean] whether or not initials will be used for printing
     def initials?
-      !!options[:'initialize-with'] && personal? && romanesque?
+      !!options[:'initialize-with'] && personal? && family? && romanesque?
     end
 
     def initialize_with
@@ -239,7 +243,7 @@ module CiteProc
     end
 
     def initialize_existing_only?
-      options[:initialize].to_s == 'false'
+      !CiteProc.boolean(options[:initialize], true)
     end
 
     def initialize_without_hyphen?
@@ -254,8 +258,6 @@ module CiteProc
       case
       when !initials?
         given
-      when initialize_existing_only?
-        existing_initials_of given
       else
         initials_of given
       end
@@ -307,7 +309,7 @@ module CiteProc
     end
 
     def to_s
-      [given, family].compact_join(' ')
+      format
     end
 
     # @return [String] the name formatted according to the current options
@@ -316,7 +318,7 @@ module CiteProc
       when literal?
         literal.to_s
       when static_order?
-        [family, initials].compact.join(' ')
+        [family, initials].compact.join(romanesque? ? ' ' : '')
       when !short_form?
         case
         when !sort_order?
@@ -351,7 +353,7 @@ module CiteProc
 
     # @return [String] the name as a string stripped off all markup
     def strip_markup
-      gsub(Variable.markup, '')
+      to_s.gsub(Variable.markup, '')
     end
 
     # @return [self] the name with all parts stripped off markup
@@ -379,36 +381,30 @@ module CiteProc
 
     def initials_of(string)
       return unless string
-      string = string.dup
-
-      string.gsub!(/([[:upper:]])[^[:upper:]\s-]*\s*/, "\\1#{initialize_with}")
-
-      initialize_hyphen!(string)
 
-      string.strip!
-      string
-    end
-
-    def initialize_hyphen!(string)
-      if initialize_without_hyphen?
-        string.tr!('-', '')
-      else
-        string.gsub!(/\s*-/, '-')
+      # Split abbreviations like "M.E" into "M. E"
+      string = string.gsub(/\.(?=[[:alpha:]])/, '. ')
+      string = string.tr('-', ' ') if initialize_without_hyphen?
+
+      string.scan(/([^\s-]+)\s*(-)?\s*/).map { |part, hyphen|
+        part = initial_of(part) || " #{part} "
+        hyphen ? "#{part.rstrip}-" : part
+      }.join.gsub(/-\s+/, '-').squeeze(' ').strip
+    end
+
+    # @return [String, nil] the initial for the given part of a name
+    #   or nil if the part should not be initialized
+    def initial_of(part)
+      case part
+      when /\A([[:upper:]])\z/, /\A(.+)\.\z/
+        "#{$1}#{initialize_with}"
+      when /\A[[:upper:]]{2}[[:lower:]]/
+        # Two letter initials like "Ts" for "TSerendorjiin"
+        "#{part[0, 2].capitalize}#{initialize_with}" unless initialize_existing_only?
+      when /\A[[:upper:]]/
+        "#{part[0]}#{initialize_with}" unless initialize_existing_only?
       end
     end
-
-    def existing_initials_of(string)
-      return unless string
-      string = string.dup
-
-      string.gsub!(/([[:upper:]])([[:upper:]])/, '\1 \2')
-      string.gsub!(/\b([[:upper:]])\b[^[:alpha:]-]*/, "\\1#{initialize_with}")
-
-      initialize_hyphen!(string)
-
-      string.strip!
-      string
-    end
   end
 
 

data/lib/citeproc/number.rb

@@ -13,24 +13,29 @@ module CiteProc
       ['i',    1]
     ].freeze
 
+    # Numbers (with optional prefixes and suffixes) or roman numerals
+    RANGE_BOUND = /(?:[[:alnum:]]*\d[[:alnum:]]*|[ivxlcdm]+)/i
+
+    # Ranges between numbers; escaped hyphens are not range delimiters
+    RANGE = /(?<![[:alnum:]])#{RANGE_BOUND}\s*[–-]\s*#{RANGE_BOUND}(?![[:alnum:]])/
+
     class << self
       def pluralize?(string)
-        /\S[\s,&–-]\S|\df/ === string
+        /\S[\s,&]\S|\df/.match?(string) || RANGE.match?(string)
       end
 
       # @param number [#to_i] the number to convert
-      # @return [String] roman equivalent of the passed-in number
+      # @return [String, Integer] roman equivalent of the passed-in number;
+      #   the number itself if it is out of range
       def romanize(number)
-        number, roman = number.to_i, ''
+        number = number.to_i
 
-        return number unless number > 0 || number < MAX_ROMAN
+        return number unless number > 0 && number < MAX_ROMAN
 
-        FACTORS.each do |code, factor|
+        FACTORS.map { |code, factor|
           count, number = number.divmod(factor)
-          roman << (code * count)
-        end
-
-        roman
+          code * count
+        }.join
       end
     end
 

data/lib/citeproc/selector.rb

@@ -19,11 +19,12 @@ module CiteProc
 
     attr_reader :type, :conditions, :skip_conditions, :custom_matcher
 
-    def initialize(attributes = nil)
+    def initialize(attributes = nil, &block)
       @conditions, @skip_conditions = {}, {}
 
       if block_given?
         @type = :ruby
+        @custom_matcher = block
 
       else
         unless attributes.nil? || attributes.empty?
@@ -54,12 +55,12 @@ module CiteProc
       @type = other.type
       @conditions = other.conditions.deep_copy
       @skip_conditions = other.skip_conditions.deep_copy
-      @custom_matcher = other
+      @custom_matcher = other.custom_matcher
     end
 
     def type=(type)
       raise TypeError, "failed to set selector type to #{type.inspect}" unless
-        type.respond_to(:to_sym) && Selector.types.include?(type.to_sym)
+        type.respond_to?(:to_sym) && Selector.types.include?(type.to_sym)
 
       @type = type.to_sym
     end
@@ -69,7 +70,7 @@ module CiteProc
     end
 
     def custom_matcher?
-      defined?(@custom_matcher)
+      !custom_matcher.nil?
     end
 
     alias ruby? custom_matcher?

data/lib/citeproc/utilities.rb

@@ -15,6 +15,17 @@ module CiteProc
       process(:bibliography, items, options)
     end
 
+    # @param value [String, Boolean, nil] an xsd:boolean value
+    # @param default [Boolean] the value if the value is not set
+    # @return [Boolean] the boolean value
+    def boolean(value, default = false)
+      case value.to_s
+      when 'true', '1' then true
+      when 'false', '0' then false
+      else default
+      end
+    end
+
   end
 
 end

data/lib/citeproc/variable.rb

@@ -20,7 +20,7 @@ module CiteProc
       :names => %w{
         author collection-editor composer container-author recipient editor
         editorial-director illustrator interviewer original-author translator
-        director reviewed-author
+        director reviewed-author narrator
       },
 
       :number => %w{
@@ -131,12 +131,15 @@ module CiteProc
     # @return [Object] the value wrapped by this variable
     attr_accessor :value
 
+    # In-place transformations of the value
     def_delegators :@value, :to_s,
-      *::String.instance_methods(false).select {|m| m.to_s =~ /!$/ }
+      :gsub!, :sub!, :upcase!, :downcase!, :capitalize!, :strip!
 
-    def_delegators :to_s, :=~, :===, *String.instance_methods(false).reject { |m|
-      m.to_s =~ /^[\W_]|[!=_]$|^(to_s|inspect|replace|first|last|dup|clone|to_f|to_i)$/
-    }
+    # Variables quack sorta like a String
+    def_delegators :to_s,
+      :to_str, :empty?,
+      :=~, :===, :match, :match?, :start_with?, :end_with?, :include?,
+      :upcase, :downcase, :capitalize, :sub, :gsub, :split, :strip
 
 
     # Creates new Variable for the passed-in value
@@ -226,7 +229,7 @@ module CiteProc
 		#
     # @return [Boolean] whether or not the variable's value is numeric
     def numeric?
-      !!match(/^[\w\.:;]*\d+[\w\.:;]*(\s*[,&-]\s*[\w\.:;]*\d+[\w\.:;]*)*$/i)
+      !!to_s.match(/^[\w\.:;]*\d+[\w\.:;]*(\s*[,&-]\s*[\w\.:;]*\d+[\w\.:;]*)*$/i)
     end
 
     def date?
@@ -247,7 +250,7 @@ module CiteProc
 
     # @return [String] the variable's value stripped of markup
     def strip_markup
-      gsub(Variable.markup, '')
+      to_s.gsub(Variable.markup, '')
     end
 
     # Strips markup off the variable's value.
@@ -274,6 +277,20 @@ module CiteProc
       end
     end
 
+    # Variables are equal (in the sense of eql?) if they are of
+    # the same type and have the same value.
+    #
+    # @param other [Object] the object used for comparison
+    # @return [Boolean]
+    def eql?(other)
+      other.instance_of?(self.class) && value.eql?(other.value)
+    end
+
+    # @return [Integer] a hash value based on the type and value
+    def hash
+      [self.class, value].hash
+    end
+
     # @!method to_s
     # @return [String] the variable's value as a string
     alias to_citeproc to_s

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: citeproc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sylvester Keil
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-18 00:00:00.000000000 Z
+date: 2026-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -101,14 +100,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".github/workflows/ci.yml"
-- ".yardopts"
-- AGPL
 - BSDL
-- Gemfile
 - README.md
-- Rakefile
 - lib/citeproc.rb
 - lib/citeproc/abbreviate.rb
 - lib/citeproc/assets.rb
@@ -132,7 +125,6 @@ homepage: https://github.com/inukshuk/citeproc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,15 +132,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 4.0.22
 specification_version: 4
 summary: A cite processor interface.
 test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-AGPL
-README.md

data/.github/workflows/ci.yml

@@ -1,33 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_WITHOUT: debug:extra
-    strategy:
-      matrix:
-        ruby-version:
-          - '3.4'
-          - '3.3'
-          - '3.2'
-          - '3.1'
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-      - run: bundle exec rake
-      - name: Upload coverage results
-        if: matrix.ruby-version == '3.3'
-        continue-on-error: true
-        uses: coverallsapp/github-action@v2
-        with:
-          github-token: ${{ github.token }}

data/.yardopts

@@ -1,2 +0,0 @@
---no-private
---document