jekyll-scholar 5.6.0 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abed0619494c665e22a5e4bd0b3aafb28e03ea7b
-  data.tar.gz: 2bd51b0607843ddc861a026a17a68f10c44d31f5
+  metadata.gz: 5b7e5e1c9176f9047d2e7492f07b212bc6e247e7
+  data.tar.gz: 106254e255857e66c6e5b81ebbb95c74876c9fe8
 SHA512:
-  metadata.gz: a4d764609ff7b540ac0b06319e8f2384e5401ab4f9d736abf64cfeb1889a16794282ea4f9de5e222eea3a288efb261ad37a396e804bef977b398fabfa3b77dfe
-  data.tar.gz: 1c45100a39f4ee8173170d534ae64b916d433a01452de1a8c64f6b7f15327757005f4ed52801c5bc94ec547bd8c2eb2937df80fbd9bd790148b4d4e087dd7010
+  metadata.gz: 6f2d2d642250db134aa6a63676ee588d9092cabf66e185c124275864e14df07316ee0121df3d0b0c5e59ee8e2bc4df23160eb589564f9bed00d4fb546f0bc95b
+  data.tar.gz: ffffd80dabf38c39cebdd07a7052ede50a7cc30e96f48a7da4e340e7d231f2a2794ad08b0270bf16f1d8e5e536f6993ec08f62f67c59c5b673fe17f3bc2ddb3e

data/features/bibtex.feature

@@ -142,6 +142,33 @@ Feature: BibTeX
     And the "_site/scholar.html" file should exist
     And I should see "<abbr>1 book \[ruby\]</abbr>Matsumoto" in "_site/scholar.html"
 
+  @tags @bibliography @config @template
+  Scenario: Simple Bibliography With Custom Template
+    Given I have a scholar configuration with:
+      | key                   | value                                         |
+      | source                | ./_bibliography                               |
+      | bibliography_template | <abbr>{{index}} {{entry.type}} [{{key}}]</abbr>{{entry.author_array[1].last}} |
+    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 page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography -f references %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "<abbr>1 book \[ruby\]</abbr>Matsumoto" in "_site/scholar.html"
+
   @tags @filter
   Scenario: Filtered Bibliography Loaded From Default Directory
     Given I have a scholar configuration with:

data/features/grouping.feature

@@ -338,7 +338,9 @@ Feature: Grouping BibTeX Bibliographies
   @tags @grouping
   Scenario: Local grouping override - grouping by year
     Given I have a scholar configuration with:
-      | group_by    | none |
+      | key         | value             |
+      | group_by    | none              |
+      | group_order | ascending         |
     And I have a "_bibliography" directory
     And I have a file "_bibliography/references.bib":
       """
@@ -359,10 +361,11 @@ Feature: Grouping BibTeX Bibliographies
       """
       ---
       ---
-      {% bibliography -f references --group_by year %}
+      {% bibliography -f references --group_by year --group_order descending %}
       """
     When I run jekyll
     Then the _site directory should exist
     And the "_site/scholar.html" file should exist
     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"

data/lib/jekyll/scholar/utilities.rb

@@ -89,12 +89,20 @@ module Jekyll
             @group_by = group_by
           end
 
+          opts.on('-G', '--group_order ORDER') do |group_order|
+            self.group_order = group_order
+          end
+
+          opts.on('-O', '--type_order ORDER') do |type_order|
+            @group_by = type_order
+          end
+
           opts.on('-T', '--template TEMPLATE') do |template|
             @bibliography_template = template
           end
         end
 
-        argv = arguments.split(/(\B-[cCfqrptTsglomA]|\B--(?:cited(_in_order)?|file|query|relative|prefix|text|style|group_by|template|locator|offset|max|suppress_author|))/)
+        argv = arguments.split(/(\B-[cCfqrptTsgGOlomA]|\B--(?:cited(_in_order)?|file|query|relative|prefix|text|style|group_(?:by|order)|type_order|template|locator|offset|max|suppress_author|))/)
 
         parser.parse argv.map(&:strip).reject(&:empty?)
       end
@@ -181,7 +189,7 @@ module Jekyll
             end
             .find { |c| c != 0 } || 0
         end
- 
+
         sorted
       end
 
@@ -211,20 +219,21 @@ module Jekyll
       end
 
       def group(ungrouped)
-        def grouper(items,keys,order)
-          groups = items
-            .group_by do |item|
-              group_value(keys.first,item)
-            end
+        def grouper(items, keys, order)
+          groups = items.group_by do |item|
+            group_value(keys.first, item)
+          end
+
           if keys.count == 1
             groups
           else
-            groups.merge(groups) do |key,items|
-              grouper(items,keys.drop(1),order.drop(1))
+            groups.merge(groups) do |key, items|
+              grouper(items, keys.drop(1), order.drop(1))
             end
           end
         end
-        grouper(ungrouped,group_keys,group_order)
+
+        grouper(ungrouped, group_keys, group_order)
       end
 
       def group_keys
@@ -237,9 +246,12 @@ module Jekyll
       end
 
       def group_order
-        return @group_order unless @group_order.nil?
+        self.group_order = config['group_order'] if @group_order.nil?
+        @group_order
+      end
 
-        @group_order = Array(config['group_order'])
+      def group_order=(value)
+        @group_order = Array(value)
           .map { |key| key.to_s.split(/\s*,\s*/) }
           .flatten
       end
@@ -286,7 +298,7 @@ module Jekyll
           .map { |key| key.to_s.split(/\s*,\s*/) }
           .flatten
       end
- 
+
       def group_name(key,value)
         case key
         when 'type'
@@ -485,10 +497,14 @@ module Jekyll
           e[key.to_s] = value.to_s
 
           if value.is_a?(BibTeX::Names)
+            e["#{key}_array"] = arr = []
             value.each.with_index do |name, idx|
+              parts = {}
               name.each_pair do |k, v|
                 e["#{key}_#{idx}_#{k}"] = v.to_s
+                parts[k.to_s] = v.to_s
               end
+              arr << parts
             end
           end
         end

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.7.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll