bibtex-ruby 4.4.7 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c4e2816fb0d45f48ff04f0ef762dcc1ed6fce5f7523ce86390bf5426a80806
-  data.tar.gz: b8158882899c29a86514ba842272a7587340648c08a37710ed66c0eadde522b0
+  metadata.gz: 1f116d02973cd3647ce69ab85bee28bfa5a361cb8eadc006905c4688839895b8
+  data.tar.gz: 8770d47027cf981318066773c7f7656317e69c3e47c81422429e38b830ac5ce3
 SHA512:
-  metadata.gz: d7598c33f7b1f60a1fa1d9bd313f918c9a9151c72b4aa14c13cfb4ad70e58dfda3413b7ae40836d0ebfb470fe7854721a65f03de2b5492e2ac3f16be7f8ef39b
-  data.tar.gz: 39ffcdc7195f0d041703a6cddfc3924f62a7ef439cfeaa04b7d5de98229daa3c6a58c5ec44a05b1bce90f6c390f1f825c6064368a8442f0fca04bf329f5dc2c6
+  metadata.gz: d5123a130e935e4710b6d907e9af2a9fe8e6e56f836ffd41acebc546faad2bd9f448508da7286d403f1ee5276737065fb85718609b680f32095dfa5ef6fdea43
+  data.tar.gz: c088b05105b9371a0578ebb7502518b974103168b59bcb9d3172c1a166b9f63e100eedf003aaf1d2772086e8c00df9581555f98c5f38913a006f4a2c7e45528d

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'json', '~>1.8', :platforms => [:mri_18, :jruby, :rbx]
+gem 'json', '~>1.8', platforms: %i[mri_18 jruby rbx]
 
 if RUBY_VERSION >= '2.0'
   gem 'rdf', '~>2.0.0'
@@ -10,57 +10,56 @@ else
   gem 'rdf', '~>1.1'
 end
 
-gem 'rubysl', '~>2.0', :platforms => :rbx
+gem 'rubysl', '~>2.0', platforms: :rbx
 
 group :debug do
   if RUBY_VERSION >= '2.0'
-    gem 'byebug', :require => false, :platforms => :mri
+    gem 'byebug', require: false, platforms: :mri
   else
-    gem 'debugger', :require => false, :platforms => :mri
+    gem 'debugger', require: false, platforms: :mri
   end
 
-  gem 'ruby-debug', :require => false, :platforms => :jruby
+  gem 'ruby-debug', require: false, platforms: :jruby
 
-  gem 'rubinius-debugger', :require => false, :platforms => :rbx
-  gem 'rubinius-compiler', :require => false, :platforms => :rbx
+  gem 'rubinius-compiler', require: false, platforms: :rbx
+  gem 'rubinius-debugger', require: false, platforms: :rbx
 end
 
 group :test do
-	gem 'minitest', '~>4.7', :require => false
-  gem 'rubysl-test-unit', '~>2.0', :platforms => :rbx
-  gem 'minitest-ansi'
   gem 'cucumber', '~>1.3'
-  gem 'unicode', '~>0.4', :platforms => [:rbx, :mswin, :mingw, :mri]
+  gem 'minitest', '~>4.7', require: false
+  gem 'minitest-ansi'
+  gem 'rubysl-test-unit', '~>2.0', platforms: :rbx
+  gem 'unicode', '~>0.4', platforms: %i[rbx mswin mingw mri]
 end
 
 group :extra do
-  if RUBY_PLATFORM =~ /darwin/i
-	  gem 'rb-fsevent', :require => false
-  end
+  gem 'rb-fsevent', require: false if RUBY_PLATFORM =~ /darwin/i
 
-	gem 'guard-minitest', :platforms => [:ruby]
-	gem 'guard-cucumber', :platforms => [:ruby]
-	gem 'redcarpet', :platforms => [:ruby]
+  gem 'guard-cucumber', platforms: [:ruby]
+  gem 'guard-minitest', platforms: [:ruby]
+  gem 'redcarpet', platforms: [:ruby]
 end
 
 group :profile do
-	gem 'ruby-prof', '~>0.14', :platforms => [:mri]
-	gem 'gnuplot', '~>2.4', :platforms => [:mri]
+  gem 'gnuplot', '~>2.4', platforms: [:mri]
+  gem 'ruby-prof', '~>0.14', platforms: [:mri]
 end
 
 group :coverage do
-	gem 'simplecov', '~>0.8', :require => false, :platforms => [:ruby]
-  gem 'rubinius-coverage', :require => false, :platforms => :rbx
-  gem 'coveralls', '~>0.7', :require => false
+  gem 'coveralls', '~>0.7', require: false
+  gem 'rubinius-coverage', require: false, platforms: :rbx
+  gem 'simplecov', '~>0.8', require: false, platforms: [:ruby]
 end
 
 group :development do
+  gem 'iconv', platforms: [:ruby]
   gem 'rake'
+  gem 'rubocop', '~> 0.71.0', require: false
   gem 'yard'
-  gem 'iconv', :platforms => [:ruby]
 end
 
 group :travis do
   # Gem is required at runtime for RBX!
-  gem 'racc', :platforms => [:ruby]
+  gem 'racc', platforms: [:ruby]
 end

data/History.txt

@@ -1,3 +1,7 @@
+5.0.0 / 2019-06-12
+==================
+* Dropped support for Ruby < 2.3
+
 4.2.0 / 2015-02-02
 ==================
 * Fixed queries being whitespace sensitive

data/Rakefile

@@ -1,19 +1,17 @@
-# encoding: utf-8
-
 require 'bundler'
 begin
   Bundler.setup
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
-$:.unshift(File.join(File.dirname(__FILE__), './lib'))
-
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), './lib'))
 
 require 'rake/clean'
 require 'rake/testtask'
+require 'rubocop/rake_task'
 
 require 'bibtex/version'
 
@@ -29,7 +27,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'
@@ -41,17 +39,19 @@ end
 begin
   require 'coveralls/rake/task'
   Coveralls::RakeTask.new
-  task :test_with_coveralls => [:test, :features, 'coveralls:push']
+  task test_with_coveralls: [:test, :features, 'coveralls:push']
 rescue LoadError
   # ignore
 end
 
-task :default => [:test, :features]
+RuboCop::RakeTask.new
+
+task default: %i[test features rubocop]
 
 desc 'Generates the BibTeX parser'
-task :racc => ['lib/bibtex/parser.rb','lib/bibtex/name_parser.rb']
+task racc: ['lib/bibtex/parser.rb', 'lib/bibtex/name_parser.rb']
 
-task :test => ['racc','test_task']
+task test: %w[racc test_task]
 
 file 'lib/bibtex/parser.output' => ['lib/bibtex/parser.rb']
 file 'lib/bibtex/parser.rb' => ['lib/bibtex/bibtex.y'] do
@@ -65,7 +65,7 @@ file 'lib/bibtex/name_parser.rb' => ['lib/bibtex/names.y'] do
 end
 
 desc 'Run an IRB session with BibTeX-Ruby loaded'
-task :console, [:script] do |t,args|
+task :console, [:script] do |_t, args|
   ARGV.clear
 
   require 'irb'
@@ -82,37 +82,35 @@ task :check_warnings do
   puts BibTeX::Version::STRING
 end
 
-
 desc 'Runs the benchmarks (and plots the results)'
-task :benchmark => ['racc'] do
-  require File.expand_path('../test/benchmark.rb', __FILE__)
+task benchmark: ['racc'] do
+  require File.expand_path('test/benchmark.rb', __dir__)
 end
-task :bm => ['benchmark']
+task bm: ['benchmark']
 
 desc 'Runs the profiler'
-task :profile => ['racc'] do
-  require File.expand_path('../test/profile.rb', __FILE__)
+task profile: ['racc'] do
+  require File.expand_path('test/profile.rb', __dir__)
 end
 
-
 desc 'Updates the Manifest file'
-task :manifest => ['clean', 'racc'] do
+task manifest: %w[clean racc] do
   m = File.open('Manifest', 'w')
-  m.print FileList['**/*'].reject{ |f|
+  m.print FileList['**/*'].reject { |f|
     f.start_with?('coverage') || f =~ /(rbc|swp|~|lock)$/
   }.join("\n")
   m.close
 end
 
 desc 'Builds the gem file'
-task :build => ['manifest'] do
+task build: ['manifest'] do
   system 'gem build bibtex-ruby.gemspec'
 end
 
 desc 'Pushes the gem file to rubygems.org'
-task :release => ['build'] do
-  system %Q{git tag "#{BibTeX::Version::STRING}"}
-  system "git push --tags"
+task release: ['build'] do
+  system %(git tag "#{BibTeX::Version::STRING}")
+  system 'git push --tags'
   system "gem push bibtex-ruby-#{BibTeX::Version::STRING}.gem"
 end
 

data/bibtex-ruby.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
@@ -8,6 +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.authors     = ['Sylvester Keil']
   s.email       = ['sylvester@keil.or.at']
   s.homepage    = 'http://inukshuk.github.com/bibtex-ruby'

data/examples/bib2html.rb

@@ -10,28 +10,27 @@ rescue LoadError
 end
 
 # Open a bibliography file
-bib = BibTeX.open File.expand_path('../markdown.bib',__FILE__),
-  :include => [:meta_content]
+bib = BibTeX.open File.expand_path('markdown.bib', __dir__),
+                  include: [:meta_content]
 
 # Replaces all strings in the Bibliography and then
 # converts each BibTeX entries to a string using Chicago style
 # (all other elements are mapped to simple strings)
 bib.replace
 
-cp = CiteProc::Processor.new :style => 'apa',
-  :format => 'html', :locale => 'en'
+cp = CiteProc::Processor.new style: 'apa',
+                             format: 'html', locale: 'en'
 
 cp.import bib.to_citeproc
 
 content = bib['@entry, @meta_content'].map do |e|
   if e.entry?
-    cp.render :bibliography, :id => e.key
+    cp.render :bibliography, id: e.key
   else
     e.to_s
   end
 end
 
-
 begin
   require 'redcarpet'
 rescue LoadError

data/examples/bib2yaml.rb

@@ -4,8 +4,8 @@ require 'rubygems'
 require 'bibtex'
 require 'yaml'
 
-if ARGV.length < 1
-  puts "Usage: #{$0} <bib> [<yml>]"
+if ARGV.empty?
+  puts "Usage: #{$PROGRAM_NAME} <bib> [<yml>]"
 else
   out = ARGV.length == 2 ? File.open(ARGV[1], 'w') : STDOUT
   out.puts BibTeX.open(ARGV[0]).to_yaml

data/features/step_definitions/bibtex_steps.rb

@@ -14,7 +14,7 @@ When /^I search for :(.+)$/ do |query|
   @result = @bibliography.query(query.to_sym)
 end
 
-When /^I search for \/(.+)\/$/ do |query|
+When %r{^I search for /(.+)/$} do |query|
   @result = @bibliography.query(Regexp.new(query))
 end
 
@@ -50,7 +50,6 @@ When /^I create entries with these elements:$/ do |table|
   end
 end
 
-
 Then /^my bibliography should contain the following objects:$/ do |table|
   @bibliography.each_with_index do |object, index|
     table.hashes[index].each_pair do |key, value|
@@ -69,7 +68,7 @@ end
 
 Then /^my bibliography should contain the following numbers of elements:$/ do |table|
   counts = table.hashes.first
-  counts[[]] = counts.delete('total') if counts.has_key?('total')
+  counts[[]] = counts.delete('total') if counts.key?('total')
   counts.each_pair do |type, length|
     assert_equal length.to_i, @bibliography.find_by_type(type).length
   end
@@ -83,12 +82,11 @@ Then /^my bibliography should contain an entry with an? (?:key|id) like "([^"]*)
   pattern = Regexp.compile key
   refute_nil @bibliography.detect { |e| e.key.to_s =~ pattern }
 end
-Then /^my bibliography should contain an entry with (?:key|id) "([^"]*)" and a?n? (\w+) value of "([^"]*)"$/ do |key,field,value|
+Then /^my bibliography should contain an entry with (?:key|id) "([^"]*)" and a?n? (\w+) value of "([^"]*)"$/ do |key, field, value|
   refute_nil @bibliography[key.to_s]
   assert_equal value, @bibliography[key.to_s][field.downcase.to_sym].to_s
 end
 
-
 Then /^my bibliography should not contain an entry with (?:key|id) "([^"]*)"$/ do |key|
   assert_nil @bibliography[key.to_sym]
 end
@@ -97,7 +95,6 @@ Then /^there should be exactly (\d+) match(?:es)?$/ do |matches|
   assert_equal matches.to_i, @result.length
 end
 
-
 Then /^my bibliography should contain (\d+) (\w+)$/ do |count, type|
   assert_equal count.to_i, @bibliography.q("@#{type.chomp('s')}").length
 end

data/features/step_definitions/name_steps.rb

@@ -6,11 +6,10 @@ When /^I parse the names "(.*)"$/ do |string|
   @names = BibTeX::Names.parse(string)
 end
 
-
 Then /^the parts should be:$/ do |table|
   table.hashes.each do |row|
     assert_equal [row['first'], row['von'], row['last'], row['jr']],
-      [@name.first, @name.von, @name.last, @name.jr].map(&:to_s)
+                 [@name.first, @name.von, @name.last, @name.jr].map(&:to_s)
     # row.each do |k,v|
     #   assert_equal v, @name.send(k).to_s
     # end

data/lib/bibtex.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2015	Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2015  Sylvester Keil <sylvester.keil.or.at>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -9,11 +9,11 @@
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.	If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
 require 'digest/md5'
@@ -36,19 +36,17 @@ require 'bibtex/version'
 # License:: GNU GPL 3.0
 #
 module BibTeX
-
-	#
-	# An instance of the Ruby core class +Logger+.
-	# Used for logging by BibTeX-Ruby.
-	#
-	@log = Logger.new(STDERR)
-	@log.level = ENV.has_key?('DEBUG') ? Logger::DEBUG : Logger::WARN
-	@log.datetime_format = '%Y-%m-%d %H:%M:%S'
+  #
+  # An instance of the Ruby core class +Logger+.
+  # Used for logging by BibTeX-Ruby.
+  #
+  @log = Logger.new(STDERR)
+  @log.level = ENV.key?('DEBUG') ? Logger::DEBUG : Logger::WARN
+  @log.datetime_format = '%Y-%m-%d %H:%M:%S'
 
   class << self
     attr_accessor :log
   end
-
 end
 
 # Load debugger
@@ -79,5 +77,5 @@ begin
   require 'bibtex/entry/rdf_converter'
   require 'bibtex/bibliography/rdf_converter'
 rescue LoadError
-# ignored
+  # ignored
 end

data/lib/bibtex/bibliography.rb

@@ -17,7 +17,6 @@
 #++
 
 module BibTeX
-
   #
   # The Bibliography class models a BibTeX bibliography;
   # typically, it corresponds to a `.bib' file.
@@ -28,10 +27,9 @@ module BibTeX
     include Enumerable
     include Comparable
 
-    @defaults = { :parse_names => true, :parse_months => true }.freeze
+    @defaults = { parse_names: true, parse_months: true }.freeze
 
     class << self
-
       attr_reader :defaults
 
       # Opens and parses the `.bib' file at the given +path+. Returns
@@ -86,7 +84,7 @@ module BibTeX
     attr_reader :data, :strings, :entries, :errors, :options
 
     attr_by_type :article, :book, :journal, :collection, :preamble,
-      :comment, :meta_content
+                 :comment, :meta_content
 
     def_delegators :@data, :length, :size, :empty?
     def_delegators :@entries, :key?, :has_key?, :values_at
@@ -96,8 +94,10 @@ module BibTeX
     # Creates a new bibliography.
     def initialize(options = {})
       @options = Bibliography.defaults.merge(options)
-      @data, @strings, @errors = [], {}, []
-      @entries = Hash.new { |h,k| h.fetch(k.to_s, nil) }
+      @data = []
+      @strings = {}
+      @errors = []
+      @entries = Hash.new { |h, k| h.fetch(k.to_s, nil) }
 
       yield self if block_given?
     end
@@ -105,8 +105,9 @@ module BibTeX
     def initialize_copy(other)
       @options = other.options.dup
       @errors = other.errors.dup
-      @data, @strings = [], {}
-      @entries = Hash.new { |h,k| h.fetch(k.to_s, nil) }
+      @data = []
+      @strings = {}
+      @entries = Hash.new { |h, k| h.fetch(k.to_s, nil) }
 
       other.each do |element|
         add element.dup
@@ -127,7 +128,6 @@ module BibTeX
     alias << add
     alias push add
 
-
     # Saves the bibliography to the current path.
     def save(options = {})
       save_to(@path, options)
@@ -135,7 +135,7 @@ module BibTeX
 
     # Saves the bibliography to a file at the given path. Returns the bibliography.
     def save_to(path, options = {})
-      options[:quotes] ||= %w({ })
+      options[:quotes] ||= %w[{ }]
 
       File.open(path, 'w:UTF-8') do |f|
         f.write(to_s(options))
@@ -144,7 +144,6 @@ module BibTeX
       self
     end
 
-
     def each
       if block_given?
         data.each(&Proc.new)
@@ -154,18 +153,16 @@ module BibTeX
       end
     end
 
-
     def parse_names
-      entries.each_value { |e| e.parse_names }
+      entries.each_value(&:parse_names)
       self
     end
 
     def parse_months
-      entries.each_value { |e| e.parse_month }
+      entries.each_value(&:parse_month)
       self
     end
 
-
     # Converts all enties using the given filter(s). If an optional block is given
     # the block is used as a condition (the block will be called with each
     # entry). @see Entry#convert!
@@ -179,7 +176,6 @@ module BibTeX
       self
     end
 
-
     # Deletes an object, or a list of objects from the bibliography.
     # If a list of objects is to be deleted, you can either supply the list
     # of objects or use a query or block to define the list.
@@ -188,14 +184,13 @@ module BibTeX
     # if the object was not part of the bibliography.
     def delete(*arguments, &block)
       objects = q(*arguments, &block).map { |o| o.removed_from_bibliography(self) }
-      @data = @data - objects
+      @data -= objects
       objects.length == 1 ? objects[0] : objects
     end
 
     alias remove delete
     alias rm delete
 
-
     # call-seq:
     # >> bib[-1]
     # => Returns the last element of the Bibliography or nil
@@ -221,20 +216,18 @@ module BibTeX
     # not yield to a block for additional refinement of the query.
     #
     def [](*arguments)
-      raise(ArgumentError, "wrong number of arguments (#{arguments.length} for 1..2)") unless arguments.length.between?(1,2)
+      raise(ArgumentError, "wrong number of arguments (#{arguments.length} for 1..2)") unless arguments.length.between?(1, 2)
 
-      case
-      when arguments[0].is_a?(Numeric) || arguments[0].is_a?(Range)
+      if arguments[0].is_a?(Numeric) || arguments[0].is_a?(Range)
         data[*arguments]
-      when arguments.length == 1
-        case
-        when arguments[0].nil?
+      elsif arguments.length == 1
+        if arguments[0].nil?
           nil
-        when arguments[0].respond_to?(:empty?) && arguments[0].empty?
+        elsif arguments[0].respond_to?(:empty?) && arguments[0].empty?
           nil
-        when arguments[0].is_a?(Symbol)
+        elsif arguments[0].is_a?(Symbol)
           entries[arguments[0]]
-        when arguments[0].respond_to?(:start_with?) && !arguments[0].start_with?('@', '!@')
+        elsif arguments[0].respond_to?(:start_with?) && !arguments[0].start_with?('@', '!@')
           entries[arguments[0]]
         else
           query(*arguments)
@@ -244,7 +237,6 @@ module BibTeX
       end
     end
 
-
     # Returns true if there are object which could not be parsed.
     def errors?
       !errors.empty?
@@ -279,7 +271,7 @@ module BibTeX
       self
     end
 
-    alias :replace_strings :replace
+    alias replace_strings replace
 
     def join(filter = '')
       q(filter, &:join)
@@ -318,18 +310,16 @@ module BibTeX
     # and 'Poe, E. A.' calling this method would convert all three names to
     # 'Poe, Edgar A.'.
     def extend_initials!
-      groups = Hash.new do |h,k|
-        h[k] = { :prototype => nil, :names => [] }
+      groups = Hash.new do |h, k|
+        h[k] = { prototype: nil, names: [] }
       end
 
       # group names together
       names.each do |name|
-        group = groups[name.sort_order(:initials => true).downcase]
+        group = groups[name.sort_order(initials: true).downcase]
         group[:names] << name
 
-        if group[:prototype].nil? || group[:prototype].first.to_s.length < name.first.to_s.length
-          group[:prototype] = name
-        end
+        group[:prototype] = name if group[:prototype].nil? || group[:prototype].first.to_s.length < name.first.to_s.length
       end
 
       # extend all names in group to prototype
@@ -353,22 +343,20 @@ module BibTeX
       pattern = Regexp.new(pattern) unless pattern.is_a?(Regexp)
 
       block = if block_given?
-        Proc.new
-      else
-        Proc.new { |e| e[field] = value }
-      end
+                Proc.new
+              else
+                proc { |e| e[field] = value }
+              end
 
       each_entry do |entry|
-        if entry.field?(field) && entry[field].to_s =~ pattern
-          block.call(entry)
-        end
+        block.call(entry) if entry.field?(field) && entry[field].to_s =~ pattern
       end
 
       self
     end
 
     def group_by(*arguments, &block)
-      groups = Hash.new { |h,k| h[k] = [] }
+      groups = Hash.new { |h, k| h[k] = [] }
 
       entries.values.each do |e|
         groups[e.digest(arguments, &block)] << e
@@ -406,7 +394,7 @@ module BibTeX
 
     # Returns a Ruby hash representation of the bibliography.
     def to_hash(options = {})
-      { :bibliography => map { |o| o.to_hash(options) } }
+      { bibliography: map { |o| o.to_hash(options) } }
     end
 
     # Returns a YAML representation of the bibliography.
@@ -430,7 +418,7 @@ module BibTeX
       require 'rexml/document'
 
       xml =  REXML::Document.new
-      xml << REXML::XMLDecl.new('1.0','UTF-8')
+      xml << REXML::XMLDecl.new('1.0', 'UTF-8')
 
       root = REXML::Element.new('bibtex:file')
       root.add_namespace('bibtex', 'http://bibtexml.sf.net/')
@@ -443,7 +431,7 @@ module BibTeX
 
     # Returns an RDF::Graph representation of the bibliography. The graph
     # can be serialized using any of the RDF serializer plugins.
-    def to_rdf(options = {})
+    def to_rdf(_options = {})
       if defined?(::RDF)
         RDFConverter.convert(self)
       else
@@ -482,17 +470,19 @@ module BibTeX
     def query(*arguments, &block)
       case arguments.length
       when 0
-        selector, q = :all, nil
+        selector = :all
+        q = nil
       when 1
-        selector, q = :all, arguments[0]
+        selector = :all
+        q = arguments[0]
       when 2
         selector, q = arguments
       else
         raise ArgumentError, "wrong number of arguments (#{arguments.length} for 0..2)"
       end
 
-      filter = block ? Proc.new { |e| e.match?(q) && block.call(e) } :
-        Proc.new { |e| e.match?(q) }
+      filter = block ? proc { |e| e.match?(q) && block.call(e) } :
+        proc { |e| e.match?(q) }
 
       send(query_handler(selector), &filter)
     end
@@ -518,19 +508,17 @@ module BibTeX
     end
 
     def select_duplicates_by(*arguments)
-      arguments = [:year, :title] if arguments.empty?
+      arguments = %i[year title] if arguments.empty?
       block = Proc.new if block_given?
 
-      group_by(*arguments) { |digest, entry|
-
+      group_by(*arguments) do |digest, entry|
         # 1.8 compatibility
         # digest = digest[0] if digest.is_a?(Array)
 
         digest.gsub(/\s+/, '').downcase
         digest = block.call(digest, entry) unless block.nil?
         digest
-
-      }.values.select { |d| d.length > 1 }
+      end.values.select { |d| d.length > 1 }
     end
 
     alias duplicates select_duplicates_by
@@ -564,7 +552,7 @@ module BibTeX
       select_duplicates_by(*arguments, &block).each do |dupes|
         dupes.shift
         dupes.each do |dupe|
-          self.remove dupe
+          remove dupe
         end
       end
 
@@ -573,7 +561,7 @@ module BibTeX
 
     # Experimental!
     # Returns a new Bibliography with all duplicates removed.
-    def uniq(*arguments, &block)
+    def uniq(*_arguments)
       dup.uniq!
     end
 
@@ -589,6 +577,5 @@ module BibTeX
         :select
       end
     end
-
   end
 end