jekyll-scholar 5.8.1 → 5.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5580ad167dd318d827b12d25b568b01a8839f695
-  data.tar.gz: b222a4eacf852bbdcaccece79fafa83def744561
+  metadata.gz: 90dcebb42bbaea9a1c38409bf3ea692140b71a3a
+  data.tar.gz: 9d1acbf5ea85649e7b66ff78ce16dad1705ae859
 SHA512:
-  metadata.gz: 170732689212bbde970ffb52030d545e1118f34ae49754fd34d43de7915c223db60e278a98d710f17b0f481165286dc9dd4d1acb204c9edf8df85700bba88e64
-  data.tar.gz: 607485599c35cff2aed70356ea1c114cd4e54d099cdc521e6d888bc2c4807de4ac91cd8c40e2c7e7a213580c2340e4543f66a34876b6b4ea1825a4f7a8484ce6
+  metadata.gz: 3a29f85b19f3e733e80052a4c9012cfc4acafbf30ca446eb283c893309a76e50242e6ce068eab262ff07794531c4d11d171857b05bc6ef8168dd6c3403319d57
+  data.tar.gz: 074ef9f7336b289abd5c2a23199fddd8375fe2fd5d958cc2d77a078a99414addf47be33fa8a4edc3158407d83ea858bd079357651613c5db7b2e02bb3d98b317

data/features/repository.feature

@@ -49,5 +49,52 @@ Feature: PDF Repository
     And I should see "Link: /papers/ruby.pdf" in "_site/scholar.html"
     And I should see "Slides: /papers/ruby.ppt" in "_site/scholar.html"
 
-
-
+  @repository
+  Scenario: A bibliography with a single entry and a repository, with source directory set
+    Given I have a configuration file with:
+      | key                   | value             |
+      | source                | src               |
+    And I have a scholar configuration with:
+      | key                   | value             |
+      | source                | _bibliography     |
+      | repository            | papers            |
+      | bibliography_template | bibliography      |
+    And I have a "src" directory
+    And I have a "src/_bibliography" directory
+    And I have a file "src/_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 "src/papers" directory
+    And I have a file "src/papers/ruby.pdf":
+      """
+      The PDF
+      """
+    And I have a file "src/papers/ruby.ppt":
+      """
+      The PPT
+      """
+    And I have a "src/_layouts" directory
+    And I have a file "src/_layouts/bibliography.html":
+      """
+      ---
+      ---
+      {{ reference }} Link: {{ link }} Slides: {{ links.ppt }}
+      """
+    And I have a page "src/scholar.html":
+      """
+      ---
+      ---
+      {% bibliography %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "The Ruby Programming Language" in "_site/scholar.html"
+    And the "_site/papers/ruby.pdf" file should exist
+    And I should see "Link: /papers/ruby.pdf" in "_site/scholar.html"
+    And I should see "Slides: /papers/ruby.ppt" in "_site/scholar.html"

data/features/support/env.rb

@@ -21,13 +21,25 @@ require 'tmpdir'
 
 TEST_DIR = File.join(Dir.tmpdir, 'jekyll')
 
-def run_jekyll(options = {})
-
-  options['source'] ||= TEST_DIR
-  options['destination'] ||= File.join(TEST_DIR, '_site')
+def prepend_test_dir(options, key)
+  if options.key?(key)
+    if Pathname(options[key]).relative?
+      options[key] = File.join(TEST_DIR, options[key])
+    end
+  else
+    options[key] ||= TEST_DIR
+  end
+end
 
+def run_jekyll(options = {})
+  
   options = Jekyll.configuration(options)
 
+  prepend_test_dir(options, 'source')
+  prepend_test_dir(options, 'destination')
+
+  print options['source'] + "\n"
+  print options['destination'] + "\n"
   site = Jekyll::Site.new(options)
   site.process
 

data/lib/jekyll/scholar/utilities.rb

@@ -351,10 +351,14 @@ module Jekyll
         repo = Hash.new { |h,k| h[k] = {} }
 
         return repo unless repository?
-
-        Dir[File.join(repository_path, '**/*')].each do |path|
+        
+        # ensure that the base directory format is literally 
+        # the same as the entries that are in the directory
+        base = Dir[site.source][0] 
+        
+        Dir[File.join(site.source, repository_path, '**/*')].each do |path|
           extname = File.extname(path)
-          repo[File.basename(path, extname)][extname[1..-1]] = path
+          repo[File.basename(path, extname)][extname[1..-1]] = Pathname(path).relative_path_from(Pathname(base))
         end
 
         repo
@@ -396,7 +400,7 @@ module Jekyll
 
       def scholar_source
         source = config['source']
-
+        
         # Improve by using Pathname from stdlib?
         return source if source.start_with?('/') && File.exists?(source)
 

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 5.8.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll