asciidoctor-bibliography 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29744edf85af3d884fd492dee1deef3a10a317dfd7c1085948dfb1f24938ff9a
-  data.tar.gz: 61c41f1153c9709ecbfe6075524c1988a9459a6c17f86936f36da170436a0b54
+  metadata.gz: 2dea03494679072cad900828875fc0cb3dc3eb3f0f4653170ed7ef7981fef4ff
+  data.tar.gz: 36d894f8e6a4920598977929397e05ae7e840403ba23fb0971de8b37163d0d5c
 SHA512:
-  metadata.gz: 4386ea833295bff8f81d026dc8b18493d19f4bbef2c997e9134d9ebbef90b35e5861f1b9c83cd64f7d9ef48922af9799a415c93fc2e16ec9e70f4401b7a9371f
-  data.tar.gz: df9b5ecf5db644a1bd54d18798e04ed7eac279e46d6280a399cb60e689f21d6e4d0c6eef9b8d77d9201109e57528411d7b327bd176128dfd9316f2129e731817
+  metadata.gz: 488fc4067b7fbbeb69eb511b2fcfc31fe181872e07706a472a070c3b5e9dbb1b635083feed330d9e61221f01bddf5d50104dbfe3a1068e89f7b629ec311e3886
+  data.tar.gz: 370215eaa5fb4b4d5714bf91c157a8ada4d932698c180f5b1aab0eb6880c9a57c2d459e51ca9a9d1362c36c01205c5fdad73c8083db6d7fa7ba2965399b84c50

data/.github/workflows/test-and-release.yml

