jekyll-scholar 4.3.6 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624d5dd714caa864327adada75088b877ed25827
-  data.tar.gz: cad811afe6ae06efa563182157c5941512a2e671
+  metadata.gz: f094338d53949be44b70b8e7f512861a5303130b
+  data.tar.gz: 4d4c0bc29496e9600934daacafd2c26c414173cf
 SHA512:
-  metadata.gz: 47c45c79bb3695d00ecf15253b5a2e86fa2197d4cef597e640cf60fef0a3d2cbac3b6c6e2f17f80ced496516bdb23e70766dec1c3529a022cd3b0079d58c19e0
-  data.tar.gz: fee5ceabb41933d6a6363bf96e9e1123307d51d4c22f158c239817c778d8aa9f5ff49138cf3dc5b82eedc4d739ae10fdc915fef96697208d94bdb24699c439c8
+  metadata.gz: b72f42658fefc593629b596e1d37ad3409586a41e29add9e25ff0f6b4225073bb0a77fc59672e5675fa3828fced0e9ef2433b29f38517957e8d6739657b9b4da
+  data.tar.gz: e9f2a7f85d9b3a99be571f3be8c83ad76c4177246256c2f3cbeb90b59e9fc45476da8a16b06785b7edeeffdc55ce3c291e804aed9b1151adc2db6fbff132f1ce

data/features/filter.feature

@@ -38,6 +38,40 @@ Feature: BibTeX
     And I should see "Programming Ruby" in "_site/scholar.html"
     And I should not see "The Ruby Programming Language" in "_site/scholar.html"
 
+  @tags @filters
+  Scenario: Jekyll Filters
+    Given I have a scholar configuration with:
+      | key    | value             |
+      | source | ./_bibliography   |
+      | bibliography_template | template |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+    @book{ruby:2008-Foo,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a "_layouts" directory
+    And I have a file "_layouts/template.html":
+      """
+      ---
+      ---
+      {{ entry.key | slugify }}
+      """
+    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
+    And I should see "ruby-2008-foo" in "_site/scholar.html"
+
   @tags @max
   Scenario: Limit number of entries
     Given I have a scholar configuration with:
@@ -71,3 +105,62 @@ Feature: BibTeX
     And the "_site/scholar.html" file should exist
     And I should not see "Programming Ruby" in "_site/scholar.html"
     And I should see "The Ruby Programming Language" in "_site/scholar.html"
+
+  @tags @urls
+  Scenario: URLs as text
+    Given I have a scholar configuration with:
+      | key    | value             |
+      | source | ./_bibliography   |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{pickaxe,
+        title     = {Programming Ruby 1.9: The Pragmatic Programmer's Guide},
+        author    = {Thomas, Dave and Fowler, Chad and Hunt, Andy},
+        year      = {2009},
+        edition   = 3,
+        publisher = {Pragmatic Bookshelf},
+        url       = {https://pragprog.com}
+      }
+      """
+    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
+    And I should see "from https://pragprog.com" in "_site/scholar.html"
+
+  @tags @urls
+  Scenario: URLs as Markdown links
+    Given I have a scholar configuration with:
+      | key    | value             |
+      | source | ./_bibliography   |
+    And I have the following BibTeX filters:
+      | latex    |
+      | markdown |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references.bib":
+      """
+      @book{pickaxe,
+        title     = {Programming Ruby 1.9: The Pragmatic Programmer's Guide},
+        author    = {Thomas, Dave and Fowler, Chad and Hunt, Andy},
+        year      = {2009},
+        edition   = 3,
+        publisher = {Pragmatic Bookshelf},
+        url       = {https://pragprog.com}
+      }
+      """
+    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
+    And I should see "from \[https://pragprog.com\]\(https://pragprog.com\)" in "_site/scholar.html"

data/features/step_definitions/jekyll_steps.rb

@@ -43,12 +43,18 @@ Then(/^the (.*) directory should exist$/) do |dir|
   assert File.directory?(dir)
 end
 
-Then(/^I should see "(.*)" in "(.*)"$/) do |text, file|
-  assert_match Regexp.new(text), File.open(file).readlines.join
+Then(/^I should see "(.*)" in "(.*)"$/) do |pattern, file|
+  text = File.open(file).readlines.join
+
+  assert_match Regexp.new(pattern), text,
+    "Pattern /#{pattern}/ not found in: #{text}"
 end
 
-Then(/^I should not see "(.*)" in "(.*)"$/) do |text, file|
-  assert !File.open(file).readlines.join.match(Regexp.new(text))
+Then(/^I should not see "(.*)" in "(.*)"$/) do |pattern, file|
+  text = File.open(file).readlines.join
+
+  assert !text.match(Regexp.new(pattern)),
+    "Did not exptect /#{pattern}/ in: #{text}"
 end
 
 

data/features/step_definitions/scholar_steps.rb

@@ -27,6 +27,15 @@ Given(/^I have the following BibTeX options:$/) do |table|
   end
 end
 
+Given(/^I have the following BibTeX filters:$/) do |table|
+  File.open('_config.yml', 'a') do |f|
+    f.write("  bibtex_filters:\n")
+    table.raw.flatten.each do |row|
+      f.write("    - #{row}\n")
+    end
+  end
+end
+
 Then(/^"(.*)" should come before "(.*)" in "(.*)"$/) do |p1, p2, file|
   data = File.open(file).readlines.join('')
 

data/lib/jekyll/scholar.rb

@@ -19,3 +19,5 @@ require 'jekyll/scholar/tags/cite_details'
 require 'jekyll/scholar/tags/quote'
 require 'jekyll/scholar/tags/reference'
 require 'jekyll/scholar/generators/details'
+
+require 'jekyll/scholar/plugins/markdown_links'

data/lib/jekyll/scholar/plugins/markdown_links.rb

@@ -0,0 +1,14 @@
+# Contriubted by @mfenner
+# See https://github.com/inukshuk/jekyll-scholar/issues/30
+
+require 'uri'
+
+module Jekyll
+  class Scholar
+    class Markdown < BibTeX::Filter
+      def apply(value)
+        value.to_s.gsub(URI.regexp(['http','https','ftp'])) { |c| "[#{$&}](#{$&})" }
+      end
+    end
+  end
+end

data/lib/jekyll/scholar/utilities.rb

@@ -255,6 +255,7 @@ module Jekyll
 
       def liquid_template
         return @liquid_template if @liquid_template
+        Liquid::Template.register_filter(Jekyll::Filters)
 
         tmp = bibliography_template
 

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.4.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -110,6 +110,7 @@ files:
 - lib/jekyll/scholar/converters/bibtex.rb
 - lib/jekyll/scholar/defaults.rb
 - lib/jekyll/scholar/generators/details.rb
+- lib/jekyll/scholar/plugins/markdown_links.rb
 - lib/jekyll/scholar/tags/bibliography.rb
 - lib/jekyll/scholar/tags/bibtex.rb
 - lib/jekyll/scholar/tags/cite.rb
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: jekyll-scholar
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Jekyll extensions for the academic blogger.