bibtex-ruby 5.1.1 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1220f03462fd20dc2547ad2d690860f971e3ae6d73374d76071e78d62438eee
-  data.tar.gz: c518a5179f6325c0ac3a2cba62107e3e6be6b7fe8c40a5b0c02f8ef38dea56fe
+  metadata.gz: 5a1f7a49db70b1dcaa1330aeacd9e1ce43fd79a0904f7c4be0c220e84e331528
+  data.tar.gz: 536ecca150ff1889fca9976515f0226ac17ded8e0a3cd27b41b3c1cbc75baa0e
 SHA512:
-  metadata.gz: d0d1816bd6913c7723b8ac6d77d42ea4e87cd1a76451c8075a890e802846402b4c27de8293ff842702a210305758279465da47541798b6cd20359a0fa0691e4e
-  data.tar.gz: 67dba827e0ea514f6182fd82fb489034a7551b4704061539e1e316094e32be8ab7a31ac36753f299f96031543bf4e390c88dfacda4b472242e366daac0a9ef93
+  metadata.gz: 57bfe6e85f4e7d5e88855d6637bc59f6f062d09dd72cc9c13b8ab7731737303dfe5531a33245b8dd70a33e6eed2ebcf8bf73be9da103ee896a6f16443067679c
+  data.tar.gz: ccb43ac768278194cdecd9f6c649c67b8d74795a30bdce34c39b117c5677d1745d1efe52411b12569b188f74d513175f77e5bb104d751e5c58004c8c6953b87f

data/Gemfile

@@ -27,13 +27,13 @@ group :profile do
 end
 
 group :coverage do
-  gem 'coveralls', '~>0.8', require: false
+  gem 'coveralls', require: false
   gem 'simplecov', require: false, platforms: [:ruby]
 end
 
 group :development do
   gem 'iconv', platforms: [:ruby]
+  gem 'racc'
   gem 'rake'
-  gem 'rubocop', require: false
   gem 'yard'
 end

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'
 
@@ -44,9 +43,7 @@ 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/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[
@@ -56,6 +57,7 @@ class BibTeX::Entry::CiteProcConverter
 
   def initialize(bibtex, options = {})
     @bibtex = bibtex
+    @hash = {}
     @options = { quotes: [] }.merge(options)
   end
 
@@ -122,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
@@ -141,21 +158,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/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

@@ -20,7 +20,7 @@ module BibTeX
   module Version
     MAJOR = 5
     MINOR = 1
-    PATCH = 1
+    PATCH = 6
     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
@@ -433,7 +438,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 +455,58 @@ 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
+
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.6
 platform: ruby
 authors:
 - Sylvester Keil
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-12-02 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:
@@ -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