blacklight-citeproc 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 395f07a993d39a9fc93ef5daa5dd611d445c6cdc6210377a38c391edc5f8030b
-  data.tar.gz: 325a4ba6c085bc8ae253310dafdda23c07a08c7376af6bb02b8dd7d696b5632c
+SHA1:
+  metadata.gz: 5946c4e6c79d1a9177e1c04239fe7169b9ffe1c9
+  data.tar.gz: f794f0c8c1f5201661a497a1b5412f54fd855d70
 SHA512:
-  metadata.gz: 624b13b2a0afce86f50e11e3657f4c3ad1aa5f4346444c0cd14602ec3806914514aa4ab1bd2c58acdd60b4499273fbfab093a5149074f0c8a232c7e8fde93a09
-  data.tar.gz: 6345b8ee436f5e6bbdbb2d3745bbd0b4b4a1153437959fe7b733ff8a0c4d5bcab5449988ce29c9829edbe9bb88a5eddf3ab7b07d357e572c126b392849be7708
+  metadata.gz: 773a24cc151605e5aa6a6687f6d6293efb57527ce544d9e4e5d6f64ad08d24b36b163ac09a17b7e9539a311781e7e3ca3b9974a74f14938de8b676d738df680e
+  data.tar.gz: 6178ce435bc9094e0ff42e74713b7f6a9f0773edee4214676fa604549539f2f5b8bea3eaa6a4e6b5ee45f7143f9e1feec82fcd898c972e5f409f895bcc0df979

data/app/controllers/blacklight/citeproc/citation_controller.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'bibtex'
 require 'citeproc'
+require 'citeproc/ruby'
 require 'csl/styles'
 
 module Blacklight::Citeproc
@@ -7,16 +10,18 @@ module Blacklight::Citeproc
   end
 
   class CitationController < ApplicationController
+    include Blacklight::Bookmarks
     include Blacklight::Searchable
 
     def initialize
       @processors = []
       @citations = []
+      format = ::CiteProc::Ruby::Formats::Html.new bib_container: 'div', bib_entry: 'p'
 
       throw BadConfigError, 'Catalog controller needs a config.citeproc section' unless blacklight_config.citeproc
       @config = blacklight_config.citeproc
       @config[:styles].each do |style|
-        @processors << ::CiteProc::Processor.new(format: 'html', style: style)
+        @processors << ::CiteProc::Processor.new(format: format, style: style)
       end
     end
 
@@ -27,13 +32,13 @@ module Blacklight::Citeproc
 
       @processors.each do |processor|
         processor.import bibtex.to_citeproc
-	citation = processor.render(:bibliography, id: params[:id]).first.tr('{}', '')
-	@citations << {citation: citation.html_safe, label: processor.options[:style]}
+        citation = processor.render(:bibliography, id: params[:id]).first.tr('{}', '')
+        @citations << { citation: citation.html_safe, label: processor.options[:style] }
       end
       render layout: false
     end
 
-    def print_multiple ids
+    def print_multiple(ids)
       _, documents = search_service.fetch(ids)
       bibtex = ::BibTeX::Bibliography.new
       documents.each do |document|
@@ -42,8 +47,7 @@ module Blacklight::Citeproc
 
       @processors.each do |processor|
         processor.import bibtex.to_citeproc
-	bibliography = processor.render(:bibliography)
-	@citations << {citation: bibliography.html_safe, label: processor.options[:style]}
+        @citations << { citation: processor.bibliography.join.html_safe, label: processor.options[:style] }
       end
       render :print_single, layout: false
     end
@@ -53,6 +57,5 @@ module Blacklight::Citeproc
       bookmark_ids = bookmarks.collect { |b| b.document_id.to_s }
       print_multiple bookmark_ids
     end
-
   end
 end

data/app/models/concerns/blacklight/document/bibtex.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This is a document extension meant to be mixed into a
 # Blacklight::Solr::Document class, such as SolrDocument. It provides support
 # for creating bibtex format from a Solr document.
@@ -17,7 +19,7 @@ module Blacklight::Document::Bibtex
   end
 
   def self.register_export_formats(document)
-    document.will_export_as(:bibtex, "application/x-bibtex")
+    document.will_export_as(:bibtex, 'application/x-bibtex')
   end
 
   def export_as_bibtex
@@ -25,32 +27,29 @@ module Blacklight::Document::Bibtex
 
     entry = ::BibTeX::Entry.new
     entry.type = :book
-    entry.key = self.id
-    entry.title = self.first config[:fields][:title]
-    multiple_valued_fields = %i{author editor}
+    entry.key = id
+    entry.title = first config[:fields][:title]
+    multiple_valued_fields = %i[author editor]
     multiple_valued_fields.each do |field|
-      entry.send("#{field}=", self.fetch(config[:fields][field])) if self.has? config[:fields][field]
+      entry.send("#{field}=", fetch(config[:fields][field])) if has? config[:fields][field]
     end
 
-    single_valued_fields = %i{address annote booktitle chapter doi edition how_published institution
-      journal key month note number organization pages publisher school series url volume year}
+    single_valued_fields = %i[address annote booktitle chapter doi edition how_published institution
+                              journal key month note number organization pages publisher school series url volume year]
     single_valued_fields.each do |field|
-      entry.send("#{field}=", self.first(config[:fields][field])) if self.has? config[:fields][field]
+      entry.send("#{field}=", first(config[:fields][field])) if has? config[:fields][field]
     end
 
-    return entry
+    entry
   end
 
   private
-  def bibtex_type config
+
+  def bibtex_type(config)
     config[:format][:mappings].each do |bibtex, solr|
-      if solr.include? self.first config[:format][:field]
-        return bibtex
-      end
+      return bibtex if solr.include? first config[:format][:field]
     end
     default_type = config[:format][:default_format] || :book
-    return default_type
+    default_type
   end
-
 end
-

data/lib/blacklight/citeproc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'blacklight/citeproc/engine'
 
 module Blacklight

data/lib/blacklight/citeproc/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Blacklight
   module Citeproc
     class Engine < ::Rails::Engine

data/lib/blacklight/citeproc/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Blacklight
   module Citeproc
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/lib/generators/blacklight/citeproc/install_generator.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Blacklight::Citeproc
   class Install < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
     def inject_routes
       inject_into_file 'config/routes.rb', after: /mount Blacklight::Engine.*$/ do
         "\n  mount Blacklight::Citeproc::Engine => '/'\n"
       end
     end
+
     def add_blacklight_citeproc_config
-      insert_into_file "app/controllers/catalog_controller.rb", after: "  configure_blacklight do |config|\n" do
+      insert_into_file 'app/controllers/catalog_controller.rb', after: "  configure_blacklight do |config|\n" do
         <<-CONFIG
     config.citeproc = {
       #bibtex_field: 'bibtex_s' # Optional. If you are already indexing BibTeX into solr, this will be the preferred way to get bibliographic data
@@ -37,7 +40,7 @@ module Blacklight::Citeproc
     end
 
     def add_marc_extension_to_solrdocument
-      insert_into_file "app/models/solr_document.rb", :after => "include Blacklight::Solr::Document" do
+      insert_into_file 'app/models/solr_document.rb', after: 'include Blacklight::Solr::Document' do
         "\n  use_extension(Blacklight::Document::Bibtex)\n"
       end
     end

metadata

@@ -1,94 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-citeproc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jane Sandberg
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-01 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bibtex-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.6
-  name: bibtex-ruby
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.6
 - !ruby/object:Gem::Dependency
+  name: citeproc-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  name: citeproc-ruby
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
+  name: csl-styles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1.9
-  name: csl-styles
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1.9
 - !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec-rails
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: engine_cart
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: solr_wrapper
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,7 +116,7 @@ homepage: https://github.com/sandbergja/blacklight-citeproc
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -131,9 +131,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.13
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []