Merge pull request #222 from sul-dlss/update-ruby

Update ruby version in .ruby-version

.ruby-version

@@ -1 +1 @@
-2.3.4
+2.5.3

.travis.yml

@@ -14,6 +14,5 @@ before_install:
 
 rvm:
   - 2.5.3
-  - 2.3.4
 
 script: bundle exec rake ci

app/mailers/hydrus_mailer.rb

@@ -89,7 +89,7 @@ def host
 
   def self.process_user_list(users)
     users.split(',').map do |user|
-      user =~ /.+@.+\..+/ ? user.strip : "#{user.strip}@stanford.edu"
+      user.match?(/.+@.+\..+/) ? user.strip : "#{user.strip}@stanford.edu"
     end
   end
 end

app/models/hydrus/item.rb

@@ -802,7 +802,7 @@ def version_description
   def is_initial_version(opts = {})
     return true if current_version == '1'
     return false if opts[:absolute]
-    version_tag =~ /\Av1\.0\./ ? true : false
+    version_tag.match?(/\Av1\.0\./) ? true : false
   end
 
   # Takes a string.

lib/validators/uri_validator.rb

@@ -4,7 +4,7 @@ def validate_each(object, attribute, value)
     configuration = { message: 'is invalid or not responding', format: URI::regexp(%w(http https)) }
     configuration.update(options)
 
-    if value =~ configuration[:format]
+    if value.match?(configuration[:format])
       begin # check header response
         case Net::HTTP.get_response(URI.parse(value))
           when Net::HTTPSuccess then true

spec/support/rubydora_transactions_monkeypatch.rb

@@ -19,13 +19,12 @@ def rollback_fixtures(fixtures)
     without_transactions do
       # First, purge everything that was modified.
       aps.each do |p|
-        begin
-          repository.purge_object(pid: p)
-          solr.delete_by_id p
-          #run_hook(:after_rollback, :pid => p, :method => :ingest)
-        rescue
-        end
+        repository.purge_object(pid: p)
+        solr.delete_by_id p
+        #run_hook(:after_rollback, :pid => p, :method => :ingest)
+      rescue
       end
+
       # Then restore the fixtures to their original state.
       fixtures.each do |p, foxml|
         next unless fps.include?(p)