bibtex-ruby 5.1.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9ac5e9768e0d7068c9283e81a5f678b57f5f5d0088050fd9568882277fe9a4f
-  data.tar.gz: 5cdbb72904fd9836db7479b5eecfb3e0d89410798fd286b63e7ffd32c2a6701b
+  metadata.gz: d20ff3c667743829aca52621d06ed9817e6889f78cc4738d036f058a7f191836
+  data.tar.gz: 8810c0a5aa024a5b7150b02326ac00ddda0657098275a41cd0e9009c19bbd8ea
 SHA512:
-  metadata.gz: 932db70949073cee21ee395c8b927b6e17fa065ffa90388f6092f69f758cf30580373ef039872221bb6aac933484850f9e734ced933a8c7699bceaa16d26b791
-  data.tar.gz: f1b94a673dd9bc16a195de943c21264c189a6b6623c7abc641e1af554216bdf5b06ac141ef85061221f2aba460f72d6b9a3b52f4207a8feec5ca44ffb6b731f9
+  metadata.gz: cab60663c560854377d34d87934365002b2cdeabbdb7aa6bdf3df42a962ff94abfc5e647629945b065a48ef83f36c1dc8a275e62c1b98cee824b9f89870cbc5b
+  data.tar.gz: a0f39e0ac274f36a4aeaa911a76087f5480819c737abba310ce17fb105528816ae68a9311bfac202fd1ae71e4fe43cfe63fb37a2be652bf90945174e8756ca17

data/Gemfile

@@ -6,6 +6,8 @@ gem 'json', '~>2.0', platforms: %i[mri_18 jruby]
 gem 'rdf', '~>3.0'
 gem 'rdf-vocab', '~>3.0'
 
+gem 'rexml', '~>3.0'
+
 group :debug do
   gem 'byebug', require: false, platforms: :mri
   gem 'ruby-debug', require: false, platforms: :jruby
@@ -27,7 +29,6 @@ group :profile do
 end
 
 group :coverage do
-  gem 'coveralls', '~>0.8', require: false
   gem 'simplecov', require: false, platforms: [:ruby]
 end
 
@@ -35,6 +36,5 @@ group :development do
   gem 'iconv', platforms: [:ruby]
   gem 'racc'
   gem 'rake'
-  gem 'rubocop', require: false
   gem 'yard'
 end

data/README.md

@@ -1,7 +1,5 @@
 BibTeX-Ruby
 ===========
-[![Build Status](https://secure.travis-ci.org/inukshuk/bibtex-ruby.png?branch=master)](http://travis-ci.org/inukshuk/bibtex-ruby)
-[![Coverage Status](https://coveralls.io/repos/inukshuk/bibtex-ruby/badge.png)](https://coveralls.io/r/inukshuk/bibtex-ruby)
 
 BibTeX-Ruby is the Rubyist's swiss-army-knife for all things BibTeX. It
 includes a parser for all common BibTeX objects (@string, @preamble, @comment
@@ -10,7 +8,7 @@ formatted names; BibTeX-Ruby recognizes BibTeX string replacements, joins
 values containing multiple strings or variables, supports cross-references,
 and decodes common LaTeX formatting instructions to unicode; if you are in a
 hurry, it also allows for easy export/conversion to formats such as YAML,
-JSON, CiteProc/CSL, XML (BibTeXML), and RDF (experimental).
+JSON, CiteProc/CSL, XML (BibTeXML, requires `rexml`), and RDF (experimental).
 
 For a list of projects using BibTeX-Ruby, take a look at the
 [project wiki](https://github.com/inukshuk/bibtex-ruby/wiki/Projects-Using-BibTeX-Ruby).
@@ -466,7 +464,7 @@ constitutes a simple BibTeX to YAML converter:
     >> BibTeX.open('example.bib').to_yaml
 
 Starting with version 2.0, BibTeX-Ruby's `#to_xml` exports your bibliography
-to the [BibTeXML](http://bibtexml.sf.net/) format. By passing the option
+to the [BibTeXML](http://bibtexml.sf.net/) format via `rexml`. By passing the option
 `:extended => true` you can make use of the BibTeXML's extended format which
 will return individual person elements and name tokens (provided you have
 successfully parsed the names of your bibliography).

data/Rakefile

@@ -11,7 +11,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), './lib'))
 
 require 'rake/clean'
 require 'rake/testtask'
-require 'rubocop/rake_task'
 
 require 'bibtex/version'
 
@@ -36,17 +35,7 @@ rescue LoadError
   end
 end
 
-begin
-  require 'coveralls/rake/task'
-  Coveralls::RakeTask.new
-  task test_with_coveralls: [:test, :features, 'coveralls:push']
-rescue LoadError
-  # ignore
-end
-
-RuboCop::RakeTask.new
-
-task default: %i[test features rubocop]
+task default: %i[test features]
 
 desc 'Generates the BibTeX parser'
 task racc: ['lib/bibtex/parser.rb', 'lib/bibtex/name_parser.rb']

data/lib/bibtex.rb

@@ -65,13 +65,18 @@ require 'bibtex/names'
 require 'bibtex/replaceable'
 require 'bibtex/elements'
 require 'bibtex/entry'
-require 'bibtex/entry/bibtexml_converter'
 require 'bibtex/entry/citeproc_converter'
 require 'bibtex/error'
 require 'bibtex/parser'
 require 'bibtex/bibliography'
 require 'bibtex/utilities'
 
+begin
+  require 'bibtex/entry/bibtexml_converter'
+rescue LoadError
+  # ignored
+end
+
 begin
   require 'rdf'
   require 'bibtex/entry/rdf_converter'

data/lib/bibtex/entry.rb

@@ -117,43 +117,6 @@ module BibTeX
       self
     end
 
-    # Generate accessors for required fields (#52)
-    REQUIRED_FIELDS.values.flatten.uniq.each do |name|
-      unless method_defined? name
-        define_method(name) do
-          get name
-        end
-      end
-
-      writer = "#{name}="
-
-      next if method_defined? writer
-
-      define_method(writer) do |value|
-        add name, value
-      end
-    end
-
-    # Generate author, editor and translator accessors
-    NAME_FIELDS.each do |contributor|
-      unless method_defined? contributor
-        define_method(contributor) do
-          get contributor
-        end
-      end
-
-      writer = "#{contributor}="
-
-      unless method_defined? writer
-        define_method(writer) do |value|
-          add contributor, value
-        end
-      end
-
-      alias_method "#{contributor}s", contributor
-      alias_method "#{contributor}s=", writer
-    end
-
     # call-seq:
     #   entry.each      { |key, value| block } -> entry
     #   entry.each_pair { |key, value| block } -> entry
@@ -216,7 +179,7 @@ module BibTeX
     end
 
     def has_type?(type)
-      type.to_s.match(/^(?:entry|\*)$/i) || @type == type.to_sym || super
+      type.to_s.match(/^(?:entry|\*)$/i) || @type.casecmp?(type.to_sym) || super
     end
 
     alias type? has_type?
@@ -669,6 +632,44 @@ module BibTeX
       fields[:date].to_s[/\d{4}/]
     end
 
+    # Generate accessors for required fields (#52)
+    REQUIRED_FIELDS.values.flatten.uniq.each do |name|
+      unless method_defined? name
+        define_method(name) do
+          get name
+        end
+      end
+
+      writer = "#{name}="
+
+      next if method_defined? writer
+
+      define_method(writer) do |value|
+        add name, value
+      end
+    end
+
+    # Generate author, editor and translator accessors
+    NAME_FIELDS.each do |contributor|
+      unless method_defined? contributor
+        define_method(contributor) do
+          get contributor
+        end
+      end
+
+      writer = "#{contributor}="
+
+      unless method_defined? writer
+        define_method(writer) do |value|
+          add contributor, value
+        end
+      end
+
+      alias_method "#{contributor}s", contributor
+      alias_method "#{contributor}s=", writer
+    end
+
+
     private
 
     # Returns a default key for this entry.

data/lib/bibtex/entry/citeproc_converter.rb

@@ -20,6 +20,7 @@ class BibTeX::Entry::CiteProcConverter
     organization publisher
     howpublished publisher
     type genre
+    urldate accessed
   ].map(&:intern)]).freeze
 
   CSL_FIELDS = %w[
@@ -123,6 +124,21 @@ class BibTeX::Entry::CiteProcConverter
     end
   end
 
+  def accessed
+    return unless hash.key? 'accessed'
+
+    hash['accessed'] =
+      case hash['accessed']
+      when %r{^[\d/\s-]+$}
+        {
+          'date-parts' =>
+            hash['accessed'].split('/').map { |pt| pt.split('-').map(&:to_i) }
+        }
+      else
+        { 'literal' => hash['accessed'] }
+      end
+  end
+
   def key
     hash['id'] = bibtex.key.to_s
   end

data/lib/bibtex/value.rb

@@ -49,9 +49,9 @@ module BibTeX
     alias to_a tokens
 
     def_delegators :to_s, :=~, :===,
-                   *String.instance_methods(false).reject do |m|
-                     m =~ /^\W|^(length|dup|replace|to_s|inspect)$|!$/
-                   end
+                   *String.instance_methods(false).reject { |m|
+                     m =~ /^\W|^(length|dup|replace|to_s|to_i|inspect)$|!$/
+                   }
 
     def_delegators :@tokens, :[], :length
     def_delegator :@tokens, :each, :each_token
@@ -180,7 +180,12 @@ module BibTeX
     # If the option :filter is given, the Value will be converted using
     # the filter(s) specified.
     def to_s(options = {})
-      return convert(options.delete(:filter)).to_s(options) if options.key?(:filter)
+      if options.key?(:filter)
+        return convert(options[:filter]).to_s(
+          options.reject { |k,| k == :filter || (k == :quotes && (!atomic? || symbol?)) }
+        )
+      end
+
       return value.to_s unless options.key?(:quotes) && atomic? && !symbol?
 
       q = Array(options[:quotes])

data/lib/bibtex/version.rb

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

data/test/bibtex/test_entry.rb

@@ -31,7 +31,8 @@ module BibTeX
           @bib = Bibliography.parse <<-END
             @book{a, editor = "A", title = "A"}
             @incollection{a1, crossref = "a"}
-            @incollection{b1, crossref = "b"}
+            @incollection{b1, crossref = "b2"}
+            @book{b, author = "B", title = "B", date = "2020", urldate = "2020"}
           END
         end
 
@@ -124,6 +125,10 @@ module BibTeX
             it 'includes inherited values' do
               @bib['a1'].to_citeproc['container-title'].must_be :==, @bib['a'].title.to_s
             end
+
+            it 'converts urldate' do
+              @bib['b'].to_citeproc['accessed'].must_be :==, 'date-parts' => [[2020]]
+            end
           end
 
           describe '#save_inherited_fields' do
@@ -483,6 +488,27 @@ module BibTeX
       end
     end
 
+    describe '#to_s' do
+      before do
+        @bib = Bibliography.parse(<<-BIBINPUT, parse_months: false)
+          @misc{foo,
+            title  = {A
+                       title},
+            series = {A
+                       series},
+            month  = dec
+          }
+        BIBINPUT
+      end
+      it 'applies filters when converting to strings' do
+        assert_equal "@misc{foo,\n"\
+                     "  title = {A title},\n"\
+                     "  series = {A series},\n"\
+                     "  month = dec\n"\
+                     "}\n", @bib['foo'].to_s(filter: :linebreaks)
+      end
+    end
+
     def test_simple
       bib = BibTeX::Bibliography.open(Test.fixtures(:entry), debug: false)
       refute_nil(bib)

data/test/helper.rb

@@ -1,6 +1,5 @@
 begin
   require 'simplecov'
-  require 'coveralls' if ENV['CI']
 rescue LoadError
   # ignore
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 6.0.0
 platform: ruby
 authors:
 - Sylvester Keil
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -128,7 +128,7 @@ homepage: http://inukshuk.github.com/bibtex-ruby
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files: