jekyll-scholar 5.8.2 → 5.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90dcebb42bbaea9a1c38409bf3ea692140b71a3a
-  data.tar.gz: 9d1acbf5ea85649e7b66ff78ce16dad1705ae859
+  metadata.gz: e0336aad197d9d6702e21a3ccf73e4b5e94f07e9
+  data.tar.gz: 8bf2a171a6fe4c213b6610f2a826c8682f5b6e3c
 SHA512:
-  metadata.gz: 3a29f85b19f3e733e80052a4c9012cfc4acafbf30ca446eb283c893309a76e50242e6ce068eab262ff07794531c4d11d171857b05bc6ef8168dd6c3403319d57
-  data.tar.gz: 074ef9f7336b289abd5c2a23199fddd8375fe2fd5d958cc2d77a078a99414addf47be33fa8a4edc3158407d83ea858bd079357651613c5db7b2e02bb3d98b317
+  metadata.gz: 8750a1a6e6bb4491ebb35936d00087e8c63577661a82673ef511f036d9d6a4f63b3b8615972620f3cc758e420a69afadf1e92a2fdcf0636076df4da3da67fb85
+  data.tar.gz: fad576cbbebed7780fcdd5b3b3cb4dd91d0f1f73465eeba84467b31356451810165b8dd34dcf7aa2affce91638ec7514189fcb9f7db5c7070f4ee7591dcb2c9d

data/.travis.yml

@@ -1,20 +1,29 @@
 language: ruby
-bundler_args: --without debug
-script: bundle exec rake test_with_coveralls
 sudo: false
 cache: bundler
-rvm:
-  - 2.3.0
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
-  - rbx-2
+matrix:
+  include:
+  - rvm: 2.3.1
+    env: WITH_COVERALLS=true
+  - rvm: 2.1
+    env: WITH_COVERALLS=false
+  - rvm: 2.0
+    env: WITH_COVERALLS=false
+install:
+- if [[ $WITH_COVERALLS = "true" ]]; then
+    bundle install --without debug extra;
+  else
+    bundle install --without debug extra coverage;
+  fi
+script:
+- if [[ $WITH_COVERALLS = "true" ]]; then
+    bundle exec rake test_with_coveralls;
+  else
+    bundle exec rake;
+  fi
 notifications:
   email:
     recipients:
       - sylvester@keil.or.at
     on_success: change
-    on_failure: always
-matrix:
-  allow_failures:
-    - rvm: rbx-2
+    on_failure: change

data/Gemfile

@@ -2,12 +2,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-
-  if RUBY_VERSION >= '2.2'
+  if RUBY_VERSION >= '2.2.2'
     gem 'test-unit'
   else
     gem 'minitest', '< 5.0'
-    gem 'listen', '~>3.0.0'
   end
 
   gem 'rake'
@@ -17,7 +15,13 @@ group :development do
   gem 'redcarpet'
 
   gem 'unicode_utils'
+end
+
+group :extra do
+    gem 'listen', '~>3.0.0'
+end
 
+group :coverage do
   gem 'simplecov', '~>0.9', :require => false
   gem 'rubinius-coverage', :platform => :rbx
   gem 'coveralls', :require => false

data/Rakefile

@@ -15,9 +15,13 @@ Cucumber::Rake::Task.new(:features)
 
 task :default => [:features]
 
-require 'coveralls/rake/task'
-Coveralls::RakeTask.new
-task :test_with_coveralls => [:features, 'coveralls:push']
+begin
+  require 'coveralls/rake/task'
+  Coveralls::RakeTask.new
+  task :test_with_coveralls => [:features, 'coveralls:push']
+rescue LoadError => e
+  # ignore
+end
 
 task :release do |t|
   system "gem build jekyll-scholar.gemspec"

data/features/bibtex.feature

@@ -368,4 +368,4 @@ Feature: BibTeX
     When I run jekyll
     Then the _site directory should exist
     And the "_site/scholar.html" file should exist
-    And I should see "{%raw%}@book" in "_site/scholar.html"
+    And I should not see "{%[\w*]raw[\w*]%}" in "_site/scholar.html"

data/features/details.feature

@@ -107,6 +107,53 @@ Feature: Details
     And I should see "Page title: An Umlaut \\\"a!" in "_site/bibliography/ruby.html"
     And I should see "Title: An Umlaut \\\"a!" in "_site/bibliography/ruby.html"
     And I should see "title = {An Umlaut \\\"a!}" in "_site/bibliography/ruby.html"
+    
+
+  @generators
+  Scenario: Raw input can be turned on, but should not generate any {%raw%} tags on the details page, and also not parse the liquid tags inside the bibtex
+    Given I have a scholar configuration with:
+      | key            | value             |
+      | source         | ./_bibliography   |
+      | details_layout | details.html      |
+      | bibtex_filters |                   |
+      | use_raw_bibtex_entry | true        |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{sdf,
+        title     = {{SDF^3}}
+        }
+      """
+    And I have a file "bibliography.html":
+      """
+      ---
+      ---
+      <html>
+      <head></head>
+      <body>
+      {%bibliography%}
+      </body>
+      </html>
+      """
+    And I have a "_layouts" directory
+    And I have a file "_layouts/details.html":
+      """
+      ---
+      ---
+      <html>
+      <head></head>
+      <body>
+      Page title: {{ page.title }}
+      Title: {{ page.entry.title }}
+      {{ page.entry.bibtex }}
+      </body>
+      </html>
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/bibliography/sdf.html" file should exist
+    And I should not see "{%raw%}" in "_site/bibliography/sdf.html"
+    And I should see "SDF\^3" in "_site/bibliography/sdf.html"
 
   @tags @details
   Scenario: Links to Detail Pages are Generated Automatically
@@ -242,3 +289,32 @@ Feature: Details
     Then the _site directory should exist
     And the "_site/bibliography/august.html" file should exist
     And I should see "month = {August}" in "_site/bibliography/august.html"
+
+  @tags @details
+  Scenario: No details
+    Given I have a scholar configuration with:
+      | key            | value             |
+      | source         | ./_bibliography   |
+      | bibliogaphy    | references        |
+    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 "_layouts" directory
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And the "_site/bibliography/ruby.html" file should not exist
+    And I should not see "<a[^>]+href=\"/bibliography/ruby.html\">" in "_site/scholar.html"

data/features/support/env.rb

@@ -32,7 +32,7 @@ def prepend_test_dir(options, key)
 end
 
 def run_jekyll(options = {})
-  
+
   options = Jekyll.configuration(options)
 
   prepend_test_dir(options, 'source')

data/lib/jekyll/scholar/utilities.rb

@@ -455,8 +455,8 @@ module Jekyll
 
       def bibliography_tag(entry, index)
         return missing_reference unless entry
-
-        liquid_template.render(
+        
+        tmp = liquid_template.render(
           reference_data(entry,index)
             .merge(site.site_payload)
             .merge({
@@ -468,6 +468,15 @@ module Jekyll
             :filters => [Jekyll::Filters]
           }
         )
+        # process the generated reference with Liquid, to get the same behaviour as 
+        # when it is used on a page
+        Liquid::Template.parse(tmp).render(
+          site.site_payload, 
+          {
+            :registers => { :site => site },
+            :filters => [Jekyll::Filters]
+          }
+        )
       end
 
       def reference_data(entry, index = nil)

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 5.8.2
+  version: 5.8.3
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -162,4 +162,3 @@ test_files:
 - features/string.feature
 - features/support/env.rb
 - features/support/hooks.rb
-has_rdoc: