middleman-citation 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 286416774bb47fa76c06bd0ad5067eea4b00e7d5
-  data.tar.gz: 27cae4ae86573f3b64bddd540690a1b8ec1d9956
+  metadata.gz: efc324dd3c7b35e0831c87aa22d919a04c13e836
+  data.tar.gz: 1e241301352b1177dd194d8f7f88d4fb466fad78
 SHA512:
-  metadata.gz: 29b0c21ac80b93034f8a4833bf9e206f930800bf8d0278dc6b531fb9565a0fdfb66de9b7ba50757362c90899cf97892ba60e6cf910090f0e1f36de1fd2831d03
-  data.tar.gz: 8017a55b8208dba643d399fcdf6d57d641a6699eacbe3c02ff052b43aa530a9f1fc4ec1ef0e0616ef168f33b9c118f3255cc76a399b35368981699e55e93010b
+  metadata.gz: '09c135dbafcb8c645cad26bce8324e22b90a7686f914f4b7855db76439351ddaecb8ded79810b47b06d75018b19a984cf408724969d4ae9ef4665804031be0c4'
+  data.tar.gz: 032e79fddee12b52c3d1ef01fb7641e2bb74348329c9f4e6a32484eea03fc086013a6768ea4fdbb9bf28cf8681d5f73f0dd24057e4686461e2070643a2a9e043

data/Gemfile

@@ -9,6 +9,7 @@ group :development do
   gem 'yard'
   gem 'guard'
   gem 'pry'
+  gem 'middleman', ['~> 4.0']
 end
 
 group :test do

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    middleman-citation (0.4.1)
+    middleman-citation (0.4.2)
       bibtex-ruby
       citeproc-ruby
       csl-styles
