bibtex-ruby 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1220f03462fd20dc2547ad2d690860f971e3ae6d73374d76071e78d62438eee
-  data.tar.gz: c518a5179f6325c0ac3a2cba62107e3e6be6b7fe8c40a5b0c02f8ef38dea56fe
+  metadata.gz: c9ac5e9768e0d7068c9283e81a5f678b57f5f5d0088050fd9568882277fe9a4f
+  data.tar.gz: 5cdbb72904fd9836db7479b5eecfb3e0d89410798fd286b63e7ffd32c2a6701b
 SHA512:
-  metadata.gz: d0d1816bd6913c7723b8ac6d77d42ea4e87cd1a76451c8075a890e802846402b4c27de8293ff842702a210305758279465da47541798b6cd20359a0fa0691e4e
-  data.tar.gz: 67dba827e0ea514f6182fd82fb489034a7551b4704061539e1e316094e32be8ab7a31ac36753f299f96031543bf4e390c88dfacda4b472242e366daac0a9ef93
+  metadata.gz: 932db70949073cee21ee395c8b927b6e17fa065ffa90388f6092f69f758cf30580373ef039872221bb6aac933484850f9e734ced933a8c7699bceaa16d26b791
+  data.tar.gz: f1b94a673dd9bc16a195de943c21264c189a6b6623c7abc641e1af554216bdf5b06ac141ef85061221f2aba460f72d6b9a3b52f4207a8feec5ca44ffb6b731f9

data/Gemfile

@@ -33,6 +33,7 @@ end
 
 group :development do
   gem 'iconv', platforms: [:ruby]
+  gem 'racc'
   gem 'rake'
   gem 'rubocop', require: false
   gem 'yard'

data/lib/bibtex/entry/citeproc_converter.rb

@@ -56,6 +56,7 @@ class BibTeX::Entry::CiteProcConverter
 
   def initialize(bibtex, options = {})
     @bibtex = bibtex
+    @hash = {}
     @options = { quotes: [] }.merge(options)
   end
 
@@ -141,21 +142,26 @@ class BibTeX::Entry::CiteProcConverter
 
   private
 
-  attr_reader :bibtex, :options
+  attr_reader :bibtex, :options, :hash
 
   def convert(key, value)
     return if BibTeX::Entry::DATE_FIELDS.include?(key)
+    return include_url(value) if howpublished_with_url?(key, value)
 
-    cp_key = CSL_FILTER[key].to_s
+    citeproc_key = CSL_FILTER[key].to_s
 
-    if hash.key?(cp_key)
+    if hash.key?(citeproc_key)
       hash[key] = value.to_citeproc(options)
     else
-      hash[cp_key] = value.to_citeproc(options)
+      hash[citeproc_key] = value.to_citeproc(options)
     end
   end
 
-  def hash
-    @hash ||= {}
+  def howpublished_with_url?(key, value)
+    key == :howpublished && value.include?('url')
+  end
+
+  def include_url(value)
+    hash['URL'] = value.to_s[/url{?([^}]*)/, 1]
   end
 end

data/lib/bibtex/version.rb

@@ -20,7 +20,7 @@ module BibTeX
   module Version
     MAJOR = 5
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

data/test/bibtex/test_entry.rb

@@ -433,7 +433,7 @@ module BibTeX
       end
     end
 
-    describe 'citeproc export' do
+    describe '#to_citeproc' do
       before do
         @entry = Entry.new do |e|
           e.type = :book
@@ -450,6 +450,37 @@ module BibTeX
       it 'should accept option to use non-dropping-particle' do
         assert_equal 'van', @entry.to_citeproc(particle: 'non-dropping-particle')['author'][0]['non-dropping-particle']
       end
+
+      describe 'howpublished' do
+        it 'converts to "URL" when there is a url (without filters)' do
+          bibtex = <<-END
+            @book{noauthor_2017-xx,
+              title = "Google",
+              howpublished = "\\url{http://www.google.com/}"
+            }
+          END
+          bibliography = Bibliography.parse(bibtex)
+
+          citeproc = bibliography.to_citeproc
+
+          assert_equal('http://www.google.com/', citeproc[0]['URL'])
+          assert_nil(citeproc[0]['publisher'])
+        end
+
+        it 'converts to "URL" when there is a url (with latex)' do
+          bibtex = <<-END
+            @book{noauthor_2017-xx,
+              title = "Google",
+              howpublished = "\\url{http://www.google.com/}"
+            }
+          END
+          bibliography = Bibliography.parse(bibtex, filter: :latex)
+
+          citeproc = bibliography.to_citeproc
+
+          assert_equal('http://www.google.com/', citeproc[0]['URL'])
+        end
+      end
     end
 
     def test_simple

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -157,8 +157,8 @@ test_files:
 - test/bibtex/test_string.rb
 - test/bibtex/test_utilities.rb
 - test/bibtex/test_value.rb
-- test/bibtex/test_entry.rb
 - test/bibtex/test_filters.rb
 - test/bibtex/test_bibliography.rb
+- test/bibtex/test_entry.rb
 - test/test_bibtex.rb
 - test/test_export.rb