csl 2.2.1 → 2.4.0

data/lib/csl/style/names.rb

@@ -229,7 +229,7 @@ module CSL
       #   be inserted between before et-al depending on the
       #   number of names rendered
       def delimiter_contextually_precedes_et_al?
-        return true unless attribute?[:'delimiter-precedes-et-al']
+        return true unless attribute?(:'delimiter-precedes-et-al')
         !!(attributes[:'delimiter-precedes-et-al'].to_s =~ /^contextual/i)
       end
 
@@ -327,7 +327,7 @@ module CSL
       end
 
       def ellipsis?
-        attributes[:'et-al-use-last'].to_s =~ /^true$/
+        boolean_attribute(:'et-al-use-last')
       end
 
       def ellipsis

data/lib/csl/style.rb

@@ -74,26 +74,35 @@ module CSL
       @errors = Schema.validate self
     end
 
+    # Merges the style's overrides into the given locale. 
+    #
+    # @param locale [Locale]
+    # @return [Locale]
+    def localize(locale)
+      overrides = locales.sort.reverse.select { |other| locale.like?(other) }
+      overrides.empty? ? locale : locale.merge(*overrides)
+    end
+
     def valid?
       validate.empty?
     end
 
     remove_method :info # generated by struct_children
     def info
-      children[:info] ||= Info.new
+      children[:info] || add_child(Info.new)
     end
 
     alias_child :metadata, :info
 
     # @return [String] the style's id
     def id
-      return unless info.has_id?
+      return unless has_info? && info.has_id?
       info.id.to_s
     end
 
     # @return [String] the style's title
     def title
-      return unless info.has_title?
+      return unless has_info? && info.has_title?
       info.title.to_s
     end
 
@@ -127,7 +136,7 @@ module CSL
     alias demote_particle? demote_non_dropping_particle?
 
     def initialize_without_hyphen?
-      attribute?(:'initialize-with-hyphen') && !attributes[:'initialize-with-hyphen']
+      !boolean_attribute(:'initialize-with-hyphen', true)
     end
 
     def has_page_range_format?
@@ -141,7 +150,7 @@ module CSL
     private
 
     def preamble
-      Schema.preamble.dup
+      Schema.preamble
     end
 
     def load_related_style_from(uri)

data/lib/csl/treelike.rb

@@ -33,12 +33,17 @@ module CSL
     end
     alias delete delete_children
 
-    # Deletes child nodes that are equal to the passed-in node. Returns all
-    # deleted children. If no children were deleted, returns nil. If the
-    # optional block is given, returns the result block if no children were
-    # deleted.
+    # Deletes the passed-in child node.
+    # Returns the deleted child.
+    # If the node is not a child, returns nil or,
+    # if the optional block is given, the result of the block.
     def delete_child(child)
-      deleted = children.delete child
+      deleted = if children.is_a?(Array)
+        index = children.index { |node| node.equal?(child) }
+        children.delete_at(index) unless index.nil?
+      else
+        children.delete child
+      end
 
       case
       when deleted.nil? && block_given?
@@ -349,8 +354,7 @@ module CSL
 
         const_set(:Children, Struct.new(*names) {
 
-          # 1.8 Compatibility
-          @keys = members.map(&:to_sym).freeze
+          @keys = members.freeze
 
           class << self
             attr_reader :keys
@@ -424,18 +428,19 @@ module CSL
 
           alias << push
 
-          # Delete items from self that are equal to node. If any items are
-          # found, returns the deleted items. If the items is not found,
-          # returns nil. If the optional code block is given, returns the
-          # result og block if the item is not found.
+          # Deletes the passed-in node; other, equal nodes are not deleted.
+          # Returns the deleted node or nil if the node is not found.
+          # If the optional code block is given,
+          # returns the result of the block if the node is not found.
           def delete(node)
             return nil unless node.respond_to?(:nodename)
 
             deleted = resolve(node.nodename)
             if deleted.kind_of?(Array)
-              deleted = deleted.delete(node)
+              index = deleted.index { |other| other.equal?(node) }
+              deleted = index.nil? ? nil : deleted.delete_at(index)
             else
-              if deleted == node
+              if deleted.equal?(node)
                 self[node.nodename] = nil
               else
                 deleted = nil
@@ -443,7 +448,7 @@ module CSL
             end
 
             # Delete node from ordered list as well
-            @order.delete(node)
+            @order.delete_if { |other| other.equal?(node) }
 
             if deleted.nil? && block_given?
               yield

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/lib/csl.rb

@@ -1,5 +1,4 @@
 
-require 'enumerator'
 require 'forwardable'
 require 'open-uri'
 require 'singleton'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Sylvester Keil
 bindir: bin
 cert_chain: []
-date: 2025-10-16 00:00:00.000000000 Z
+date: 2026-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -117,17 +117,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".yardopts"
-- AGPL
 - BSDL
-- Gemfile
 - README.md
-- Rakefile
-- csl.gemspec
-- cucumber.yml
 - lib/csl.rb
 - lib/csl/compatibility.rb
 - lib/csl/date_part.rb
@@ -176,14 +167,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.22
 specification_version: 4
 summary: A Ruby CSL parser and library
 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/.gitignore

@@ -1,13 +0,0 @@
-.DS_Store
-Gemfile.lock
-/coverage
-/pkg
-/doc
-/.yardoc
-/.rbx
-*.rbc
-*.swp
-*.gem
-.ruby-version
-.rvm
-.bundle

data/.yardopts

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