jekyll-scholar 0.0.1 → 0.0.2

data/README.md

@@ -22,10 +22,18 @@ to a file in your plugin directory (e.g., to `_plugins/ext.rb`):
 
     require 'jekyll/scholar'
 
-In your configuration you can now adjust the Jekyll-Scholar settings
-
-    citation_style: apa
-    citation_language: en
+In your configuration you can now adjust the Jekyll-Scholar settings. The
+default configuration is as follows:
+
+    scholar:
+      style: apa
+      locale: en
+      
+      sort_by: none
+      order: ascending
+      
+      source: ./_bibliography
+      bibliography: references.bib
 
 You can use any style that ships with
 [CiteProc-Ruby](https://github.com/inukshuk/citeproc-ruby) by name (e.g.,
@@ -33,10 +41,14 @@ apa, mla, chicago-fullnote-bibliography), or else you can add a link
 to any CSL style (e.g., you could link to any of the styles available at
 the official [CSL style repository](https://github.com/citation-style-language/styles)).
 
-The `citation_language` settings defines what language to use when formatting
+The `locale` settings defines what language to use when formatting
 your references (this typically applies to localized terms, e.g., 'Eds.' for
 editors in English).
 
+The `source` option indicates where your bibliographies are stored;
+`bibliography` is the name of your default bibliography.
+
+
 ### Bibliographies
 
 Once you have loaded Jekyll-Scholar, all files with the extension `.bib` or
@@ -47,17 +59,17 @@ the citation style and language defined in your configuration file.
 
 For example, if you had a file `bibliography.bib` in your root directory:
 
-      ---
-      ---
-      References
-      ==========
-
-      @book{ruby,
-        title     = {The Ruby Programming Language},
-        author    = {Flanagan, David and Matsumoto, Yukihiro},
-        year      = {2008},
-        publisher = {O'Reilly Media}
-      }
+    ---
+    ---
+    References
+    ==========
+    
+    @book{ruby,
+      title     = {The Ruby Programming Language},
+      author    = {Flanagan, David and Matsumoto, Yukihiro},
+      year      = {2008},
+      publisher = {O'Reilly Media}
+    }
 
 It would be converted to `bibliography.html` with the following content:
 
@@ -65,14 +77,50 @@ It would be converted to `bibliography.html` with the following content:
 
     <p>Flanagan, D., &#38; Matsumoto, Y. (2008). <i>The Ruby Programming Language</i>. O&#8217;Reilly Media.</p>
 
-This makes it very easy for you to add you bibliography to your Jekyll-powered
+This makes it very easy for you to add your bibliography to your Jekyll-powered
 blog or website.
 
+If your using other converters to generate your site, don't worry, you can
+still generate bibliographies using the `bibliography` tag. In your site
+or blog post, simply call:
+
+    {% bibliography %}
+
+This will generate your default bibliography; if you use multiple, you can
+also pass in a name to tell Jekyll-Scholar which bibliography it should render.
+
+Let's say you have two bibliographies stored in `_bibliography/books.bib` and
+`_bibliography/papers.bib`; you can include the bibliographies on your site
+by respectively calling:
+
+    {% bibliography books %}
+    
+    {% bibliography papers %}
+
 
 ### Citations
 
-Jekyll-Scholar will support inline citations and automatic generation of
-a list of references for individual blog posts. Stay tuned.
+If you want to reference books or papers from your bibliography in your blog
+posts, Jekyll-Scholar can help you, too. Simply use the `cite` tag with
+the appropriate key of the item you want to cite and Jekyll-Scholar will
+create a formatted citation reference for you. For example:
+
+    "Once upon a midnight dreary..." {{% cite poe %}}
+
+
+Contributing
+------------
+
+The Jekyll-Scholar source code is
+[hosted on GitHub](http://github.com/inukshuk/jekyll-scholar/).
+You can check out a copy of the latest code using Git:
+
+    $ git clone https://github.com/inukshuk/jekyll-scholar.git
+
+If you've found a bug or have a question, please open an issue on the
+[Jekyll-Scholar issue tracker](http://github.com/inukshuk/jekyll-scholar/issues).
+Or, for extra credit, clone the Jekyll-Scholar repository, write a failing
+example, fix the bug and submit a pull request.
 
 
 License

data/features/bibtex.feature

@@ -3,9 +3,12 @@ Feature: BibTeX
   I want to publish my BibTeX bibliography on my blog
   In order to share my awesome references with my peers
 
+  @converters
 	Scenario: Simple Bibliography
-		Given I have a configuration file with "citation_style" set to "apa"
-	  And I have a page "references.bib":
+	  Given I have a scholar configuration with:
+		  | key   | value |
+		  | style | apa   |
+		 And I have a page "references.bib":
 			"""
 			---
 			---
@@ -21,8 +24,11 @@ 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 configuration file with "citation_style" set to "apa"
+    Given I have a scholar configuration with:
+  	  | key   | value |
+  	  | style | apa   |
 	  And I have a page "references.bib":
 			"""
 			---
@@ -39,3 +45,47 @@ Feature: BibTeX
 			"""
 	  When I run jekyll
 	  Then I should see "<h1[^>]*>References</h1>" in "_site/references.html"
+
+  @latex
+	Scenario: Simple Bibliography with LaTeX directives
+    Given I have a scholar configuration with:
+  	  | key   | value |
+  	  | style | apa   |
+	  And I have a page "references.bib":
+			"""
+			---
+			---
+			@misc{umlaut,
+			  title     = {Look, an umlaut: \"u!},
+			}
+			"""
+	  When I run jekyll
+	  Then the _site directory should exist
+		And the "_site/references.html" file should exist
+	  And I should see "Look, an umlaut: ü!" in "_site/references.html"
+
+  @tags
+	Scenario: Simple Bibliography Loaded From Default Directory
+    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}
+			}
+			"""
+	  And I have a page "scholar.html":
+			"""
+			---
+			---
+			{% bibliography references %}
+			"""
+	  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"

data/features/citation.feature

@@ -0,0 +1,57 @@
+Feature: Citations
+  As a scholar who likes to blog
+  I want to reference cool papers and books from my bibliography
+
+  @tags
+	Scenario: A Simple Citation
+    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}
+			}
+			"""
+	  And I have a page "scholar.html":
+			"""
+			---
+			---
+			{% cite ruby %}
+			"""
+	  When I run jekyll
+	  Then the _site directory should exist
+		And the "_site/scholar.html" file should exist
+	  And I should see "Flanagan" in "_site/scholar.html"
+
+  @tags
+	Scenario: Missing references
+    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}
+			}
+			"""
+	  And I have a page "scholar.html":
+			"""
+			---
+			---
+			{% cite java %}
+			"""
+	  When I run jekyll
+	  Then the _site directory should exist
+		And the "_site/scholar.html" file should exist
+	  And I should see "missing reference" in "_site/scholar.html"

data/features/sorting.feature

@@ -0,0 +1,69 @@
+Feature: Sorting BibTeX Bibliographies
+  As a scholar who likes to blog
+  I want to sort my bibliographies according to configurable parameters
+
+  @tags @sorting
+	Scenario: Sort By Year
+    Given I have a scholar configuration with:
+  	  | key     | value             |
+  	  | sort_by | year              |
+		And I have a "_bibliography" directory
+	  And I have a file "_bibliography/references.bib":
+			"""
+			@book{ruby1,
+			  title     = {The Ruby Programming Language},
+			  author    = {Flanagan, David and Matsumoto, Yukihiro},
+			  year      = {2008},
+			  publisher = {O'Reilly Media}
+			}
+			@book{ruby2,
+			  title     = {The Ruby Programming Language},
+			  author    = {Flanagan, David and Matsumoto, Yukihiro},
+			  year      = {2007},
+			  publisher = {O'Reilly Media}
+			}
+			"""
+	  And I have a page "scholar.html":
+			"""
+			---
+			---
+			{% bibliography references %}
+			"""
+	  When I run jekyll
+	  Then the _site directory should exist
+		And the "_site/scholar.html" file should exist
+    Then "2007" should come before "2008" in "_site/scholar.html"
+
+  @tags @sorting
+	Scenario: Reverse Sort Order
+    Given I have a scholar configuration with:
+  	  | key     | value             |
+  	  | sort_by | year              |
+  	  | order   | descending        |
+		And I have a "_bibliography" directory
+	  And I have a file "_bibliography/references.bib":
+			"""
+			@book{ruby1,
+			  title     = {The Ruby Programming Language},
+			  author    = {Flanagan, David and Matsumoto, Yukihiro},
+			  year      = {2008},
+			  publisher = {O'Reilly Media}
+			}
+			@book{ruby2,
+			  title     = {The Ruby Programming Language},
+			  author    = {Flanagan, David and Matsumoto, Yukihiro},
+			  year      = {2007},
+			  publisher = {O'Reilly Media}
+			}
+			"""
+	  And I have a page "scholar.html":
+			"""
+			---
+			---
+			{% bibliography references %}
+			"""
+	  When I run jekyll
+	  Then the _site directory should exist
+		And the "_site/scholar.html" file should exist
+    Then "2008" should come before "2007" in "_site/scholar.html"
+

data/features/step_definitions/jekyll_steps.rb

@@ -45,16 +45,6 @@ Given /^I have a configuration file with:$/ do |table|
   end
 end
 
-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|
-      f.write("- #{row["value"]}\n")
-    end
-    f.close
-  end
-end
-
 When /^I run jekyll$/ do
   run_jekyll
 end

data/features/step_definitions/scholar_steps.rb

@@ -1,6 +1,39 @@
 
-Given /^I have a page "([^"]*)":$/ do |file, string|
+Given /^I have a "([^"]*)" directory/ do |dir|
+  FileUtils.mkdir(dir)
+end
+
+Given /^I have a (?:page|file) "([^"]*)":$/ do |file, string|
   File.open(file, 'w') do |f|
-   f.write(string)
+    f.write(string)
+  end
+end
+
+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|
+      f.write("  #{row["key"]}: #{row["value"]}\n")
+    end
+  end
+end
+
+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|
+      f.write("  #{row["key"]}: #{row["value"]}\n")
+    end
   end
 end
+
+
+Then /^"(.*)" should come before "(.*)" in "(.*)"$/ do |p1, p2, file|
+  data = File.open(file).readlines.join('')
+
+  m1 = data.match(p1)
+  m2 = data.match(p2)
+
+  assert m1.offset(0)[0] < m2.offset(0)[0]
+end
+

data/jekyll-scholar.gemspec

@@ -21,16 +21,16 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('jekyll', '~> 0.10')
   s.add_runtime_dependency('citeproc-ruby', '~> 0.0.6')
   s.add_runtime_dependency('bibtex-ruby', '~> 2.0.5')
-  
-  s.add_development_dependency('bundler', '~> 1.1')
-  s.add_development_dependency('rdoc', '~> 3.12')
-  s.add_development_dependency('rake', '~> 0.9')
-  s.add_development_dependency('redgreen', ">= 1.2.2")
-  s.add_development_dependency('shoulda', ">= 2.11.3")
-  s.add_development_dependency('rr', ">= 1.0.2")
-  s.add_development_dependency('cucumber', ">= 0.10.0")
-  s.add_development_dependency('RedCloth', ">= 4.2.1")
-  s.add_development_dependency('rdiscount', ">= 1.6.5")
+
+  s.add_development_dependency('rake', "~> 0.9")
+  s.add_development_dependency('rdoc', "~> 3.11")
+  s.add_development_dependency('redgreen', "~> 1.2")
+  s.add_development_dependency('shoulda', "~> 2.11")
+  s.add_development_dependency('rr', "~> 1.0")
+  s.add_development_dependency('cucumber', "1.1")
+  s.add_development_dependency('RedCloth', "~> 4.2")
+  s.add_development_dependency('rdiscount', "~> 1.6")
+  s.add_development_dependency('redcarpet', "~> 1.9")  
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/jekyll/scholar.rb

