diff --git a/lib/jekyll/scholar.rb b/lib/jekyll/scholar.rb
index b3d2f55a35df36ef770faedd7ee9a1602794a83a..d9832a4caea9d3182ab2e303290d8cc932b11270 100644
--- a/lib/jekyll/scholar.rb
+++ b/lib/jekyll/scholar.rb
@@ -5,36 +5,10 @@ require 'bibtex'
require 'citeproc'
require 'jekyll/scholar/version'
+require 'jekyll/scholar/defaults'
require 'jekyll/scholar/utilities'
+
require 'jekyll/scholar/converters/bibtex'
require 'jekyll/scholar/tags/bibliography'
require 'jekyll/scholar/tags/cite'
require 'jekyll/scholar/generators/details'
-
-module Jekyll
- class Scholar
-
- @defaults = Hash[*%w{
-
- style apa
- locale en
-
- sort_by none
- order ascending
-
- source ./_bibliography
- bibliography references.bib
-
- details_dir ./bibliography
- details_layout bibtex.html
-
- query @*
-
- }].freeze
-
- class << self
- attr_reader :defaults
- end
-
- end
-end
diff --git a/lib/jekyll/scholar/defaults.rb b/lib/jekyll/scholar/defaults.rb
new file mode 100644
index 0000000000000000000000000000000000000000..39d2e67e01a8bd79818e07a853d8e9601eb511b9
--- /dev/null
+++ b/lib/jekyll/scholar/defaults.rb
@@ -0,0 +1,26 @@
+module Jekyll
+ class Scholar
+ @defaults = Hash[*%w{
+
+ style apa
+ locale en
+
+ sort_by none
+ order ascending
+
+ source ./_bibliography
+ bibliography references.bib
+
+ details_dir bibliography
+ details_layout bibtex.html
+ details_link Details
+
+ query @*
+
+ }].freeze
+
+ class << self
+ attr_reader :defaults
+ end
+ end
+end
\ No newline at end of file
diff --git a/lib/jekyll/scholar/generators/details.rb b/lib/jekyll/scholar/generators/details.rb
index 2e334a3b2bd2ecef35e49659e620edbca6b6d953..31c5d858b6092c9b378058a256ba79ffd7b38e03 100644
--- a/lib/jekyll/scholar/generators/details.rb
+++ b/lib/jekyll/scholar/generators/details.rb
@@ -2,15 +2,14 @@ module Jekyll
class Scholar
class Details < Page
-
- attr_reader :config
+ include Scholar::Utilities
def initialize(site, base, dir, entry)
@site, @base, @dir = site, base, dir
@config = Scholar.defaults.merge(site.config['scholar'] || {})
- @name = filename_for(entry)
+ @name = details_file_for(entry)
process(@name)
read_yaml(File.join(base, '_layouts'), config['details_layout'])
@@ -20,14 +19,6 @@ module Jekyll
private
- def filename_for(entry)
- n = entry.key.dup
-
- n.gsub!(/[:\s]+/, '_')
-
- [n, 'html'].join('.')
- end
-
def liquidify(entry)
data['entry'] = {}
@@ -42,16 +33,17 @@ module Jekyll
end
class DetailsGenerator < Generator
+ include Scholar::Utilities
safe true
attr_reader :config
def generate(site)
- @config = Scholar.defaults.merge(site.config['scholar'] || {})
+ @site, @config = site, Scholar.defaults.merge(site.config['scholar'] || {})
- if site.layouts.key?(File.basename(config['details_layout'], '.html'))
- bibliography[config['query']].each do |entry|
- details = Details.new(site, site.source, config['details_dir'], entry)
+ if generate_details?
+ entries.each do |entry|
+ details = Details.new(site, site.source, details_path, entry)
details.render(site.layouts, site.site_payload)
details.write(site.dest)
@@ -61,17 +53,6 @@ module Jekyll
end
end
- private
-
- def bibliography
- @bibliography ||= BibTeX.open(bibliography_path, :filter => :latex)
- end
-
- def bibliography_path
- p = File.join(config['source'], config['bibliography'])
- p << '.bib' unless File.exists?(p)
- p
- end
end
diff --git a/lib/jekyll/scholar/tags/bibliography.rb b/lib/jekyll/scholar/tags/bibliography.rb
index b395b7b3041caffb0c325bd77c1ca17fd339409c..6f79efe5b22b288daeab5e21e7d2bd67fdcdb3a5 100644
--- a/lib/jekyll/scholar/tags/bibliography.rb
+++ b/lib/jekyll/scholar/tags/bibliography.rb
@@ -2,65 +2,35 @@ module Jekyll
class Scholar
class BibliographyTag < Liquid::Tag
+ include Scholar::Utilities
- attr_reader :file, :config
-
def initialize(tag_name, arguments, tokens)
super
@config = Scholar.defaults.dup
- @file = arguments.strip
+ @bibtex_file = arguments.strip
end
def render(context)
- config.merge!(context.registers[:site].config['scholar'] || {})
+ @site = context.registers[:site]
+ config.merge!(site.config['scholar'] || {})
references = entries.map do |e|
- r = CiteProc.process e.to_citeproc, :style => config['style'],
+ reference = CiteProc.process e.to_citeproc, :style => config['style'],
:locale => config['locale'], :format => 'html'
- r = "#{r}"
+ reference = "#{reference}"
- if e.field?(:url)
- r << "URL"
- end
-
- if e.field?(:doi)
- r << "DOI"
+ if generate_details?
+ reference << "#{config['details_link']}"
end
-
- "#{r}"
+
+ "#{reference}"
end
"\n#{references.join("\n")}\n
"
end
- private
-
- def bibliography
- @bibliography ||= BibTeX.open(extend_path(file), :filter => :latex)
- end
-
- def entries
- b = bibliography[config['query']]
-
- unless config['sort_by'] == 'none'
- b.sort_by! { |e| e[config['sort_by']].to_s }
- b.reverse! if config['order'] =~ /^(desc|reverse)/i
- end
-
- b
- end
-
- def extend_path(name)
- if name.nil? || name.empty?
- name = config['bibliography']
- end
-
- p = File.join(config['source'], name)
- p << '.bib' unless File.exists?(p)
- p
- end
end
end
diff --git a/lib/jekyll/scholar/tags/cite.rb b/lib/jekyll/scholar/tags/cite.rb
index 5202743892571b52e71a74d6b285faeabcdf44fa..b22ac74b8f8ac3407286da01c8956896c7dc4aaf 100644
--- a/lib/jekyll/scholar/tags/cite.rb
+++ b/lib/jekyll/scholar/tags/cite.rb
@@ -2,7 +2,8 @@ module Jekyll
class Scholar
class CiteTag < Liquid::Tag
-
+ include Scholar::Utilities
+
attr_reader :key, :pages, :config
def initialize(tag_name, arguments, tokens)
@@ -15,29 +16,18 @@ module Jekyll
def render(context)
config.merge!(context.registers[:site].config['scholar'] || {})
- e = bibliography[key]
+ entry = bibliography[key]
- if e
- c = CiteProc.process e.to_citeproc, :style => config['style'],
+ if entry
+ c = CiteProc.process entry.to_citeproc, :style => config['style'],
:locale => config['locale'], :format => 'html', :mode => :citation
- "#{c}"
+ "#{c}"
else
"(missing reference)"
end
end
- private
-
- def bibliography
- @bibliography ||= BibTeX.open(extend_path(config['bibliography']), :filter => :latex)
- end
-
- def extend_path(name)
- p = File.join(config['source'], name)
- p << '.bib' unless File.exists?(p)
- p
- end
end
end
diff --git a/lib/jekyll/scholar/utilities.rb b/lib/jekyll/scholar/utilities.rb
index 3dd13c1b2e3d9a8823652d912207aaad87f81a98..28b1d70d1fe0d3b4d047a7cb7a4095c3ed75cd3b 100644
--- a/lib/jekyll/scholar/utilities.rb
+++ b/lib/jekyll/scholar/utilities.rb
@@ -1,10 +1,67 @@
module Jekyll
- class Scholar
-
- module Utilities
-
-
- end
-
- end
+ class Scholar
+
+ # Utility methods used by several Scholar plugins. The methods in this
+ # module may depend on the presence of #config, #bibtex_file, and
+ # #site readers
+ module Utilities
+
+ attr_reader :bibtex_file, :config, :site
+
+ def bibtex_options
+ @bibtex_options ||= { :filter => :latex }
+ end
+
+ def bibtex_path
+ @bibtex_path ||= extend_path(bibtex_file)
+ end
+
+ def bibliography
+ @bibliography ||= BibTeX.open(bibtex_path, bibtex_options)
+ end
+
+ def entries
+ b = bibliography[config['query']]
+
+ unless config['sort_by'] == 'none'
+ b.sort_by! { |e| e[config['sort_by']].to_s }
+ b.reverse! if config['order'] =~ /^(desc|reverse)/i
+ end
+
+ b
+ end
+
+ def extend_path(name)
+ if name.nil? || name.empty?
+ name = config['bibliography']
+ end
+
+ p = File.join(config['source'], name)
+ p << '.bib' unless File.exists?(p)
+ p
+ end
+
+ def generate_details?
+ site.layouts.key?(File.basename(config['details_layout'], '.html'))
+ end
+
+ def details_file_for(entry)
+ name = entry.key.to_s.dup
+
+ name.gsub!(/[:\s]+/, '_')
+
+ [name, 'html'].join('.')
+ end
+
+ def details_link_for(entry)
+ [site.source, details_path, details_file_for(entry)].join('/')
+ end
+
+ def details_path
+ config['details_dir']
+ end
+
+ end
+
+ end
end
\ No newline at end of file