hyrax 2.0 Beta4

Update ruby version

Fix rubocop defenses

Author: VivianChu

.rubocop_todo.yml

@@ -97,3 +97,13 @@ Security/MarshalLoad:
   Exclude:
     - 'app/models/concerns/hyrax/user.rb'
 
+RSpec/PredicateMatcher:
+  Enabled: false
+
+RSpec/HookArgument:
+  Enabled: false
+
+RSpec/ReturnFromStub:
+  Exclude:
+    - 'spec/support/features/stub_view_helpers.rb'
+

.solr_wrapper

@@ -1,5 +1,5 @@
 # Place any default configuration for solr_wrapper here
-version: 6.6.1
+# version: 6.0.0
 # port: 8983
 instance_dir: tmp/solr-development
 collection:

Gemfile

@@ -1,58 +1,64 @@
 source 'https://rubygems.org'
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
+gem 'rails', '~> 5.0.5'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 3.8.2'
+gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '3.2.0'
+gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2.0'
+gem 'coffee-rails', '~> 4.2'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 gem 'factory_girl', '~> 4.0'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.6.3'
+gem 'jbuilder', '~> 2.5'
 # Use Redis adapter to run Action Cable in production
 # gem 'redis', '~> 3.0'
 # bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
-gem 'json', '~> 1.8.6'
-gem 'coveralls', '~> 0.8.21', require: false
 gem "blacklight_advanced_search"
 gem 'sitemap_generator', '~> 5.3.1'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
-# Use Unicorn as the app server
-# gem 'unicorn'
-
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug'
+  gem 'byebug', platform: :mri
+  gem 'capybara', '~> 2.14.0'
+  gem 'factory_girl_rails', '~> 4.4'
+  gem 'rspec-activemodel-mocks', '~> 1.0'
+  gem 'rspec-mocks', '3.6.0'
+  gem 'simplecov', '~> 0.14.1'
+  gem 'rails_autolink', '~> 1.1.6'
+  gem 'unicorn', '~> 5.3.0'
   gem 'rubocop', '~> 0.49.1'
   gem 'rubocop-rspec', '~> 1.15.1'
 end
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 3.5.0'
-  gem 'listen', '~> 3.1.5'
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '~> 3.0.5'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring', '~> 2.0.1'
+  gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
@@ -65,39 +71,28 @@ gem 'capistrano-bundler', '~> 1.2.0'
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'hyrax', '2.0.0.beta4', github: 'samvera/hyrax', ref: 'a8873d1c3647bbe7a326221192e726de77a76e5d'
+gem 'hyrax', '2.0.0.beta4'
 gem 'hydra-role-management'
-
-gem 'nokogiri', '~> 1.7.1'
-gem 'sidekiq', '~> 5.0.0'
-gem 'rubyXL'
-
-gem 'openseadragon', '~> 0.4.0'
-
 group :development, :test do
-  gem 'capybara', '~> 2.14.0'
-  gem 'factory_girl_rails', '~> 4.4'
-  gem 'rspec-activemodel-mocks', '~> 1.0'
-  gem 'rspec-mocks', '3.6.0'
-  gem 'simplecov', '~> 0.14.1'
-  gem 'rails_autolink', '~> 1.1.6'
-  gem 'unicorn', '~> 5.3.0'
-  gem 'solr_wrapper', '~> 1.0.0'
-  gem 'database_cleaner', '~> 1.6.0'
-  gem 'rails-controller-testing', '~> 1.0.1'
+  gem 'solr_wrapper', '>= 0.3'
 end
 
-gem 'rsolr', '~> 2.0.1'
-gem 'devise', '~> 4.2.1'
-gem 'devise-guests', '~> 0.6.0'
+gem 'rsolr', '>= 1.0'
+gem 'devise'
+gem 'devise-guests', '~> 0.6'
+gem 'rubyXL'
 gem 'omniauth', '1.6.1'
 gem 'omniauth-shibboleth', '1.2.1'
 gem 'net-ldap'
 gem 'flexmock'
 gem 'fakeldap'
 gem 'ruby-ldapserver', '~> 0.5.0'
+gem 'sidekiq', '~> 5.0.0'
 
+gem 'openseadragon', '~> 0.4.0'
 group :development, :test do
-  gem 'fcrepo_wrapper', '~> 0.8.0'
+  gem 'fcrepo_wrapper'
   gem 'rspec-rails', '~> 3.6.0'
+  gem 'database_cleaner', '~> 1.6.0'
+  gem 'rails-controller-testing', '~> 1.0.1'
 end