jekyll-scholar 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a8a2fd3f3695fae59cf4570cee99a52e053bb7
-  data.tar.gz: d44d4e4d1570d3753017660674c6d7a9cf2d02a6
+  metadata.gz: c16bae70f0ffc07f1992663a2701df9cd583ef2a
+  data.tar.gz: 72b599b29cd812aed688cb27b26690544b87eab1
 SHA512:
-  metadata.gz: c343d40bc0ab7998529ce5cfc586b0fffe9e31790d14d6578c1e863f081df26b2ceebf7dade23d1d0a892e3ad1cdbe11ad55677bc05879c7f6a036f9c3157fa0
-  data.tar.gz: 0fad5c9a6997abafafe708cefa4895fe01552c107913c79dc0ad78c10fb4d236e03bfef86b7ccbe7da9a490456861785f65c52d554c15a4020104712ac62490f
+  metadata.gz: c991da6b828bcb8951cbe61d089493d3306ac4fc3af57223f3dedd71bf507d09b773f666ffef45adcd2de9bba484d094962941ba81beb48eb500afab9093e683
+  data.tar.gz: e4f167a232610483e7886194c4d81db146d3c2b2e88a3ca0e70208981f17a10b006bbbd684a2647bc865ac853cb0ce229d608784f9eebeb5a33041a91c8041a2

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 bundler_args: --without debug
 script: bundle exec rake test_with_coveralls
+sudo: false
+cache: bundler
 rvm:
+  - 2.2.0
   - 2.1.0
   - 2.0.0
   - 1.9.3
@@ -12,3 +15,6 @@ notifications:
       - sylvester@keil.or.at
     on_success: change
     on_failure: always
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/Gemfile

@@ -2,24 +2,30 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'minitest', '< 5.0'
+
+  if RUBY_VERSION.start_with?('2.2')
+    gem 'test-unit'
+  else
+    gem 'minitest', '< 5.0'
+  end
+
   gem 'rake'
   gem 'redgreen', '~> 1.2'
   gem 'shoulda', '~> 3.5'
   gem 'rr', '~> 1.1'
   gem 'cucumber', '1.3.11'
-  gem 'redcarpet', '~> 3.1'
-  gem 'launchy', '~> 2.1.2'
+  gem 'redcarpet'
+  gem 'launchy', '~> 2.3'
 
   gem 'unicode_utils'
 
-  gem 'simplecov', '~>0.8', :require => false
+  gem 'simplecov', '~>0.9', :require => false
   gem 'rubinius-coverage', :platform => :rbx
   gem 'coveralls', :require => false
 end
 
 group :debug do
-  gem 'debugger', '~>1.6', :require => false, :platform => :mri
+  gem 'debugger', '~>1.6', :require => false, :platform => [:mri_19, :mri_20]
   gem 'rubinius-compiler', '~>2.0', :require => false, :platform => :rbx
   gem 'rubinius-debugger', '~>2.0', :require => false, :platform => :rbx
 end

data/README.md

@@ -200,10 +200,10 @@ would be a more complex template file:
     {{ reference }}
 
     {% if entry.abstract %}
-    <p>{{ entry.abstract %}</p>
+    <p>{{ entry.abstract }}</p>
     {% endif %}
 
-    <pre>{{ entry.bibtex %}</pre>
+    <pre>{{ entry.bibtex }}</pre>
 
 You can also override the default bibliography template, by passing the
 `--template` or `-T` option parameter to the bibliography tag.

data/features/sorting.feature

@@ -190,3 +190,39 @@ Feature: Sorting BibTeX Bibliographies
     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"
+
+  @tags @sorting
+  Scenario: Sort By Year And Month
+    Given I have a scholar configuration with:
+      | key     | value       |
+      | sort_by | year, month |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{ruby1,
+        title     = {December 08},
+        year      = {2008},
+        month     = dec
+      }
+      @book{ruby2,
+        title     = {March 08},
+        year      = {2008},
+        month     = mar
+      }
+      @book{ruby3,
+        title     = {August 07},
+        year      = {2007},
+        month     = aug
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    Then "August 07" should come before "March 08" in "_site/scholar.html"
+    And "March 08" should come before "December 08" in "_site/scholar.html"

data/features/support/env.rb

@@ -16,10 +16,6 @@ require 'test/unit'
 
 require 'jekyll/scholar'
 
-World do
-  include Test::Unit::Assertions
-end
-
 TEST_DIR = File.join('/', 'tmp', 'jekyll')
 
 def run_jekyll(options = {})

data/jekyll-scholar.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('jekyll', '~> 2.0')
   s.add_runtime_dependency('citeproc-ruby', '~> 1.0')
   s.add_runtime_dependency('csl-styles', '~> 1.0')
-  s.add_runtime_dependency('bibtex-ruby', '~> 4.0')
+  s.add_runtime_dependency('bibtex-ruby', '>= 4.0.8')
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/jekyll/scholar/defaults.rb

@@ -13,7 +13,7 @@ module Jekyll
       'bibliography'          => 'references.bib',
       'repository'            => nil,
 
-      'bibtex_options'        => { :strip => false },
+      'bibtex_options'        => { :strip => false, :parse_months => true },
       'bibtex_filters'        => [ :latex ],
 
       'replace_strings'       => true,

data/lib/jekyll/scholar/utilities.rb

@@ -141,11 +141,20 @@ module Jekyll
       def sort(unsorted)
         return unsorted if skip_sort?
 
-        sorted = unsorted.sort_by { |e| e[config['sort_by']].to_s }
+        sorted = unsorted.sort_by { |e| e.values_at(*sort_keys).map(&:v) }
         sorted.reverse! if config['order'] =~ /^(desc|reverse)/i
         sorted
       end
 
+      def sort_keys
+        return @sort_keys unless @sort_keys.nil?
+
+        @sort_keys = Array(config['sort_by'])
+          .map { |key| key.to_s.split(/\s*,\s*/) }
+          .flatten
+          .map { |key| key == 'month' ? 'month_numeric' : key }
+      end
+
       def suppress_author?
         !!@suppress_author
       end

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,84 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: citeproc-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: csl-styles
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-description: ' Jekyll-Scholar is for all the academic bloggers out there. It is a
+        version: 4.0.8
+description: " Jekyll-Scholar is for all the academic bloggers out there. It is a
   set of extensions for Jekyll the awesome, blog aware, static site generator; it
   formats your BibTeX bibliographies for the web using CSL citation styles and generally
-  gives your blog posts citation super-powers.'' '
+  gives your blog posts citation super-powers.' "
 email: http://sylvester.keil.or.at
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .simplecov
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -122,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: jekyll-scholar
-rubygems_version: 2.1.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Jekyll extensions for the academic blogger.
@@ -152,4 +152,3 @@ test_files:
 - features/string.feature
 - features/support/env.rb
 - features/support/hooks.rb
-has_rdoc: