Skip to content

Added option +taggable_model_type+ to +tagged_with+ scope #994

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added option +taggable_model_type+ to +tagged_with+ scope #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions lib/acts_as_taggable_on/taggable/tagged_with_query/all_tags_query.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def each_tag_in_list

def on_conditions(tag, tagging_alias)
on_condition = tagging_alias[:taggable_id].eq(taggable_arel_table[taggable_model.primary_key])
.and(tagging_alias[:taggable_type].eq(taggable_model.base_class.name))
.and(tagging_alias[:taggable_type].eq(taggable_model_type))
.and(
tagging_alias[:tag_id].in(
tag_arel_table.project(tag_arel_table[:id]).where(tag_match_type(tag))
Expand Down Expand Up @@ -62,7 +62,7 @@ def on_conditions(tag, tagging_alias)

def match_all_on_conditions
on_condition = tagging_arel_table[:taggable_id].eq(taggable_arel_table[taggable_model.primary_key])
.and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
.and(tagging_arel_table[:taggable_type].eq(taggable_model_type))

if options[:start_at].present?
on_condition = on_condition.and(tagging_arel_table[:created_at].gteq(options[:start_at]))
Expand Down Expand Up @@ -104,7 +104,7 @@ def order_conditions
end

def tagging_alias(tag)
alias_base_name = taggable_model.base_class.name.downcase
alias_base_name = taggable_model_type.downcase
adjust_taggings_alias("#{alias_base_name[0..11]}_taggings_#{ActsAsTaggableOn::Utils.sha_prefix(tag)}")
end
end
Expand Down
4 changes: 2 additions & 2 deletions lib/acts_as_taggable_on/taggable/tagged_with_query/any_tags_query.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def model_has_at_least_one_tag

def at_least_one_tag
exists_contition = tagging_arel_table[:taggable_id].eq(taggable_arel_table[taggable_model.primary_key])
.and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
.and(tagging_arel_table[:taggable_type].eq(taggable_model_type))
.and(
tagging_arel_table[:tag_id].in(
tag_arel_table.project(tag_arel_table[:id]).where(tags_match_type)
Expand Down Expand Up @@ -57,7 +57,7 @@ def order_conditions
end

def alias_name(tag_list)
alias_base_name = taggable_model.base_class.name.downcase
alias_base_name = taggable_model_type.downcase
taggings_context = options[:on] ? "_#{options[:on]}" : ''

taggings_alias = adjust_taggings_alias(
Expand Down
6 changes: 3 additions & 3 deletions lib/acts_as_taggable_on/taggable/tagged_with_query/exclude_tags_query.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def tags_not_in_list
.join(tag_arel_table)
.on(
tagging_arel_table[:tag_id].eq(tag_arel_table[:id])
.and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
.and(tagging_arel_table[:taggable_type].eq(taggable_model_type))
.and(tags_match_type)
)
)
Expand All @@ -36,7 +36,7 @@ def owning_to_tagger
tagging_arel_table[:tagger_id].eq(owner.id)
.and(tagging_arel_table[:tagger_type].eq(owner.class.base_class.to_s))
.and(tagging_arel_table[:taggable_id].eq(taggable_arel_table[taggable_model.primary_key]))
.and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
.and(tagging_arel_table[:taggable_type].eq(taggable_model_type))
)

if options[:match_all].present?
Expand All @@ -52,7 +52,7 @@ def owning_to_tagger

def match_all_on_conditions
on_condition = tagging_arel_table[:taggable_id].eq(taggable_arel_table[taggable_model.primary_key])
.and(tagging_arel_table[:taggable_type].eq(taggable_model.base_class.name))
.and(tagging_arel_table[:taggable_type].eq(taggable_model_type))

if options[:start_at].present?
on_condition = on_condition.and(tagging_arel_table[:created_at].gteq(options[:start_at]))
Expand Down
3 changes: 2 additions & 1 deletion lib/acts_as_taggable_on/taggable/tagged_with_query/query_base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ def initialize(taggable_model, tag_model, tagging_model, tag_list, options)
@tagging_model = tagging_model
@tag_list = tag_list
@options = options
@taggable_model_type = options[:taggable_model_type] || taggable_model.base_class.name
end

private

attr_reader :taggable_model, :tag_model, :tagging_model, :tag_list, :options
attr_reader :taggable_model, :tag_model, :tagging_model, :tag_list, :options, :taggable_model_type

def taggable_arel_table
@taggable_arel_table ||= taggable_model.arel_table
Expand Down