Fix kwargs for Ruby 2.7 (#885)
* Fix kwargs for Ruby 2.7 * Test with Ruby 3.0 Co-authored-by: Nicolas Rodriguez <nicoladmin@free.fr>
This commit is contained in:
parent
da6cd976ef
commit
9cb42f6e71
|
@ -12,6 +12,7 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
ruby:
|
ruby:
|
||||||
|
- '3.0'
|
||||||
- '2.7'
|
- '2.7'
|
||||||
- '2.6'
|
- '2.6'
|
||||||
- '2.5'
|
- '2.5'
|
||||||
|
|
|
@ -21,6 +21,7 @@ Gem::Specification.new do |s|
|
||||||
s.add_dependency 'request_store', '>= 1.0'
|
s.add_dependency 'request_store', '>= 1.0'
|
||||||
s.add_dependency 'activemodel', '>= 5.0'
|
s.add_dependency 'activemodel', '>= 5.0'
|
||||||
s.add_dependency 'activemodel-serializers-xml', '>= 1.0'
|
s.add_dependency 'activemodel-serializers-xml', '>= 1.0'
|
||||||
|
s.add_dependency 'ruby2_keywords'
|
||||||
|
|
||||||
s.add_development_dependency 'ammeter'
|
s.add_development_dependency 'ammeter'
|
||||||
s.add_development_dependency 'rake'
|
s.add_development_dependency 'rake'
|
||||||
|
|
|
@ -8,6 +8,8 @@ require 'active_support/core_ext/hash/keys'
|
||||||
require 'active_support/core_ext/hash/reverse_merge'
|
require 'active_support/core_ext/hash/reverse_merge'
|
||||||
require 'active_support/core_ext/name_error'
|
require 'active_support/core_ext/name_error'
|
||||||
|
|
||||||
|
require 'ruby2_keywords'
|
||||||
|
|
||||||
require 'draper/version'
|
require 'draper/version'
|
||||||
require 'draper/configuration'
|
require 'draper/configuration'
|
||||||
require 'draper/view_helpers'
|
require 'draper/view_helpers'
|
||||||
|
|
|
@ -6,7 +6,7 @@ module Draper
|
||||||
# method calls to `object` as well. Calling `super` will first try to call the method on
|
# method calls to `object` as well. Calling `super` will first try to call the method on
|
||||||
# the parent decorator class. If no method exists on the parent class, it will then try
|
# the parent decorator class. If no method exists on the parent class, it will then try
|
||||||
# to call the method on the `object`.
|
# to call the method on the `object`.
|
||||||
def method_missing(method, *args, &block)
|
ruby2_keywords def method_missing(method, *args, &block)
|
||||||
return super unless delegatable?(method)
|
return super unless delegatable?(method)
|
||||||
|
|
||||||
object.send(method, *args, &block)
|
object.send(method, *args, &block)
|
||||||
|
@ -27,7 +27,7 @@ module Draper
|
||||||
|
|
||||||
module ClassMethods
|
module ClassMethods
|
||||||
# Proxies missing class methods to the source class.
|
# Proxies missing class methods to the source class.
|
||||||
def method_missing(method, *args, &block)
|
ruby2_keywords def method_missing(method, *args, &block)
|
||||||
return super unless delegatable?(method)
|
return super unless delegatable?(method)
|
||||||
|
|
||||||
object_class.send(method, *args, &block)
|
object_class.send(method, *args, &block)
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Draper
|
||||||
end
|
end
|
||||||
|
|
||||||
# Sends helper methods to the view context.
|
# Sends helper methods to the view context.
|
||||||
def method_missing(method, *args, &block)
|
ruby2_keywords def method_missing(method, *args, &block)
|
||||||
self.class.define_proxy method
|
self.class.define_proxy method
|
||||||
send(method, *args, &block)
|
send(method, *args, &block)
|
||||||
end
|
end
|
||||||
|
@ -31,6 +31,7 @@ module Draper
|
||||||
define_method name do |*args, &block|
|
define_method name do |*args, &block|
|
||||||
view_context.send(name, *args, &block)
|
view_context.send(name, *args, &block)
|
||||||
end
|
end
|
||||||
|
ruby2_keywords name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,7 +4,7 @@ module Draper
|
||||||
# bazillion methods.
|
# bazillion methods.
|
||||||
module LazyHelpers
|
module LazyHelpers
|
||||||
# Sends missing methods to the {HelperProxy}.
|
# Sends missing methods to the {HelperProxy}.
|
||||||
def method_missing(method, *args, &block)
|
ruby2_keywords def method_missing(method, *args, &block)
|
||||||
helpers.send(method, *args, &block)
|
helpers.send(method, *args, &block)
|
||||||
rescue NoMethodError
|
rescue NoMethodError
|
||||||
super
|
super
|
||||||
|
|
|
@ -3,7 +3,7 @@ require_relative 'query_methods/load_strategy'
|
||||||
module Draper
|
module Draper
|
||||||
module QueryMethods
|
module QueryMethods
|
||||||
# Proxies missing query methods to the source class if the strategy allows.
|
# Proxies missing query methods to the source class if the strategy allows.
|
||||||
def method_missing(method, *args, &block)
|
ruby2_keywords def method_missing(method, *args, &block)
|
||||||
return super unless strategy.allowed? method
|
return super unless strategy.allowed? method
|
||||||
|
|
||||||
object.send(method, *args, &block).decorate(with: decorator_class, context: context)
|
object.send(method, *args, &block).decorate(with: decorator_class, context: context)
|
||||||
|
|
|
@ -28,7 +28,7 @@ module Draper
|
||||||
|
|
||||||
# Alias for `helpers.localize`, since localize is something that's used
|
# Alias for `helpers.localize`, since localize is something that's used
|
||||||
# quite often. Further aliased to `l` for convenience.
|
# quite often. Further aliased to `l` for convenience.
|
||||||
def localize(*args)
|
ruby2_keywords def localize(*args)
|
||||||
helpers.localize(*args)
|
helpers.localize(*args)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue