@@ -34,7 +34,7 @@ def self.expose!(*args, &block)
34
34
# the Proc.
35
35
#
36
36
# Returns a normalized options Hash.
37
- def initialize ( controller , name , fetch_block = nil , **options , &block )
37
+ def initialize ( controller , name , fetch_block = nil , **options , &block )
38
38
@controller = controller
39
39
@options = options . with_indifferent_access . merge ( name : name )
40
40
@@ -86,43 +86,43 @@ def normalize_options
86
86
87
87
def normalize_fetch_option
88
88
normalize_non_proc_option :fetch do |method_name |
89
- -> { send ( method_name ) }
89
+ -> { send ( method_name ) }
90
90
end
91
91
end
92
92
93
93
def normalize_find_by_option
94
- if find_by = options . delete ( :find_by )
95
- merge_lambda_option :find , -> ( id , scope ) { scope . find_by! ( find_by => id ) }
94
+ if ( find_by = options . delete ( :find_by ) )
95
+ merge_lambda_option :find , -> ( id , scope ) { scope . find_by! ( find_by => id ) }
96
96
end
97
97
end
98
98
99
99
def normalize_parent_option
100
100
exposure_name = options . fetch ( :name )
101
101
102
- if parent = options . delete ( :parent )
103
- merge_lambda_option :scope , -> { send ( parent ) . send ( exposure_name . to_s . pluralize ) }
102
+ if ( parent = options . delete ( :parent ) )
103
+ merge_lambda_option :scope , -> { send ( parent ) . send ( exposure_name . to_s . pluralize ) }
104
104
end
105
105
end
106
106
107
107
def normalize_from_option
108
108
exposure_name = options . fetch ( :name )
109
109
110
- if from = options . delete ( :from )
111
- merge_lambda_option :build , -> { send ( from ) . send ( exposure_name ) }
112
- merge_lambda_option :model , -> { nil }
113
- merge_lambda_option :id , -> { nil }
110
+ if ( from = options . delete ( :from ) )
111
+ merge_lambda_option :build , -> { send ( from ) . send ( exposure_name ) }
112
+ merge_lambda_option :model , -> { nil }
113
+ merge_lambda_option :id , -> { nil }
114
114
end
115
115
end
116
116
117
117
def normalize_with_option
118
- if configs = options . delete ( :with )
119
- Array . wrap ( configs ) . each { |config | reverse_merge_config! config }
118
+ if ( configs = options . delete ( :with ) )
119
+ Array . wrap ( configs ) . each { |config | reverse_merge_config! config }
120
120
end
121
121
end
122
122
123
123
def normalize_id_option
124
124
normalize_non_proc_option :id do |ids |
125
- -> { Array . wrap ( ids ) . map { |id | params [ id ] } . find ( &:present? ) }
125
+ -> { Array . wrap ( ids ) . map { |id | params [ id ] } . find ( &:present? ) }
126
126
end
127
127
end
128
128
@@ -134,7 +134,7 @@ def normalize_model_option
134
134
value
135
135
end
136
136
137
- -> { model }
137
+ -> { model }
138
138
end
139
139
end
140
140
@@ -147,7 +147,7 @@ def normalize_build_params_option
147
147
148
148
def normalize_scope_options
149
149
normalize_non_proc_option :scope do |custom_scope |
150
- -> ( model ) { model . send ( custom_scope ) }
150
+ -> ( model ) { model . send ( custom_scope ) }
151
151
end
152
152
end
153
153
@@ -165,7 +165,7 @@ def normalize_non_proc_option(name)
165
165
end
166
166
167
167
def merge_lambda_option ( name , body )
168
- if previous_value = options [ name ] and Proc === previous_value
168
+ if ( previous_value = options [ name ] ) && ( Proc === previous_value )
169
169
fail ArgumentError , "#{ name . to_s . titleize } block is already defined"
170
170
end
171
171
@@ -178,7 +178,7 @@ def attribute
178
178
179
179
name = options . fetch ( :name )
180
180
ivar_name = "exposed_#{ name } "
181
- fetch = -> { Flow . new ( self , local_options ) . fetch }
181
+ fetch = -> { Flow . new ( self , local_options ) . fetch }
182
182
183
183
Attribute . new (
184
184
name : name ,
0 commit comments