jekyll-scholar 6.3.1 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452e18974fffbcc53b889b3c5669fbcd545a327462a72b3d331764019e9fc664
-  data.tar.gz: 90aab98a5f43f43c90a576b8eb1df3a2c05c9ca7581d6112871ad9172f4ddcb2
+  metadata.gz: aea0dbf09c4b9675d2341466637d0d869ca493ae944bd4a151d62d080debada1
+  data.tar.gz: a060e41c331f683ac52f7eaff50d42e3c50f9715e415f6326cc6fc6c1efddf6f
 SHA512:
-  metadata.gz: 03156b59764f5e578aa60b227b4308d3590b96490a2a5ae2dd5bc4c50b689a3aedcfb98e98a1415207e59b7b60eba0fd7f0d6d8cf2d4b0d4e7b75d417e50e6d3
-  data.tar.gz: 6a626feb3f485af7d4f7ef8ff76064f520bf7351fed4ee764b27e0c2f5ea15b4046acd07a5520a7248b91d166300ff0372b25cba939f88ac82658f04a3575c5d
+  metadata.gz: b529c1db74c86b0fdc854725b3251463a06a18c5818cff4630ba17a5d34bf661f3a3c33bd23bcaee553cb5b9e4edbd5d9c4d602f67bd48ee4d811205c3690561
+  data.tar.gz: 3bbef145e79ef2e5e18732ec345f94726ca97e55a040c57509dc51308f8fafdf24ab21c010570f52eeef7fbcf79248f042ed1910c6a2f81293abdee42bc44d91

data/features/bibtex.feature

@@ -557,3 +557,35 @@ Feature: BibTeX
     And the "_site/scholar.html" file should exist
     And I should see "Estudios de Asia y Africa</i>, n.º 22" in "_site/scholar.html"
     And I should see "Estudios De Asia y Africa</i>, no. 22" in "_site/scholar.html"
+
+  @latex
+  Scenario: Simple Bibliography with LaTeX directives
+    Given I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{rosso_image_2006,
+        address = {{Paris}},
+        series = {{Arch{\'e}ologie et histoire de l'art}},
+        title = {{L'image de l'empereur en Gaule romaine :  portraits et inscriptions}},
+        isbn = {978-2-7355-0583-8},
+        lccn = {Tolbiac - Rez de Jardin - Philosophie, histoire, sciences de l'homme - Magasin - 2006-174258},
+        shorttitle = {{L'image de l'empereur en Gaule romaine}},
+        language = {fre},
+        number = {20},
+        publisher = {{{\'E}d. du Comit{\'e} des travaux historiques et scientifiques}},
+        author = {Rosso, Emmanuelle},
+        year = {2006},
+        keywords = {Empereurs,Inscriptions latines,Sculpture de portraits romaine},
+        note = {ill., couv. ill. 27 cm. Ouvrage issu des m{\'e}moires de ma{\^i}trise et de DEA. Bibliogr. p. 561-582. Notes bibliogr.}
+      }
+      """
+    And I have a page "test.md":
+      """
+      ---
+      ---
+      {% bibliography %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/test.html" file should exist
+    And I should see "L’image de l’empereur en Gaule romaine" in "_site/test.html"

data/features/layout.feature

@@ -49,3 +49,67 @@ Feature: Bibliographies in Layouts
     And I should see "<i>Smalltalk Best Practice Patterns</i>" in "_site/scholar.html"
 
 
+  Scenario: I want to interpolate variables in my layout
+    Given I have a "_bibliography" directory
+    And I have a file "_bibliography/a.bib":
+      """
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a file "_bibliography/b.bib":
+      """
+      @book{smalltalk,
+        title     = {Smalltalk Best Practice Patterns},
+        author    = {Kent Beck},
+        year      = {1996},
+        publisher = {Prentice Hall}
+      }
+      """
+    And I have a "_layouts" directory
+    And I have a file "_layouts/page.html":
+      """
+      ---
+      ---
+      {{ page.title }}
+      <div>
+        {{ content }}
+      </div>
+      <div>
+        {% bibliography --file {{page.bibliography}} %}
+      </div>
+      """
+    And I have a page "a.html":
+      """
+      ---
+      layout: page
+      title: Page A
+      bibliography: a
+      ---
+      A-A-A
+      """
+    And I have a page "b.html":
+      """
+      ---
+      layout: page
+      title: Page B
+      bibliography: b
+      ---
+      B-B-B
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/a.html" file should exist
+    And I should see "Page A" in "_site/a.html"
+    And I should see "A-A-A" in "_site/a.html"
+    And I should see "<i>The Ruby Programming Language</i>" in "_site/a.html"
+    And I should not see "<i>Smalltalk Best Practice Patterns</i>" in "_site/a.html"
+    And the "_site/b.html" file should exist
+    And I should see "Page B" in "_site/b.html"
+    And I should see "B-B-B" in "_site/b.html"
+    And I should see "<i>Smalltalk Best Practice Patterns</i>" in "_site/b.html"
+    And I should not see "<i>The Ruby Programming Language</i>" in "_site/b.html"
+

data/lib/jekyll/scholar/utilities.rb

@@ -166,7 +166,7 @@ module Jekyll
       end
 
       def bibtex_paths
-        @bibtex_paths ||= bibtex_files.map { |file|
+        bibtex_files.map { |file|
           interpolated_file = interpolate file
           extend_path interpolated_file
         }
@@ -178,21 +178,35 @@ module Jekyll
       end
 
       def bibliography
+        paths = bibtex_paths
+
+        # Clear @bibliography if sources change! See #282
+        unless @paths.nil? || @paths == paths
+          @bibliography = nil
+        end
+
         unless @bibliography
           @bibliography = BibTeX::Bibliography.parse(
-            bibtex_paths.reduce('') { |s, p| s << IO.read(p) },
+            paths.reduce('') { |s, p| s << IO.read(p) },
             bibtex_options
           )
+
+          @paths = paths
+
           @bibliography.replace_strings if replace_strings?
           @bibliography.join if join_strings? && replace_strings?
-        end
 
-        # Remove duplicate entries
-        @bibliography.uniq!(*match_fields) if remove_duplicates?
+          # Remove duplicate entries
+          @bibliography.uniq!(*match_fields) if remove_duplicates?
+        end
 
         @bibliography
       end
 
+      def bibliography_stale?
+      end
+
+
       def query
         interpolate @query
       end

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.3.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll