jekyll-scholar 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d847e99be12f0d86a09c4c311c611ec75bc6acfc9c87b6153d12459b7f9739fc
-  data.tar.gz: 7e6f5ccb6857f6b409625cc8dd295fa6c45ea886c8d32ceccfada77c4f58315e
+  metadata.gz: 452e18974fffbcc53b889b3c5669fbcd545a327462a72b3d331764019e9fc664
+  data.tar.gz: 90aab98a5f43f43c90a576b8eb1df3a2c05c9ca7581d6112871ad9172f4ddcb2
 SHA512:
-  metadata.gz: af5f996147e731bdc6366b3c3fa57c80b14d4db68428e4ba96a06090b20c85b62fb82b7ab5d4bf28a7db8bf55ff06149eb75212ead0502c3b94dfc675b2376bc
-  data.tar.gz: 0eadd4d81469a5ea5d2056f30c16c811acf8f29f70b93550720956ef9423f93394fd058abbfd1138b89c2b8af323b7252fa199f1181dd7915b7943781213b9cc
+  metadata.gz: 03156b59764f5e578aa60b227b4308d3590b96490a2a5ae2dd5bc4c50b689a3aedcfb98e98a1415207e59b7b60eba0fd7f0d6d8cf2d4b0d4e7b75d417e50e6d3
+  data.tar.gz: 6a626feb3f485af7d4f7ef8ff76064f520bf7351fed4ee764b27e0c2f5ea15b4046acd07a5520a7248b91d166300ff0372b25cba939f88ac82658f04a3575c5d

data/features/cited_only.feature

@@ -96,7 +96,7 @@ Feature: Cited-only Bibliographies
       ---
       ---
       {% cite smalltalk %}
-      {% bibliography --cited --prefix one %}
+      {% bibliography --cited --clear --prefix one %}
 
       {% cite ruby %}
       {% bibliography --cited --prefix two %}

data/features/interpolate.feature

@@ -44,7 +44,7 @@ Feature: Interpolations ...
     Then the _site directory should exist
     And the "_site/scholar.html" file should exist
     And I should see "The Ruby Programming Language" in "_site/scholar.html"
- 
+
 
   @tags @grouping
   Scenario: Local grouping override - grouping by year with interpolation
@@ -81,3 +81,95 @@ Feature: Interpolations ...
     Then I should see "<h2 class=\"bibliography\">2007</h2>" in "_site/scholar.html"
     And I should see "<h2 class=\"bibliography\">2008</h2>" in "_site/scholar.html"
     And "2008" should come before "2007" in "_site/scholar.html"