@@ -0,0 +1,47 @@
+name: test-and-release
+
+on:
+  push:
+    branches: [ main ]
+    tags: [ 'v*' ]
+  pull_request:
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0', '3.1' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rspec
+
+  release:
+    name: Release gem
+    needs: test
+    runs-on: ubuntu-latest
+    if: contains(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - uses: cadwallion/publish-rubygems-action@master
+        env:
+          RUBYGEMS_API_KEY: ${{secrets.RIBOSE_RUBYGEMS_API_KEY}}

data/README.adoc

@@ -1,10 +1,11 @@
 = Citations and Bibliography the "asciidoctor-way"
 
-asciidoctor-bibliography lets you handle citations and bibliography the
-http://asciidoctor.org/[asciidoctor]-way!
+asciidoctor-bibliography lets you handle citations and bibliography in
+http://asciidoctor.org/[asciidoctor].
 
-image:https://img.shields.io/gem/v/asciidoctor-bibliography.svg["Gem Version", link="https://rubygems.org/gems/asciidoctor-bibliography"]
-image:https://img.shields.io/travis/riboseinc/asciidoctor-bibliography/master.svg["Build Status", link="https://travis-ci.org/riboseinc/asciidoctor-bibliography"]
+image:https://github.com/riboseinc/asciidoctor-bibliography/actions/workflows/rspec.yml/badge.svg["Build Status", link="https://github.com/riboseinc/asciidoctor-bibliography/actions/workflows/test-and-release.yml"]
+image:https://img.shields.io/gem/v/fontist.svg["Gem Version", link="https://rubygems.org/gems/fontist"]
+image:https://img.shields.io/github/issues-pr-raw/riboseinc/asciidoctor-bibliography.svg["Pull Requests", link="https://github.com/riboseinc/asciidoctor-bibliography/pulls"]
 image:https://codeclimate.com/github/riboseinc/asciidoctor-bibliography/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/asciidoctor-bibliography"]
 
 
@@ -424,11 +425,11 @@ copyright covering the contribution to use the contribution by all means.
 
 Here are a few technical guidelines to follow:
 
-1. Open an https://github.com/riboseinc/asciidoctor-bibliography/issues[issues] to discuss a new feature.
+1. Open an https://github.com/riboseinc/asciidoctor-bibliography/issues[issue] to discuss a new feature.
 2. Write tests to support your new feature.
 3. Make sure the entire test suite passes locally and on CI.
 4. Open a Pull Request.
-5. https://github.com/thoughtbot/guides/tree/master/protocol/git=write-a-feature[Squash your commits] after receiving feedback.
+5. https://github.com/thoughtbot/guides/tree/main/git#write-a-feature[Squash your commits] after receiving feedback.
 6. Party!
 
 == Credits

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task :default => :spec

data/asciidoctor-bibliography.gemspec

@@ -32,19 +32,19 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciidoctor", ">= 1.5.6"
-  spec.add_dependency "bibtex-ruby", "~> 4.4.4"
+  spec.add_dependency "bibtex-ruby", "~> 6.0.0"
   spec.add_dependency "citeproc-ruby", "~> 1.1.7"
   spec.add_dependency "csl-styles", "~> 1.0.1"
   spec.add_dependency "latex-decode", "~> 0.2.2"
-  spec.add_dependency "nokogiri", "~> 1.8.1"
-
-  spec.add_development_dependency "byebug", "~> 10.0.1"
-  spec.add_development_dependency "rake", "~> 12.3.0"
-  spec.add_development_dependency "rspec", "~> 3.7.0"
-  spec.add_development_dependency "rubocop", "~> 0.54.0"
-  spec.add_development_dependency "simplecov", "~> 0.16.1"
-  spec.add_development_dependency "yard", "~> 0.9.12"
+  spec.add_dependency "nokogiri", "~> 1.8"
+
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rspec", "~> 3.7"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "yard"
 end

data/lib/asciidoctor-bibliography/asciidoctor/bibliographer_preprocessor.rb

@@ -79,10 +79,15 @@ module AsciidoctorBibliography
       end
 
       def glob_pattern(pattern_string, base_dir)
-        pattern_string.split(/(?<!\\)\s+/).map do |pattern|
-          Dir.chdir(base_dir) { Dir.glob(pattern) }
+        pattern_string.split.map do |pattern|
+          Dir.chdir(base_dir) { Dir.glob(normalize_separator(pattern)) }
         end.flatten
       end
+
+      def normalize_separator(path)
+        return path if File::ALT_SEPARATOR.nil?
+        path.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
+      end
     end
   end
 end

data/lib/asciidoctor-bibliography/version.rb

@@ -1,3 +1,3 @@
 module AsciidoctorBibliography
-  VERSION = "0.10.3".freeze
+  VERSION = "0.11.0".freeze
 end

data/lib/citeproc/ruby/formats/adoc.rb

@@ -40,7 +40,9 @@ module CiteProc
         end
 
         def aligned_first_accessible?
-          !(node.root.is_a? CSL::Locale) && node.root.bibliography["second-field-align"]
+          !(node.root.is_a? CSL::Locale) &&
+            node.root.respond_to?(:bibliography) &&
+            node.root.bibliography["second-field-align"]
         end
       end
     end

data/spec/macros_spec.rb

@@ -4,12 +4,12 @@ require_relative "citation_helper"
 
 describe "cite macro with apa style" do
   it "formats a complex citation" do
-    expect(formatted_citation("cite:[Erdos65, prefix=see]+[Einstein35, page=41-43]",
+    expect(formatted_citation("cite:[Erdos65, prefix='see ']+[Einstein35, page=41-43]",
                               options: { "bibliography-style" => "apa",
                                          "bibliography-database" => "database.bib",
                                          "bibliography-hyperlinks" => "true" })).
-      to eq "(<<bibliography-default-Einstein35,Einstein, Podolsky, & Rosen, 1935, pp. 41-43>>; " +
-      "<<bibliography-default-Erdos65,seeErdős, Heyting, & Brouwer, 1965>>)"
+      to eq "(<<bibliography-default-Einstein35,Einstein et al., 1935, pp. 41-43>>; " +
+      "<<bibliography-default-Erdos65,see Erdős et al., 1965>>)"
   end
 end
 
@@ -19,7 +19,7 @@ describe "cite macro with arbitrary interpolated text" do
                               options: { "bibliography-style" => "apa",
                                          "bibliography-database" => "database.bib",
                                          "bibliography-hyperlinks" => "true" })).
-      to eq "(<<bibliography-default-Erdos65,foo Erdős, Heyting, & Brouwer, 1965 bar>>)"
+      to eq "(<<bibliography-default-Erdos65,foo Erdős et al., 1965 bar>>)"
   end
 end
 
@@ -48,6 +48,6 @@ describe "cite macro using more than two keys" do
                               options: { "bibliography-style" => "apa",
                                          "bibliography-database" => "database.bib",
                                          "bibliography-hyperlinks" => "true" })).
-      to eq "(<<bibliography-default-Einstein35,Einstein, Podolsky, & Rosen, 1935>>; <<bibliography-default-Erdos65,Erdős, Heyting, & Brouwer, 1965>>; <<bibliography-default-Lane12a,Lane, 2000>>; <<bibliography-default-Lane12b,Mane & Smith, 2000>>)"
+      to eq "(<<bibliography-default-Einstein35,Einstein et al., 1935>>; <<bibliography-default-Erdos65,Erdős et al., 1965>>; <<bibliography-default-Lane12a,Lane, 2000>>; <<bibliography-default-Lane12b,Mane & Smith, 2000>>)"
   end
 end

data/spec/sanity_spec.rb

@@ -86,7 +86,7 @@ describe "asciidoctor integration" do
         <p>Hello World. (<a href="#bibliography-default-Foo00">Bar, 2000</a>)</p>
         </div>
         <div class="paragraph">
-        <p><a id="bibliography-default-Foo00"></a>Bar, F. (2000). Title.</p>
+        <p><a id="bibliography-default-Foo00"></a>Bar, F. (2000). <em>Title</em>.</p>
         </div>
         </div>
       BODY
@@ -119,7 +119,7 @@ describe "asciidoctor integration" do
         <p>This is content from a nested file. (<a href="#bibliography-default-Foo00">Bar, 2000</a>)</p>
         </div>
         <div class="paragraph">
-        <p><a id="bibliography-default-Foo00"></a>Bar, F. (2000). Title.</p>
+        <p><a id="bibliography-default-Foo00"></a>Bar, F. (2000). <em>Title</em>.</p>
         </div>
         </div>
       BODY
@@ -183,22 +183,22 @@ describe "asciidoctor integration" do
         <div class="sect2">
         <h3 id="_default">Default</h3>
         <div class="paragraph">
-        <p><a id="bibliography-default-Foo00"></a>Bar, F. (2000). Title.</p>
+        <p><a id="bibliography-default-Foo00"></a>Bar, F. (2000). <em>Title</em>.</p>
         </div>
         </div>
         <div class="sect2">
         <h3 id="_first">First</h3>
         <div class="paragraph">
-        <p><a id="bibliography-first-Foo00"></a>Bar, F. (2000). Title.</p>
+        <p><a id="bibliography-first-Foo00"></a>Bar, F. (2000). <em>Title</em>.</p>
         </div>
         <div class="paragraph">
-        <p><a id="bibliography-first-Qux00"></a>Zot, Q. (3000). Title.</p>
+        <p><a id="bibliography-first-Qux00"></a>Zot, Q. (3000). <em>Title</em>.</p>
         </div>
         </div>
         <div class="sect2">
         <h3 id="_last">Last</h3>
         <div class="paragraph">
-        <p><a id="bibliography-last-Qux00"></a>Zot, Q. (3000). Title.</p>
+        <p><a id="bibliography-last-Qux00"></a>Zot, Q. (3000). <em>Title</em>.</p>
         </div>
         </div>
         </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-bibliography
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.4
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.4
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: citeproc-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -86,98 +86,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0'
 description: |
   asciidoctor-bibliography lets you handle citations and bibliography the "asciidoctor-way"!
 
@@ -198,12 +198,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/test-and-release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.adoc
@@ -326,14 +326,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Citations and bibliography the "asciidoctor-way"

data/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  -  2.3
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - bundle exec rspec
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT