jekyll-scholar 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c8ccd2ac58af0bf1f408e492607526d4ecd8b5a
-  data.tar.gz: 6172bf565989e36b457cc3de16437a53fa02ecae
+  metadata.gz: 34743acb71968a7f175a125ac5926b505ad582ec
+  data.tar.gz: 03b992fb8717bfcfb5b73a6ea1fa1ba090fe261a
 SHA512:
-  metadata.gz: bc5af627007cab164c6ea82c4628904b4819b6b55a08d1ac49723a9b5e1b895ac199e287b76535a67a5d78800188e697870d0a5fd3f01b521f43c7444c06749f
-  data.tar.gz: 568c21dd446843dfa6753713599b9bfd973a885b5f09fc1292cd2b3756e493bfdfa6add069f97889f648d7e103362adf0b60d6d7ef9153d5c304f05a4ae7af45
+  metadata.gz: b572dfd70c40978104bfb83254ffe46df35b79de2fb8a56ee8319fa9551b461c577682320cd11023cc25795f021d338e8e6554b384a00696efd506fc3d54d62b
+  data.tar.gz: e3d8c10e49a05b3b2082ecde221d5bccf53e142275ffb3c5ce18cd07a1bc3da6091b14bb244672116915cee5d970fc8524e5238cf139e8c6557ad15bbf6a6935

data/features/sorting.feature

@@ -67,3 +67,86 @@ Feature: Sorting BibTeX Bibliographies
     And the "_site/scholar.html" file should exist
     Then "2008" should come before "2007" in "_site/scholar.html"
 
+  @tags @sorting @cited_only
+  Scenario: Sort By Year Cited Only
+    Given I have a scholar configuration with:
+      | key     | value             |
+      | sort_by | year              |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{ruby1,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      @book{ruby2,
+        title     = {Ruby Not Cited},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2007},
+        publisher = {O'Reilly Media}
+      }
+      @book{smalltalk,
+        title     = {Smalltalk Best Practice Patterns},
+        author    = {Kent Beck},
+        year      = {1996},
+        publisher = {Prentice Hall}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% cite ruby1 %}
+      {% cite smalltalk %}
+      {% bibliography --cited %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    Then "Smalltalk" should come before "Ruby Programming" in "_site/scholar.html"
+    And I should not see "<i>Ruby Not Cited</i>" in "_site/scholar.html"
+
+  @tags @sorting @cited_only
+  Scenario: Reverse Sort Order Cited Only
+    Given I have a scholar configuration with:
+      | key     | value             |
+      | sort_by | year              |
+      | order   | descending        |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{ruby1,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      @book{ruby2,
+        title     = {Ruby Not Cited},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2007},
+        publisher = {O'Reilly Media}
+      }
+      @book{smalltalk,
+        title     = {Smalltalk Best Practice Patterns},
+        author    = {Kent Beck},
+        year      = {1996},
+        publisher = {Prentice Hall}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% cite ruby1 %}
+      {% cite smalltalk %}
+      {% bibliography --cited %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    Then "Ruby Programming" should come before "Smalltalk" in "_site/scholar.html"
+    And I should not see "<i>Ruby Not Cited</i>" in "_site/scholar.html"
+

data/lib/jekyll/scholar/tags/bibliography.rb

@@ -17,11 +17,9 @@ module Jekyll
 
         references = entries
 
-        if cited_only?
-          references = cited_references.uniq.map do |key|
-            references.detect { |e| e.key == key }
-          end
-        end
+        references.select! do |e|
+          cited_references.include? e.key
+        end if cited_only?
 
         bibliography = references.each_with_index.map { |entry, index|
           reference = bibliography_tag(entry, index + 1)

data/lib/jekyll/scholar/utilities.rb

@@ -116,14 +116,15 @@ module Jekyll
       end
 
       def entries
-        b = bibliography[query || config['query']]
+        sort bibliography[query || config['query']]
+      end
 
-        unless config['sort_by'] == 'none'
-          b = b.sort_by { |e| e[config['sort_by']].to_s }
-          b.reverse! if config['order'] =~ /^(desc|reverse)/i
-        end
+      def sort(unsorted)
+        return unsorted if config['sort_by'] == 'none'
 
-        b
+        sorted = unsorted.sort_by { |e| e[config['sort_by']].to_s }
+        sorted.reverse! if config['order'] =~ /^(desc|reverse)/i
+        sorted
       end
 
       def repository?

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll