Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ruby version testing matrix #465

Merged
merged 8 commits into from Sep 12, 2020
Merged

Update ruby version testing matrix #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff96fc7
Update ruby version testing matrix
pixeltrix Sep 11, 2020
789c682
Exclude Rails 5.2.x/Ruby 2.2 from build matrix
pixeltrix Sep 11, 2020
c388c28
Only use kwargs splat operator on Ruby 2.7+
pixeltrix Sep 11, 2020
b86310c
Fix Sprockets deprecation warning
pixeltrix Sep 12, 2020
06b1fdf
Require Rails::VERSION so test can run in isolation
pixeltrix Sep 12, 2020
fc1badb
Fix Action View deprecation warning
pixeltrix Sep 12, 2020
3ad8f0d
Silence warnings about static path fallback
pixeltrix Sep 12, 2020
66fd4ab
Fix extending ActionView::Base instances
pixeltrix Sep 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 24 additions & 15 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -9,9 +9,10 @@ rvm:
- 2.1.10
- 2.2.10
- 2.3.8
- 2.4.5
- 2.5.3
- 2.6.0
- 2.4.10
- 2.5.8
- 2.6.6
- 2.7.1

gemfile:
- Gemfile
Expand All @@ -30,17 +31,23 @@ gemfile:
matrix:
exclude:
- gemfile: gemfiles/Gemfile.rails-4.0.x
rvm: 2.4.5
rvm: 2.4.10
- gemfile: gemfiles/Gemfile.rails-4.1.x
rvm: 2.4.5
rvm: 2.4.10
- gemfile: gemfiles/Gemfile.rails-4.0.x
rvm: 2.5.3
rvm: 2.5.8
- gemfile: gemfiles/Gemfile.rails-4.1.x
rvm: 2.5.3
rvm: 2.5.8
- gemfile: gemfiles/Gemfile.rails-4.0.x
rvm: 2.6.0
rvm: 2.6.6
- gemfile: gemfiles/Gemfile.rails-4.1.x
rvm: 2.6.0
rvm: 2.6.6
- gemfile: gemfiles/Gemfile.rails-4.0.x
rvm: 2.7.1
- gemfile: gemfiles/Gemfile.rails-4.1.x
rvm: 2.7.1
- gemfile: gemfiles/Gemfile.rails-4.2.x
rvm: 2.7.1
- gemfile: Gemfile
rvm: 1.9.3
- gemfile: Gemfile
Expand All @@ -52,7 +59,7 @@ matrix:
- gemfile: Gemfile
rvm: 2.3.8
- gemfile: Gemfile
rvm: 2.4.5
rvm: 2.4.10
- gemfile: gemfiles/Gemfile.rails-5.0.x
rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails-5.0.x
Expand All @@ -70,7 +77,7 @@ matrix:
- gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x
rvm: 2.3.8
- gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x
rvm: 2.4.5
rvm: 2.4.10
- gemfile: gemfiles/Gemfile.rails-5.1.x
rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails-5.1.x
Expand All @@ -88,13 +95,15 @@ matrix:
- gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
rvm: 2.3.8
- gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
rvm: 2.4.5
rvm: 2.4.10
- gemfile: gemfiles/Gemfile.rails-5.2.x
rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails-5.2.x
rvm: 2.0.0
- gemfile: gemfiles/Gemfile.rails-5.2.x
rvm: 2.1.10
- gemfile: gemfiles/Gemfile.rails-5.2.x
rvm: 2.2.10
- gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
Expand All @@ -106,7 +115,7 @@ matrix:
- gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
rvm: 2.3.8
- gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
rvm: 2.4.5
rvm: 2.4.10
- gemfile: gemfiles/Gemfile.rails-6.0.x
rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails-6.0.x
Expand All @@ -118,7 +127,7 @@ matrix:
- gemfile: gemfiles/Gemfile.rails-6.0.x
rvm: 2.3.8
- gemfile: gemfiles/Gemfile.rails-6.0.x
rvm: 2.4.5
rvm: 2.4.10
- gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
Expand All @@ -130,7 +139,7 @@ matrix:
- gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
rvm: 2.3.8
- gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
rvm: 2.4.5
rvm: 2.4.10

notifications:
email: false
Expand Down
14 changes: 11 additions & 3 deletions lib/sprockets/rails/helper.rb
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ def assets_environment
end

def self.extended(obj)
obj.class_eval do
obj.singleton_class.class_eval do
attr_accessor(*VIEW_ACCESSORS)

remove_method :assets_environment
Expand Down Expand Up @@ -352,8 +352,16 @@ def find_debug_asset(path)
end

private
def find_asset(path, options = {})
@env[path, **options]
if RUBY_VERSION >= "2.7"
class_eval <<-RUBY, __FILE__, __LINE__ + 1
def find_asset(path, options = {})
@env[path, **options]
end
RUBY
else
def find_asset(path, options = {})
@env[path, options]
end
end

def precompiled?(path)
Expand Down