File tree Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 17
17
require 'rabl/cache_engine'
18
18
19
19
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 ]/
23
23
end
24
24
25
25
# Rabl.register!
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ def cache_key
62
62
template = @_options [ :template ] || @virtual_path
63
63
64
64
digest =
65
- if Rails . version . to_s =~ /^[6 ]/
65
+ if Rails . version . to_s =~ /^[67 ]/
66
66
Digestor . digest ( name : template , finder : lookup_context , format : :rabl )
67
67
elsif Gem ::Version . new ( Rails . version ) >= Gem ::Version . new ( '4.1' )
68
68
Digestor . digest ( :name => template , :finder => lookup_context )
@@ -393,7 +393,7 @@ def cache_results(&block)
393
393
end
394
394
395
395
def digestor_available?
396
- defined? ( Rails ) && Rails . version =~ /^[456 ]/
396
+ defined? ( Rails ) && Rails . version =~ /^[4567 ]/
397
397
end
398
398
399
399
def valid_format? ( format )
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ module ApiRendering
22
22
Rabl . register!
23
23
24
24
# Inject dependency tracker for :rabl
25
- if Rails . version =~ /^[456 ]/
25
+ if Rails . version =~ /^[4567 ]/
26
26
require 'action_view/dependency_tracker'
27
27
ActionView ::DependencyTracker . register_tracker :rabl , Rabl ::Tracker
28
28
end
Original file line number Diff line number Diff line change @@ -62,8 +62,8 @@ def self.call(template)
62
62
ActionView ::Template . register_template_handler :rabl , ActionView ::Template ::Handlers ::Rabl
63
63
end
64
64
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 ]/
67
67
module ActionView
68
68
module Template ::Handlers
69
69
class Rabl
You can’t perform that action at this time.
0 commit comments