asciidoctor-bibliography 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0aebe410aec21707e9acf513afd0913792a76cd806cff5eb24312ab294e08c4d
-  data.tar.gz: fdffc4aee122f017599de6c51db1b53fd5fd9f006014dea11a420a21c3e85155
+SHA1:
+  metadata.gz: 568b3aeefaaaf19618322048145162faeb1b9d41
+  data.tar.gz: d87637a8e50c389f004fefa1022ad95d5a2eb405
 SHA512:
-  metadata.gz: 210e7f614e817d141c7c7ffe92a3163a1e70a219a5bdc65e5f663ce3d1d53702bbc49ec1f51f95091b99d9e8f668f64854f980e7ce2eb4660bff031b451cfa7f
-  data.tar.gz: c78c2e60e930cd7b0737f9fa0e6d74314b407c641b6b7d9ade6df8e8ab10a98059f444e607305de5ada16334e9d65c9ebe12e10f6282d3efbd604561ec23fe8f
+  metadata.gz: fc4c7d5c15773821a9a0dded3dcda41d34072e3b7f645a683f7bef429dace26e5ec5009f4baceaa7e47d49051127dd9a683b38823efdb33f2beb8c3abbf0f40a
+  data.tar.gz: 77b89168013c0a5d62a84f1a7a47b49741dc82cab82f740e76ba1665b0b0f6589480d59f2a37f54cc991f3de092950a5fac0e716d3e3d2f8c7e29f360609b1de

data/README.adoc

@@ -199,6 +199,13 @@ Currently only the `BibTeX` format is supported, with `.bib` or `.bibtex` extens
 are safe to use: unknown attributes will be silently ignored. If the file has `.biblatex`
 extension the you will receive a warning on compilation.
 
+If you need to include multiple databases, you can simply list their names.
+Wildcards are allowed too:
+
+[source,asciidoc]
+----
+:bibliography-database: db1.bib db2.bib ../dbs/*.bibtex
+----
 
 === Styling
 

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

@@ -12,12 +12,8 @@ module AsciidoctorBibliography
         document.bibliographer.options =
           ::AsciidoctorBibliography::Options.build document, reader
 
-        database_filepath =
-          File.expand_path document.bibliographer.options.database,
-                           document.base_dir
-
         document.bibliographer.database =
-          ::AsciidoctorBibliography::Database.new database_filepath
+          ::AsciidoctorBibliography::Database.new *expand_db_globs(document)
 
         processed_lines = process_lines reader.read_lines, document.bibliographer
         reader.unshift_lines processed_lines
@@ -63,6 +59,19 @@ module AsciidoctorBibliography
           end
         end.flatten
       end
+
+      def expand_db_globs(document)
+        glob_pattern(
+          document.bibliographer.options.database,
+          document.base_dir,
+        )
+      end
+
+      def glob_pattern(pattern_string, base_dir)
+        pattern_string.split(/(?<!\\)\s+/).map do |pattern|
+          Dir.chdir(base_dir) { Dir.glob(pattern) }
+        end.flatten
+      end
     end
   end
 end

data/lib/asciidoctor-bibliography/database.rb

@@ -13,6 +13,8 @@ module AsciidoctorBibliography
 
     def append(filepath)
       concat Database.load(filepath)
+      ensure_no_conflicts!
+      self
     end
 
     def find_entry_by_id(id)
@@ -37,5 +39,15 @@ module AsciidoctorBibliography
         raise Errors::Database::UnsupportedFormat, fileext
       end
     end
+
+    private
+
+    def ensure_no_conflicts!
+      ids = map { |entry| entry["id"] }
+      conflicting_ids = ids.select { |id| ids.count(id) > 1 }.uniq.sort
+      raise Errors::Database::ConflictingIds, <<~MESSAGE if conflicting_ids.any?
+        Conflicting ids were found during database import: #{conflicting_ids}.
+      MESSAGE
+    end
   end
 end

data/lib/asciidoctor-bibliography/errors.rb

@@ -11,6 +11,7 @@ module AsciidoctorBibliography
       class UnsupportedFormat < Error; end
       class FileNotFound < Error; end
       class IdNotFound < Error; end
+      class ConflictingIds < Error; end
     end
   end
 end

data/lib/asciidoctor-bibliography/version.rb

@@ -1,3 +1,3 @@
 module AsciidoctorBibliography
-  VERSION = "0.7.3".freeze
+  VERSION = "0.8.0".freeze
 end

data/spec/database_spec.rb

@@ -42,6 +42,12 @@ describe AsciidoctorBibliography::Database do
       expect { db.append("spec/fixtures/database.bib") }.to(change { db.length })
       expect { db.append("spec/fixtures/database.bibtex") }.to(change { db.length })
     end
+
+    it "raises error if conflicting ids are found" do
+      db.append("spec/fixtures/database.bib")
+      expect { db.append("spec/fixtures/database.bib") }.
+        to raise_exception AsciidoctorBibliography::Errors::Database::ConflictingIds
+    end
   end
 
   describe ".load" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-bibliography
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -326,7 +326,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Citations and bibliography the "asciidoctor-way"