Skip to content

Commit dccd5b6

Browse files
authored
Merge pull request nesquena#752 from nesquena/feature/rails7
Add support for Rails 7
2 parents 905cba2 + 20f6150 commit dccd5b6

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

lib/rabl.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
require 'rabl/cache_engine'
1818

1919
if defined?(Rails) && Rails.respond_to?(:version)
20-
require 'rabl/tracker' if Rails.version =~ /^[456]/
21-
require 'rabl/digestor' if Rails.version =~ /^[456]/
22-
require 'rabl/railtie' if Rails.version =~ /^[3456]/
20+
require 'rabl/tracker' if Rails.version =~ /^[4567]/
21+
require 'rabl/digestor' if Rails.version =~ /^[4567]/
22+
require 'rabl/railtie' if Rails.version =~ /^[34567]/
2323
end
2424

2525
# Rabl.register!

lib/rabl/engine.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def cache_key
6262
template = @_options[:template] || @virtual_path
6363

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

395395
def digestor_available?
396-
defined?(Rails) && Rails.version =~ /^[456]/
396+
defined?(Rails) && Rails.version =~ /^[4567]/
397397
end
398398

399399
def valid_format?(format)

lib/rabl/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module ApiRendering
2222
Rabl.register!
2323

2424
# Inject dependency tracker for :rabl
25-
if Rails.version =~ /^[456]/
25+
if Rails.version =~ /^[4567]/
2626
require 'action_view/dependency_tracker'
2727
ActionView::DependencyTracker.register_tracker :rabl, Rabl::Tracker
2828
end

lib/rabl/template.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ def self.call(template)
6262
ActionView::Template.register_template_handler :rabl, ActionView::Template::Handlers::Rabl
6363
end
6464

65-
# Rails 6.X Template
66-
if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^[6]/
65+
# Rails 6.X / 7.X Template
66+
if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^[67]/
6767
module ActionView
6868
module Template::Handlers
6969
class Rabl

0 commit comments

Comments
 (0)