jekyll-scholar 5.12.0 → 5.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e25d6efe7c8dee59ef300050b011a440db405e8faf3d67df0a7cd338f66463
-  data.tar.gz: 95d5957d275047e9039124fa70e33662450e8e7032671c3639ce7d5247dd83ad
+  metadata.gz: f359f44f4b469aa193816eba500f7681fc030ed23dbf766ae1ad2a8e4803eef2
+  data.tar.gz: 6a69cfd5619d538f8ddce416f4e1b188972823cc245933af39f96fc2413bebdc
 SHA512:
-  metadata.gz: 386d44e9ad73e9f48ffc82c7bce87347a3087192358227271962df940e046c64df085af49c40040e1d9779494476005b371f0f66501746fdeaab2a4449446656
-  data.tar.gz: e39490aa41dee0744b9a1eb158d0e7e1b16c48c97f4e74147708d1f4c57b2fa9ce49022234840531c1ce51e1d125861cb35882d1afc986bd510f0069069158f1
+  metadata.gz: 5edcdf79e17f89ab9fe6058b88b78fa352cb81769bde7be530e57afa2cd7ea0c5e52e317bc87d55a12387dc1261a81947da04046b0f611e198461a458124b5e7
+  data.tar.gz: 5dfff2a5f869f20f32aab61933088f569fa9c2f67e0acf1a61dcdf254a3f64fb902db49a503d8e2f99cc7fffa42929149a14787854841145d33c3894f0859809

data/Gemfile

@@ -2,17 +2,13 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  if RUBY_VERSION >= '2.2.2'
-    gem 'test-unit'
-  else
-    gem 'minitest', '< 5.0'
-  end
-
+  gem 'test-unit'
   gem 'rake'
   gem 'redgreen', '~> 1.2'
   gem 'shoulda', '~> 3.5'
   gem 'cucumber', '1.3.11'
   gem 'redcarpet'
+  gem 'unicode_utils' if RUBY_VERSION < '2.4'
 end
 
 group :extra do
@@ -21,17 +17,9 @@ end
 
 group :coverage do
   gem 'simplecov', '~>0.14', :require => false
-  gem 'rubinius-coverage', :platform => :rbx
   gem 'coveralls', :require => false
 end
 
 group :debug do
-  if RUBY_VERSION > '2.0'
-    gem 'byebug', '~>3.5', :require => false, :platform => :mri
-  else
-    gem 'debugger', '~>1.6', :require => false, :platform => [:mri_19, :mri_20]
-  end
-
-  gem 'rubinius-compiler', '~>2.0', :require => false, :platform => :rbx
-  gem 'rubinius-debugger', '~>2.0', :require => false, :platform => :rbx
+  gem 'byebug', '~>3.5', :require => false, :platform => :mri
 end

data/README.md

@@ -73,7 +73,7 @@ description of all options and their defaults, see
 | `sort_by` | `none` | Specifies if and how bibliography entries are sorted. Entries can be sorted on multiple fields, by using a list of keys, e.g. `year,month`. Ordering can be specified per sort level, e.g. `order: descending,ascending` will sort the years descending, but per year the months are ascending. If there are more sort keys than order directives, the last order entry is used for the remaining keys. |
 | `order` | `ascending` | Specifies order bibliography entries are sorted in. Can be `ascending` or descending. Ordering can be specified per sort level, e.g. `descending,ascending` will sort in descending on the first key then ascending order on the second key. If there are more sort keys than order directives, the last order entry is used for the remaining keys. |
 | `group_by` | `none` | Specifies how bibliography items are grouped. Grouping can be multi-level, e.g. `type, year` groups entries per publication type, and within those groups per year. |
-| `group_order` | `ascending` |  Ordering for groups is specified in the same way as the sort order. Publication types -- specified with group key `type`, can be ordered by adding `type_order` to the configuration. For example, `type_order: article,techreport` lists journal articles before technical reports. Types not mentioned in `type_order` are considered smaller than types that are mentioned. Types can be merge in one group using the `type_aliases` setting. By default `phdthesis` and `mastersthesis` are grouped as `thesis`. By using, for example, `type_aliases: { inproceedings: article}`, journal and conference articles appear in a single group. The display names for entry types are specified with `type_names`. Names for common types are provided, but they can be extended or overridden. For example, the default name for `article` is *Journal Articles*, but it can be changed to *Papers* using `type_names: { article: Papers }`. |
+| `group_order` | `ascending` |  Ordering for groups is specified in the same way as the sort order. Publication types -- specified with group key `type`, can be ordered by adding `type_order` to the configuration. For example, `type_order: [article,techreport]` lists journal articles before technical reports. Types not mentioned in `type_order` are considered smaller than types that are mentioned. Types can be merge in one group using the `type_aliases` setting. By default `phdthesis` and `mastersthesis` are grouped as `thesis`. By using, for example, `type_aliases: { inproceedings: article}`, journal and conference articles appear in a single group. The display names for entry types are specified with `type_names`. Names for common types are provided, but they can be extended or overridden. For example, the default name for `article` is *Journal Articles*, but it can be changed to *Papers* using `type_names: { article: Papers }`. |
 | `bibtex_filters` | `latex,smallcaps,superscript` | Configures which [BibTeX-Ruby](https://github.com/inukshuk/bibtex-ruby) formatting filters values of entries should be passed through. The default `latex` filter converts LaTeX character escapes into unicode, `smallcaps` converts the `\textsc` command into a HTML `<font style=\"font-variant: small-caps\">` tag, and `superscript` which converts the `\textsuperscript` command into a HTML `<sup>` tag. |
 
 

data/features/repository.feature

@@ -246,3 +246,46 @@ Feature: PDF Repository
     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"
+
+  @repository
+  Scenario: A bibliography with a single entry with a complex name
+    Given I have a scholar configuration with:
+      | key                   | value             |
+      | source                | ./_bibliography   |
+      | repository            | papers            |
+      | bibliography_template | bibliography      |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{test:book/ruby/Flanagan08,
+        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 "papers/test_book" directory
+    And I have a "papers/test_book/ruby" directory
+    And I have a file "papers/test_book/ruby/Flanagan08.pdf":
+      """
+      The PDF
+      """
+    And I have a "_layouts" directory
+    And I have a file "_layouts/bibliography.html":
+      """
+      ---
+      ---
+      {{ reference }} Link: {{ link }}
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/papers/test_book/ruby/Flanagan08.pdf" file should exist
+    And I should see "The Ruby Programming Language" in "_site/scholar.html"
+    And I should see "Link: /papers/test_book/ruby/Flanagan08.pdf" in "_site/scholar.html"

data/lib/jekyll/scholar/utilities.rb

@@ -371,7 +371,8 @@ module Jekyll
         base = Dir[site.source][0]
 
         Dir[File.join(site.source, repository_path, '**/*')].each do |path|
-          parts = File.basename(path).split(repository_file_delimiter, 2)
+          parts = Pathname(path).relative_path_from(Pathname(File.join(base, repository_path)))
+          parts = parts.to_path.split(repository_file_delimiter, 2)
           repo[parts[0]][parts[1]] =
             Pathname(path).relative_path_from(Pathname(base))
         end
@@ -570,7 +571,9 @@ module Jekyll
       end
 
       def repository_link_for(entry, base = base_url)
-        links = repository[entry.key]
+        name = entry.key.to_s.dup
+        name.gsub!(/[:\s]+/, '_')
+        links = repository[name]
         url   = links['pdf'] || links['ps']
 
         return unless url
@@ -579,7 +582,9 @@ module Jekyll
       end
 
       def repository_links_for(entry, base = base_url)
-        Hash[repository[entry.key].map { |ext, url|
+        name = entry.key.to_s.dup
+        name.gsub!(/[:\s]+/, '_')
+        Hash[repository[name].map { |ext, url|
           [ext, File.join(base, url)]
         }]
       end

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.13.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll