From 1d64ef2238d3eb6cf73c3887eb4398e94a2a1fd8 Mon Sep 17 00:00:00 2001 From: Hashrocket Workstation Date: Fri, 13 Jan 2023 16:56:30 -0500 Subject: [PATCH] Cleanup from standardrb suggestions These changes are supported by Ruby 2.7, our current minimum version --- lib/decent_exposure/exposure.rb | 10 +++++----- lib/decent_exposure/flow.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/decent_exposure/exposure.rb b/lib/decent_exposure/exposure.rb index 9096f1d..5fc55fd 100644 --- a/lib/decent_exposure/exposure.rb +++ b/lib/decent_exposure/exposure.rb @@ -13,8 +13,8 @@ class Exposure # the Proc when called. # # Returns a collection of exposed helper methods. - def self.expose!(*args, **options, &block) - new(*args, **options, &block).expose! + def self.expose!(...) + new(...).expose! end # Public: Initalize an Exposure with a hash of options. @@ -39,7 +39,7 @@ def initialize(controller, name, fetch_block = nil, **options, &block) @options = options.with_indifferent_access.merge(name: name) merge_lambda_option :fetch, fetch_block if fetch_block - merge_lambda_option :fetch, block if block_given? + merge_lambda_option :fetch, block if block assert_singleton_option :fetch assert_singleton_option :from @@ -109,8 +109,8 @@ def normalize_from_option if (from = options.delete(:from)) merge_lambda_option :build, -> { send(from).send(exposure_name) } - merge_lambda_option :model, -> { nil } - merge_lambda_option :id, -> { nil } + merge_lambda_option :model, -> {} + merge_lambda_option :id, -> {} end end diff --git a/lib/decent_exposure/flow.rb b/lib/decent_exposure/flow.rb index b0df3e3..d764a1b 100644 --- a/lib/decent_exposure/flow.rb +++ b/lib/decent_exposure/flow.rb @@ -72,7 +72,7 @@ def handle_options_override(name, *args) def handle_default_flow_method(name, *args, &block) method = Behavior.instance_method(name) - method.bind(self).call(*args, &block) + method.bind_call(self, *args, &block) end def fetch_ivar(name)