jekyll-scholar 4.0.5 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 854a3b6eb1db9fb5e669d6501d251e3efa8eacd0
-  data.tar.gz: aaa908317ef5953921d7df4db8fe09c4f4c3eae8
+  metadata.gz: 3526ee5f1f1f511cb8af9059c0da3e82331ff87b
+  data.tar.gz: 147e99c0e375f097015d4fa527c04d565f8011ae
 SHA512:
-  metadata.gz: 51bc9151f76818b473c960469e5d1ecbc552875aafb9faaabd06b0ebf4736d318a30225cda7e645b6da21891442bac2a12bae2fe526cdd9b7d8a5179ff40226d
-  data.tar.gz: 3db13f1b2de1e4bac67c447a9d1ae23ac8d26e30b102768e9455de498cb8e918a75903dad18e55bdd9c7381f509894b9068eb025ad9aa5f72b0574c7a53da708
+  metadata.gz: cf53a90ba56215c0f4bd6bb5b68520766bdb7457f3f20f93b6de5668fc7d4840af3d49140cd558d09a2d10a3d0438be1e25cc227b76f318ab29c817cbe14bbb7
+  data.tar.gz: e2cc049bc9eb96dc9425ef5fa475d7f5b0c0c8de4a6311c3456e67bdaeb0a5dd27c1692921de4d0a127e3cf746ffcc16ced4ac96d591ba8d6bfef871cbde0dff

data/README.md

@@ -379,12 +379,19 @@ Postscript files of your papers, you can use the configuration option
 `repository` to indicate this directory. When generating bibliographies,
 Jekyll-Scholar will look in that folder to see if it contains a filename
 matching each entry's BibTeX key: if it does, the path to that file
-will be exposed to the bibliography template.
+will be exposed to the bibliography template as the `link` property.
+
+Since version 4.1.0 repositories are not limited to PDF and PS files.
+These files are mapped to the `links` property in your bibliography
+template. Here is an example of template that utilizes this feature
+to link to supporting material in a ZIP archive:
+
+    {{ reference }} [<a href="{{links.zip}}">Supporting Materials</a>]
 
 ### Detail Pages
 
 If your layouts directory contains a layout file for bibliography details
-(the 'details_layout' configuration options), Jekyll-Scholar will generate
+(the `details_layout` configuration options), Jekyll-Scholar will generate
 a details page for each entry in you main bibliography. That is to say, if
 your bibliography contains the following entry:
 
@@ -437,8 +444,8 @@ configuration option. For example:
     query: "@book" #=> includes only books
     query: "@article[year>=2003]" #=> includes only articles published 2003 or later
     query: "@*[url]" #=> includes all entries with a url field
-    query: "@*[status!=review]" #=> includes all entries whose status field is not set to 'review' 
-    query: "@book[year <= 1900 && author ^= Poe]" #=> Books published before 1900 where the author matches /Poe/ 
+    query: "@*[status!=review]" #=> includes all entries whose status field is not set to 'review'
+    query: "@book[year <= 1900 && author ^= Poe]" #=> Books published before 1900 where the author matches /Poe/
     query: "!@book" #=> includes all entries with a type other than book
 
 Please note that some of these queries require BibTeX-Ruby 2.3.0 or

data/features/bibtex.feature

@@ -63,6 +63,32 @@ Feature: BibTeX
     And the "_site/references.html" file should exist
     And I should see "Look, an umlaut: ü!" in "_site/references.html"
 
+  @tags @bibtex @wip
+  Scenario: Embedded BibTeX
+    Given I have a scholar configuration with:
+      | key   | value |
+      | style | apa   |
+     And I have a page "references.md":
+      """
+      ---
+      ---
+      References
+      ==========
+
+      {% bibtex %}
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      {% endbibtex %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/references.html" file should exist
+    And I should see "<i>The Ruby Programming Language</i>" in "_site/references.html"
+
   @tags
   Scenario: Simple Bibliography Loaded From Default Directory
     Given I have a scholar configuration with:

data/features/repository.feature

@@ -25,12 +25,16 @@ Feature: PDF Repository
       """
       The PDF
       """
+    And I have a file "papers/ruby.ppt":
+      """
+      The PPT
+      """
     And I have a "_layouts" directory
     And I have a file "_layouts/bibliography.html":
       """
       ---
       ---
-      {{ reference }} Link: {{ link }}
+      {{ reference }} Link: {{ link }} Slides: {{ links.ppt }}
       """
     And I have a page "scholar.html":
       """
@@ -43,6 +47,7 @@ Feature: PDF Repository
     And the "_site/papers/ruby.pdf" file should exist
     And I should see "The Ruby Programming Language" in "_site/scholar.html"
     And I should see "Link: /papers/ruby.pdf" in "_site/scholar.html"
+    And I should see "Slides: /papers/ruby.ppt" in "_site/scholar.html"
 
 
 

data/lib/jekyll/scholar.rb

@@ -13,6 +13,7 @@ require 'jekyll/scholar/utilities'
 
 require 'jekyll/scholar/converters/bibtex'
 require 'jekyll/scholar/tags/bibliography'
+require 'jekyll/scholar/tags/bibtex'
 require 'jekyll/scholar/tags/cite'
 require 'jekyll/scholar/tags/cite_details'
 require 'jekyll/scholar/tags/quote'

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

@@ -0,0 +1,30 @@
+module Jekyll
+  class Scholar
+
+    class BibTeXTag < Liquid::Block
+      include Scholar::Utilities
+
+      def initialize(tag_name, arguments, tokens)
+        super
+
+        @config = Scholar.defaults.dup
+        @keys, arguments = split_arguments arguments
+
+        optparse(arguments)
+      end
+
+      def render(context)
+        set_context_to context
+        
+        BibTeX.parse(super, bibtex_options).map { |entry|
+          reference_tag entry
+
+        }.join("\n")
+      end
+    end
+
+  end
+end
+
+Liquid::Template.register_tag('bibtex', Jekyll::Scholar::BibTeXTag)
+

data/lib/jekyll/scholar/utilities.rb

@@ -151,11 +151,16 @@ module Jekyll
       end
 
       def load_repository
-        return {} unless repository?
+        repo = Hash.new { |h,k| h[k] = {} }
 
-        Hash[Dir[File.join(repository_path, '**/*.{pdf,ps}')].map { |path|
-          [File.basename(path).sub(/\.(pdf|ps)$/, ''), path]
-        }]
+        return repo unless repository?
+
+        Dir[File.join(repository_path, '**/*')].each do |path|
+          extname = File.extname(path)
+          repo[File.basename(path, extname)][extname[1..-1]] = path
+        end
+
+        repo
       end
 
       def repository_path
@@ -241,6 +246,7 @@ module Jekyll
           'key' => entry.key,
           'type' => entry.type.to_s,
           'link' => repository_link_for(entry),
+          'links' => repository_links_for(entry),
           'index' => index,
           'details' => details_link_for(entry)
         })
@@ -281,12 +287,20 @@ module Jekyll
       end
 
       def repository_link_for(entry, base = base_url)
-        url = repository[entry.key]
+        links = repository[entry.key]
+        url   = links['pdf'] || links['ps']
+
         return unless url
 
         File.join(base, url)
       end
 
+      def repository_links_for(entry, base = base_url)
+        Hash[repository[entry.key].map { |ext, url|
+          [ext, File.join(base, url)]
+        }]
+      end
+
       def details_link_for(entry, base = base_url)
         File.join(base, details_path, details_file_for(entry))
       end

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -105,6 +105,7 @@ files:
 - lib/jekyll/scholar/defaults.rb
 - lib/jekyll/scholar/generators/details.rb
 - lib/jekyll/scholar/tags/bibliography.rb
+- lib/jekyll/scholar/tags/bibtex.rb
 - lib/jekyll/scholar/tags/cite.rb
 - lib/jekyll/scholar/tags/cite_details.rb
 - lib/jekyll/scholar/tags/quote.rb
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: jekyll-scholar
-rubygems_version: 2.2.2
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Jekyll extensions for the academic blogger.