lib/genevalidatorapp/database.rb in genevalidatorapp-1.5.4 vs lib/genevalidatorapp/database.rb in genevalidatorapp-2.0.0

@@ -71,13 +71,13 @@
         database_dir = config[:database_dir]
         cmd  = "blastdbcmd -recursive -list #{database_dir} -list_outfmt" \
                ' "%p::%f::%t"'
         list = `#{cmd} 2>&1`
         list.each_line do |line|
-          type, name, title =  line.split('::', 3)
+          type, name, title = line.split('::', 3)
           next if multipart_database_name?(name)
-          next unless type.downcase == 'protein'
+          next unless type.casecmp('protein').zero?
           self << Database.new(name, title, type)
         end
       end
 
       # Returns true if the database name appears to be a multi-part database
@@ -86,10 +86,10 @@
       # e.g.
       # /home/ben/pd.ben/sequenceserver/db/nr.00 => yes
       # /home/ben/pd.ben/sequenceserver/db/nr => no
       # /home/ben/pd.ben/sequenceserver/db/img3.5.finished.faa.01 => yes
       def multipart_database_name?(db_name)
-        !(db_name.match(/.+\/\S+\d{2}$/).nil?)
+        !db_name.match(%r{.+\/\S+\d{2}$}).nil?
       end
     end
 
     def initialize(*args)
       args.last.downcase!