jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

alias_and_implication_list: refactor alias/implication lookup.

Browse Source 
Add alias and implications associations to Tag. Use them in
alias_and_implication list instead of duplicating the alias/implication
lookup code.
This commit is contained in:
evazion
2017-03-23 02:43:55 -05:00
parent b3e3012a9c
commit 0793beded9
5 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/artists_helper.rb
View File

@@ -1,11 +1,6 @@
module ArtistsHelper module ArtistsHelper
def artist_alias_and_implication_list(artist) def artist_alias_and_implication_list(artist)
consequent_tag_aliases = TagAlias.where("status in ('active', 'processing') and consequent_name = ?", artist.name) alias_and_implication_list(artist.tag)
antecedent_tag_alias = TagAlias.where("status in ('active', 'processing') and antecedent_name = ?", artist.name).first
consequent_tag_implications = TagImplication.where("status in ('active', 'processing') and consequent_name = ?", artist.name)
antecedent_tag_implications = TagImplication.where("status in ('active', 'processing') and antecedent_name = ?", artist.name)
alias_and_implication_list(antecedent_tag_alias, consequent_tag_aliases, antecedent_tag_implications, consequent_tag_implications)
end end
def link_to_artist(name) def link_to_artist(name)

20
app/helpers/tags_helper.rb
View File

@@ -1,28 +1,30 @@
module TagsHelper module TagsHelper
def alias_and_implication_list(antecedent_alias, consequent_aliases, antecedent_implications, consequent_implications) def alias_and_implication_list(tag)
return "" if tag.nil?
html = "" html = ""
if antecedent_alias if tag.antecedent_alias
html << "<p class='hint'>This tag has been aliased to " html << "<p class='hint'>This tag has been aliased to "
html << link_to(antecedent_alias.consequent_name, show_or_new_wiki_pages_path(:title => antecedent_alias.consequent_name)) html << link_to(tag.antecedent_alias.consequent_name, show_or_new_wiki_pages_path(:title => tag.antecedent_alias.consequent_name))
html << ".</p>" html << ".</p>"
end end
if consequent_aliases.any? if tag.consequent_aliases.any?
html << "<p class='hint'>The following tags are aliased to this tag: " html << "<p class='hint'>The following tags are aliased to this tag: "
html << raw(consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", ")) html << raw(tag.consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", "))
html << ".</p>" html << ".</p>"
end end
if antecedent_implications.any? if tag.antecedent_implications.any?
html << "<p class='hint'>This tag implicates " html << "<p class='hint'>This tag implicates "
html << raw(antecedent_implications.map {|x| link_to(x.consequent_name, show_or_new_wiki_pages_path(:title => x.consequent_name))}.join(", ")) html << raw(tag.antecedent_implications.map {|x| link_to(x.consequent_name, show_or_new_wiki_pages_path(:title => x.consequent_name))}.join(", "))
html << ".</p>" html << ".</p>"
end end
if consequent_implications.any? if tag.consequent_implications.any?
html << "<p class='hint'>The following tags implicate this tag: " html << "<p class='hint'>The following tags implicate this tag: "
html << raw(consequent_implications.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", ")) html << raw(tag.consequent_implications.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", "))
html << ".</p>" html << ".</p>"
end end

7
app/helpers/wiki_pages_helper.rb
View File

@@ -1,11 +1,6 @@
module WikiPagesHelper module WikiPagesHelper
def wiki_page_alias_and_implication_list(wiki_page) def wiki_page_alias_and_implication_list(wiki_page)
antecedent_alias = wiki_page.presenter.antecedent_tag_alias alias_and_implication_list(wiki_page.tag)
consequent_aliases = wiki_page.presenter.consequent_tag_aliases
antecedent_implications = wiki_page.presenter.antecedent_tag_implications
consequent_implications = wiki_page.presenter.consequent_tag_implications
alias_and_implication_list(antecedent_alias, consequent_aliases, antecedent_implications, consequent_implications)
end end
def wiki_page_post_previews(wiki_page) def wiki_page_post_previews(wiki_page)

4
app/models/tag.rb
View File

@@ -5,6 +5,10 @@ class Tag < ActiveRecord::Base
attr_accessible :category, :as => [:moderator, :janitor, :gold, :platinum, :member, :anonymous, :default, :builder, :admin] attr_accessible :category, :as => [:moderator, :janitor, :gold, :platinum, :member, :anonymous, :default, :builder, :admin]
attr_accessible :is_locked, :as => [:moderator, :admin] attr_accessible :is_locked, :as => [:moderator, :admin]
has_one :wiki_page, :foreign_key => "title", :primary_key => "name" has_one :wiki_page, :foreign_key => "title", :primary_key => "name"
has_one :antecedent_alias, lambda {active}, :class_name => "TagAlias", :foreign_key => "antecedent_name", :primary_key => "name"
has_many :consequent_aliases, lambda {active}, :class_name => "TagAlias", :foreign_key => "consequent_name", :primary_key => "name"
has_many :antecedent_implications, lambda {active}, :class_name => "TagImplication", :foreign_key => "antecedent_name", :primary_key => "name"
has_many :consequent_implications, lambda {active}, :class_name => "TagImplication", :foreign_key => "consequent_name", :primary_key => "name"
validates :name, uniqueness: true, tag_name: true, on: :create validates :name, uniqueness: true, tag_name: true, on: :create

16
app/presenters/wiki_page_presenter.rb
View File

@@ -13,22 +13,6 @@ class WikiPagePresenter
DText.strip(excerpt.to_s) DText.strip(excerpt.to_s)
end end
def consequent_tag_aliases
@consequent_tag_aliases ||= TagAlias.where("status in ('active', 'processing') and consequent_name = ?", wiki_page.title)
end
def antecedent_tag_alias
@antecedent_tag_alias ||= TagAlias.where("status in ('active', 'processing') and antecedent_name = ?", wiki_page.title).first
end
def consequent_tag_implications
@consequent_tag_implications ||= TagImplication.where("status in ('active', 'processing') and consequent_name = ?", wiki_page.title)
end
def antecedent_tag_implications
@antecedent_tag_implications ||= TagImplication.where("status in ('active', 'processing') and antecedent_name = ?", wiki_page.title)
end
# Produce a formatted page that shows the difference between two versions of a page. # Produce a formatted page that shows the difference between two versions of a page.
def diff(other_version) def diff(other_version)
pattern = Regexp.new('(?:<.+?>)|(?:[0-9_A-Za-z\x80-\xff]+[\x09\x20]?)|(?:[ \t]+)|(?:\r?\n)|(?:.+?)') pattern = Regexp.new('(?:<.+?>)|(?:[0-9_A-Za-z\x80-\xff]+[\x09\x20]?)|(?:[ \t]+)|(?:\r?\n)|(?:.+?)')