Preventing @string objects being passed to the renderer. (#170)

* Add failing test for bibtex string replacement with negative queries. * Fix entries returing non-BibTeX::Entry objects.
inukshuk · Oct 3, 2016 · 4b8c0f2 · 4b8c0f2
1 parent aec36c9
commit 4b8c0f2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/features/string.feature b/features/string.feature
@@ -112,3 +112,30 @@ Feature: String replacement
     Then the _site directory should exist
     And the "_site/scholar.html" file should exist
     And I should see "<i>\"The \" # \"Ruby\" # \" Programming Language\"</i>" in "_site/scholar.html"
+
+    @tags @string
+    Scenario: String replacement with queries involving negative conditions
+      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":
+        """
+        @string{ rubypl = "The Ruby Programming Language" }
+        @book{ruby,
+          title     = rubypl,
+          author    = {Flanagan, David and Matsumoto, Yukihiro},
+          year      = {2008},
+          publisher = {O'Reilly Media}
+        }
+        """
+      And I have a page "scholar.html":
+        """
+        ---
+        ---
+        {% bibliography -f references --query !@article %}
+        """
+      When I run jekyll
+      Then the _site directory should exist
+      And the "_site/scholar.html" file should exist
+      And I should see "<i>The Ruby Programming Language</i>" in "_site/scholar.html"
diff --git a/lib/jekyll/scholar/utilities.rb b/lib/jekyll/scholar/utilities.rb
@@ -161,7 +161,7 @@ def query
       end
 
       def entries
-        sort bibliography[query || config['query']]
+        sort bibliography[query || config['query']].select { |x| x.instance_of? BibTeX::Entry}
       end
 
       def offset