@@ -1,4 +1,29 @@
 
 require 'jekyll'
+
+require 'bibtex'
+require 'citeproc'
+
 require 'jekyll/scholar/version'
 require 'jekyll/scholar/converters/bibtex'
+require 'jekyll/scholar/tags/bibliography'
+require 'jekyll/scholar/tags/cite'
+
+module Jekyll
+  class Scholar
+    
+    @defaults = Hash[*%w{
+      style        apa
+      locale       en
+      sort_by      none
+      order        ascending
+      source       ./_bibliography
+      bibliography references.bib
+    }].freeze
+    
+    class << self
+      attr_reader :defaults
+    end
+    
+  end
+end

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

@@ -1,36 +1,36 @@
-require 'bibtex'
-require 'citeproc'
-
 module Jekyll
-  module Scholar
+  class Scholar
     class BibTeXConverter < Converter
       safe true
     
       priority :highest
     
-      DEFAULTS = Hash[*%w{
-        citation_style  apa
-        citation_locale en
-      }].freeze
-      
-      PATTERN = (/bib(tex)?$/i).freeze
-      EXTENSION = '.html'.freeze
+      @pattern = (/bib(tex)?$/i).freeze
+      @extension = '.html'.freeze
       
+			class << self
+				attr_reader :pattern, :extension
+			end
+			
       def initialize (config = {})
         super
