Skip to content

Add support for Rails 7 #752

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

Merged
tagliala merged 1 commit into from
Dec 8, 2021
+8 −8
Merged

Add support for Rails 7 #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/rabl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
require 'rabl/cache_engine'

if defined?(Rails) && Rails.respond_to?(:version)
require 'rabl/tracker' if Rails.version =~ /^[456]/
require 'rabl/digestor' if Rails.version =~ /^[456]/
require 'rabl/railtie' if Rails.version =~ /^[3456]/
require 'rabl/tracker' if Rails.version =~ /^[4567]/
require 'rabl/digestor' if Rails.version =~ /^[4567]/
require 'rabl/railtie' if Rails.version =~ /^[34567]/
end

# Rabl.register!
Expand Down
4 changes: 2 additions & 2 deletions lib/rabl/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def cache_key
template = @_options[:template] || @virtual_path

digest =
if Rails.version.to_s =~ /^[6]/
if Rails.version.to_s =~ /^[67]/
Digestor.digest(name: template, finder: lookup_context, format: :rabl)
elsif Gem::Version.new(Rails.version) >= Gem::Version.new('4.1')
Digestor.digest(:name => template, :finder => lookup_context)
Expand Down Expand Up @@ -393,7 +393,7 @@ def cache_results(&block)
end

def digestor_available?
defined?(Rails) && Rails.version =~ /^[456]/
defined?(Rails) && Rails.version =~ /^[4567]/
end

def valid_format?(format)
Expand Down
2 changes: 1 addition & 1 deletion lib/rabl/railtie.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module ApiRendering
Rabl.register!

# Inject dependency tracker for :rabl
if Rails.version =~ /^[456]/
if Rails.version =~ /^[4567]/
require 'action_view/dependency_tracker'
ActionView::DependencyTracker.register_tracker :rabl, Rabl::Tracker
end
Expand Down
4 changes: 2 additions & 2 deletions lib/rabl/template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ def self.call(template)
ActionView::Template.register_template_handler :rabl, ActionView::Template::Handlers::Rabl
end

# Rails 6.X Template
if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^[6]/
# Rails 6.X / 7.X Template
if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^[67]/
module ActionView
module Template::Handlers
class Rabl
Expand Down