middleman-bibtex 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61bc8489e893fb11cae83087f5f72a31a89f38d4
-  data.tar.gz: 546fc88351c74e003730e0607d604ffce190659c
+  metadata.gz: 199ce7be117cd42b0280729cb23677e30b125fd8
+  data.tar.gz: 4bd445d96f1a1797a95d2a513f143144c2a1fe93
 SHA512:
-  metadata.gz: 949916cad46754e3cb3759b72f24f60377f8bd50d3882edb548afa3db2486c61bfa9c9d2d8c6fea7ba60b59a5a0cb7d0a10da1a1154b2e90b87c5cb6ab1e295f
-  data.tar.gz: d9c44c5c5e1842b5864af47c5ef84a8e9695cdeb6d8527b0830c633aaff869c4aff33505c1b94b14ef889f209c9d50082d5795fc3bc07bf841849d5a8ca77e23
+  metadata.gz: 7c0559a190ea39f4aac5f3268af9d94dcbe1cc6c9e0598a91f365aa497d1a4b876827d55fee801176b29c5b67c407e65b036f2789785d6eb34c72888b2cdb3eb
+  data.tar.gz: 68bdf0aaa51d4f699b0e9a6181fd118939ef686e3d409a5a2caba4a2b3f5f8cc3c8fa69c4a4fd2eb7f9337b8ac6ef42b6a049dc81672007e77888a4de1f8ee1c

data/lib/middleman-bibtex/version.rb

@@ -1,6 +1,6 @@
 module Middleman
   module Bibtex
-    VERSION = '0.2.4'
+    VERSION = '0.3.0'
     class KeyNotFound < RuntimeError ; end
   end
 end

data/lib/middleman-bibtex.rb

@@ -52,23 +52,27 @@ module Middleman
 
     def initialize(app, options_hash = {}, &block)
       super
-      app.set(:bib, BibTeX.open(options.path))
-      app.set(:cite_style, options.style)
-      app.set(:cite_format, options.format)
+      app.config[:bib] = BibTeX.open(options.path)
+      app.config[:cite_style] = options.style
+      app.config[:cite_format] = options.format
     end
 
     helpers do
 
       def citations_search(search_key, author = nil)
+        bib = app.config[:bib]
         BibtexHelper.citations_search(bib, search_key, author)
       end
 
       def citation_entry(key)
+        bib = app.config[:bib]
         BibtexHelper.citation_entry(bib, key)
       end
 
       def citation_formatted(entry)
-        BibtexHelper.citation_formatted(entry, cite_style, cite_format)
+        style = app.config[:cite_style]
+        format = app.config[:cite_format]
+        BibtexHelper.citation_formatted(entry, style, format)
       end
 
       def citation(key)
@@ -78,4 +82,4 @@ module Middleman
   end
 end
 
-::Middleman::Extensions.register(:bibtex, Middleman::BibtexExtension)
+Middleman::Extensions.register(:bibtex, Middleman::BibtexExtension)

data/middleman-bibtex.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'bibtex-ruby'
   spec.add_runtime_dependency 'citeproc-ruby', ['< 1.0']
-  spec.add_runtime_dependency 'middleman-core', ['< 4.0']
+  spec.add_runtime_dependency 'middleman-core', ['~> 4.0']
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'middleman', ['< 4.0']
+  spec.add_development_dependency 'middleman', ['~> 4.0']
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
-require 'middleman'
 require 'rspec'
 require 'capybara/rspec'
+require 'middleman-core'
+require 'middleman-core/rack'
 
 def fixture(subpath)
   absolute_path('fixtures', subpath)
@@ -15,7 +16,8 @@ def absolute_path(*parts)
 end
 
 ENV['MM_ROOT'] = example_site
-Capybara.app = Middleman::Application.server.inst do
+middleman = Middleman::Application.new
+Capybara.app = Middleman::Rack.new(middleman).to_app do
   set :environment, :development
   set :show_exceptions, false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-bibtex
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - J. J. Green
@@ -42,14 +42,14 @@ dependencies:
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -98,14 +98,14 @@ dependencies:
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: |2
@@ -126,7 +126,7 @@ files:
 - lib/middleman-bibtex.rb
 - lib/middleman-bibtex/version.rb
 - middleman-bibtex.gemspec
-- spec/bibtex_spec.rb
+- spec/bibtex_helpers_spec.rb
 - spec/fixtures/site/config.rb
 - spec/fixtures/site/source/index.html.erb
 - spec/fixtures/site/source/layouts/layout.erb
@@ -158,7 +158,7 @@ signing_key:
 specification_version: 4
 summary: Middleman extension for BibTeX bibliographies
 test_files:
-- spec/bibtex_spec.rb
+- spec/bibtex_helpers_spec.rb
 - spec/fixtures/site/config.rb
 - spec/fixtures/site/source/index.html.erb
 - spec/fixtures/site/source/layouts/layout.erb