+
+  @tags @reference @liquid @interpolate
+  Scenario: Interpolate liquid variables in queries
+    Given I have a scholar configuration with:
+      | key                | value             |
+      | source             | ./_bibliography   |
+      | bibliography       | my_references     |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/my_references.bib":
+      """
+      @book{a,
+        title     = {Book A},
+        year      = {2008}
+      }
+      @book{b,
+        title     = {Book B},
+        year      = {2018}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% assign from = 2000 %}
+      {% assign to = 2010 %}
+      {% bibliography --query @book[year >= {{from}} && year <= {{to}}] %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "Book A" in "_site/scholar.html"
+    And I should not see "Book B" in "_site/scholar.html"
+
+  @tags @bibliography @liquid @interpolate
+  Scenario: Interpolate page variables in queries
+    Given I have a scholar configuration with:
+      | key                | value             |
+      | source             | ./_bibliography   |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{a,
+        title     = {Book A},
+        year      = {2008}
+      }
+      @book{b,
+        title     = {Book B},
+        year      = {2018}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      bibquery: year >= 2000 && year <= 2010
+      ---
+      {% bibliography --query @*[{{page.bibquery}}] %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "Book A" in "_site/scholar.html"
+    And I should not see "Book B" in "_site/scholar.html"
+
+  @tags @bibliography @liquid @interpolate
+  Scenario: Interpolate page variables in queries
+    Given I have a scholar configuration with:
+      | key                | value             |
+      | source             | ./_bibliography   |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{a,
+        title     = {Book A},
+        year      = {2008}
+      }
+      @book{b,
+        title     = {Book B},
+        year      = {2018}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      bibquery: "@book[year >= 2000 && year <= 2010]"
+      ---
+      {% bibliography --query {{page.bibquery}} %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "Book A" in "_site/scholar.html"
+    And I should not see "Book B" in "_site/scholar.html"

data/lib/jekyll/scholar/utilities.rb

@@ -33,7 +33,7 @@ module Jekyll
 
         parser = OptionParser.new do |opts|
 
-         opts.on('-c', '--cited') do |cited|
+          opts.on('-c', '--cited') do |cited|
             @cited = true
           end
 
@@ -41,6 +41,10 @@ module Jekyll
             @cited, @skip_sort = true, true
           end
 
+          opts.on('--clear') do |cited|
+            @clear = true
+          end
+
           opts.on('-r', '--remove_duplicates [MATCH_FIELDS]') do |match_field|
             @remove_duplicates = true
             @match_fields = match_field.split(/,\s+/) if not match_field.nil? 
@@ -108,17 +112,17 @@ module Jekyll
           end
         end
 
-        argv = arguments.split(/(\B-[cCfhqptTsgGOlLomAr]|\B--(?:cited(_in_order)?|bibliography_list_tag|file|query|prefix|text|style|group_(?:by|order)|type_order|template|locator|label|offset|max|suppress_author|remove_duplicates|))/)
+        argv = arguments.split(/(\B-[cCfhqptTsgGOlLomAr]|\B--(?:cited(_in_order)?|clear|bibliography_list_tag|file|query|prefix|text|style|group_(?:by|order)|type_order|template|locator|label|offset|max|suppress_author|remove_duplicates|))/)
 
         parser.parse argv.map(&:strip).reject(&:empty?)
       end
 
       def bibliography_list_tag
-         if @bibliography_list_tag.nil?
-            config['bibliography_list_tag']
-         else
-            @bibliography_list_tag
-         end
+        if @bibliography_list_tag.nil?
+          config['bibliography_list_tag']
+        else
+          @bibliography_list_tag
+        end
       end
 
       def allow_locale_overrides?
@@ -128,7 +132,7 @@ module Jekyll
 
       def match_fields
         @match_fields ||= []
-      end 
+      end
 
       def locators
         @locators ||= []
@@ -163,8 +167,8 @@ module Jekyll
 
       def bibtex_paths
         @bibtex_paths ||= bibtex_files.map { |file|
-           interpolated_file = interpolate file
-           extend_path interpolated_file
+          interpolated_file = interpolate file
+          extend_path interpolated_file
         }
       end
 
@@ -215,14 +219,14 @@ module Jekyll
         sorted = unsorted.sort do |e1, e2|
           sort_keys
             .map.with_index do |key, idx|
-              v1 = e1[key].nil? ? BibTeX::Value.new : e1[key]
-              v2 = e2[key].nil? ? BibTeX::Value.new : e2[key]
-              if (sort_order[idx] || sort_order.last) =~ /^(desc|reverse)/i
-                v2 <=> v1
-              else
-                v1 <=> v2
-              end
+            v1 = e1[key].nil? ? BibTeX::Value.new : e1[key]
+            v2 = e2[key].nil? ? BibTeX::Value.new : e2[key]
+            if (sort_order[idx] || sort_order.last) =~ /^(desc|reverse)/i
+              v2 <=> v1
+            else
+              v1 <=> v2
             end
+          end
             .find { |c| c != 0 } || 0
         end
 
@@ -420,6 +424,10 @@ module Jekyll
         !!@cited
       end
 
+      def clear?
+        !!@clear
+      end
+
       def skip_sort?
         @skip_sort || config['sort_by'] == 'none'
       end
@@ -498,15 +506,15 @@ module Jekyll
 
         tmp = liquid_template.render(
           reference_data(entry,index)
-            .merge(site.site_payload)
-            .merge({
-              'index' => index,
-              'details' => details_link_for(entry)
-            }),
-          {
-            :registers => { :site => site },
-            :filters => [Jekyll::Filters]
-          }
+          .merge(site.site_payload)
+          .merge({
+          'index' => index,
+          'details' => details_link_for(entry)
+        }),
+        {
+          :registers => { :site => site },
+          :filters => [Jekyll::Filters]
+        }
         )
         # process the generated reference with Liquid, to get the same behaviour as
         # when it is used on a page
@@ -660,10 +668,10 @@ module Jekyll
         rescue
           # Locale failed to load; just use original one!
         end if allow_locale_overrides? &&
-          entry['language'] != renderer.locale.language
+        entry['language'] != renderer.locale.language
 
         renderer.render citation_item_for(entry, index),
-            styles(style).bibliography
+          styles(style).bibliography
       ensure
         renderer.locale = original_locale unless original_locale.nil?
       end
@@ -784,32 +792,32 @@ module Jekyll
       end
 
       def update_dependency_tree
-         # Add bibtex files to dependency tree
-         if context.registers[:page] and context.registers[:page].key? "path"
-            bibtex_paths.each do |bibtex_path|
-               site.regenerator.add_dependency(
-                  site.in_source_dir(context.registers[:page]["path"]),
-                  bibtex_path
-               )
-            end
-         end
+        # Add bibtex files to dependency tree
+        if context.registers[:page] and context.registers[:page].key? "path"
+          bibtex_paths.each do |bibtex_path|
+            site.regenerator.add_dependency(
+              site.in_source_dir(context.registers[:page]["path"]),
+              bibtex_path
+            )
+          end
+        end
       end
 
       def cited_entries
         items = entries
         if cited_only?
           items = if skip_sort?
-            cited_references.uniq.map do |key|
-              items.detect { |e| e.key == key }
-            end
-          else
-            entries.select do |e|
-              cited_references.include? e.key
-            end
-          end
+                    cited_references.uniq.map do |key|
+                      items.detect { |e| e.key == key }
+                    end
+                  else
+                    entries.select do |e|
+                      cited_references.include? e.key
+                    end
+                  end
 
           # See #90
-          cited_keys.clear
+          cited_keys.clear if clear?
         end
 
         items

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Jekyll extensions for the academic blogger.