-        @config['scholar'] = DEFAULTS.merge(@config['scholar'] || {})
+        @config['scholar'] = Scholar.defaults.merge(@config['scholar'] || {})
         @markdown = MarkdownConverter.new config
       end
     
-      def matches (extension); extension =~ PATTERN; end
+      def matches(extension)
+				extension =~ BibTeXConverter.pattern
+			end
     
-      def output_ext (extension); EXTENSION; end
+      def output_ext(extension)
+				BibTeXConverter.extension
+			end
     
       def convert (content)
-        content = BibTeX.parse(content, :include => [:meta_content]).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['citation_style'],
-              :locale => @config['citation_locale'], :format => 'html'
+            CiteProc.process b.to_citeproc, :style => @config['style'],
+              :locale => @config['locale'], :format => 'html'
           else
               b.is_a?(BibTeX::MetaContent) ? b.to_s : ''
           end

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

@@ -0,0 +1,55 @@
+module Jekyll
+  class Scholar
+
+    class BibliographyTag < Liquid::Tag
+  
+      attr_reader :file, :config
+    
+      def initialize(tag_name, arguments, tokens)
+        super
+        
+        @config = Scholar.defaults.dup
+        @file = arguments.strip
+      end
+
+      def render(context)
+        config.merge!(context.registers[:site].config['scholar'] || {})
+
+        entries.map { |e|
+          CiteProc.process e.to_citeproc, :style => config['style'],
+            :locale => config['locale'], :format => 'html'
+        }.join("\n")
+      end
+      
+      private
+      
+      def bibliography
+        @bibliography ||= BibTeX.open(extend_path(file), :filter => :latex)
+      end          
+      
+      def entries
+        b = bibliography['@*']
+
+        unless config['sort_by'] == 'none'
+          b.sort_by! { |e| e[config['sort_by']] }
+          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
+end
+
+Liquid::Template.register_tag('bibliography', Jekyll::Scholar::BibliographyTag)

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

