bibtex-ruby 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd8273ecbfc910f5944b9f471cf8eeda31e2052fbeeaf1c12335420f25d09371
-  data.tar.gz: 11000b7d5bca33dc41a3c3d49abaeccecaaefb0457fa815998cbbaab6e1b2bb4
+  metadata.gz: 333784b37e105aee5f6f28e49793bd6cb4d969da35f34577007a48d496de7f5d
+  data.tar.gz: c2d544d145cfd202c099246ce91432746c535e49b38df9436adf043d4353e937
 SHA512:
-  metadata.gz: c3403927d721d510d21b9ce5b0ea9b3507291cea43b62a4de00601b706d19401167e33d5696a8f6db1a276b9054e1d6b287f7de0b651ce9341609e83cde40986
-  data.tar.gz: d2cea6ef667ffc50872c183a6f4dc6cf74039597987fea0747858cdb7850536b9af285e67f27a31748c691876d5029b97c8eb5525379711eab5b8c5bce8118b2
+  metadata.gz: fa8ff3fe9544b77d3c0de73e82ae1ff95f7708f0d63fa81b6e0a99e536170b550a275bb5321048463d4e301a31d467657b2f80876bc50e380498299fc0a99a2e
+  data.tar.gz: 4e08f81624ebec89855ad80b3cc7f5d1b7a40ca9bc64dcec44d8c091a3e38d4a93e9b0c8733954a8ff910c87ecda01d1f6e84e287dbf7f46afb75eae2ea0339f

data/Gemfile

@@ -15,11 +15,6 @@ end
 group :test do
   gem 'cucumber'
   gem 'minitest', require: false
-  gem 'unicode', '~>0.4', platforms: %i[mswin mingw mri]
-end
-
-group :extra do
-  gem 'redcarpet', platforms: [:ruby]
 end
 
 group :profile do
@@ -32,7 +27,6 @@ group :coverage do
 end
 
 group :development do
-  gem 'iconv', platforms: [:ruby]
   gem 'rake'
   gem 'yard'
 end

data/Rakefile

@@ -26,7 +26,7 @@ end
 begin
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = '--format progress'
+    t.cucumber_opts = ['--format progress']
   end
 rescue LoadError
   desc 'Cucumber rake task not available'

data/bibtex-ruby.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('racc', ['~>1.7'])
   s.add_runtime_dependency('latex-decode', ['~>0.0'])
+  s.add_runtime_dependency('logger', ['~>1.7'])
 
   s.files        = File.open('Manifest').readlines.map(&:chomp)
   s.test_files   = Dir.glob('test/**/test*.rb')

data/lib/bibtex/compatibility.rb

@@ -1,23 +1,9 @@
 module BibTeX
-  begin
-    original_verbosity = $VERBOSE
-    $VERBOSE = nil
-
-    require 'iconv'
-
-    @iconv = Iconv.new('ascii//translit//ignore', 'utf-8')
-
-    def self.transliterate(str)
-      @iconv.iconv(str)
-    end
-  rescue LoadError
-    @iconv_replacements = Hash['ä', 'ae', 'ö', 'oe', 'ü', 'ue', 'Ä', 'Ae', 'Ö', 'Oe', 'Ü', 'Ue', 'ß', 'ss']
-
-    # Returns +str+ transliterated containing only ASCII characters.
-    def self.transliterate(str)
-      str.gsub(/[äöüÄÖÜß]/, @iconv_replacements)
-    end
-  ensure
-    $VERBOSE = original_verbosity
+  def self.transliterate(str)
+    str
+      .unicode_normalize(:nfkd)
+      .encode(Encoding::ASCII, invalid: :replace, undef: :replace, replace: '')
+  rescue
+    str.gsub(/[^\x20-\x7E]/, '')
   end
 end

data/lib/bibtex/entry/rdf_converter.rb

@@ -1,11 +1,3 @@
-require 'uri/common'
-
-begin
-  require 'rdf/vocab'
-rescue LoadError
-  ::RDF::Vocab = RDF # support RDF on Ruby 1.9
-end
-
 class BibTeX::Entry::RDFConverter
   DEFAULT_REMOVE_FROM_FALLBACK = %w[
     bdsk-file-1

data/lib/bibtex/entry.rb

@@ -676,12 +676,11 @@ module BibTeX
     def default_key
       k = names[0]
       k = k.respond_to?(:family) ? k.family : k.to_s
-      k = BibTeX.transliterate(k).gsub(/["']/, '')
+      k = BibTeX.transliterate(k).tr('"\'', '')
       k = k[/[A-Za-z-]+/] || 'unknown'
       k << (year.to_s[/\d+/] || '-')
       k << 'a'
-      k.downcase!
-      k
+      k.downcase
     end
   end
 end

data/lib/bibtex/lexer.rb

@@ -58,7 +58,7 @@ module BibTeX
       string: /string/io,
       comment: /comment\b/io,
       preamble: /preamble\b/io,
-      key: %r{\s*[[:alpha:][:digit:] /:_!$\?\.%+;&\*'"-]+,}io,
+      key: %r{\s*[[:alpha:][:digit:] /:_!$\?\.%+;&\*'"{}-]+,}io,
       optional_key: %r{\s*[[:alpha:][:digit:] /:_!$\?\.%+;&\*'"-]*,}io
     }
 

data/lib/bibtex/version.rb

@@ -19,7 +19,7 @@
 module BibTeX
   module Version
     MAJOR = 6
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     BUILD = nil
 

data/lib/bibtex.rb

@@ -79,6 +79,8 @@ end
 
 begin
   require 'rdf'
+  require 'rdf/vocab'
+  require 'uri/common'
   require 'bibtex/entry/rdf_converter'
   require 'bibtex/bibliography/rdf_converter'
 rescue LoadError

data/test/bibtex/test_lexer.rb

@@ -7,33 +7,47 @@ module BibTeX
     end
 
     it 'strips line breaks by default' do
-      Lexer.new.analyse(%(@string{ x = "foo\nbar" })).stack[-3].must_be :==,
-                                                                        [:STRING_LITERAL, 'foo bar']
+      assert_equal Lexer.new.analyse(%(@string{ x = "foo\nbar" })).stack[-3],
+        [:STRING_LITERAL, 'foo bar']
     end
 
     it 'strips whitespace after line breaks by default' do
-      Lexer.new.analyse(%(@string{ x = "foo\n    bar" })).stack[-3].must_be :==,
-                                                                            [:STRING_LITERAL, 'foo bar']
+      assert_equal Lexer.new.analyse(%(@string{ x = "foo\n    bar" })).stack[-3],
+        [:STRING_LITERAL, 'foo bar']
     end
 
     it 'matches KEY tokens' do
-      Lexer.new.analyse('@misc{foo, }').symbols.must_be :==, [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+      assert_equal Lexer.new.analyse('@misc{foo, }').symbols,
+        [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
     end
 
     it 'matches KEY tokens with non-ascii characters' do
-      Lexer.new.analyse('@misc{löwe, }').symbols.must_be :==, [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+      assert_equal Lexer.new.analyse('@misc{löwe, }').symbols,
+        [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
     end
 
     it 'matches KEY tokens after whitespace' do
-      Lexer.new.analyse('@misc{  foo, }').symbols.must_be :==, [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+      assert_equal Lexer.new.analyse('@misc{  foo, }').symbols,
+        [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+    end
+
+    it 'matches KEY token with braces' do
+      assert_equal Lexer.new.analyse('@misc{fo{o, }').symbols,
+        [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+      assert_equal Lexer.new.analyse('@misc{fo}o, }').symbols,
+        [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+      assert_equal Lexer.new.analyse('@misc{foo:{bar}, }').symbols,
+        [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
     end
 
     it "doesn't start a comment for types starting with but not equal @comment" do
-      Lexer.new.analyse('@commentary{staudinger, }').symbols.must_be :==, [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
+      assert_equal Lexer.new.analyse('@commentary{staudinger, }').symbols,
+        [:AT, :NAME, :LBRACE, :KEY, :RBRACE, false]
     end
 
     it "doesn't start a preamble for types starting with but not equal @preamble" do
-      Lexer.new.analyse('@preamblestring{ preamble }').symbols.must_be :==, [:AT, :NAME, :LBRACE, :NAME, :RBRACE, false]
+      assert_equal Lexer.new.analyse('@preamblestring{ preamble }').symbols,
+        [:AT, :NAME, :LBRACE, :NAME, :RBRACE, false]
     end
   end
 end

data/test/bibtex/test_utilities.rb

@@ -1,7 +1,7 @@
 require 'helper.rb'
 
 module BibTeX
-  class TestBibtex < Minitest::Test
+  class TestUtilities < Minitest::Test
     def test_empty?
       assert BibTeX.open(Test.fixtures(:empty)).empty?
       refute BibTeX.open(Test.fixtures(:bibdesk)).empty?

data/test/test_bibtex.rb

@@ -102,21 +102,17 @@ module BibTeX
 
     def test_missing_key
       assert_raises(BibTeX::ParseError) do
-        BibTeX.parse(<<EOF)
-        @article{}
-EOF
+        BibTeX.parse(<<-EOF)
+          @article{}
+        EOF
       end
-      assert(
-        BibTeX.parse(<<EOF, allow_missing_keys: true)
+      refute_empty BibTeX.parse(<<-EOF, allow_missing_keys: true)
         @article{}
-EOF
-      )
-      Timeout.timeout(2) do
-        BibTeX.parse(<<EOF, allow_missing_keys: true)
+      EOF
+      refute_empty BibTeX.parse(<<-EOF, allow_missing_keys: true)
         @article{},
         @article{}
-EOF
-      end
+      EOF
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Sylvester Keil
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -38,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: |
   BibTeX-Ruby is the Rubyist's swiss-army-knife for all things BibTeX. It
   includes a parser for all common BibTeX objects (@string, @preamble,
@@ -142,7 +155,6 @@ homepage: http://inukshuk.github.com/bibtex-ruby
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.7.0
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files: