Merge pull request #14 from MITLibraries/rails601

ETD-222 Add support for Rails 6 apps

Gemfile.lock

@@ -1,61 +1,77 @@
 PATH
  remote: .
  specs:
- mitlibraries-theme (0.4.0)
- rails (~> 5)
- sass (~> 3.4)
- sass-rails (~> 5)
+ mitlibraries-theme (0.5.0)
+ rails (>= 5, < 7)
+ sassc (~> 2)
 
 GEM
  remote: https://rubygems.org/
  specs:
- actioncable (5.2.4.5)
- actionpack (= 5.2.4.5)
+ actioncable (6.1.3)
+ actionpack (= 6.1.3)
+ activesupport (= 6.1.3)
  nio4r (~> 2.0)
  websocket-driver (>= 0.6.1)
- actionmailer (5.2.4.5)
- actionpack (= 5.2.4.5)
- actionview (= 5.2.4.5)
- activejob (= 5.2.4.5)
+ actionmailbox (6.1.3)
+ actionpack (= 6.1.3)
+ activejob (= 6.1.3)
+ activerecord (= 6.1.3)
+ activestorage (= 6.1.3)
+ activesupport (= 6.1.3)
+ mail (>= 2.7.1)
+ actionmailer (6.1.3)
+ actionpack (= 6.1.3)
+ actionview (= 6.1.3)
+ activejob (= 6.1.3)
+ activesupport (= 6.1.3)
  mail (~> 2.5, >= 2.5.4)
  rails-dom-testing (~> 2.0)
- actionpack (5.2.4.5)
- actionview (= 5.2.4.5)
- activesupport (= 5.2.4.5)
- rack (~> 2.0, >= 2.0.8)
+ actionpack (6.1.3)
+ actionview (= 6.1.3)
+ activesupport (= 6.1.3)
+ rack (~> 2.0, >= 2.0.9)
  rack-test (>= 0.6.3)
  rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.2.4.5)
- activesupport (= 5.2.4.5)
+ rails-html-sanitizer (~> 1.0, >= 1.2.0)
+ actiontext (6.1.3)
+ actionpack (= 6.1.3)
+ activerecord (= 6.1.3)
+ activestorage (= 6.1.3)
+ activesupport (= 6.1.3)
+ nokogiri (>= 1.8.5)
+ actionview (6.1.3)
+ activesupport (= 6.1.3)
  builder (~> 3.1)
  erubi (~> 1.4)
  rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.4.5)
- activesupport (= 5.2.4.5)
+ rails-html-sanitizer (~> 1.1, >= 1.2.0)
+ activejob (6.1.3)
+ activesupport (= 6.1.3)
  globalid (>= 0.3.6)
- activemodel (5.2.4.5)
- activesupport (= 5.2.4.5)
- activerecord (5.2.4.5)
- activemodel (= 5.2.4.5)
- activesupport (= 5.2.4.5)
- arel (>= 9.0)
- activestorage (5.2.4.5)
- actionpack (= 5.2.4.5)
- activerecord (= 5.2.4.5)
+ activemodel (6.1.3)
+ activesupport (= 6.1.3)
+ activerecord (6.1.3)
+ activemodel (= 6.1.3)
+ activesupport (= 6.1.3)
+ activestorage (6.1.3)
+ actionpack (= 6.1.3)
+ activejob (= 6.1.3)
+ activerecord (= 6.1.3)
+ activesupport (= 6.1.3)
  marcel (~> 0.3.1)
- activesupport (5.2.4.5)
+ mimemagic (~> 0.3.2)
+ activesupport (6.1.3)
  concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- arel (9.0.0)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+  zeitwerk (~> 2.3)
  builder (3.2.4)
  concurrent-ruby (1.1.8)
  crass (1.0.6)
  erubi (1.10.0)
- ffi (1.13.1)
+ ffi (1.15.0)
  globalid (0.4.2)
  activesupport (>= 4.2.0)
  i18n (1.8.9)
@@ -68,81 +84,70 @@ GEM
  marcel (0.3.3)
  mimemagic (~> 0.3.2)
  method_source (1.0.0)
- mimemagic (0.3.5)
+ mimemagic (0.3.6)
  mini_mime (1.0.2)
  mini_portile2 (2.5.0)
- minitest (5.14.2)
- nio4r (2.5.5)
- nokogiri (1.11.1)
+ minitest (5.14.4)
+ nio4r (2.5.7)
+ nokogiri (1.11.2)
  mini_portile2 (~> 2.5.0)
  racc (~> 1.4)
  racc (1.5.2)
  rack (2.2.3)
  rack-test (1.1.0)
  rack (>= 1.0, < 3)
- rails (5.2.4.5)
- actioncable (= 5.2.4.5)
- actionmailer (= 5.2.4.5)
- actionpack (= 5.2.4.5)
- actionview (= 5.2.4.5)
- activejob (= 5.2.4.5)
- activemodel (= 5.2.4.5)
- activerecord (= 5.2.4.5)
- activestorage (= 5.2.4.5)
- activesupport (= 5.2.4.5)
- bundler (>= 1.3.0)
- railties (= 5.2.4.5)
+ rails (6.1.3)
+ actioncable (= 6.1.3)
+ actionmailbox (= 6.1.3)
+ actionmailer (= 6.1.3)
+ actionpack (= 6.1.3)
+ actiontext (= 6.1.3)
+ actionview (= 6.1.3)
+ activejob (= 6.1.3)
+ activemodel (= 6.1.3)
+ activerecord (= 6.1.3)
+ activestorage (= 6.1.3)
+ activesupport (= 6.1.3)
+ bundler (>= 1.15.0)
+ railties (= 6.1.3)
  sprockets-rails (>= 2.0.0)
  rails-dom-testing (2.0.3)
  activesupport (>= 4.2.0)
  nokogiri (>= 1.6)
  rails-html-sanitizer (1.3.0)
  loofah (~> 2.3)
- railties (5.2.4.5)
- actionpack (= 5.2.4.5)
- activesupport (= 5.2.4.5)
+ railties (6.1.3)
+ actionpack (= 6.1.3)
+ activesupport (= 6.1.3)
  method_source
  rake (>= 0.8.7)
- thor (>= 0.19.0, < 2.0)
- rake (13.0.1)
- rb-fsevent (0.10.4)
- rb-inotify (0.10.1)
- ffi (~> 1.0)
- sass (3.7.4)
- sass-listen (~> 4.0.0)
- sass-listen (4.0.0)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- sass-rails (5.1.0)
- railties (>= 5.2.0)
- sass (~> 3.1)
- sprockets (>= 2.8, < 4.0)
- sprockets-rails (>= 2.0, < 4.0)
- tilt (>= 1.1, < 3)
- sprockets (3.7.2)
+ thor (~> 1.0)
+ rake (13.0.3)
+ sassc (2.4.0)
+ ffi (~> 1.9)
+ sprockets (4.0.2)
  concurrent-ruby (~> 1.0)
  rack (> 1, < 3)
  sprockets-rails (3.2.2)
  actionpack (>= 4.0)
  activesupport (>= 4.0)
  sprockets (>= 3.0.0)
  thor (1.1.0)
- thread_safe (0.3.6)
- tilt (2.0.10)
- tzinfo (1.2.9)
- thread_safe (~> 0.1)
+ tzinfo (2.0.4)
+ concurrent-ruby (~> 1.0)
  websocket-driver (0.7.3)
  websocket-extensions (>= 0.1.0)
  websocket-extensions (0.1.5)
+ zeitwerk (2.4.2)
 
 PLATFORMS
  ruby
 
 DEPENDENCIES
- bundler (~> 2)
+ bundler (~> 2.0)
  minitest (~> 5.0)
  mitlibraries-theme!
- rake (>= 12.3.3)
+ rake (~> 13.0)
 
 BUNDLED WITH
  2.1.4

lib/mitlibraries/theme/version.rb

@@ -1,5 +1,5 @@
 module Mitlibraries
  module Theme
- VERSION = '0.4.0'.freeze
+ VERSION = '0.5.0'.freeze
  end
 end

mitlibraries-theme.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
  spec.require_paths = ['lib']
 
- spec.add_development_dependency 'bundler', '~> 2'
+ spec.add_development_dependency 'bundler', '~> 2.0'
  spec.add_development_dependency 'minitest', '~> 5.0'
- spec.add_development_dependency "rake", ">= 12.3.3"
- spec.add_dependency 'rails', '~> 5'
- spec.add_dependency 'sass', '~> 3.4'
- spec.add_dependency 'sass-rails', '~> 5'
+ spec.add_development_dependency 'rake', '~> 13.0'
+ spec.add_dependency 'rails', '>= 5', '<7'
+ spec.add_dependency 'sassc', '~> 2'
 end