csl 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3891b313aec0cbbfec56bbcecd6fd874097197ce
-  data.tar.gz: a39948e8a466db44d15805ba18c0213582b49725
+SHA256:
+  metadata.gz: c9def0950732e2af79808e712e972c454f49c18b8e71f31dcae1917a61d67b65
+  data.tar.gz: 996804a7e5e66aaad59f0679039b6a56b88d408f90a1b0414e6f32741ef0cf26
 SHA512:
-  metadata.gz: d0f086551f952a7e7b06c1cbd0979d9316812a96a01cee97e142859bb2cf60b1f1980ab0f69e477b9f6bc0bb315b1aaaf80d160b2666bf64894f8b196f0c6e8c
-  data.tar.gz: ca47300596bec6740d303d856e07e68b6742e724e6bde74b27a7183d0a8240fe14f711b68eae74c13b25010f13ed33510ba15ccea3c8f7a5ebc96d03e6bc1955
+  metadata.gz: f2e5824f038b51ce12dc80cb4bab54d59f2adea043ecf7614fb000742e518f67c082cc09e1f44f0b76ffc52ad24c2f5410c7c866e944ea491b1dd66c599da657
+  data.tar.gz: e51bdbd453bbe73c78fce162643a41c4c61697bb3f443dcdf08f7bea8a8fbea28e89cf5d3bfa07876dab1e188dfe5c010d9cff407dcedc8157c1e8af64f12ed9

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+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.0
+          - 2.7
+          - 2.6
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/BSDL

@@ -1,7 +1,7 @@
 CSL-Ruby. A Ruby CSL parser and library.
 
 Copyright 2012 President and Fellows of Harvard College.
-Copyright 2009-2014 Sylvester Keil. All rights reserved.
+Copyright 2009-2020 Sylvester Keil. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/Gemfile

@@ -24,7 +24,6 @@ group :extra do
 end
 
 group :coverage do
-  gem 'coveralls', require: false if ENV['CI']
   gem 'simplecov', require: false
 end
 

data/README.md

@@ -4,10 +4,6 @@ CSL-Ruby provides a Ruby parser and a comprehensive API for the
 [Citation Style Language](http://citationstyles.org) (CSL), an XML-based
 format to describe the formatting of citations, notes and bibliographies.
 
-[![Build Status](https://secure.travis-ci.org/inukshuk/csl-ruby.png)](http://travis-ci.org/inukshuk/csl-ruby)
-[![Coverage Status](https://coveralls.io/repos/inukshuk/csl-ruby/badge.png?branch=master)](https://coveralls.io/r/inukshuk/csl-ruby?branch=master)
-[![Dependency Status](https://gemnasium.com/inukshuk/csl-ruby.png)](https://gemnasium.com/inukshuk/csl-ruby)
-
 Styles and Locales
 ------------------
 You can load CSL styles and locales by passing a respective XML string, file
@@ -139,7 +135,7 @@ this project as part of [Google Summer of Code](https://developers.google.com/op
 
 Copyright
 ---------
-Copyright 2009-2015 Sylvester Keil. All rights reserved.
+Copyright 2009-2020 Sylvester Keil. All rights reserved.
 
 Copyright 2012 President and Fellows of Harvard College.
 

data/Rakefile

@@ -34,14 +34,6 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
   t.profile = 'default'
 end
 
-begin
-  require 'coveralls/rake/task'
-  Coveralls::RakeTask.new
-  task :test_with_coveralls => [:spec, :cucumber, 'coveralls:push']
-rescue LoadError => e
-  # ignore
-end if ENV['CI']
-
 task :release do |t|
   system "gem build csl.gemspec"
   system "git tag #{CSL::VERSION}"

data/csl.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Sylvester Keil']
   s.email       = ['http://sylvester.keil.or.at']
   s.homepage    = 'https://github.com/inukshuk/csl-ruby'
-  s.license     = 'AGPL-3.0'
+  s.licenses     = ['AGPL-3.0','BSD-2-Clause']
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'A Ruby CSL parser and library'
   s.description = <<~EOS
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
 
 
   s.required_ruby_version = '>= 2.2'
-  s.add_dependency('namae', ['~>1.0'])
+  s.add_runtime_dependency('namae', ['~>1.0'])
+  s.add_runtime_dependency('rexml')
 
   s.files        = `git ls-files`.split("\n") - EXCLUDES
   s.require_path = 'lib'
-  s.has_rdoc     = 'yard'
 end
 
 # vim: syntax=ruby

data/cucumber.yml

@@ -1 +1 @@
-default: --format progress --require features --color
+default: --format progress --require features --color --publish-quiet

data/lib/csl/locale.rb

@@ -330,9 +330,9 @@ module CSL
     #
     # Calls block once for each term defined by the locale. If no block is
     # given, an enumerator is returned instead.
-    def each_term
+    def each_term(&block)
       if block_given?
-        terms.each(&Proc.new)
+        terms.each(&block)
         self
       else
         enum_for :each_term
@@ -345,12 +345,12 @@ module CSL
     #
     # Calls block once for each date format defined by the locale. If no
     # block is given, an enumerator is returned instead.
-    def each_date
+    def each_date(&block)
       if block_given?
         if date.is_a? CSL::Node
           yield date
         else
-          date.each(&Proc.new)
+          date.each(&block)
         end
       else
         enum_for :each_date

data/lib/csl/node.rb

@@ -268,9 +268,9 @@ module CSL
     alias has_defaults? has_default_attributes?
 
     # Iterates through the Node's attributes
-    def each
+    def each(&block)
       if block_given?
-        attributes.each_pair(&Proc.new)
+        attributes.each_pair(&block)
         self
       else
         to_enum

data/lib/csl/schema.rb

@@ -2,46 +2,172 @@ module CSL
 
   class Schema
 
-    @version         = '1.0.1'.freeze
+    @version         = '1.0.2'.freeze
     @major_version   = '1.0'.freeze
 
     @namespace = 'http://purl.org/net/xbiblio/csl'.freeze
     @preamble  = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".freeze
 
-    @default_license = 'http://creativecommons.org/licenses/by-sa/3.0/'
+    @default_license = 'https://creativecommons.org/licenses/by-sa/4.0/'
     @default_rights_string =
-      'This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License'
-
-    @types = %w{ article article-journal article-magazine article-newspaper
-      bill book broadcast chapter entry entry-dictionary entry-encyclopedia
-      figure graphic interview legal_case legislation manuscript map
-      motion_picture musical_score pamphlet paper-conference patent
-      personal_communication post post-weblog report review review-book song
-      speech thesis treaty webpage }.map(&:to_sym).freeze
+      'This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.'
+
+    @types = %w{
+      article
+      article-journal
+      article-magazine
+      article-newspaper
+      bill
+      book
+      broadcast
+      chapter
+      classic
+      collection
+      dataset
+      document
+      entry
+      entry-dictionary
+      entry-encyclopedia
+      event
+      figure
+      graphic
+      hearing
+      interview
+      legal_case
+      legislation
+      manuscript
+      map
+      motion_picture
+      musical_score
+      pamphlet
+      paper-conference
+      patent
+      performance
+      periodical
+      personal_communication
+      post
+      post-weblog
+      regulation
+      report
+      review
+      review-book
+      software
+      song
+      speech
+      standard
+      thesis
+      treaty
+      webpage
+    }.map(&:to_sym).freeze
 
     @variables = Hash.new { |h,k| h.fetch(k.to_sym, nil) }.merge({
       :date => %w{
-        accessed container event-date issued original-date submitted
+        accessed
+        available-date
+        event-date
+        issued
+        original-date
+        submitted
       },
 
       :names => %w{
-        author collection-editor composer container-author recipient editor
-        editorial-director illustrator interviewer original-author translator
+        author
+        chair
+        collection-editor
+        compiler
+        composer
+        container-author
+        contributor
+        creator
+        curator
+        editor
+        editorial-director
+        executive-producer
+        guest
+        host
+        illustrator
+        interviewer
+        narrator
+        organizer
+        original-author
+        performer
+        producer
+        recipient
+        translator
+        writer
       },
 
       :number => %w{
-        chapter-number collection-number edition issue number number-of-pages
-        number-of-volumes volume
+        chapter-number
+        citation-number
+        collection-number
+        edition
+        first-reference-note-number
+        issue
+        locator
+        number
+        number-of-pages
+        number-of-volumes
+        page
+        page-first
+        part-number
+        printing-number
+        section
+        supplement-number
+        version
+        volume
       },
 
       :text => %w{
-        abstract annote archive archive_location archive-place authority
-        call-number citation-label citation-number collection-title
-        container-title container-title-short dimensions DOI event event-place
-        first-reference-note-number genre ISBN ISSN jurisdiction keyword
-        locator medium note original-publisher original-publisher-place
-        original-title page page-first PMID PMCID publisher publisher-place
-        references section source status title title-short URL version
+        abstract
+        annote
+        archive
+        archive_collection
+        archive_location
+        archive-place
+        authority
+        call-number
+        citation-key
+        citation-label
+        collection-title
+        container-title
+        container-title-short
+        dimensions
+        division
+        DOI
+        event
+        event-place
+        event-title
+        genre
+        ISBN
+        ISSN
+        jurisdiction
+        keyword
+        language
+        license
+        medium
+        note
+        original-publisher
+        original-publisher-place
+        original-title
+        part
+        part-title
+        PMCID
+        PMID
+        printing
+        publisher
+        publisher-place
+        references
+        reviewed-genre
+        reviewed-title
+        scale
+        source
+        status
+        title
+        title-short
+        translated-title
+        URL
+        volume-title
         year-suffix
       }
     })

data/lib/csl/treelike.rb

@@ -17,9 +17,9 @@ module CSL
       @nodename ||= self.class.name.split(/::/)[-1].gsub(/([[:lower:]])([[:upper:]])/, '\1-\2').downcase
     end
 
-    def each_child
+    def each_child(&block)
       if block_given?
-        children.each(&Proc.new)
+        children.each(&block)
         self
       else
         enum_for :each_child
@@ -167,11 +167,11 @@ module CSL
     end
 
     # Traverses the node's sub-tree in depth-first order.
-    def each_descendant
+    def each_descendant(&block)
       if block_given?
         each_child do |child|
           yield child
-          child.each_descendant(&Proc.new)
+          child.each_descendant(&block)
         end
 
         self
@@ -230,7 +230,11 @@ module CSL
     %w{ ancestors descendants siblings root depth }.each do |name|
       ivar = "@#{name}"
       define_method("#{name}!") do
-        instance_variable_get(ivar) || send(name)
+        if instance_variable_defined?(ivar)
+          instance_variable_get(ivar) 
+        else 
+          send(name)
+        end
       end
     end
 
@@ -376,9 +380,9 @@ module CSL
 
           # Iterates through all children. Nil values are skipped and Arrays
           # expanded.
-          def each
+          def each(&block)
             if block_given?
-              order.each(&Proc.new)
+              order.each(&block)
               self
             else
               to_enum

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL
-  VERSION = '1.5.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/vendor/schema/csl-choose.rng

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns:cs="http://purl.org/net/xbiblio/csl" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
+  <div>
+    <a:documentation>cs:choose - Conditional Statements"</a:documentation>
+    <define name="rendering-element.choose">
+      <element name="cs:choose">
+        <a:documentation>Use to conditionally render rendering elements.</a:documentation>
+        <ref name="choose.if"/>
+        <zeroOrMore>
+          <ref name="choose.else-if"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="choose.else"/>
+        </optional>
+      </element>
+    </define>
+    <define name="choose.if">
+      <element name="cs:if">
+        <oneOrMore>
+          <ref name="condition"/>
+        </oneOrMore>
+        <ref name="match"/>
+        <zeroOrMore>
+          <ref name="rendering-element"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="choose.else-if">
+      <element name="cs:else-if">
+        <oneOrMore>
+          <ref name="condition"/>
+        </oneOrMore>
+        <ref name="match"/>
+        <zeroOrMore>
+          <ref name="rendering-element"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="choose.else">
+      <element name="cs:else">
+        <oneOrMore>
+          <ref name="rendering-element"/>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="condition">
+      <choice>
+        <attribute name="disambiguate" a:defaultValue="true">
+          <a:documentation>If used, the element content is only rendered if it disambiguates two
+otherwise identical citations. This attempt at disambiguation is only
+made after all other disambiguation methods have failed.</a:documentation>
+          <value>true</value>
+        </attribute>
+        <attribute name="is-numeric">
+          <a:documentation>Tests whether the given variables contain numeric text.</a:documentation>
+          <list>
+            <oneOrMore>
+              <ref name="variables"/>
+            </oneOrMore>
+          </list>
+        </attribute>
+        <attribute name="is-uncertain-date">
+          <a:documentation>Tests whether the given date variables contain approximate dates.</a:documentation>
+          <list>
+            <oneOrMore>
+              <ref name="variables.dates"/>
+            </oneOrMore>
+          </list>
+        </attribute>
+        <attribute name="locator">
+          <a:documentation>Tests whether the locator matches the given locator types.</a:documentation>
+          <list>
+            <oneOrMore>
+              <ref name="terms.locator"/>
+            </oneOrMore>
+          </list>
+        </attribute>
+        <attribute name="position">
+          <a:documentation>Tests whether the cite position matches the given positions.</a:documentation>
+          <list>
+            <oneOrMore>
+              <choice>
+                <value>first</value>
+                <value>subsequent</value>
+                <value>ibid</value>
+                <value>ibid-with-locator</value>
+                <value>near-note</value>
+              </choice>
+            </oneOrMore>
+          </list>
+        </attribute>
+        <attribute name="type">
+          <a:documentation>Tests whether the item matches the given types.</a:documentation>
+          <list>
+            <oneOrMore>
+              <ref name="item-types"/>
+            </oneOrMore>
+          </list>
+        </attribute>
+        <attribute name="variable">
+          <a:documentation>Tests whether the default ("long") forms of the given variables
+contain non-empty values.</a:documentation>
+          <list>
+            <oneOrMore>
+              <ref name="variables"/>
+            </oneOrMore>
+          </list>
+        </attribute>
+      </choice>
+    </define>
+    <define name="match">
+      <optional>
+        <attribute name="match" a:defaultValue="all">
+          <a:documentation>Set the testing logic.</a:documentation>
+          <choice>
+            <value>all</value>
+            <a:documentation>Element only tests "true" when all conditions test "true" for all
+given test values.</a:documentation>
+            <value>any</value>
+            <a:documentation>Element tests "true" when any condition tests "true" for any given
+test value.</a:documentation>
+            <value>none</value>
+            <a:documentation>Element only tests "true" when none of the conditions test "true"
+for any given test value.</a:documentation>
+          </choice>
+        </attribute>
+      </optional>
+    </define>
+  </div>
+</grammar>