jekyll-scholar 5.9.0 → 5.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa155858171a28430fabd6809b18b61b34afae48
-  data.tar.gz: 5b92a94a4abedb754108a1b8f5d7bdd5da7b5cdf
+  metadata.gz: 8414581a958ce3712c77dd03c19d972b905d2d6d
+  data.tar.gz: fa222ae2ff01bb4f0aa94622fe693ab41ac2cad8
 SHA512:
-  metadata.gz: e72d369a92f0be6a3cbd7e931149b365437bc204a5d19b046fb987fbd0122e6f048fc8471f5bb3910328f325f2a51153869dc6cde4d2ae84b3c87dc7aa552344
-  data.tar.gz: 8f31ed291d15017d72d5d3772ff6aee88e90e73195ae971c62973f082ebf7662edc87ba0a6c0bb2cbce7d1a0ce8d75c774185d63960bb73125f97a148706dc0c
+  metadata.gz: 1b2826bab8059be09db7a90f6479aa746b1d8b847fedf8276765f2431c055173327be9eeda4636609a1ea129d534111d81dc48740c0f9bae77170944ee4a70f0
+  data.tar.gz: '0971344cec58a854b6ff2a8c52f58e242a881f061731e7481fb062bbd9e15ae33d2c4eb9972d4a4c1a44077904fa97b650921686f6f7f01099abf7d4e36b71dd'

data/README.md

@@ -433,6 +433,14 @@ to link to supporting material in a ZIP archive:
 
     {{ reference }} [<a href="{{links.zip}}">Supporting Materials</a>]
 
+Since version 5.9.0, Jekyll-Scholar matches files which begin with a BibTeX key
+and are immediately followed by a delimiter (default: "."). All text proceeding
+the delimiter is treated as the file extension. For example, if two files named
+`key.pdf` and `key.slides.pdf` are found, `{{links.pdf}}` and
+`{{links['slides.pdf']}}` will both be populated.  You can use the configuration
+option `repository_file_delimiter` to change the default delimiter.
+
+
 ### Detail Pages
 
 If your layouts directory contains a layout file for bibliography details

data/features/repository.feature

@@ -106,7 +106,6 @@ Feature: PDF Repository
       | source                | ./_bibliography   |
       | repository            | papers            |
       | bibliography_template | bibliography      |
-      | file_delimit          | '.'               |
 
     And I have a "_bibliography" directory
     And I have a file "_bibliography/references.bib":
@@ -147,3 +146,103 @@ Feature: PDF Repository
     And I should see "The Ruby Programming Language" in "_site/scholar.html"
     And I should see "Link: /papers/ruby.pdf" in "_site/scholar.html"
     And I should see "Slides: /papers/ruby.slides.pdf" in "_site/scholar.html"
+
+  @repository
+  Scenario: A bibliography with a single entry and a repository with slides pdf
+    using a custom delimiter
+    Given I have a scholar configuration with:
+      | key                       | value             |
+      | source                    | ./_bibliography   |
+      | repository                | papers            |
+      | bibliography_template     | bibliography      |
+      | repository_file_delimiter | ':'               |
+
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{ruby.ref,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a "papers" directory
+    And I have a file "papers/ruby.ref:pdf":
+      """
+      The PDF
+      """
+    And I have a file "papers/ruby.ref:slides.pdf":
+      """
+      The Slides PDF
+      """
+    And I have a "_layouts" directory
+    And I have a file "_layouts/bibliography.html":
+      """
+      ---
+      ---
+      {{ reference }} Link: {{ link }} Slides: {{ links['slides.pdf'] }}
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/papers/ruby.ref:pdf" file should exist
+    And the "_site/papers/ruby.ref:slides.pdf" file should exist
+    And I should see "The Ruby Programming Language" in "_site/scholar.html"
+    And I should see "Link: /papers/ruby.ref:pdf" in "_site/scholar.html"
+    And I should see "Slides: /papers/ruby.ref:slides.pdf" in "_site/scholar.html"
+
+  @repository
+  Scenario: A bibliography with a single entry and a repository with a directory
+    named using the delimiter with slides pdf
+    Given I have a scholar configuration with:
+      | key                       | value             |
+      | source                    | ./_bibliography   |
+      | repository                | papers.dir        |
+      | bibliography_template     | bibliography      |
+      | repository_file_delimiter | '.'               |
+
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a "papers.dir" directory
+    And I have a file "papers.dir/ruby.pdf":
+      """
+      The PDF
+      """
+    And I have a file "papers.dir/ruby.slides.pdf":
+      """
+      The Slides PDF
+      """
+    And I have a "_layouts" directory
+    And I have a file "_layouts/bibliography.html":
+      """
+      ---
+      ---
+      {{ reference }} Link: {{ link }} Slides: {{ links['slides.pdf'] }}
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/papers.dir/ruby.pdf" file should exist
+    And the "_site/papers.dir/ruby.slides.pdf" file should exist
+    And I should see "The Ruby Programming Language" in "_site/scholar.html"
+    And I should see "Link: /papers.dir/ruby.pdf" in "_site/scholar.html"
+    And I should see "Slides: /papers.dir/ruby.slides.pdf" in "_site/scholar.html"

data/lib/jekyll/scholar/utilities.rb

@@ -353,8 +353,8 @@ module Jekyll
         base = Dir[site.source][0]
 
         Dir[File.join(site.source, repository_path, '**/*')].each do |path|
-          parts = path.split(repository_file_delimiter, 2)
-          repo[File.basename(parts[0])][parts[1]] =
+          parts = File.basename(path).split(repository_file_delimiter, 2)
+          repo[parts[0]][parts[1]] =
             Pathname(path).relative_path_from(Pathname(base))
         end
 

data/lib/jekyll/scholar/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   class Scholar
-    VERSION = '5.9.0'.freeze
+    VERSION = '5.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.9.1
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll