bibmarkdown 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e44cd9b80ded7fea0a9b95d4155da2d1cdf7115
-  data.tar.gz: eaf09d977f1ab9a032e0cef5c6e165eeb505903c
+  metadata.gz: b1ae9c68a4ae3e578f2e0c51ac4848ad49ba8615
+  data.tar.gz: 3a02f49a6aaf61dc9e04c5b6c63449a691574198
 SHA512:
-  metadata.gz: 241bf7dc4aeafe5ca924e29457c314ed67cee26c4eab8cbd9e4b7f3af3a279cde3eea7f46cf8a7cf5260a9d2c732f9c0df85d85d0310bf91bd195ba5b4f8b54f
-  data.tar.gz: 59a5703d1ff9fc4f1f83cc6f3e639b0c08d4bf5d9f9d26771d3d5d66aca593ddac2acc0ecdbb7c5fb3f65293b5ea243bd68ea4c228a6755510e77f28ec6ff68a
+  metadata.gz: 46cd8fc901d0000095b9f9ce5abdf25a8cb44610e485f096d8803540172fd8438e3713b11f6c5342c74856178e2cf5aea36ea9fbf846deba002ca1d82fbb885a
+  data.tar.gz: 272d0cef6ebb59597cb8ec2da626c7b807fd8499362c414d33fa8c5768f042990fadabe8a77341863c56779e610420366edd1df4fbc6dd060d9a92f0c8ea3831

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/bibmarkdown.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bibmarkdown 1.1.0 ruby lib
+# stub: bibmarkdown 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bibmarkdown"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ruben Verborgh"]
-  s.date = "2017-01-05"
+  s.date = "2017-05-09"
   s.email = "ruben@verborgh.org"
   s.extra_rdoc_files = [
     "LICENSE.md",

data/lib/bibmarkdown/document.rb

@@ -11,44 +11,50 @@ module BibMarkdown
     end
 
     def to_markdown
-      reference_ids = {}
+      @references = {}
 
       # Replace all citations by links
-      markdown = @source.gsub %r{\[([^\]]*)\]\(cite:(\w+)\s+([^\)]+)\)} do |match|
-        html = $1; rel = $2; key = $3
+      markdown = @source.gsub %r{\[([^\]]*)\]\(cit[eo]:(\w+)\s+([^\)]+)\)} do |match|
+        text = $1; rel = $2; keys = $3
 
-        # Look up or assign reference ID
-        if reference_ids.has_key? key
-          reference_id = reference_ids[key]
-        else
-          reference_id = reference_ids[key] = reference_ids.length + 1
-        end
-
-        # Look up citation and its URL
-        entry = @entries[key]
-        raise "Failed to generate references: entry '#{key}' does not exist." unless entry
-        url = entry[:url] || ''
+        # Create the references
+        refs = keys.strip.split(/\s*,\s*/).map {|key| create_reference key }
+        raise "Missing reference key in #{match}" if refs.empty?
+        reflinks = refs.map{|r| r[:link]}.join ''
 
-        # Create the reference
-        reflink = create_link "[#{reference_id}]", "#ref-#{reference_id}", class: 'reference'
-
-        # If the text is empty, just output the reference
-        if html.empty?
-          reflink
-        # If there is no URL, just output the text with the reference
-        elsif url.empty?
-          "#{html} #{reflink}"
-        # Otherwise, output the link and the reference
+        # If the link text is empty, output links to the references
+        if text.empty?
+          reflinks
+        # If there is no URL, output the text followed by links to the references
+        elsif refs.first[:url].empty?
+          "#{text} #{reflinks}"
+        # Otherwise, output the linked text and the references
         else
-          "#{create_link html, url, property: 'http://purl.org/spar/cito/' + rel} #{reflink}"
+          property = 'http://purl.org/spar/cito/' + rel
+          "#{create_link text, refs.first[:url], property: property} #{reflinks}"
         end
       end
 
-      # Append the reference list to the text
-      "#{markdown}\n\n#{references_html reference_ids}".rstrip
+      # Append the reference list to the document
+      "#{markdown}\n\n#{references_html}".rstrip
     end
 
     protected
+    def create_reference key
+      return @references[key] if @references.has_key? key
+
+      # Look up citation and its URL
+      entry = @entries[key]
+      raise "Failed to generate references: entry '#{key}' does not exist." unless entry
+      url = entry[:url] || ''
+
+      # Assign an ID and create a link to the reference
+      id = @references.length + 1
+      link = create_link "[#{id}]", "#ref-#{id}", class: 'reference'
+
+      @references[key] = { id: id, url: url, link: link }
+    end
+
     def h text
       CGI::escapeHTML(text || '')
     end
@@ -59,14 +65,14 @@ module BibMarkdown
       %Q{<a #{attrs.join ' '}>#{html}</a>}
     end
 
-    def references_html reference_ids
-      if reference_ids.empty?
+    def references_html
+      if @references.empty?
         ''
       else
         html =  %Q{<h2 id="references">References</h2>\n}
         html += %Q{<dl class="references">\n}
-        reference_ids.each do |key, id|
-          html += %Q{  <dt id="ref-#{id}">[#{id}]</dt>\n}
+        @references.each do |key, ref|
+          html += %Q{  <dt id="ref-#{ref[:id]}">[#{ref[:id]}]</dt>\n}
           html += %Q{  <dd>#{reference_html key}</dd>\n}
         end
         html += %Q{</dl>\n}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibmarkdown
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ruben Verborgh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citeproc-ruby