Skip to content

Commit 9b88b83

Browse files
chore(internal): minor refactoring of utils (#76)
1 parent 5b79b2c commit 9b88b83

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CLEAN.push(*%w[.idea/ .ruby-lsp/ .yardoc/])
1111

1212
xargs = %w[xargs --no-run-if-empty --null --max-procs=0 --max-args=300 --]
1313

14-
task(default: [:test])
14+
multitask(default: [:test])
1515

1616
multitask(:test) do
1717
rb =

lib/finch-api/individuals_page.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def initialize(client:, req:, headers:, page_data:)
4949

5050
case page_data
5151
in {paging: Hash | nil => paging}
52-
@paging = FinchAPI::Models::Paging.coerce(paging)
52+
@paging = FinchAPI::Converter.coerce(FinchAPI::Models::Paging, paging)
5353
else
5454
end
5555
end

lib/finch-api/page.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def initialize(client:, req:, headers:, page_data:)
4949

5050
case page_data
5151
in {paging: Hash | nil => paging}
52-
@paging = FinchAPI::Models::Paging.coerce(paging)
52+
@paging = FinchAPI::Converter.coerce(FinchAPI::Models::Paging, paging)
5353
else
5454
end
5555
end

lib/finch-api/single_page.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def initialize(client:, req:, headers:, page_data:)
3737

3838
case page_data
3939
in Array
40-
replace(page_data.map { model.coerce(_1) })
40+
replace(page_data.map { FinchAPI::Converter.coerce(model, _1) })
4141
else
4242
end
4343
end

lib/finch-api/util.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def primitive?(input)
7575
def coerce_boolean(input)
7676
case input.is_a?(String) ? input.downcase : input
7777
in Numeric
78-
!input.zero?
78+
input.nonzero?
7979
in "true"
8080
true
8181
in "false"
@@ -165,14 +165,12 @@ class << self
165165
private def deep_merge_lr(lhs, rhs, concat: false)
166166
case [lhs, rhs, concat]
167167
in [Hash, Hash, _]
168-
# rubocop:disable Style/YodaCondition
169-
rhs_cleaned = rhs.reject { |_, val| OMIT == val }
168+
rhs_cleaned = rhs.reject { _2 == FinchAPI::Util::OMIT }
170169
lhs
171-
.reject { |key, _| OMIT == rhs[key] }
170+
.reject { |key, _| rhs[key] == FinchAPI::Util::OMIT }
172171
.merge(rhs_cleaned) do |_, old_val, new_val|
173172
deep_merge_lr(old_val, new_val, concat: concat)
174173
end
175-
# rubocop:enable Style/YodaCondition
176174
in [Array, Array, true]
177175
lhs.concat(rhs)
178176
else

0 commit comments

Comments
 (0)