jekyll-scholar 5.5.1 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c51e61d287ce06cc1ec0f5dc0f3d3ab55fbc006
-  data.tar.gz: a6a92a2e9247e31ba3497b6f49de675f6b84f853
+  metadata.gz: abed0619494c665e22a5e4bd0b3aafb28e03ea7b
+  data.tar.gz: 2bd51b0607843ddc861a026a17a68f10c44d31f5
 SHA512:
-  metadata.gz: 673e986fcafae6405c8856f1ba8fb37033f07b5bcc8c74f7a9e1036311244ff8ef70dacbfb3ca776a88e971f077603ff7b7288a01d29e2085a27678f81ec677d
-  data.tar.gz: 94605701fbc7fb37920f3518dbc893b5f8c60edaa058dd3e8e16fa5db7b75bed09316ba85b4cbda38b193031f9cda6607221392d3101331353f8d3457df59b34
+  metadata.gz: a4d764609ff7b540ac0b06319e8f2384e5401ab4f9d736abf64cfeb1889a16794282ea4f9de5e222eea3a288efb261ad37a396e804bef977b398fabfa3b77dfe
+  data.tar.gz: 1c45100a39f4ee8173170d534ae64b916d433a01452de1a8c64f6b7f15327757005f4ed52801c5bc94ec547bd8c2eb2937df80fbd9bd790148b4d4e087dd7010

data/features/grouping.feature

@@ -40,7 +40,7 @@ Feature: Grouping BibTeX Bibliographies
     Given I have a scholar configuration with:
       | key         | value             |
       | group_by    | year              |
-      | group_order | ascending         | 
+      | group_order | ascending         |
     And I have a "_bibliography" directory
     And I have a file "_bibliography/references.bib":
       """
@@ -73,7 +73,7 @@ Feature: Grouping BibTeX Bibliographies
     Given I have a scholar configuration with:
       | key         | value             |
       | group_by    | year              |
-      | group_order | descending        | 
+      | group_order | descending        |
     And I have a "_bibliography" directory
     And I have a file "_bibliography/references.bib":
       """
@@ -106,7 +106,7 @@ Feature: Grouping BibTeX Bibliographies
     Given I have a scholar configuration with:
       | key         | value                |
       | group_by    | year,month           |
-      | group_order | descending,ascending | 
+      | group_order | descending,ascending |
     And I have a "_bibliography" directory
     And I have a file "_bibliography/references.bib":
       """
@@ -301,4 +301,68 @@ Feature: Grouping BibTeX Bibliographies
     Then I should see "Januar" in "_site/scholar.html"
     And I should not see "January" in "_site/scholar.html"
     And I should see "Dezember" in "_site/scholar.html"
-    And I should not see "December" in "_site/scholar.html"
+    And I should not see "December" in "_site/scholar.html"
+
+  @tags @grouping
+  Scenario: Local grouping override - no grouping
+    Given I have a scholar configuration with:
+      | group_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     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2007},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography -f references --group_by none %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    Then I should not see "<h2 class=\"bibliography\">2007</h2>" in "_site/scholar.html"
+    And I should not see "<h2 class=\"bibliography\">2008</h2>" in "_site/scholar.html"
+
+  @tags @grouping
+  Scenario: Local grouping override - grouping by year
+    Given I have a scholar configuration with:
+      | group_by    | none |
+    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     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2007},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography -f references --group_by year %}
+      """
+    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"

data/features/support/env.rb

@@ -16,10 +16,10 @@ rescue LoadError
 end
 
 require 'test/unit'
-
 require 'jekyll/scholar'
+require 'tmpdir'
 
-TEST_DIR = File.join('/', 'tmp', 'jekyll')
+TEST_DIR = File.join(Dir.tmpdir, 'jekyll')
 
 def run_jekyll(options = {})
 

data/lib/jekyll/scholar/utilities.rb

@@ -85,12 +85,16 @@ module Jekyll
             @style = style
           end
 
+          opts.on('-g', '--group_by GROUP') do |group_by|
+            @group_by = group_by
+          end
+
           opts.on('-T', '--template TEMPLATE') do |template|
             @bibliography_template = template
           end
         end
 
-        argv = arguments.split(/(\B-[cCfqrptTslomA]|\B--(?:cited(_in_order)?|file|query|relative|prefix|text|style|template|locator|offset|max|suppress_author|))/)
+        argv = arguments.split(/(\B-[cCfqrptTsglomA]|\B--(?:cited(_in_order)?|file|query|relative|prefix|text|style|group_by|template|locator|offset|max|suppress_author|))/)
 
         parser.parse argv.map(&:strip).reject(&:empty?)
       end
@@ -198,10 +202,14 @@ module Jekyll
           .flatten
       end
 
+      def group_by
+        @group_by ||= config['group_by']
+      end
+
       def group?
-        config['group_by'] != 'none'
+        group_by != 'none'
       end
- 
+
       def group(ungrouped)
         def grouper(items,keys,order)
           groups = items
@@ -218,16 +226,16 @@ module Jekyll
         end
         grouper(ungrouped,group_keys,group_order)
       end
- 
+
       def group_keys
         return @group_keys unless @group_keys.nil?
 
-        @group_keys = Array(config['group_by'])
+        @group_keys = Array(group_by)
           .map { |key| key.to_s.split(/\s*,\s*/) }
           .flatten
           .map { |key| key == 'month' ? 'month_numeric' : key }
       end
- 
+
       def group_order
         return @group_order unless @group_order.nil?
 
@@ -235,7 +243,7 @@ module Jekyll
           .map { |key| key.to_s.split(/\s*,\s*/) }
           .flatten
       end
- 
+
       def group_compare(key,v1,v2)
         case key
         when 'type'
@@ -254,7 +262,7 @@ module Jekyll
           v1 <=> v2
         end
       end
-      
+
       def group_value(key,item)
         case key
         when 'type'

data/lib/jekyll/scholar/version.rb

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

metadata

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