Skip to content

Use underscore instead of downcase #1366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgebhardt merged 2 commits into from
May 19, 2021
Merged

Use underscore instead of downcase #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9de4b8
Use underscore instead of downcase
lgebhardt May 19, 2021
c175b9b
Use underscore instead of downcase for polymorphic names
lgebhardt May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/jsonapi/active_relation_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ def find_related_polymorphic_fragments(source_rids, relationship, options, conne
end
end

relation_position = relation_positions[row[2].downcase.pluralize]
relation_position = relation_positions[row[2].underscore.pluralize]
model_fields = relation_position[:model_fields]
cache_field = relation_position[:cache_field]
cache_offset = relation_position[:cache_offset]
Expand Down
4 changes: 2 additions & 2 deletions lib/jsonapi/basic_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ def _polymorphic_name
if !_polymorphic
''
else
@_polymorphic_name ||= _model_name.to_s.downcase
@_polymorphic_name ||= _model_name.to_s.underscore
end
end

Expand Down Expand Up @@ -927,7 +927,7 @@ def _polymorphic_types
next unless Module === klass
if klass < ActiveRecord::Base
klass.reflect_on_all_associations(:has_many).select{|r| r.options[:as] }.each do |reflection|
(hash[reflection.options[:as]] ||= []) << klass.name.downcase
(hash[reflection.options[:as]] ||= []) << klass.name.underscore
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/jsonapi/relationship.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def self.polymorphic_types(name)
next unless Module === klass
if ActiveRecord::Base > klass
klass.reflect_on_all_associations(:has_many).select{|r| r.options[:as] }.each do |reflection|
(hash[reflection.options[:as]] ||= []) << klass.name.downcase
(hash[reflection.options[:as]] ||= []) << klass.name.underscore
end
end
end
Expand Down