@@ -0,0 +1,45 @@
+module Jekyll
+  class Scholar
+
+    class CiteTag < Liquid::Tag
+  
+      attr_reader :key, :pages, :config
+    
+      def initialize(tag_name, arguments, tokens)
+        super
+        
+        @config = Scholar.defaults.dup
+        @key = arguments.strip.split(/\s+/)[0]
+      end
+
+      def render(context)
+        config.merge!(context.registers[:site].config['scholar'] || {})
+
+        puts key
+        e = bibliography[key]
+        puts e
+        if e
+          CiteProc.process e.to_citeproc, :style => config['style'],
+            :locale => config['locale'], :format => 'html', :mode => :citation
+        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
+end
+
+Liquid::Template.register_tag('cite', Jekyll::Scholar::CiteTag)

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70277834274540 !ruby/object:Gem::Requirement
+  requirement: &70141486252080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *70277834274540
+  version_requirements: *70141486252080
 - !ruby/object:Gem::Dependency
   name: citeproc-ruby
-  requirement: &70277834273580 !ruby/object:Gem::Requirement
+  requirement: &70141486251300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70277834273580
+  version_requirements: *70141486251300
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
-  requirement: &70277834288720 !ruby/object:Gem::Requirement
+  requirement: &70141486249780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,106 +43,106 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70277834288720
+  version_requirements: *70141486249780
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70277834287260 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70141486264360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70277834287260
+  version_requirements: *70141486264360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70277834286200 !ruby/object:Gem::Requirement
+  requirement: &70141486263420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *70277834286200
+  version_requirements: *70141486263420
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70277834285300 !ruby/object:Gem::Requirement
+  name: redgreen
+  requirement: &70141486262680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70277834285300
+  version_requirements: *70141486262680
 - !ruby/object:Gem::Dependency
-  name: redgreen
-  requirement: &70277834284200 !ruby/object:Gem::Requirement
+  name: shoulda
+  requirement: &70141486261140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70277834284200
+  version_requirements: *70141486261140
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70277834283440 !ruby/object:Gem::Requirement
+  name: rr
+  requirement: &70141486260640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70277834283440
+  version_requirements: *70141486260640
 - !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70277834282580 !ruby/object:Gem::Requirement
+  name: cucumber
+  requirement: &70141486259820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70277834282580
+  version_requirements: *70141486259820
 - !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &70277834281600 !ruby/object:Gem::Requirement
+  name: RedCloth
+  requirement: &70141486258100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *70277834281600
+  version_requirements: *70141486258100
 - !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: &70277834297280 !ruby/object:Gem::Requirement
+  name: rdiscount
+  requirement: &70141486273300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70277834297280
+  version_requirements: *70141486273300
 - !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &70277834296260 !ruby/object:Gem::Requirement
+  name: redcarpet
+  requirement: &70141486271560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '1.9'
   type: :development
   prerelease: false
-  version_requirements: *70277834296260
+  version_requirements: *70141486271560
 description: A set of jekyll extensions for academic blogging.
 email: http://sylvester.keil.or.at
 executables: []
@@ -154,12 +154,16 @@ files:
 - LICENSE
 - README.md
 - features/bibtex.feature
+- features/citation.feature
+- features/sorting.feature
 - features/step_definitions/jekyll_steps.rb
 - features/step_definitions/scholar_steps.rb
 - features/support/env.rb
 - jekyll-scholar.gemspec
 - lib/jekyll/scholar.rb
 - lib/jekyll/scholar/converters/bibtex.rb
+- lib/jekyll/scholar/tags/bibliography.rb
+- lib/jekyll/scholar/tags/cite.rb
 - lib/jekyll/scholar/version.rb
 homepage: http://github.com/inukshuk/jekyll-scholar
 licenses: []
@@ -187,6 +191,8 @@ specification_version: 3
 summary: Jekyll extensions for the academic blogger.
 test_files:
 - features/bibtex.feature
+- features/citation.feature
+- features/sorting.feature
 - features/step_definitions/jekyll_steps.rb
 - features/step_definitions/scholar_steps.rb
 - features/support/env.rb