jekyll-scholar 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082fd7a25a1d8bec380e5311248c00a86680f5bc
-  data.tar.gz: 34123cf9d4f87b7fad1d8d2312fa727df7ba3cd2
+  metadata.gz: c7d2bffb292d27ff2150ac22f4f08c16725933e1
+  data.tar.gz: df29da3988760f7cf35edfa13c147ff1a11b8a1d
 SHA512:
-  metadata.gz: 41d977833e021bf6d06e42ab6eef3650c07eab7fd1ffdcdaf02595df83956a5cc238ca743f8847f65fef3082f0dec9f14efa4999832599835ca41c19c26ca21f
-  data.tar.gz: 503c8db545f09233ea25239705778d3c724dc4180c21201672e574b00c0b5b40d7563d8ce2cde705204c469811dd0437dafe437add161fdabd137bbf80071cde
+  metadata.gz: a3e5ad5b114cc0b8c2ac03c79a3154964c32bc81f72d1187e304c0028e596775fd260ca674037cf59e9038f6b25e989d4f2a29b0ba9e52e8b57df2d7b6c9aa15
+  data.tar.gz: e4c94ec420ef8e67cd4fdbabf188dc79a08930b53461c151cb00a203fa680604f3e11f4e3926feb87eecb9ee70b35d3abae32d64cde1eb55d8d52d11aa116de3

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-ci
+

data/.gitignore

@@ -2,3 +2,4 @@ Gemfile.lock
 demo
 **/*.swp
 .bundle
+coverage

data/.simplecov

@@ -0,0 +1,4 @@
+SimpleCov.start do
+  add_filter 'features/'
+end
+

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 bundler_args: --without debug
+script: bundle exec rake test_with_coveralls
 rvm:
   - 2.1.0
   - 2.0.0

data/Gemfile

@@ -1,22 +1,26 @@
 source 'https://rubygems.org'
 gemspec
 
-group 'development' do
+group :development do
+  gem 'minitest', '< 5.0'
   gem 'rake'
   gem 'redgreen', '~> 1.2'
-  gem 'shoulda', '~> 3.3.2'
-  gem 'rr', '~> 1.0.5'
-  gem 'cucumber', '~> 1.2.1'
+  gem 'shoulda', '~> 3.5'
+  gem 'rr', '~> 1.1'
+  gem 'cucumber', '=1.3.10'
   gem 'RedCloth', '~> 4.2'
   gem 'rdiscount', '~> 1.6'
-  gem 'redcarpet', '~> 2.2.2'
+  gem 'redcarpet', '~> 3.0'
   gem 'launchy', '~> 2.1.2'
 
   gem 'unicode_utils'
+
+  gem 'simplecov', '~>0.8', :require => false
+  gem 'rubinius-coverage', :platform => :rbx
+  gem 'coveralls', :require => false
 end
 
 group :debug do
-  gem 'ruby-debug', :require => false, :platform => :jruby
   gem 'debugger', '~>1.6', :require => false, :platform => :mri
   gem 'rubinius-compiler', '~>2.0', :require => false, :platform => :rbx
   gem 'rubinius-debugger', '~>2.0', :require => false, :platform => :rbx

data/README.md

@@ -10,7 +10,8 @@ For additional features you may also want to take a look at
 [jekyll-scholar-extras](https://github.com/jgoodall/jekyll-scholar-extras).
 
 [![Build Status](https://travis-ci.org/inukshuk/jekyll-scholar.png?branch=master)](https://travis-ci.org/inukshuk/jekyll-scholar)
-
+[![Coverage Status](https://coveralls.io/repos/inukshuk/jekyll-scholar/badge.png)](https://coveralls.io/r/inukshuk/jekyll-scholar)
+[![Dependency Status](https://gemnasium.com/inukshuk/jekyll-scholar.png)](https://gemnasium.com/inukshuk/jekyll-scholar)
 
 Installation
 ------------
@@ -253,6 +254,23 @@ For example, this could be rendered as:
       </cite>
     </blockquote>
 
+#### Multiple citation
+
+You can cite multiple items in a single citation by referencing all ids
+of the items you wish to quote separated by spaces. For example,
+`{% cite ruby microscope %}` would produce a cite tag like:
+
+    <a href="#ruby">(Flanagan, D. &amp; Matsumoto, Y. 2008; Shaughnessy, P. 2013)</a>
+
+#### Page numbers and locators
+
+If you would like to add page numbers to your citation, you can use the
+`-l` or `--locator` option. For example, `{% cite ruby -l 23-5 %}` would
+produce a citation like `(Matsumoto, Y., 2008, pp. 23-5)`.
+
+When quoting multiple items (see above) you can add multiple locators after
+the list of ids. For example, `{% cite ruby microscope -l 2 -l 24 & 32 %}`.
+
 #### Displaying formatted references
 
 If you want to display the full formatted reference entry, you can use the
@@ -336,7 +354,7 @@ document.
 ### File Repositories
 
 File repository support was added to Jekyll-Scholar starting at version
-4.0. Currently, if you have a folder in your site that contains PDF or
+2.0. Currently, if you have a folder in your site that contains PDF or
 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

data/Rakefile

@@ -15,6 +15,10 @@ Cucumber::Rake::Task.new(:features)
 
 task :default => [:features]
 
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+task :test_with_coveralls => [:features, 'coveralls:push']
+
 task :release do |t|
   system "gem build jekyll-scholar.gemspec"
   system "git tag v#{Jekyll::Scholar::VERSION}"

data/features/bibtex.feature

@@ -24,7 +24,6 @@ Feature: BibTeX
     And the "_site/references.html" file should exist
     And I should see "<i>The Ruby Programming Language</i>" in "_site/references.html"
 
-  @converters
   Scenario: Markdown Formatted Bibliography
     Given I have a scholar configuration with:
       | key   | value |
@@ -205,7 +204,7 @@ Feature: BibTeX
       """
       ---
       ---
-      {% bibliography  --style mla %}
+      {% bibliography  --style modern-language-association %}
       """
     When I run jekyll
     Then the _site directory should exist

data/features/citation.feature

@@ -111,3 +111,107 @@ Feature: Citations
     Then the _site directory should exist
     And the "_site/scholar.html" file should exist
     And I should see "#a-ruby" in "_site/scholar.html"
+
+  @tags @cite
+  Scenario: Multiple Citations
+    Given I have a scholar configuration with:
+      | key          | value             |
+      | source       | ./_bibliography   |
+      | bibliography | my_references     |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/my_references.bib":
+      """
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+
+      @book{microscope,
+        title     = {Ruby Under a Microscope},
+        author    = {Pat Shaughnessy},
+        year      = {2013},
+        publisher = {No Starch Press}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% cite ruby microscope %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "Flanagan & Matsumoto, 2008; Shaughnessy, 2013" in "_site/scholar.html"
+
+  @tags @cite @locator
+  Scenario: Multiple Citations with locators
+    Given I have a scholar configuration with:
+      | key          | value             |
+      | source       | ./_bibliography   |
+      | bibliography | my_references     |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/my_references.bib":
+      """
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+
+      @book{microscope,
+        title     = {Ruby Under a Microscope},
+        author    = {Pat Shaughnessy},
+        year      = {2013},
+        publisher = {No Starch Press}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% cite ruby microscope -l 2-3 --locator 23 & 42 %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "Matsumoto, 2008, pp. 2-3; Shaughnessy, 2013, pp. 23 & 42" in "_site/scholar.html"
+
+  @tags @cite @citation_number
+  Scenario: Multiple citations using citation numbers
+    Given I have a scholar configuration with:
+      | key          | value             |
+      | source       | ./_bibliography   |
+      | bibliography | my_references     |
+      | style        | ieee              |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/my_references.bib":
+      """
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+
+      @book{microscope,
+        title     = {Ruby Under a Microscope},
+        author    = {Pat Shaughnessy},
+        year      = {2013},
+        publisher = {No Starch Press}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% cite ruby microscope %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "\[1\], \[2\]" in "_site/scholar.html"
+

data/features/cited_only.feature

@@ -0,0 +1,72 @@
+Feature: Cited-only Bibliographies
+  As a scholar who likes to blog
+  I want to cite references on my website
+  And generate bibliographies for the cited items
+
+  Scenario: Cited-only references from a single bibliography
+    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{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      },
+      @book{smalltalk,
+        title     = {Smalltalk Best Practice Patterns},
+        author    = {Kent Beck},
+        year      = {1996},
+        publisher = {Prentice Hall}
+      }
+
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% cite smalltalk %}
+      {% bibliography --cited %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should not see "<i>The Ruby Programming Language</i>" in "_site/scholar.html"
+    And I should see "<i>Smalltalk Best Practice Patterns</i>" in "_site/scholar.html"
+
+  Scenario: No-cited items result in empty bibliography
+    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{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      },
+      @book{smalltalk,
+        title     = {Smalltalk Best Practice Patterns},
+        author    = {Kent Beck},
+        year      = {1996},
+        publisher = {Prentice Hall}
+      }
+
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography --cited %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should not see "<i>The Ruby Programming Language</i>" in "_site/scholar.html"
+    And I should not see "<i>Smalltalk Best Practice Patterns</i>" in "_site/scholar.html"
+

data/features/multiple_files.feature

@@ -0,0 +1,41 @@
+Feature: BibTeX
+  As a scholar who likes to blog
+  I want to publish my BibTeX bibliography on my website
+  Based on multiple BibTeX files
+
+
+  Scenario: Multiple bibliography files
+    Given I have a scholar configuration with:
+      | key    | value             |
+      | source | ./_bibliography   |
+    And I have a "_bibliography" directory
+    And I have a file "_bibliography/references1.bib":
+      """
+      @book{ruby,
+        title     = {The Ruby Programming Language},
+        author    = {Flanagan, David and Matsumoto, Yukihiro},
+        year      = {2008},
+        publisher = {O'Reilly Media}
+      }
+      """
+    And I have a file "_bibliography/references2.bib":
+      """
+      @book{microscope,
+        title     = {Ruby Under a Microscope},
+        author    = {Pat Shaughnessy},
+        year      = {2013},
+        publisher = {No Starch Press}
+      }
+      """
+    And I have a page "scholar.html":
+      """
+      ---
+      ---
+      {% bibliography -f references1 -f references2 %}
+      """
+    When I run jekyll
+    Then the _site directory should exist
+    And the "_site/scholar.html" file should exist
+    And I should see "<i>The Ruby Programming Language</i>" in "_site/scholar.html"
+    And I should see "<i>Ruby Under a Microscope</i>" in "_site/scholar.html"
+

data/features/step_definitions/jekyll_steps.rb

@@ -1,16 +1,6 @@
-Before do
-  FileUtils.rm_rf(TEST_DIR)
-  FileUtils.mkdir(TEST_DIR)
-  Dir.chdir(TEST_DIR)
-end
 
-After do
-  Dir.chdir(TEST_DIR)
-  FileUtils.rm_rf(TEST_DIR)
-end
- 
 # Like "I have a foo file" but gives a yaml front matter so jekyll actually processes it
-Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |file, key, value, text|
+Given(/^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/) do |file, key, value, text|
   File.open(file, 'w') do |f|
     f.write <<EOF
 ---
@@ -22,21 +12,21 @@ EOF
   end
 end
 
-Given /^I have an? "(.*)" file that contains "(.*)"$/ do |file, text|
+Given(/^I have an? "(.*)" file that contains "(.*)"$/) do |file, text|
   File.open(file, 'w') do |f|
     f.write(text)
     f.close
   end
 end
 
-Given /^I have a configuration file with "(.*)" set to "(.*)"$/ do |key, value|
+Given(/^I have a configuration file with "(.*)" set to "(.*)"$/) do |key, value|
   File.open('_config.yml', 'w') do |f|
     f.write("#{key}: #{value}\n")
     f.close
   end
 end
 
-Given /^I have a configuration file with:$/ do |table|
+Given(/^I have a configuration file with:$/) do |table|
   File.open('_config.yml', 'w') do |f|
     table.hashes.each do |row|
       f.write("#{row["key"]}: #{row["value"]}\n")
@@ -45,28 +35,27 @@ Given /^I have a configuration file with:$/ do |table|
   end
 end
 
-When /^I run jekyll$/ do
+When(/^I run jekyll$/) do
   run_jekyll
 end
 
-Then /^the (.*) directory should exist$/ do |dir|
+Then(/^the (.*) directory should exist$/) do |dir|
   assert File.directory?(dir)
 end
 
-Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
-  puts File.open(file).readlines.join
+Then(/^I should see "(.*)" in "(.*)"$/) do |text, file|
   assert_match Regexp.new(text), File.open(file).readlines.join
 end
 
-Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
+Then(/^I should not see "(.*)" in "(.*)"$/) do |text, file|
   assert !File.open(file).readlines.join.match(Regexp.new(text))
 end
 
 
-Then /^the "(.*)" file should exist$/ do |file|
+Then(/^the "(.*)" file should exist$/) do |file|
   assert File.file?(file)
 end
 
-Then /^the "(.*)" file should not exist$/ do |file|
+Then(/^the "(.*)" file should not exist$/) do |file|
   assert !File.exists?(file)
 end

data/features/step_definitions/scholar_steps.rb

@@ -1,15 +1,15 @@
 
-Given /^I have a "([^"]*)" directory/ do |dir|
+Given(/^I have a "([^"]*)" directory/) do |dir|
   FileUtils.mkdir(dir)
 end
 
-Given /^I have a (?:page|file) "([^"]*)":$/ do |file, string|
+Given(/^I have a (?:page|file) "([^"]*)":$/) do |file, string|
   File.open(file, 'w') do |f|
     f.write(string)
   end
 end
 
-Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table|
+Given(/^I have a configuration file with "([^\"]*)" set to:$/) do |key, table|
   File.open('_config.yml', 'w') do |f|
     f.write("#{key}:\n")
     table.hashes.each do |row|
@@ -18,7 +18,7 @@ Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table|
   end
 end
 
-Given /^I have a scholar configuration with:$/ do |table|
+Given(/^I have a scholar configuration with:$/) do |table|
   File.open('_config.yml', 'w') do |f|
     f.write("scholar:\n")
     table.hashes.each do |row|
@@ -28,7 +28,7 @@ Given /^I have a scholar configuration with:$/ do |table|
 end
 
 
-Then /^"(.*)" should come before "(.*)" in "(.*)"$/ do |p1, p2, file|
+Then(/^"(.*)" should come before "(.*)" in "(.*)"$/) do |p1, p2, file|
   data = File.open(file).readlines.join('')
 
   m1 = data.match(p1)

data/features/support/env.rb

@@ -1,7 +1,9 @@
-require 'rr'
-require 'test/unit'
-
-require 'jekyll/scholar'
+begin
+  require 'simplecov'
+  require 'coveralls' if ENV['CI']
+rescue LoadError
+  # ignore
+end
 
 begin
   require 'debugger'
@@ -9,6 +11,10 @@ rescue LoadError
   # ignore
 end
 
+require 'rr'
+require 'test/unit'
+
+require 'jekyll/scholar'
 
 World do
   include Test::Unit::Assertions
@@ -17,10 +23,10 @@ end
 TEST_DIR = File.join('/', 'tmp', 'jekyll')
 
 def run_jekyll(options = {})
-  
+
   options['source'] ||= TEST_DIR
   options['destination'] ||= File.join(TEST_DIR, '_site')
-  
+
   options = Jekyll.configuration(options)
 
   site = Jekyll::Site.new(options)

data/features/support/hooks.rb

@@ -0,0 +1,10 @@
+Before do
+  FileUtils.rm_rf(TEST_DIR) if File.exist?(TEST_DIR)
+  FileUtils.mkdir_p(TEST_DIR)
+  Dir.chdir(TEST_DIR)
+end
+
+After do
+  FileUtils.rm_rf(TEST_DIR) if File.exist?(TEST_DIR)
+end
+

data/jekyll-scholar.gemspec

@@ -26,8 +26,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = s.name
 
   s.add_runtime_dependency('jekyll', '~> 1.0')
-  s.add_runtime_dependency('citeproc-ruby', '~> 0.0.6')
-  s.add_runtime_dependency('bibtex-ruby', '~> 2.3')
+  s.add_runtime_dependency('citeproc-ruby', '~> 1.0')
+  s.add_runtime_dependency('csl-styles', '~> 1.0')
+  s.add_runtime_dependency('bibtex-ruby', '~> 3.0')
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/jekyll/scholar.rb

@@ -4,7 +4,8 @@ require 'jekyll'
 require 'optparse'
 
 require 'bibtex'
-require 'citeproc'
+require 'citeproc/ruby'
+require 'csl/styles'
 
 require 'jekyll/scholar/version'
 require 'jekyll/scholar/defaults'

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

@@ -1,45 +1,46 @@
 module Jekyll
   class Scholar
     class BibTeXConverter < Converter
+      include Scholar::Utilities
+
       safe true
       priority :highest
 
-			attr_reader :config
-    
+      attr_reader :config
+
       @pattern = (/bib(tex)?$/i).freeze
       @extension = '.html'.freeze
-      
-			class << self
-				attr_reader :pattern, :extension
-			end
-			
+
+      class << self
+        attr_reader :pattern, :extension
+      end
+
       def initialize(config = {})
         super
         @config['scholar'] = Scholar.defaults.merge(@config['scholar'] || {})
         @markdown = Jekyll::Converters::Markdown.new(config)
       end
-    
+
       def matches(extension)
-				extension =~ BibTeXConverter.pattern
-			end
-    
+        extension =~ BibTeXConverter.pattern
+      end
+
       def output_ext(extension)
-				BibTeXConverter.extension
-			end
-    
+        BibTeXConverter.extension
+      end
+
       def convert(content)
-				content = BibTeX.parse(content, :strict => true, :include => [:meta_content], :filter => [:latex]).map do |b|
+        content = BibTeX.parse(content, :strict => true, :include => [:meta_content], :filter => [:latex]).map do |b|
           if b.respond_to?(:to_citeproc)
-            CiteProc.process b.to_citeproc, :style => config['style'],
-              :locale => config['locale'], :format => 'html'
+            render_bibliography b
           else
-              b.is_a?(BibTeX::MetaContent) ? b.to_s : ''
+            b.is_a?(BibTeX::MetaContent) ? b.to_s : ''
           end
         end
 
         @markdown.convert(content.join("\n"))
       end
-    
+
     end
   end
-end
+end

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

@@ -38,15 +38,6 @@ module Jekyll
       end
     end
 
-    private
-
-    def citeproc
-      @citeproc ||= CiteProc::Processor.new do |p|
-        p.style = config['style']
-        p.format = 'html'
-        p.locale = config['locale']
-      end
-    end
   end
 end
 

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

@@ -10,14 +10,14 @@ module Jekyll
         super
 
         @config = Scholar.defaults.dup
-        @key, arguments = arguments.strip.split(/\s+/, 2)
+        @keys, arguments = split_arguments(arguments)
 
         optparse(arguments)
       end
 
       def render(context)
         set_context_to context
-        cite key
+        cite keys
       end
 
     end
@@ -25,4 +25,4 @@ module Jekyll
   end
 end
 
-Liquid::Template.register_tag('cite', Jekyll::Scholar::CiteTag)
+Liquid::Template.register_tag('cite', Jekyll::Scholar::CiteTag)

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

@@ -8,14 +8,16 @@ module Jekyll
         super
 
         @config = Scholar.defaults.dup
-        @key, arguments = arguments.strip.split(/\s+/, 2)
+        @keys, arguments = split_arguments arguments
 
         optparse(arguments)
       end
 
       def render(context)
         set_context_to context
-        cite_details key, text
+        keys.map { |key|
+          cite_details key, text
+        }.join("\n")
       end
     end
 

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

@@ -3,32 +3,32 @@ module Jekyll
 
     class QuoteTag < Liquid::Block
       include Scholar::Utilities
-      
+
       attr_reader :pages
-    
+
       def initialize(tag_name, arguments, tokens)
         super
-        
+
         @config = Scholar.defaults.dup
-        @key, arguments = arguments.strip.split(/\s+/, 2)
+        @keys, arguments = split_arguments arguments
       end
 
       def render(context)
         set_context_to context
-        
+
         quote = super.strip.gsub(/\n\n/, '</p><p>').gsub(/\n/, '<br/>')
         quote = content_tag :p, quote
-        
-        citation = cite key
-        
+
+        citation = cite keys
+
         quote << content_tag(:cite, citation)
-        
+
         content_tag :blockquote, quote
       end
-      
+
     end
-    
+
   end
 end
 
-Liquid::Template.register_tag('quote', Jekyll::Scholar::QuoteTag)
+Liquid::Template.register_tag('quote', Jekyll::Scholar::QuoteTag)

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

@@ -8,16 +8,16 @@ module Jekyll
         super
 
         @config = Scholar.defaults.dup
-        @key, arguments = arguments.strip.split(/\s+/, 2)
+        @keys, arguments = split_arguments arguments
 
         optparse(arguments)
       end
 
       def render(context)
         set_context_to context
-        reference_tag bibliography[key]
-      rescue
-        "(#{key})"
+        keys.map { |key|
+          reference_tag bibliography[key]
+        }.join("\n")
       end
     end
 

data/lib/jekyll/scholar/utilities.rb

@@ -1,13 +1,31 @@
 module Jekyll
   class Scholar
 
+    # Load styles into static memory.
+    # They should be thread safe as long as they are
+    # treated as being read-only.
+    STYLES = Hash.new do |h, k|
+      h[k.to_s] = CSL::Style.load k
+    end
+
+
     # Utility methods used by several Scholar plugins. The methods in this
-    # module may depend on the presence of #config, #bibtex_file, and
+    # module may depend on the presence of #config, #bibtex_files, and
     # #site readers
     module Utilities
 
-      attr_reader :bibtex_file, :config, :site, :query,
-        :context, :prefix, :key, :text
+      attr_reader :config, :site, :query,
+        :context, :prefix, :keys, :text
+
+      def split_arguments(arguments)
+
+        tokens = arguments.strip.split(/\s+/)
+
+        args = tokens.take_while { |a| !a.start_with?('-') }
+        opts = (tokens - args).join(' ')
+
+        [args, opts]
+      end
 
       def optparse(arguments)
         return if arguments.nil? || arguments.empty?
@@ -18,7 +36,8 @@ module Jekyll
           end
 
           opts.on('-f', '--file FILE') do |file|
-            @bibtex_file = file
+            @bibtex_files ||= []
+            @bibtex_files << file
           end
 
           opts.on('-q', '--query QUERY') do |query|
@@ -33,6 +52,10 @@ module Jekyll
             @text = text
           end
 
+          opts.on('-l', '--locator LOCATOR') do |locator|
+            locators << locator
+          end
+
           opts.on('-s', '--style STYLE') do |style|
             @style = style
           end
@@ -42,11 +65,24 @@ module Jekyll
           end
         end
 
-        argv = arguments.split(/(\B-[cfqptTs]|\B--(?:cited|file|query|prefix|text|style|template|))/)
+        argv = arguments.split(/(\B-[cfqptTsl]|\B--(?:cited|file|query|prefix|text|style|template|locator|))/)
 
         parser.parse argv.map(&:strip).reject(&:empty?)
       end
 
+      def locators
+        @locators ||= []
+      end
+
+      def bibtex_files
+        @bibtex_files ||= [config['bibliography']]
+      end
+
+      # :nodoc: backwards compatibility
+      def bibtex_file
+        bibtex_files[0]
+      end
+
       def bibtex_options
         config['bibtex_options'] ||= {}
       end
@@ -55,13 +91,23 @@ module Jekyll
         config['bibtex_filters'] ||= []
       end
 
+      def bibtex_paths
+        @bibtex_paths ||= bibtex_files.map { |file|
+          extend_path file
+        }
+      end
+
+      # :nodoc: backwards compatibility
       def bibtex_path
-        @bibtex_path ||= extend_path(bibtex_file)
+        bibtex_paths[0]
       end
 
       def bibliography
         unless @bibliography
-          @bibliography = BibTeX.open(bibtex_path, bibtex_options)
+          @bibliography = BibTeX.parse(
+            bibtex_paths.reduce('') { |s, p| s << IO.read(p) },
+            bibtex_options
+          )
           @bibliography.replace_strings if replace_strings?
         end
 
@@ -120,12 +166,11 @@ module Jekyll
         p
       end
 
-      def reference_tag(entry)
+      def reference_tag(entry, index = nil)
         return missing_reference unless entry
 
         entry = entry.convert(*bibtex_filters) unless bibtex_filters.empty?
-        reference = CiteProc.process entry.to_citeproc,
-          :style => style, :locale => config['locale'], :format => 'html'
+        reference = render_bibliography entry, index
 
         content_tag reference_tagname, reference,
           :id => [prefix, entry.key].compact.join('-')
@@ -167,7 +212,7 @@ module Jekyll
 
         liquid_template.render({
           'entry' => liquidify(entry),
-          'reference' => reference_tag(entry),
+          'reference' => reference_tag(entry, index),
           'key' => entry.key,
           'type' => entry.type,
           'link' => repository_link_for(entry),
@@ -228,23 +273,55 @@ module Jekyll
         config['details_dir']
       end
 
-      def cite(key)
-        context['cited'] ||= []
-        context['cited'] << key
+      def renderer
+        @renderer ||= CiteProc::Ruby::Renderer.new :format => 'html',
+          :style => style, :locale => config['locale']
+      end
 
-        if bibliography.key?(key)
-          entry = bibliography[key]
-          entry = entry.convert(*bibtex_filters) unless bibtex_filters.empty?
+      def render_citation(items)
+        renderer.render items.zip(locators).map { |entry, locator|
+          cited_keys << entry.key
 
-          citation = CiteProc.process entry.to_citeproc, :style => style,
-            :locale => config['locale'], :format => 'html', :mode => :citation
+          item = citation_item_for entry, citation_number
+          item.locator = locator
 
-          link_to "##{[prefix, entry.key].compact.join('-')}", citation.join
-        else
-          missing_reference
+          item
+        }, STYLES[style].citation
+      end
+
+      def render_bibliography(entry, index = nil)
+        renderer.render citation_item_for(entry, index),
+          STYLES[style].bibliography
+      end
+
+      def citation_item_for(entry, citation_number = nil)
+        CiteProc::CitationItem.new id: entry.id do |c|
+          c.data = CiteProc::Item.new entry.to_citeproc
+          c.data[:'citation-number'] = citation_number
+        end
+      end
+
+      def cited_keys
+        context['cited'] ||= []
+      end
+
+      def citation_number
+        number = context['citation_number'] || 1
+        context['citation_number'] = number.succ
+        number
+      end
+
+      def cite(keys)
+        items = keys.map do |key|
+          if bibliography.key?(key)
+            entry = bibliography[key]
+            entry = entry.convert(*bibtex_filters) unless bibtex_filters.empty?
+          else
+            return missing_reference
+          end
         end
-      rescue
-        "(#{key})"
+
+        link_to "##{[prefix, keys[0]].compact.join('-')}", render_citation(items)
       end
 
       def cite_details(key, text)

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,28 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        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: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 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
@@ -61,7 +75,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
+- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -71,14 +87,17 @@ files:
 - features/bibtex.feature
 - features/citation.feature
 - features/cite_details.feature
+- features/cited_only.feature
 - features/details.feature
 - features/filter.feature
+- features/multiple_files.feature
 - features/reference.feature
 - features/repository.feature
 - features/sorting.feature
 - features/step_definitions/jekyll_steps.rb
 - features/step_definitions/scholar_steps.rb
 - features/support/env.rb
+- features/support/hooks.rb
 - jekyll-scholar.gemspec
 - lib/jekyll/scholar.rb
 - lib/jekyll/scholar/converters/bibtex.rb
@@ -111,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: jekyll-scholar
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Jekyll extensions for the academic blogger.
@@ -119,11 +138,15 @@ test_files:
 - features/bibtex.feature
 - features/citation.feature
 - features/cite_details.feature
+- features/cited_only.feature
 - features/details.feature
 - features/filter.feature
+- features/multiple_files.feature
 - features/reference.feature
 - features/repository.feature
 - features/sorting.feature
 - features/step_definitions/jekyll_steps.rb
 - features/step_definitions/scholar_steps.rb
 - features/support/env.rb
+- features/support/hooks.rb
+has_rdoc: