bibtex-ruby 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b87649ab1cf5fb6c463ac3d0bfbc38d52063b0bbb5b9e46cb653e29edd697a
-  data.tar.gz: 0d08d2dcb18309792bcd1ca37918de1e212201a548c3591eab381e2aa65c1d10
+  metadata.gz: b9758639d1863a9801e17e0986cdb4aa9256a20f8038adc8ce593decd1a8dc16
+  data.tar.gz: 7fc4c40e952ff4c33811651df3a676f36d9545c384135ee6e3083e36d5cc8620
 SHA512:
-  metadata.gz: 3646b9ab287939c2644a77614558b83d367806491782e973e6763e3172fcaa77a5cadfe001860ab5293c9f09ee742d25207efbd1a6bad8a7b5f59ae27f5ee863
-  data.tar.gz: ad1a67151f49f0112b95178b2a1f920b7163ab4a2aefddc77494df2d552cb1a038dda58ef9c14955077fa2c1aa83f2fdeabbece54adbccf8d9fd9d2e6f16b5d8
+  metadata.gz: 88c9411586003c0fd091fd505ed74057aca7c367281af3fa6632cb510eb2b25e11940f134f28824c07fd5d047de3fc62615556da914d78ff1e5b7e49125c501b
+  data.tar.gz: 5254bae56f6cdefd6076f324d241348b5e6b211e0f4d763ae7f37fcce38448041e522ca5646138f6bf89a08e546d2761a42f9b7e895732fef36d8de3fa59eb84

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'json', '~>1.8', platforms: %i[mri_18 jruby]
+gem 'json', '~>2.0', platforms: %i[mri_18 jruby]
 
-gem 'rdf', '~>2.0.0'
-gem 'rdf-vocab', '~>2.0.0'
+gem 'rdf', '~>3.0'
+gem 'rdf-vocab', '~>3.0'
 
 group :debug do
   gem 'byebug', require: false, platforms: :mri
@@ -12,33 +12,28 @@ group :debug do
 end
 
 group :test do
-  gem 'cucumber', '~>1.3'
-  gem 'minitest', '~>4.7', require: false
-  gem 'minitest-ansi'
+  gem 'cucumber'
+  gem 'minitest', require: false
   gem 'unicode', '~>0.4', platforms: %i[mswin mingw mri]
 end
 
 group :extra do
-  gem 'rb-fsevent', require: false if RUBY_PLATFORM =~ /darwin/i
-
-  gem 'guard-cucumber', platforms: [:ruby]
-  gem 'guard-minitest', platforms: [:ruby]
   gem 'redcarpet', platforms: [:ruby]
 end
 
 group :profile do
-  gem 'gnuplot', '~>2.4', platforms: [:mri]
-  gem 'ruby-prof', '~>0.14', platforms: [:mri]
+  gem 'gnuplot', platforms: [:mri]
+  gem 'ruby-prof', platforms: [:mri]
 end
 
 group :coverage do
-  gem 'coveralls', '~>0.7', require: false
-  gem 'simplecov', '~>0.8', require: false, platforms: [:ruby]
+  gem 'coveralls', '~>0.8', require: false
+  gem 'simplecov', require: false, platforms: [:ruby]
 end
 
 group :development do
   gem 'iconv', platforms: [:ruby]
   gem 'rake'
-  gem 'rubocop', '~> 0.71.0', require: false
+  gem 'rubocop', require: false
   gem 'yard'
 end

data/History.txt

@@ -1,3 +1,8 @@
+5.1.0 / 2020-01-17
+==================
+* Use File.read instead of Kernel.open in BibTeX.open
+* Fix Ruby 2.7 deprecation warnings
+
 5.0.0 / 2019-06-12
 ==================
 * Dropped support for Ruby < 2.3

data/Manifest

@@ -1,5 +1,4 @@
 Gemfile
-Guardfile
 History.txt
 LICENSE
 Manifest
@@ -97,4 +96,4 @@ test/macruby.d
 test/macruby.rb
 test/profile.rb
 test/test_bibtex.rb
-test/test_export.rb
+test/test_export.rb

data/Rakefile

@@ -21,7 +21,7 @@ YARD::Rake::YardocTask.new
 Rake::TestTask.new(:test_task) do |t|
   t.libs << 'lib' << 'test'
   t.test_files = FileList['test/**/test_*.rb']
-  t.verbose = true
+  # t.verbose = true
 end
 
 begin

data/bibtex-ruby.gemspec

@@ -1,5 +1,5 @@
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'bibtex/version'
 
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name        = 'bibtex-ruby'
   s.version     = BibTeX::Version::STRING.dup
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.4.0'
   s.authors     = ['Sylvester Keil']
   s.email       = ['sylvester@keil.or.at']
   s.homepage    = 'http://inukshuk.github.com/bibtex-ruby'
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     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, CSL, and XML (BibTeXML).
-	END_DESCRIPTION
+  END_DESCRIPTION
 
   s.add_runtime_dependency('latex-decode', ['~>0.0'])
 

data/features/support/env.rb

@@ -11,7 +11,7 @@ rescue LoadError
   # ignore
 end
 
-require 'minitest/unit'
+require 'minitest'
 require 'bibtex'
 
 World(MiniTest::Assertions)

data/lib/bibtex/bibliography.rb

@@ -47,7 +47,7 @@ module BibTeX
       # -:filter: convert all entries using the sepcified filter (not set by default)
       #
       def open(path, options = {})
-        b = parse(Kernel.open(path, 'r:UTF-8').read, options)
+        b = parse(File.read(path), options)
         b.path = path
         return b unless block_given?
 
@@ -144,9 +144,9 @@ module BibTeX
       self
     end
 
-    def each
+    def each(&block)
       if block_given?
-        data.each(&Proc.new)
+        data.each(&block)
         self
       else
         to_enum
@@ -339,14 +339,9 @@ module BibTeX
     # Sets all fields matching the passed-in pattern to the supplied value.
     # If a block is given, each matching entry will be passed to the block
     # instead. Returns the bibliography.
-    def unify(field, pattern, value = nil)
+    def unify(field, pattern, value = nil, &block)
       pattern = Regexp.new(pattern) unless pattern.is_a?(Regexp)
-
-      block = if block_given?
-                Proc.new
-              else
-                proc { |e| e[field] = value }
-              end
+      block = proc { |e| e[field] = value } unless block_given?
 
       each_entry do |entry|
         block.call(entry) if entry.field?(field) && entry[field].to_s =~ pattern
@@ -489,9 +484,9 @@ module BibTeX
 
     alias q query
 
-    def each_entry
+    def each_entry(&block)
       if block_given?
-        q('@entry').each(&Proc.new)
+        q('@entry').each(&block)
       else
         q('@entry').to_enum
       end
@@ -507,9 +502,8 @@ module BibTeX
       other.respond_to?(:to_a) ? to_a <=> other.to_a : nil
     end
 
-    def select_duplicates_by(*arguments)
+    def select_duplicates_by(*arguments, &block)
       arguments = %i[year title] if arguments.empty?
-      block = Proc.new if block_given?
 
       group_by(*arguments) do |digest, entry|
         # 1.8 compatibility

data/lib/bibtex/entry.rb

@@ -164,9 +164,9 @@ module BibTeX
     # pair as parameters.
     #
     # If no block is given, an enumerator is returned instead.
-    def each
+    def each(&block)
       if block_given?
-        fields.each(&Proc.new)
+        fields.each(&block)
         self
       else
         to_enum
@@ -606,8 +606,8 @@ module BibTeX
     # the block returns true (the block will be called with each key-value pair).
     #
     # @see #convert!
-    def convert(*filters)
-      block_given? ? dup.convert!(*filters, &Proc.new) : dup.convert!(*filters)
+    def convert(*filters, &block)
+      block_given? ? dup.convert!(*filters, &block) : dup.convert!(*filters)
     end
 
     # In-place variant of @see #convert

data/lib/bibtex/filters.rb

@@ -28,7 +28,7 @@ module BibTeX
   module Filters
     LOAD_PATH = [File.expand_path(__dir__), 'filters'].join('/').freeze
 
-    Dir.glob("#{LOAD_PATH}/*.rb").each do |filter|
+    Dir.glob("#{LOAD_PATH}/*.rb").sort.each do |filter|
       require filter
     end
 

data/lib/bibtex/name_parser.rb

@@ -560,4 +560,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class NameParser
-  end   # module BibTeX
+end   # module BibTeX

data/lib/bibtex/parser.rb

@@ -471,4 +471,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module BibTeX
+end   # module BibTeX

data/lib/bibtex/version.rb

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

data/test/bibtex/test_bibliography.rb

@@ -27,11 +27,11 @@ module BibTeX
 
     describe '.parse' do
       it 'accepts filters' do
-        Bibliography.parse("@misc{k, title = {\\''u}}", filter: 'latex')[0].title.must_be :==, 'ü'
+        _(Bibliography.parse("@misc{k, title = {\\''u}}", filter: 'latex')[0].title).must_be :==, 'ü'
       end
 
       it 'accepts filters in an array' do
-        Bibliography.parse("@misc{k, title = {\\''u}}", filter: ['latex'])[0].title.must_be :==, 'ü'
+        _(Bibliography.parse("@misc{k, title = {\\''u}}", filter: ['latex'])[0].title).must_be :==, 'ü'
       end
     end
 
@@ -252,15 +252,15 @@ module BibTeX
 
       describe '#query' do
         it 'returns all elements when passed no arguments' do
-          @bib.query.length.must_be :==, 6
+          assert_equal 6, @bib.query.length
         end
 
         it 'returns all elements when passed :all and an empty condition' do
-          @bib.query(:all, '').length.must_be :==, 6
+          assert_equal 6, @bib.query(:all, '').length
         end
 
         it 'returns all entries when passed a * wildcard' do
-          @bib.query('@*').length.must_be :==, 5
+          assert_equal 5, @bib.query('@*').length
         end
       end
 
@@ -393,7 +393,7 @@ module BibTeX
         end
 
         it 'converts LaTeX umlauts' do
-          @bib.convert(:latex)['rails'].keywords.must_be :==, 'rüby'
+          assert_equal 'rüby', @bib.convert(:latex)['rails'].keywords
         end
       end
 
@@ -405,16 +405,16 @@ module BibTeX
           @bib.to_xml.write(@bibtexml, 2)
           @bibtexml.rewind
           xml = REXML::Document.new(@bibtexml)
-          xml.root.namespace.must_be :==, 'http://bibtexml.sf.net/'
-          xml.root.get_elements('//bibtex:entry').wont_be_empty
+          _(xml.root.namespace).must_be :==, 'http://bibtexml.sf.net/'
+          _(xml.root.get_elements('//bibtex:entry')).wont_be_empty
         end
 
         it 'supports exporting to extended BibTeXML' do
           @bib.to_xml(extended: true).write(@bibtexml, 2)
           @bibtexml.rewind
           xml = REXML::Document.new(@bibtexml)
-          xml.root.namespace.must_be :==, 'http://bibtexml.sf.net/'
-          xml.root.get_elements('//bibtex:person').wont_be_empty
+          _(xml.root.namespace).must_be :==, 'http://bibtexml.sf.net/'
+          _(xml.root.get_elements('//bibtex:person')).wont_be_empty
         end
       end
     end

data/test/bibtex/test_entry.rb

@@ -4,7 +4,7 @@ module BibTeX
   class EntryTest < Minitest::Spec
     describe 'a new entry' do
       it "won't be nil" do
-        Entry.new.wont_be_nil
+        _(Entry.new).wont_be_nil
       end
     end
 
@@ -23,7 +23,7 @@ module BibTeX
 
       it 'is not cross-referenced by default' do
         assert_equal false, Entry.new.cross_referenced?
-        Entry.new.cross_referenced_by.must_be_empty
+        _(Entry.new.cross_referenced_by).must_be_empty
       end
 
       describe 'given a bibliography with cross referenced entries' do
@@ -74,26 +74,26 @@ module BibTeX
           describe 'when a "title" is set in the entry itself' do
             before { @bib['a1'].title = 'A1' }
             it 'returns the title' do
-              @bib['a1'].title.must_be :==, 'A1'
+              _(@bib['a1'].title).must_be :==, 'A1'
             end
           end
 
           describe 'when "title" is undefined for the entry but defined in the reference' do
             it 'returns the referenced title' do
-              @bib['a1'].title.must_be :==, @bib['a'].title
+              _(@bib['a1'].title).must_be :==, @bib['a'].title
             end
           end
 
           describe 'when "booktitle" is undefined for the entry but defined in the reference' do
             before { @bib['a'].booktitle = 'A Booktitle' }
             it 'returns the referenced booktitle' do
-              @bib['a1'].booktitle.must_be :==, @bib['a'].booktitle
+              _(@bib['a1'].booktitle).must_be :==, @bib['a'].booktitle
             end
           end
 
           describe 'when "booktitle" is undefined for the entry and the reference but the reference has a "title"' do
             it "returns the reference's title" do
-              @bib['a1'].booktitle.must_be :==, @bib['a'].title
+              _(@bib['a1'].booktitle).must_be :==, @bib['a'].title
             end
           end
 

data/test/bibtex/test_filters.rb

@@ -28,9 +28,9 @@ module BibTeX
       end
 
       it 'should return nil if there is no filter by that name' do
-        assert_equal nil, Filters.resolve(:foobar)
-        assert_equal nil, Filters.resolve('foobar')
-        assert_equal nil, Filters.resolve(nil)
+        assert_nil Filters.resolve(:foobar)
+        assert_nil Filters.resolve('foobar')
+        assert_nil Filters.resolve(nil)
       end
     end
   end

data/test/helper.rb

@@ -17,9 +17,6 @@ rescue LoadError
 end
 
 require 'minitest/autorun'
-require 'minitest/ansi'
-
-Minitest::ANSI.use!
 
 require 'tempfile'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -40,7 +40,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Guardfile
 - History.txt
 - LICENSE
 - Manifest
@@ -137,22 +136,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.
 test_files:
 - test/bibtex/entry/test_rdf_converter.rb
-- test/bibtex/test_bibliography.rb
 - test/bibtex/test_elements.rb
-- test/bibtex/test_filters.rb
 - test/bibtex/test_lexer.rb
 - test/bibtex/test_name_parser.rb
 - test/bibtex/test_names.rb
@@ -161,5 +158,7 @@ test_files:
 - 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/test_bibtex.rb
 - test/test_export.rb

data/Guardfile

@@ -1,22 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'cucumber' do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
-end
-
-guard 'minitest' do
-  ignore(%r|swp$|)
-
-  # with Minitest::Unit
-  watch(%r|^test/(.*)/?test_(.*)\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r|^test/helper\.rb|)    { 'test' }
-
-  # with Minitest::Spec
-  # watch(%r|^spec/(.*)_spec\.rb|)
-  # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
-end