OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

sigh, add another special color description format

Browse source
This commit is contained in:
Emi Matchu 2013-06-23 22:58:17 -07:00
parent 3c127569fe
commit fb219f82e8
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/item.rb
View file

@ -18,7 +18,7 @@ class Item < ActiveRecord::Base
NCRarities = [0, 500] NCRarities = [0, 500]
PAINTBRUSH_SET_DESCRIPTION = 'This item is part of a deluxe paint brush set!' PAINTBRUSH_SET_DESCRIPTION = 'This item is part of a deluxe paint brush set!'
SPECIAL_COLOR_DESCRIPTION_REGEX = SPECIAL_COLOR_DESCRIPTION_REGEX =
/This item is only wearable by Neopets painted ([a-zA-Z]+)\.|WARNING: This [a-zA-Z]+ can be worn by ([a-zA-Z]+) [a-zA-Z]+ ONLY!/ /This item is only wearable by Neopets painted ([a-zA-Z]+)\.|WARNING: This [a-zA-Z]+ can be worn by ([a-zA-Z]+) [a-zA-Z]+ ONLY!|If your Neopet is not painted ([a-zA-Z]+), it will not be able to wear this item\./
cattr_reader :per_page cattr_reader :per_page
@@per_page = 30 @@per_page = 30
@ -168,7 +168,9 @@ class Item < ActiveRecord::Base
match = description.match(SPECIAL_COLOR_DESCRIPTION_REGEX) match = description.match(SPECIAL_COLOR_DESCRIPTION_REGEX)
if match if match
color = match[1] || match[2] # Since there are multiple formats in the one regex, there are multiple
# possible color name captures. So, take the first non-nil capture.
color = match.captures.detect(&:present?)
return Color.find_by_name(color.downcase) return Color.find_by_name(color.downcase)
end end
end end