-      middleman-core (~> 4)
+      middleman-core (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
@@ -25,10 +25,10 @@ GEM
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
     backports (3.6.8)
-    bibtex-ruby (4.4.2)
+    bibtex-ruby (4.4.3)
       latex-decode (~> 0.0)
-    builder (3.2.2)
-    capybara (2.10.1)
+    builder (3.2.3)
+    capybara (2.12.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -37,13 +37,19 @@ GEM
       xpath (~> 2.0)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    citeproc (1.0.4)
+    citeproc (1.0.5)
       namae (~> 0.8)
-    citeproc-ruby (1.1.5)
+    citeproc-ruby (1.1.6)
       citeproc (>= 1.0.4, < 2.0)
       csl (~> 1.4)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.0.4)
     contracts (0.13.0)
     csl (1.4.5)
       namae (~> 0.7)
@@ -60,17 +66,17 @@ GEM
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
-    diff-lcs (1.2.5)
-    dotenv (2.1.1)
+    diff-lcs (1.3)
+    dotenv (2.2.0)
     erubis (2.7.0)
     execjs (2.7.0)
     fast_blank (1.0.0)
-    fastimage (2.0.0)
+    fastimage (2.0.1)
       addressable (~> 2)
-    ffi (1.9.14)
+    ffi (1.9.17)
     formatador (0.2.5)
     gherkin (4.0.0)
-    guard (2.14.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
@@ -84,21 +90,33 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    haml (4.0.7)
+      tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (3.4.6)
+    hashie (3.5.1)
     i18n (0.7.0)
-    json (1.8.3)
+    kramdown (1.13.2)
     latex-decode (0.2.2)
       unicode (~> 0.4)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    lumberjack (1.0.10)
+    lumberjack (1.0.11)
     memoist (0.15.0)
     method_source (0.8.2)
-    middleman-core (4.1.10)
-      activesupport (~> 4.2)
+    middleman (4.2.1)
+      coffee-script (~> 2.2)
+      compass-import-once (= 1.0.5)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-cli (= 4.2.1)
+      middleman-core (= 4.2.1)
+      sass (>= 3.4.0, < 4.0)
+    middleman-cli (4.2.1)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.2.1)
+      activesupport (>= 4.2, < 5.1)
       addressable (~> 2.3)
       backports (~> 3.6)
       bundler (~> 1.1)
@@ -115,45 +133,45 @@ GEM
       memoist (~> 0.14)
       padrino-helpers (~> 0.13.0)
       parallel
-      rack (>= 1.4.5, < 2.0)
+      rack (>= 1.4.5, < 3)
       sass (>= 3.4)
       servolux
-      tilt (~> 1.4.1)
+      tilt (~> 2.0)
       uglifier (~> 3.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     multi_json (1.12.1)
     multi_test (0.1.2)
-    namae (0.11.0)
+    namae (0.11.3)
     nenv (0.3.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    padrino-helpers (0.13.3.2)
+    padrino-helpers (0.13.3.3)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.3.2)
+      padrino-support (= 0.13.3.3)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.13.3.2)
+    padrino-support (0.13.3.3)
       activesupport (>= 3.1)
-    parallel (1.9.0)
+    parallel (1.10.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    public_suffix (2.0.5)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (11.3.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    rdoc (5.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -163,28 +181,28 @@ GEM
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-html-matchers (0.8.1)
+    rspec-html-matchers (0.9.1)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sass (3.4.22)
+    sass (3.4.23)
     servolux (0.12.0)
     shellany (0.0.1)
     slop (3.6.0)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.2)
+    uglifier (3.0.4)
       execjs (>= 0.3.0, < 3)
     unicode (0.4.4.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.9.5)
+    yard (0.9.8)
 
 PLATFORMS
   ruby
@@ -195,6 +213,7 @@ DEPENDENCIES
   cucumber
   guard
   guard-rspec
+  middleman (~> 4.0)
   middleman-citation!
   pry
   rake
@@ -204,4 +223,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.11.2
+   1.14.3

data/lib/middleman-citation.rb

@@ -13,9 +13,9 @@ module Middleman
 
     def initialize(app, options_hash={}, &block)
       super
-      app.set(:bibtex,      BibTeX.open(options.bibtex, :filter => 'latex'))
-      app.set(:cite_style,  options.style)
-      app.set(:cite_format, options.format)
+      app.config[:bibtex] = BibTeX.open(options.bibtex, :filter => 'latex')
+      app.config[:cite_style] = options.style
+      app.config[:cite_format] = options.format
     end
   
     helpers do
@@ -24,7 +24,7 @@ module Middleman
       # Params:
       # +key+:: bibtex key located in the BibTeX file defined in the config
       def cite_full(key)
-        Citations::cite_full(key, bibtex, cite_style, cite_format)
+        Citations::cite_full(key, config.bibtex, config.cite_style, config.cite_format)
       end
 
       # Given a BibTeX citation return a block containing the citation
@@ -32,11 +32,11 @@ module Middleman
       # Params:
       # +key+:: bibtex key located in the BibTeX file defined in the config
       def cite_inline(key)
-        Citations::cite_inline(key, bibtex, cite_style)
+        Citations::cite_inline(key, config.bibtex, config.cite_style)
       end
 
       def citations_search(search_key, author = nil)
-        entries_matching_key = bibtex.query(search_key)
+        entries_matching_key = config.bibtex.query(search_key)
         entries = 
           if author then
             search_by_author(entries_matching_key, author)

data/lib/middleman-citation/version.rb

@@ -1,7 +1,7 @@
 
 module Middleman
   module Citation
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end
 

data/middleman-citation.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bibtex-ruby"
   spec.add_runtime_dependency "citeproc-ruby"
   spec.add_runtime_dependency "csl-styles"
-  spec.add_runtime_dependency "middleman-core", ["~> 4"]
+  spec.add_runtime_dependency "middleman-core", ["~> 4.0"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-citation
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Thomas Torsney-Weir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
 description: |2
                          A middleman extension that gives helpers for
                          creating citations using citeproc
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Middleman extension for citeproc