From cf2cd41531149919d42b3c9c5e55f3069889bd55 Mon Sep 17 00:00:00 2001 From: Emi Matchu Date: Fri, 20 Sep 2024 13:10:15 -0700 Subject: [PATCH] Remove unused config/basic_type_hashes.yml file Our production data now contains basic hashes for all species/color combinations, and it's easy enough for a dev copy of the site to get them too by running `rails public_data:pull`. So, I think it's time to retire this hardcoded set, and get one more file out of our codebase! --- app/models/pet_type.rb | 14 +- config/basic_type_hashes.yml | 425 ----------------------------------- 2 files changed, 1 insertion(+), 438 deletions(-) delete mode 100644 config/basic_type_hashes.yml diff --git a/app/models/pet_type.rb b/app/models/pet_type.rb index 2a45ce72a..1d388cfce 100644 --- a/app/models/pet_type.rb +++ b/app/models/pet_type.rb @@ -9,8 +9,6 @@ class PetType < ApplicationRecord has_many :pet_states has_many :pets - BasicHashes = YAML::load_file(Rails.root.join('config', 'basic_type_hashes.yml')) - scope :basic, -> { joins(:color).merge(Color.basic) } scope :matching_name, ->(color_name, species_name) { color = Color.find_by_name!(color_name) @@ -52,17 +50,7 @@ class PetType < ApplicationRecord # Otherwise, refer to the fallback YAML file (though, if we have our # basic image hashes set correctly, the fallbacks should just be an old # subset of the basic image hashes in the database.) - basic_image_hash || self['image_hash'] || fallback_image_hash - end - - def fallback_image_hash - I18n.with_locale(I18n.default_locale) do - if species && color && BasicHashes[species.name] && BasicHashes[species.name][color.name] - BasicHashes[species.name][color.name] - else - return 'deadbeef' - end - end + basic_image_hash || self['image_hash'] || 'deadbeef' end def possibly_new_color diff --git a/config/basic_type_hashes.yml b/config/basic_type_hashes.yml deleted file mode 100644 index 98844ead5..000000000 --- a/config/basic_type_hashes.yml +++ /dev/null @@ -1,425 +0,0 @@ ---- -acara: - blue: mnbztxxn - green: obxdjm88 - red: 7njwqlq8 - yellow: o3wj6s77 - baby: sk5z9r4n - maraquan: ntvxx7xc - mutant: zmofvhdx -aisha: - blue: n9ozx4z5 - green: vw3j5rnt - red: r27dkxdc - yellow: t4osnjxq - baby: bon8m2o4 - maraquan: 37wgjb6s - mutant: c4wrb4vd -blumaroo: - blue: 8dng4bvh - green: xmqmg3m9 - red: j77lzlmx - yellow: kfonqhdc - baby: md7bjrss - maraquan: 82fzq4kh - mutant: jcxf8fwx -bori: - blue: cdtgf7jo - green: 6c8dvw76 - red: tg7hx55j - yellow: sc2hhvhn - baby: fofhnsqj - maraquan: rln8zot7 - mutant: 7lqvol7n -bruce: - blue: w3hljbx7 - green: gwgc67tt - red: 72d26x2b - yellow: wqz8xn4t - baby: kkkqd9hd - maraquan: oddhtbgs - mutant: b3jrdol9 -buzz: - blue: rkvgtzv3 - green: schfx5c4 - red: gddkkb5j - yellow: jc9klfxm - baby: kvxjk22f - maraquan: cm66xwqk - mutant: j9brxg4n -chia: - blue: d65mc9gf - green: 8d4949sr - red: 4lrb4n3f - yellow: oqs3kzmf - baby: kvm8jr9k - mutant: mnf38rsr - pea: mn53trx7 -chomby: - blue: h3qctoxg - green: 552mzx7r - red: 9swsd8ln - yellow: bdml26md - baby: v2l4d2nf - 8-bit: 96lgkwnj - maraquan: v5x466sl - mutant: b4l8of99 -cybunny: - blue: v8shwcoq - green: xl6msllv - red: lfkscvgd - yellow: cwlv6zz9 - baby: h3lx4sw2 - maraquan: 6zlzft6t - mutant: zzsonrg8 -draik: - blue: 2g4jtrfh - green: 438o4dv5 - red: vd2joxxq - yellow: bob39shq - baby: h7g2lzvw - maraquan: mtxqzrjz - mutant: gq3dmvcf -elephante: - blue: 4ckkjxjj - green: r22hl9oh - red: jhhhbrww - yellow: jf9ww4om - baby: gvj8c7rn - maraquan: gh3bofrd - mutant: fsvsz87k -eyrie: - blue: m5mvxv23 - green: s42o6oon - red: 6kngmhvs - yellow: d6b8fqnm - baby: gqxnnsc4 - maraquan: 4qxob8gs - mutant: dvxtocr7 -flotsam: - blue: hwdo7rlb - green: 47vt32x2 - red: xhob45wn - yellow: r8r7jmvr - baby: 84jvz79s - mutant: wj83k9kh -gelert: - blue: 4g7n9mh5 - green: jfmwlmk8 - red: l95vq4w2 - yellow: 5nrd2lvd - baby: c473f4o7 - maraquan: 3dzw2l8c - mutant: 9ldnhtw5 -gnorbu: - blue: 6c275jcg - green: ghfgo5tn - red: qozzjgmg - yellow: 5lrvftfb - baby: fzjt34mc - mutant: bqgwjvq2 -grarrl: - blue: j7q65fv4 - green: t3mstkl6 - red: r946sq53 - yellow: jtg67z98 - baby: g66gs7m7 - maraquan: 3dldqlj2 - mutant: 8jtbfojx -grundo: - blue: nwx8v2rb - green: 5xn4kjf8 - red: qjcb6t8x - yellow: n2g9d94f - baby: 4sqhoksn - maraquan: 8coxbn7v - mutant: 9tfsvdk7 -hissi: - blue: 7ls55f33 - green: dz5dwsbx - red: jsfvcqwt - yellow: z24m7h7l - baby: fwd63758 - maraquan: z5dw7ln7 - mutant: xx8g8jjb -ixi: - blue: ro3qcd6s - green: w32r74vo - red: zs2m6862 - yellow: oggkzvq7 - baby: r6djxvxw - maraquan: xd73hdoz - mutant: scd2f73q -jetsam: - blue: w3rl2k9n - green: cwss4w3s - red: ghddf93g - yellow: kz43rnld - baby: zhz7wlxg - mutant: m8n64bsr -jubjub: - blue: 8mf5gzov - green: m267j935 - red: szckt2tj - yellow: 78hdsnmw - baby: 92x2bdtq - maraquan: gj7dmvsd - mutant: 783vj5nt -kacheek: - blue: tvnq2l5s - green: fkzfcb47 - red: 9hbtocjh - yellow: 4gsrb59g - baby: nw424vgn - mutant: fq6nnvwh - maraquan: z3gfj7rx -kau: - blue: ktlxmrtr - green: x9ww69qo - red: mrdtwkto - yellow: 78w49w7x - baby: qtxmt64l - maraquan: r5fzvmtd - mutant: 39thxh84 -kiko: - blue: 2qlfqqnd - green: 42j5q3zx - red: mcodrwlt - yellow: 86b5xdn6 - baby: d54hfwc7 - mutant: wdqnjz2z -koi: - blue: tjvv5cq8 - green: ncfn87wk - red: f3wvzz6r - yellow: 4f6cvzgh - baby: 59lh68wg - mutant: zoc4ntrg -korbat: - blue: 4qxwv7w7 - green: d2ow9co8 - red: omx9c876 - yellow: nsxodd8z - baby: kgmnvlx8 - maraquan: 6g73dr7l - mutant: lf98r4sb -kougra: - blue: rfsbh59t - green: otvq569n - red: x8hsckbh - yellow: x7bbg59h - baby: 45dwtg2f - 8-bit: 5g6fj4g8 - maraquan: 4snffcf5 - mutant: 5qt72kjo -krawk: - blue: hxgsm5d4 - green: 7ngw8z4f - red: kzwxb3dn - yellow: m2gq59r5 - baby: zgscmthd - maraquan: kbmht6zh - mutant: 8m94bk5w -kyrii: - blue: ojmo7qgg - green: t3b8s9nz - red: 6fvg9ngs - yellow: blxmjgbk - baby: 42fokwff - maraquan: s2do4jhq - mutant: x25ml223 -lenny: - blue: jfc75n44 - green: 242k4kdq - red: kc4w238d - yellow: 8r94jhfq - baby: k2qnttxo - mutant: 89zgj87k -lupe: - blue: r552fqj8 - green: ohmx4lc9 - red: 6jwlghsg - yellow: z42535zh - baby: b4xfn6xv - maraquan: fhlqw4bf - mutant: 7ggn4k6x -lutari: - blue: qgg6z8s7 - green: wtjv7hw4 - red: lgws33oo - yellow: 8x37fgjf - baby: jnbjxvf5 - mutant: k37r5lc6 -meerca: - blue: wwwhjf88 - green: lg9bb6tf - red: v7g8w8w6 - yellow: kk2nn2jr - baby: 446k2fln - maraquan: kgw5wv42 - mutant: n4nd3c4v -moehog: - blue: moot839l - green: jgkoro5z - red: dk47mfk8 - yellow: g84ovct7 - baby: 5r3oq2k4 - maraquan: 5cgov2km - mutant: wdc9gwtq -mynci: - blue: xwlo9657 - green: s33qzokw - red: f828tkrc - yellow: tdfhsndr - baby: 9d354534 - maraquan: 7d2ll99r - mutant: bqtb9hsz -nimmo: - blue: bx7fho8x - green: mb4mcwj5 - red: mok2fcl4 - yellow: 9559onds - baby: nwq55xx5 -ogrin: - blue: 26v2sx49 - green: lg5bzqkq - red: 3xgoz429 - yellow: rjzmx24v - baby: bfrh323n - mutant: t6s8hrzx - maraquan: f4f2s8tk -peophin: - blue: 996t7zfg - green: c9qo7zzt - red: kokc52kh - yellow: 4khvfnwl - baby: 4jbvhghx - mutant: bjdggzwd -poogle: - blue: 5n2vx7v2 - green: fw6lvf3c - red: xhcwbdd5 - yellow: xozlhd68 - baby: b2467jkz - maraquan: z44rk3xg - mutant: hn9v6koh -pteri: - blue: 82d369sm - green: slqmqr78 - red: tjhwbro3 - yellow: 4gkkb57f - baby: snd77sqq - maraquan: sktvv8t7 - mutant: 57tg8jb8 -quiggle: - blue: 4zs6b32m - green: vbrsgqrl - red: xrmt72wr - yellow: jdto7mj4 - baby: 2k7wm6dx - mutant: bv9htk44 -ruki: - blue: qsgbm5f6 - green: vgml65cz - red: sm55zs3q - yellow: n43szv42 - baby: grbwvh54 - maraquan: kjx2jjcg - mutant: hsls3rd8 -scorchio: - blue: ohb3b486 - green: kmb82xw8 - red: hkjoncsx - yellow: hgfofbl2 - baby: n443j7hn - maraquan: bm9b2b73 - mutant: 3mfckmq4 -shoyru: - blue: dj7n2zk8 - green: 3qwwn4n2 - red: 3zb2s2zw - yellow: mmvn4tkg - baby: xvvxvvjt - maraquan: f57glqj6 - mutant: 49tjr4vf -skeith: - blue: 7c847jkn - green: qdgwwz6c - red: fc4cxk3t - yellow: 533nc7rj - baby: tjjsn83l - maraquan: o65f8j4f - mutant: jb8jhqqr -techo: - blue: vl8qro4r - green: 2zc3vd47 - red: zgl2gjjn - yellow: 84gvowmj - baby: ng83vkg7 - maraquan: ln8lcbvh - mutant: tkqgzsv3 -tonu: - blue: jd433863 - green: 6mcv27mn - red: oskw3hqd - yellow: 5bhqs7sv - baby: h6jd7kw8 - mutant: 59kr9c96 - maraquan: zx39gx94 -tuskaninny: - blue: jj6t6cqd - green: stl4mm78 - red: 48z4o75j - yellow: q39wn6vq - baby: c3vhmr2m - mutant: j2hob2sj -uni: - blue: 74xvb24d - green: njzvoflw - red: jzfbdomk - yellow: 5qdfrtcq - baby: st84z8xf - maraquan: 3f3nzsjf - mutant: qw3gsfbb -usul: - blue: xff976n8 - green: 5245lzmh - red: rox4mgh5 - yellow: vxn8b4vr - baby: 39vzk6nc - maraquan: 8sfjr77d - mutant: 3dgowzld -wocky: - blue: xonntr5f - green: 4ssorlcs - red: 743smd5v - yellow: dnr2kj4b - baby: s7tld393 - maraquan: 6m2otk7o -xweetok: - blue: ddhdrt2o - green: thzwbqsq - red: tdkqr2b6 - yellow: o36btnbf - baby: wwh2wvkn - mutant: qs53ohzt -yurble: - blue: nhn5lxb4 - green: mjgbr7vb - red: h95cs547 - yellow: vfqkbvv6 - baby: 8b8fvxo2 - mutant: 5o5t2j3s -zafara: - blue: x8c57g2l - green: tq56zj3x - red: n32sgrvm - yellow: onxr95x6 - baby: 93c22wgn - maraquan: b2gxlo5h - mutant: 9c9frk9g -vandagyre: - blue: orsct24j - green: 6d3gd6t5 - red: 6kv8lfjl - yellow: xkntzsww