jekyll-scholar 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e169fc7d980dafa5ad612600118efd4203ebea20
-  data.tar.gz: 2943347383b39ec0b9ba69da6b45d3922d7827a1
+  metadata.gz: fd97537f40b52ff26ec6564b5d22bea683991fb2
+  data.tar.gz: fdc05e3ae4767f19e44b89b730a1014abd5549de
 SHA512:
-  metadata.gz: 260730d6739653ef5e47db756f2bed262976fbb220c76b927c379fc546f4503d424e3480e1287157b9cedb14773f0282f1dfaf9acdce578f8ebda5c161ff2cc0
-  data.tar.gz: 64869e0857a2ee4ac5e1e545e5a6e900f154c1105cc909fa5dacf2220263e34c3ff3e52c9068561d3f6eb539e3ec336d5e3579eb1fbbf0bb76b3facc90ea4b80
+  metadata.gz: 625084ad4b2d9cac4dfb56322da7e8c4732398ed94d07099262d1779ed9a60ecdf9334785db8b771d8c3fe2c521bbcf2399532699f3be01a358a431476b56dcd
+  data.tar.gz: ecef959d91c3552a1d452f067f0b215c42dcece7024cfc7369e638fdd606f7586473efe4537a1b304fc3a0d97229282d515971653a33ddb62c4870dc9fa43c5b

data/Gemfile

@@ -5,7 +5,7 @@ group 'development' do
   gem 'rake'
   gem 'redgreen', '~> 1.2'
   gem 'shoulda', '~> 3.3.2'
-  gem 'rr', '~> 1.0'
+  gem 'rr', '~> 1.0.5'
   gem 'cucumber', '~> 1.2.1'
   gem 'RedCloth', '~> 4.2'
   gem 'rdiscount', '~> 1.6'

data/features/bibtex.feature

@@ -185,3 +185,29 @@ Feature: BibTeX
     And the "_site/scholar.html" file should exist
     And I should not see "ruby" in "_site/scholar.html"
     And I should see "id=\"a-smalltalk\"" in "_site/scholar.html"
+
+  @tags @bibliography @style
+  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  --style mla %}
+      """
+    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>. O’Reilly Media, 2008" in "_site/scholar.html"

data/lib/jekyll/scholar/utilities.rb

@@ -32,9 +32,13 @@ module Jekyll
           opts.on('-t', '--text TEXT') do |text|
             @text = text
           end
+
+          opts.on('-s', '--style STYLE') do |style|
+            @style = style
+          end 
         end
 
-        argv = arguments.split(/(\B-[cfqpt]|\B--(?:cited|file|query|prefix|text))/)
+        argv = arguments.split(/(\B-[cfqpts]|\B--(?:cited|file|query|prefix|text|style|))/)
 
         parser.parse argv.map(&:strip).reject(&:empty?)
       end
@@ -88,12 +92,16 @@ module Jekyll
 
         entry = entry.convert(*bibtex_filters) unless bibtex_filters.empty?
         reference = CiteProc.process entry.to_citeproc,
-          :style => config['style'], :locale => config['locale'], :format => 'html'
+          :style => style, :locale => config['locale'], :format => 'html'
 
         content_tag reference_tagname, reference,
           :id => [prefix, entry.key].compact.join('-')
       end
 
+      def style
+        @style || config['style']
+      end
+
       def missing_reference
         config['missing_reference']
       end

data/lib/jekyll/scholar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scholar
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll