2730 files changed, 1499 insertions, 1515 deletions

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link_directory ../javascripts .js
@@ -1,3 +0,0 @@
-//= link_directory ../javascripts/pokeviewer .js
-//= link_directory ../stylesheets/pokeviewer .css
-//= link_tree ../images/pokeviewer
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end
@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery with: :exception
+end
@@ -0,0 +1,10 @@
+class PokedexController < ApplicationController
+  def index
+    @species = Species.
+      order(id: :asc).
+      includes(:pokedex_entries).
+      order("pokedex_entries.trainer_id ASC")
+
+    @trainers = Trainer.order(id: :asc)
+  end
+end
@@ -0,0 +1,99 @@
+class PokemonController < ApplicationController
+  before_action :load_pokemon, only: [:show, :embed]
+
+  def index
+    pokemon = Pokemon.order(Arel.sql("trainer_id IS NULL DESC")).
+      order(trainer_id: :asc).
+      order(box: :asc).
+      order(slot: :asc).
+      joins(:current).
+      includes(:current).
+      chunk do |p|
+        if p.trainer_id.nil?
+          -1
+        else
+          p.trainer_id
+        end
+      end
+
+    @unaccounted = []
+
+    begin
+      if pokemon.peek.first == -1
+        @unaccounted = pokemon.next.second
+      end
+    rescue StopIteration
+      # There are no Pokémon, but that's fine.
+    end
+
+    @trainers = Trainer.order(id: :asc).all.map do |trainer|
+      if trainer.id == pokemon.peek.first
+        party = []
+
+        boxes = (1..14).map do |i|
+          {
+            name: trainer.box_name(i),
+            pokemon: [nil] * 30
+          }
+        end
+
+        pokemon.next.second.chunk do |p|
+          if p.box.nil?
+            -1
+          else
+            p.box
+          end
+        end.each do |box, pokes|
+          if box == -1
+            party = pokes
+          else
+            boxes[box-1][:pokemon] = (0..29).map do |i|
+              if not pokes.empty? and (pokes.first.slot == i)
+                pokes.shift
+              else
+                nil
+              end
+            end
+          end
+        end
+
+        [trainer, party, boxes]
+      else
+        nil
+      end
+    end.compact
+  end
+
+  def show
+  end
+
+  def show_revision
+    @revision = Revision.
+      where(
+        sequential_id: params[:revision_id],
+        pokemon: { uuid: params[:id] }
+      ).includes(
+        :species, :item, :move_1, :move_2, :move_3, :move_4,
+        pokemon: [:trainer, :location]
+      ).first
+
+    @pokemon = @revision.pokemon
+
+    render :show
+  end
+
+  def embed
+    render layout: false
+  end
+
+  protected
+    def load_pokemon
+      @pokemon = Pokemon.includes(
+          current: [
+            :species, :item, :move_1, :move_2, :move_3, :move_4,
+            pokemon: [:trainer, :location]]
+        ).find_by_uuid! params[:id]
+
+      @revision = @pokemon.current
+    end
+end
@@ -1,5 +0,0 @@
-module Pokeviewer
-  class ApplicationController < ::ApplicationController
-    protect_from_forgery with: :exception
-  end
-end
@@ -1,14 +0,0 @@
-require_dependency "pokeviewer/application_controller"
-
-module Pokeviewer
-  class PokedexController < ApplicationController
-    def index
-      @species = Species.
-        order(id: :asc).
-        includes(:pokedex_entries).
-        order("pokeviewer_pokedex_entries.trainer_id ASC")
-
-      @trainers = Trainer.order(id: :asc)
-    end
-  end
-end
@@ -1,103 +0,0 @@
-require_dependency "pokeviewer/application_controller"
-
-module Pokeviewer
-  class PokemonController < ApplicationController
-    before_action :load_pokemon, only: [:show, :embed]
-
-    def index
-      pokemon = Pokemon.order(Arel.sql("trainer_id IS NULL DESC")).
-        order(trainer_id: :asc).
-        order(box: :asc).
-        order(slot: :asc).
-        joins(:current).
-        includes(:current).
-        chunk do |p|
-          if p.trainer_id.nil?
-            -1
-          else
-            p.trainer_id
-          end
-        end
-
-      @unaccounted = []
-
-      begin
-        if pokemon.peek.first == -1
-          @unaccounted = pokemon.next.second
-        end
-      rescue StopIteration
-        # There are no Pokémon, but that's fine.
-      end
-
-      @trainers = Trainer.order(id: :asc).all.map do |trainer|
-        if trainer.id == pokemon.peek.first
-          party = []
-
-          boxes = (1..14).map do |i|
-            {
-              name: trainer.box_name(i),
-              pokemon: [nil] * 30
-            }
-          end
-
-          pokemon.next.second.chunk do |p|
-            if p.box.nil?
-              -1
-            else
-              p.box
-            end
-          end.each do |box, pokes|
-            if box == -1
-              party = pokes
-            else
-              boxes[box-1][:pokemon] = (0..29).map do |i|
-                if not pokes.empty? and (pokes.first.slot == i)
-                  pokes.shift
-                else
-                  nil
-                end
-              end
-            end
-          end
-
-          [trainer, party, boxes]
-        else
-          nil
-        end
-      end.compact
-    end
-
-    def show
-    end
-
-    def show_revision
-      @revision = Revision.
-        where(
-          sequential_id: params[:revision_id],
-          pokeviewer_pokemon: { uuid: params[:id] }
-        ).includes(
-          :species, :item, :move_1, :move_2, :move_3, :move_4,
-          pokemon: [:trainer, :location]
-        ).first
-
-      @pokemon = @revision.pokemon
-
-      render :show
-    end
-
-    def embed
-      render layout: false
-    end
-
-    protected
-      def load_pokemon
-        @pokemon = Pokemon.includes(
-            current: [
-              :species, :item, :move_1, :move_2, :move_3, :move_4,
-              pokemon: [:trainer, :location]]
-          ).find_by_uuid! params[:id]
-
-        @revision = @pokemon.current
-      end
-  end
-end
@@ -1,26 +0,0 @@
-require_dependency "pokeviewer/application_controller"
-
-module Pokeviewer
-  class UploaderController < ApplicationController
-    skip_before_action :verify_authenticity_token
-    before_action :authenticate_user_from_token!
-
-    def submit
-      ExtractSaveDataJob.perform_later params[:game].as_json
-
-      render json: { message: "Data submitted for processing." }
-    end
-
-    private
-
-      def authenticate_user_from_token!
-        login = request.headers["X-User-Login"].presence
-        token = request.headers["X-User-Token"].presence
-
-        unless authenticate_pokeviewer(login, token)
-          head :unauthorized
-        end
-      end
-
-  end
-end
@@ -0,0 +1,23 @@
+class UploaderController < ApplicationController
+  skip_before_action :verify_authenticity_token
+  before_action :authenticate_user_from_token!
+
+  def submit
+    ExtractSaveDataJob.perform_later params[:game].as_json
+
+    render json: { message: "Data submitted for processing." }
+  end
+
+  private
+
+    def authenticate_user_from_token!
+      login = request.headers["X-User-Login"].presence
+      token = request.headers["X-User-Token"].presence
+
+      # TODO: Replace this.
+      unless authenticate_pokeviewer(login, token)
+        head :unauthorized
+      end
+    end
+
+end
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
@@ -0,0 +1,49 @@
+module PokedexHelper
+
+  def pokedex_table(all_species, trainers)
+    final_result = "".html_safe
+
+    all_species.each do |species|
+      noted_trainers = species.pokedex_entries.to_a
+
+      if noted_trainers.empty?
+        poke_name = "???"
+        poke_image = image_tag "icons/0.png"
+      else
+        poke_name = species.name
+        poke_image = image_tag "icons/#{species.id}.png"
+      end
+
+      result = "".html_safe
+
+      result << tag.th("\##{species.id}")
+      result << tag.th(poke_name)
+      result << tag.th(poke_image)
+
+      trainers.each do |trainer|
+        if !noted_trainers.empty? and noted_trainers.first.trainer_id == trainer.id
+          nt = noted_trainers.shift
+
+          if nt.caught
+            result << tag.td(trainer.display_number,
+              class: ["pkvd-caught", trainer.game])
+          else
+            result << tag.td(trainer.display_number,
+              class: ["pkvd-seen", trainer.game])
+          end
+        else
+          result << tag.td(trainer.display_number, class: "pkvd-unseen")
+        end
+      end
+
+      result << tag.td(
+        species.current_revisions.map {
+          |p| link_to p.nickname, p.pokemon }.join(", ").html_safe)
+
+      final_result << tag.tr(result)
+    end
+
+    tag.table(final_result, class: "pkvd-table")
+  end
+
+end
@@ -0,0 +1,206 @@
+require 'victor'
+
+module PokemonHelper
+
+  def condition_diagram(revision)
+    svg = Victor::SVG.new width: 420, height: 430
+
+    center_x = 200
+    center_y = 200
+    radius = 160
+
+    angle = -Math::PI / 2.0
+    incr = (2 * Math::PI) / 5
+
+    data = [
+      [:cool, revision.coolness],
+      [:beauty, revision.beauty],
+      [:cute, revision.cuteness],
+      [:smart, revision.smartness],
+      [:tough, revision.toughness]
+    ]
+
+    outline = data.map do |c|
+      x_offset = radius * Math.cos(angle)
+      y_offset = radius * Math.sin(angle)
+
+      svg.circle(
+        cx: (center_x + x_offset),
+        cy: (center_y + y_offset),
+        r: 53,
+        class: "pkcv-#{c[0]}-circle")
+
+      if c[0] == :cool
+        text_y = center_y + (radius + 20) * Math.sin(angle)
+      else
+        text_y = center_y + (radius + 60) * Math.sin(angle)
+      end
+
+      svg.text(c[0].upcase,
+        x: (center_x + (radius + 60) * Math.cos(angle)),
+        y: text_y,
+        class: "pkcv-label-outline")
+
+      svg.text(c[0].upcase,
+        x: (center_x + (radius + 60) * Math.cos(angle)),
+        y: text_y,
+        class: "pkcv-label")
+
+      angle += incr
+
+      [center_x + x_offset, center_y + y_offset]
+    end
+
+    svg.polygon(
+      points: outline.map { |point| point * "," } * " ",
+      class: "pkcv-outline")
+
+    points = data.map do |c|
+      svg.line(
+        x1: center_x,
+        y1: center_y,
+        x2: center_x + radius * Math.cos(angle),
+        y2: center_y + radius * Math.sin(angle),
+        class: "pkcv-line")
+
+      datapoint = c[1]
+      datapoint = 0.01 if datapoint < 1
+      datapoint /= 10.0
+      datapoint **= (1.0/3.0)
+
+      x_offset = (radius - 3) * Math.cos(angle) * datapoint
+      y_offset = (radius - 3) * Math.sin(angle) * datapoint
+
+      angle += incr
+
+      [center_x + x_offset, center_y + y_offset]
+    end
+
+    svg.polygon(
+      points: points.map { |point| point * "," } * " ",
+      class: "pkcv-data")
+
+    svg.rect(
+      x: -40,
+      y: 460,
+      rx: 10,
+      ry: 10,
+      width: 490,
+      height: 60,
+      class: "pkcv-sheen-bg")
+
+    if revision.sheen > 0
+      svg.rect(
+        x: -37,
+        y: 460,
+        width: revision.sheen * 490 / 10 - 6,
+        height: 60,
+        class: "pkcv-sheen-data")
+    end
+
+    svg.rect(
+      x: -40,
+      y: 460,
+      rx: 10,
+      ry: 10,
+      width: 490,
+      height: 60,
+      class: "pkcv-sheen-border")
+
+    svg.text("SHEEN",
+      x: -20,
+      y: 500,
+      class: "pkcv-sheen-label")
+
+    tag.svg(svg.to_s.html_safe,
+      viewBox: "-80 -30 570 560",
+      width: "100%",
+      class: "pokemon-condition")
+  end
+
+  def image_for_type(type)
+    image_tag "types/#{type}.gif", class: "pkv-type"
+  end
+
+  def move_details(revision, index)
+    move = revision.send "move_#{index}".intern
+
+    if move
+      move_name = move.name
+      move_type = image_for_type move.move_type
+      move_pp = revision.send "move_#{index}_pp".intern
+      move_pp = "#{move_pp}/#{move_pp}"
+    else
+      move_name = "-"
+      move_type = ""
+      move_pp = "--/--"
+    end
+
+    tag.tr(
+      tag.th(move_type) +
+      tag.td(move_name)) +
+    tag.tr(
+      tag.th("") +
+      tag.td(
+        tag.div(
+          tag.span(
+            "PP",
+            class: 'pp-label') +
+          tag.span(
+            move_pp,
+            class: 'pp-value') +
+          tag.div(
+            "",
+            class: 'clear'),
+          class: 'tb-only')))
+  end
+
+  def display_met(pokemon)
+    met_type = pokemon.met_type
+
+    if met_type == :normal or met_type == :hatched
+      result = "".html_safe
+
+      if met_type == :normal
+        if pokemon.outsider?
+          result << "Apparently met"
+        else
+          result << "Met"
+        end
+      else
+        if pokemon.outsider?
+          result << "Apparently hatched"
+        else
+          result << "Hatched"
+        end
+      end
+
+      result << " in "
+
+      pokemon.location.name.split(" ").each_with_index do |w, i|
+        result << "&nbsp;".html_safe if i > 0
+        result << w
+      end
+
+      result << " at Lv.&nbsp;".html_safe
+
+      if met_type == :hatched
+        result << "5"
+      else
+        result << pokemon.met_level.to_s
+      end
+
+      result << "."
+
+      result
+    elsif met_type == :npc_trade
+      "Met in a trade."
+    elsif met_type == :fateful_encounter
+      "Met in a fateful encounter at Lv.&nbsp;".html_safe +
+        pokemon.met_level.to_s
+    elsif met_type == :orre
+      "Met in a trade."
+    end
+  end
+
+end
@@ -1,4 +0,0 @@
-module Pokeviewer
-  module ApplicationHelper
-  end
-end
@@ -1,51 +0,0 @@
-module Pokeviewer
-  module PokedexHelper
-
-    def pokedex_table(all_species, trainers)
-      final_result = "".html_safe
-
-      all_species.each do |species|
-        noted_trainers = species.pokedex_entries.to_a
-
-        if noted_trainers.empty?
-          poke_name = "???"
-          poke_image = image_tag "pokeviewer/icons/0.png"
-        else
-          poke_name = species.name
-          poke_image = image_tag "pokeviewer/icons/#{species.id}.png"
-        end
-
-        result = "".html_safe
-
-        result << tag.th("\##{species.id}")
-        result << tag.th(poke_name)
-        result << tag.th(poke_image)
-
-        trainers.each do |trainer|
-          if !noted_trainers.empty? and noted_trainers.first.trainer_id == trainer.id
-            nt = noted_trainers.shift
-
-            if nt.caught
-              result << tag.td(trainer.display_number,
-                class: ["pkvd-caught", trainer.game])
-            else
-              result << tag.td(trainer.display_number,
-                class: ["pkvd-seen", trainer.game])
-            end
-          else
-            result << tag.td(trainer.display_number, class: "pkvd-unseen")
-          end
-        end
-
-        result << tag.td(
-          species.current_revisions.map {
-            |p| link_to p.nickname, p.pokemon }.join(", ").html_safe)
-
-        final_result << tag.tr(result)
-      end
-
-      tag.table(final_result, class: "pkvd-table")
-    end
-
-  end
-end
@@ -1,208 +0,0 @@
-require 'victor'
-
-module Pokeviewer
-  module PokemonHelper
-
-    def condition_diagram(revision)
-      svg = Victor::SVG.new width: 420, height: 430
-
-      center_x = 200
-      center_y = 200
-      radius = 160
-
-      angle = -Math::PI / 2.0
-      incr = (2 * Math::PI) / 5
-
-      data = [
-        [:cool, revision.coolness],
-        [:beauty, revision.beauty],
-        [:cute, revision.cuteness],
-        [:smart, revision.smartness],
-        [:tough, revision.toughness]
-      ]
-
-      outline = data.map do |c|
-        x_offset = radius * Math.cos(angle)
-        y_offset = radius * Math.sin(angle)
-
-        svg.circle(
-          cx: (center_x + x_offset),
-          cy: (center_y + y_offset),
-          r: 53,
-          class: "pkcv-#{c[0]}-circle")
-
-        if c[0] == :cool
-          text_y = center_y + (radius + 20) * Math.sin(angle)
-        else
-          text_y = center_y + (radius + 60) * Math.sin(angle)
-        end
-
-        svg.text(c[0].upcase,
-          x: (center_x + (radius + 60) * Math.cos(angle)),
-          y: text_y,
-          class: "pkcv-label-outline")
-
-        svg.text(c[0].upcase,
-          x: (center_x + (radius + 60) * Math.cos(angle)),
-          y: text_y,
-          class: "pkcv-label")
-
-        angle += incr
-
-        [center_x + x_offset, center_y + y_offset]
-      end
-
-      svg.polygon(
-        points: outline.map { |point| point * "," } * " ",
-        class: "pkcv-outline")
-
-      points = data.map do |c|
-        svg.line(
-          x1: center_x,
-          y1: center_y,
-          x2: center_x + radius * Math.cos(angle),
-          y2: center_y + radius * Math.sin(angle),
-          class: "pkcv-line")
-
-        datapoint = c[1]
-        datapoint = 0.01 if datapoint < 1
-        datapoint /= 10.0
-        datapoint **= (1.0/3.0)
-
-        x_offset = (radius - 3) * Math.cos(angle) * datapoint
-        y_offset = (radius - 3) * Math.sin(angle) * datapoint
-
-        angle += incr
-
-        [center_x + x_offset, center_y + y_offset]
-      end
-
-      svg.polygon(
-        points: points.map { |point| point * "," } * " ",
-        class: "pkcv-data")
-
-      svg.rect(
-        x: -40,
-        y: 460,
-        rx: 10,
-        ry: 10,
-        width: 490,
-        height: 60,
-        class: "pkcv-sheen-bg")
-
-      if revision.sheen > 0
-        svg.rect(
-          x: -37,
-          y: 460,
-          width: revision.sheen * 490 / 10 - 6,
-          height: 60,
-          class: "pkcv-sheen-data")
-      end
-
-      svg.rect(
-        x: -40,
-        y: 460,
-        rx: 10,
-        ry: 10,
-        width: 490,
-        height: 60,
-        class: "pkcv-sheen-border")
-
-      svg.text("SHEEN",
-        x: -20,
-        y: 500,
-        class: "pkcv-sheen-label")
-
-      tag.svg(svg.to_s.html_safe,
-        viewBox: "-80 -30 570 560",
-        width: "100%",
-        class: "pokemon-condition")
-    end
-
-    def image_for_type(type)
-      image_tag "pokeviewer/types/#{type}.gif", class: "pkv-type"
-    end
-
-    def move_details(revision, index)
-      move = revision.send "move_#{index}".intern
-
-      if move
-        move_name = move.name
-        move_type = image_for_type move.move_type
-        move_pp = revision.send "move_#{index}_pp".intern
-        move_pp = "#{move_pp}/#{move_pp}"
-      else
-        move_name = "-"
-        move_type = ""
-        move_pp = "--/--"
-      end
-
-      tag.tr(
-        tag.th(move_type) +
-        tag.td(move_name)) +
-      tag.tr(
-        tag.th("") +
-        tag.td(
-          tag.div(
-            tag.span(
-              "PP",
-              class: 'pp-label') +
-            tag.span(
-              move_pp,
-              class: 'pp-value') +
-            tag.div(
-              "",
-              class: 'clear'),
-            class: 'tb-only')))
-    end
-
-    def display_met(pokemon)
-      met_type = pokemon.met_type
-
-      if met_type == :normal or met_type == :hatched
-        result = "".html_safe
-
-        if met_type == :normal
-          if pokemon.outsider?
-            result << "Apparently met"
-          else
-            result << "Met"
-          end
-        else
-          if pokemon.outsider?
-            result << "Apparently hatched"
-          else
-            result << "Hatched"
-          end
-        end
-
-        result << " in "
-
-        pokemon.location.name.split(" ").each_with_index do |w, i|
-          result << "&nbsp;".html_safe if i > 0
-          result << w
-        end
-
-        result << " at Lv.&nbsp;".html_safe
-
-        if met_type == :hatched
-          result << "5"
-        else
-          result << pokemon.met_level.to_s
-        end
-
-        result << "."
-
-        result
-      elsif met_type == :npc_trade
-        "Met in a trade."
-      elsif met_type == :fateful_encounter
-        "Met in a fateful encounter at Lv.&nbsp;".html_safe +
-          pokemon.met_level.to_s
-      elsif met_type == :orre
-        "Met in a trade."
-      end
-    end
-
-  end
-end
@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end
@@ -0,0 +1,186 @@
+class ExtractSaveDataJob < ApplicationJob
+  queue_as :default
+
+  def perform(args)
+    game = Trainer.find_or_initialize_by(
+      name: args["playerName"],
+      number: args["playerId"]) do |r|
+        case args["gameId"].to_i
+        when 1
+          r.game = :ruby
+        when 2
+          r.game = :sapphire
+        when 3
+          r.game = :firered
+        when 4
+          r.game = :leafgreen
+        when 5
+          r.game = :emerald
+        else
+          # Invalid, so just leave the field nil
+        end
+      end
+
+    game.box_1_name = args["boxes"].shift
+    game.box_2_name = args["boxes"].shift
+    game.box_3_name = args["boxes"].shift
+    game.box_4_name = args["boxes"].shift
+    game.box_5_name = args["boxes"].shift
+    game.box_6_name = args["boxes"].shift
+    game.box_7_name = args["boxes"].shift
+    game.box_8_name = args["boxes"].shift
+    game.box_9_name = args["boxes"].shift
+    game.box_10_name = args["boxes"].shift
+    game.box_11_name = args["boxes"].shift
+    game.box_12_name = args["boxes"].shift
+    game.box_13_name = args["boxes"].shift
+    game.box_14_name = args["boxes"].shift
+
+    if args.key? "marineRibbon"
+      game.marine_ribbon_id = args["marineRibbon"]
+    end
+
+    if args.key? "landRibbon"
+      game.land_ribbon_id = args["landRibbon"]
+    end
+
+    if args.key? "skyRibbon"
+      game.sky_ribbon_id = args["skyRibbon"]
+    end
+
+    if args.key? "countryRibbon"
+      game.country_ribbon_id = args["countryRibbon"]
+    end
+
+    if args.key? "nationalRibbon"
+      game.national_ribbon_id = args["nationalRibbon"]
+    end
+
+    if args.key? "earthRibbon"
+      game.earth_ribbon_id = args["earthRibbon"]
+    end
+
+    if args.key? "worldRibbon"
+      game.world_ribbon_id = args["worldRibbon"]
+    end
+
+    game.save! if game.new_record? or game.changed?
+
+    game.pokemon.clear
+
+    args["pokemon"].each do |param|
+      pk = Pokemon.find_or_create_by!(key: param["key"]) do |r|
+        r.ot_name = param["otName"]
+        r.ot_number = param["otId"]
+        r.ot_gender = param["otGender"]
+
+        if param["orre"]
+          r.met_type = :orre
+        elsif param["metLevel"] == 0
+          r.met_type = :hatched
+          r.location_id = param["metLocation"]
+        elsif param["metLocation"] == 254
+          r.met_type = :npc_trade
+        elsif param["metLocation"] == 255
+          r.met_type = :fateful_encounter
+          r.met_level = param["metLevel"]
+        else
+          r.met_type = :normal
+          r.met_level = param["metLevel"]
+          r.location_id = param["metLocation"]
+        end
+
+        r.shiny = param["shiny"]
+        r.nature = Pokemon.nature.values[param["nature"]]
+        r.gender = param["gender"]
+        r.second_ability = param["secondAbility"]
+        r.pokeball = Pokemon.pokeball.values[param["pokeball"] - 1]
+
+        # Handle Unown form
+        if param["species"] == 201
+          r.unown_letter = Pokemon.unown_letter.values[param["unownLetter"]]
+        end
+      end
+
+      pk.trainer = game
+
+      if param["storage"] == "party"
+        pk.box = nil
+      elsif param["storage"] == "box"
+        pk.box = param["box"] + 1
+      end
+
+      pk.slot = param["slot"]
+
+      pk.save!
+
+      rev = Revision.new(pokemon: pk)
+      rev.species_id = param["species"]
+      rev.nickname = param["nickname"]
+      rev.experience = param["experience"]
+      rev.level = param["level"]
+      rev.hp = param["hp"]
+      rev.attack = param["attack"]
+      rev.defense = param["defense"]
+      rev.special_attack = param["spAttack"]
+      rev.special_defense = param["spDefense"]
+      rev.speed = param["speed"]
+      rev.coolness = param["coolness"]
+      rev.beauty = param["beauty"]
+      rev.cuteness = param["cuteness"]
+      rev.smartness = param["smartness"]
+      rev.toughness = param["toughness"]
+      rev.sheen = param["sheen"]
+      rev.item_id = param["heldItem"] if param.key? "heldItem"
+      rev.move_1_id = param["moves"][0]["id"]
+      rev.move_1_pp_bonuses = param["moves"][0]["ppBonuses"]
+
+      if param["moves"].length >= 2
+        rev.move_2_id = param["moves"][1]["id"]
+        rev.move_2_pp_bonuses = param["moves"][1]["ppBonuses"]
+      end
+
+      if param["moves"].length >= 3
+        rev.move_3_id = param["moves"][2]["id"]
+        rev.move_3_pp_bonuses = param["moves"][2]["ppBonuses"]
+      end
+
+      if param["moves"].length == 4
+        rev.move_4_id = param["moves"][3]["id"]
+        rev.move_4_pp_bonuses = param["moves"][3]["ppBonuses"]
+      end
+
+      rev.cool_ribbons = param["coolRibbons"]
+      rev.beauty_ribbons = param["beautyRibbons"]
+      rev.cute_ribbons = param["cuteRibbons"]
+      rev.smart_ribbons = param["smartRibbons"]
+      rev.tough_ribbons = param["toughRibbons"]
+      rev.champion_ribbon = param.fetch "championRibbon", false
+      rev.winning_ribbon = param.fetch "winningRibbon", false
+      rev.victory_ribbon = param.fetch "victoryRibbon", false
+      rev.artist_ribbon = param.fetch "artistRibbon", false
+      rev.effort_ribbon = param.fetch "effortRibbon", false
+      rev.marine_ribbon = param.fetch "marineRibbon", false
+      rev.land_ribbon = param.fetch "landRibbon", false
+      rev.sky_ribbon = param.fetch "skyRibbon", false
+      rev.country_ribbon = param.fetch "countryRibbon", false
+      rev.national_ribbon = param.fetch "nationalRibbon", false
+      rev.earth_ribbon = param.fetch "earthRibbon", false
+      rev.world_ribbon = param.fetch "worldRibbon", false
+
+      if pk.revisions.empty? or rev.diff?(pk.current)
+        rev.save!
+      end
+    end
+
+    game.pokedex_entries.clear
+
+    args["seen"].each do |param|
+      game.pokedex_entries.create(species_id: param, caught: false)
+    end
+
+    args["caught"].each do |param|
+      game.pokedex_entries.create(species_id: param, caught: true)
+    end
+  end
+end
@@ -1,4 +0,0 @@
-module Pokeviewer
-  class ApplicationJob < ActiveJob::Base
-  end
-end
@@ -1,188 +0,0 @@
-module Pokeviewer
-  class ExtractSaveDataJob < ApplicationJob
-    queue_as :default
-
-    def perform(args)
-      game = Trainer.find_or_initialize_by(
-        name: args["playerName"],
-        number: args["playerId"]) do |r|
-          case args["gameId"].to_i
-          when 1
-            r.game = :ruby
-          when 2
-            r.game = :sapphire
-          when 3
-            r.game = :firered
-          when 4
-            r.game = :leafgreen
-          when 5
-            r.game = :emerald
-          else
-            # Invalid, so just leave the field nil
-          end
-        end
-
-      game.box_1_name = args["boxes"].shift
-      game.box_2_name = args["boxes"].shift
-      game.box_3_name = args["boxes"].shift
-      game.box_4_name = args["boxes"].shift
-      game.box_5_name = args["boxes"].shift
-      game.box_6_name = args["boxes"].shift
-      game.box_7_name = args["boxes"].shift
-      game.box_8_name = args["boxes"].shift
-      game.box_9_name = args["boxes"].shift
-      game.box_10_name = args["boxes"].shift
-      game.box_11_name = args["boxes"].shift
-      game.box_12_name = args["boxes"].shift
-      game.box_13_name = args["boxes"].shift
-      game.box_14_name = args["boxes"].shift
-
-      if args.key? "marineRibbon"
-        game.marine_ribbon_id = args["marineRibbon"]
-      end
-
-      if args.key? "landRibbon"
-        game.land_ribbon_id = args["landRibbon"]
-      end
-
-      if args.key? "skyRibbon"
-        game.sky_ribbon_id = args["skyRibbon"]
-      end
-
-      if args.key? "countryRibbon"
-        game.country_ribbon_id = args["countryRibbon"]
-      end
-
-      if args.key? "nationalRibbon"
-        game.national_ribbon_id = args["nationalRibbon"]
-      end
-
-      if args.key? "earthRibbon"
-        game.earth_ribbon_id = args["earthRibbon"]
-      end
-
-      if args.key? "worldRibbon"
-        game.world_ribbon_id = args["worldRibbon"]
-      end
-
-      game.save! if game.new_record? or game.changed?
-
-      game.pokemon.clear
-
-      args["pokemon"].each do |param|
-        pk = Pokemon.find_or_create_by!(key: param["key"]) do |r|
-          r.ot_name = param["otName"]
-          r.ot_number = param["otId"]
-          r.ot_gender = param["otGender"]
-
-          if param["orre"]
-            r.met_type = :orre
-          elsif param["metLevel"] == 0
-            r.met_type = :hatched
-            r.location_id = param["metLocation"]
-          elsif param["metLocation"] == 254
-            r.met_type = :npc_trade
-          elsif param["metLocation"] == 255
-            r.met_type = :fateful_encounter
-            r.met_level = param["metLevel"]
-          else
-            r.met_type = :normal
-            r.met_level = param["metLevel"]
-            r.location_id = param["metLocation"]
-          end
-
-          r.shiny = param["shiny"]
-          r.nature = Pokemon.nature.values[param["nature"]]
-          r.gender = param["gender"]
-          r.second_ability = param["secondAbility"]
-          r.pokeball = Pokemon.pokeball.values[param["pokeball"] - 1]
-
-          # Handle Unown form
-          if param["species"] == 201
-            r.unown_letter = Pokemon.unown_letter.values[param["unownLetter"]]
-          end
-        end
-
-        pk.trainer = game
-
-        if param["storage"] == "party"
-          pk.box = nil
-        elsif param["storage"] == "box"
-          pk.box = param["box"] + 1
-        end
-
-        pk.slot = param["slot"]
-
-        pk.save!
-
-        rev = Revision.new(pokemon: pk)
-        rev.species_id = param["species"]
-        rev.nickname = param["nickname"]
-        rev.experience = param["experience"]
-        rev.level = param["level"]
-        rev.hp = param["hp"]
-        rev.attack = param["attack"]
-        rev.defense = param["defense"]
-        rev.special_attack = param["spAttack"]
-        rev.special_defense = param["spDefense"]
-        rev.speed = param["speed"]
-        rev.coolness = param["coolness"]
-        rev.beauty = param["beauty"]
-        rev.cuteness = param["cuteness"]
-        rev.smartness = param["smartness"]
-        rev.toughness = param["toughness"]
-        rev.sheen = param["sheen"]
-        rev.item_id = param["heldItem"] if param.key? "heldItem"
-        rev.move_1_id = param["moves"][0]["id"]
-        rev.move_1_pp_bonuses = param["moves"][0]["ppBonuses"]
-
-        if param["moves"].length >= 2
-          rev.move_2_id = param["moves"][1]["id"]
-          rev.move_2_pp_bonuses = param["moves"][1]["ppBonuses"]
-        end
-
-        if param["moves"].length >= 3
-          rev.move_3_id = param["moves"][2]["id"]
-          rev.move_3_pp_bonuses = param["moves"][2]["ppBonuses"]
-        end
-
-        if param["moves"].length == 4
-          rev.move_4_id = param["moves"][3]["id"]
-          rev.move_4_pp_bonuses = param["moves"][3]["ppBonuses"]
-        end
-
-        rev.cool_ribbons = param["coolRibbons"]
-        rev.beauty_ribbons = param["beautyRibbons"]
-        rev.cute_ribbons = param["cuteRibbons"]
-        rev.smart_ribbons = param["smartRibbons"]
-        rev.tough_ribbons = param["toughRibbons"]
-        rev.champion_ribbon = param.fetch "championRibbon", false
-        rev.winning_ribbon = param.fetch "winningRibbon", false
-        rev.victory_ribbon = param.fetch "victoryRibbon", false
-        rev.artist_ribbon = param.fetch "artistRibbon", false
-        rev.effort_ribbon = param.fetch "effortRibbon", false
-        rev.marine_ribbon = param.fetch "marineRibbon", false
-        rev.land_ribbon = param.fetch "landRibbon", false
-        rev.sky_ribbon = param.fetch "skyRibbon", false
-        rev.country_ribbon = param.fetch "countryRibbon", false
-        rev.national_ribbon = param.fetch "nationalRibbon", false
-        rev.earth_ribbon = param.fetch "earthRibbon", false
-        rev.world_ribbon = param.fetch "worldRibbon", false
-
-        if pk.revisions.empty? or rev.diff?(pk.current)
-          rev.save!
-        end
-      end
-
-      game.pokedex_entries.clear
-
-      args["seen"].each do |param|
-        game.pokedex_entries.create(species_id: param, caught: false)
-      end
-
-      args["caught"].each do |param|
-        game.pokedex_entries.create(species_id: param, caught: true)
-      end
-    end
-  end
-end
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: "from@example.com"
+  layout "mailer"
+end
@@ -1,6 +0,0 @@
-module Pokeviewer
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end
@@ -0,0 +1,5 @@
+class Ability < ApplicationRecord
+  validates :name, presence: true, uniqueness: true
+
+  validates :description, presence: true
+end
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  primary_abstract_class
+end
@@ -0,0 +1,3 @@
+class GiftRibbon < ApplicationRecord
+  validates :description, presence: true
+end
@@ -0,0 +1,41 @@
+class Item < ApplicationRecord
+  validates :name, presence: true
+
+  belongs_to :move, optional: true
+  validates :move, presence: true, if: :tm?
+
+  validates :rs_description, presence: true, unless: :tm?
+  validates :frlg_description, presence: true, unless: :tm?
+
+  def description(game)
+    if game == :emerald
+      if not emerald_description.nil?
+        emerald_description
+      elsif not rs_description.nil?
+        rs_description
+      else
+        move.description game
+      end
+    elsif game == :firered or game == :leafgreen
+      if not frlg_description.nil?
+        frlg_description
+      else
+        move.description game
+      end
+    else
+      if not rs_description.nil?
+        rs_description
+      else
+        move.description game
+      end
+    end
+  end
+
+  def icon_path
+    if tm?
+      "items/tms/#{move.move_type}.png"
+    else
+      "items/#{id}.png"
+    end
+  end
+end
@@ -0,0 +1,5 @@
+class Location < ApplicationRecord
+  has_many :pokemon, dependent: :nullify
+
+  validates :name, presence: true
+end
@@ -0,0 +1,31 @@
+class Move < ApplicationRecord
+  extend Enumerize
+
+  has_many :revision_moves
+  has_many :revisions, through: :revision_moves
+
+  validates :name, presence: true, uniqueness: true
+
+  validates :pp, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  TYPES = [:normal, :fighting, :flying, :poison, :ground,
+    :rock, :bug, :ghost, :steel, :mystery, :fire, :water, :grass, :electric,
+    :psychic, :ice, :dragon, :dark]
+
+  validates :move_type, presence: true
+  enumerize :move_type, in: TYPES, predicates: true
+
+  validates :rs_description, presence: true
+  validates :frlg_description, presence: true
+
+  def description(game)
+    if game == :emerald and not emerald_description.nil?
+      emerald_description
+    elsif game == :firered or game == :leafgreen
+      frlg_description
+    else
+      rs_description
+    end
+  end
+end
@@ -0,0 +1,4 @@
+class PokedexEntry < ApplicationRecord
+  belongs_to :trainer
+  belongs_to :species
+end
@@ -0,0 +1,165 @@
+class Pokemon < ApplicationRecord
+  extend Enumerize
+  extend ActiveModel::Naming
+
+  has_many :revisions, -> { order "sequential_id ASC" }, dependent: :destroy
+
+  belongs_to :current, class_name: "Revision", optional: true
+  validate :current_is_cached
+
+  belongs_to :trainer, optional: true
+
+  validates :box, numericality: {
+      greater_than_or_equal_to: 1,
+      less_than_or_equal_to: 14,
+      only_integer: true },
+    allow_nil: true
+
+  validates :slot, presence: true,
+    uniqueness: { scope: [:trainer_id, :box] },
+    numericality: {
+      greater_than_or_equal_to: 0,
+      only_integer: true },
+    unless: Proc.new { |a| a.trainer_id.nil? }
+
+  validates :slot,
+    numericality: { less_than: 30 },
+    unless: Proc.new { |a| a.trainer_id.nil? or a.box.nil? }
+
+  validates :slot,
+    numericality: { less_than: 6 },
+    unless: Proc.new { |a| a.trainer_id.nil? or not a.box.nil? }
+
+  scope :party, -> { where(box: nil) }
+  scope :box, ->(n) { where(box: n) }
+  scope :unaccounted, -> { where(trainer_id: nil) }
+
+  validate :uuid_is_constant, on: :update
+  before_create :set_uuid
+
+  validates :ot_name, presence: true
+
+  validates :ot_number, presence: true,
+    numericality: { greater_than_or_equal_to: 0, only_integer: true }
+
+  validates :ot_gender, presence: true
+  enumerize :ot_gender, in: [:female, :male]
+
+  validates :met_level, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true },
+    if: Proc.new { |a| a.met_type == :normal }
+
+  validates :met_type, presence: true
+  enumerize :met_type,
+    in: [:normal, :hatched, :npc_trade, :fateful_encounter, :orre]
+
+  belongs_to :location, optional: true
+  validates :location, presence: true,
+    if: Proc.new { |c| c.met_type == :normal or c.met_type == :hatched}
+
+  validates :gender, presence: true
+  enumerize :gender, in: [:genderless, :female, :male]
+
+  validates :nature, presence: true
+  enumerize :nature, in: [:hardy, :lonely, :brave, :adamant, :naughty, :bold,
+    :docile, :relaxed, :impish, :lax, :timid, :hasty, :serious, :jolly,
+    :naive, :modest, :mild, :quiet, :bashful, :rash, :calm, :gentle, :sassy,
+    :careful, :quirky]
+
+  enumerize :unown_letter, in: [:a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k,
+    :l, :m, :n, :o, :p, :q, :r, :s, :t, :u, :v, :w, :x, :y, :z,
+    :question, :exclamation]
+
+  validates :pokeball, presence: true
+  enumerize :pokeball, in: [:master, :ultra, :great, :poke, :safari, :net,
+    :dive, :nest, :repeat, :timer, :luxury, :premier]
+
+  def to_param
+    uuid
+  end
+
+  def outsider?
+    (trainer.nil?) or (ot_name != trainer.name) or (ot_number != trainer.number)
+  end
+
+  def display_ot_number
+    ot_number.to_s.rjust(5, '0')
+  end
+
+  def nature_benefits?(stat)
+    if stat == :attack
+      [:lonely, :brave, :adamant, :naughty].include? nature.intern
+    elsif stat == :defense
+      [:bold, :relaxed, :impish, :lax].include? nature.intern
+    elsif stat == :speed
+      [:timid, :hasty, :jolly, :naive].include? nature.intern
+    elsif stat == :special_attack
+      [:modest, :mild, :quiet, :rash].include? nature.intern
+    elsif stat == :special_defense
+      [:calm, :gentle, :sassy, :careful].include? nature.intern
+    else
+      false
+    end
+  end
+
+  def nature_hinders?(stat)
+    if stat == :attack
+      [:bold, :timid, :modest, :calm].include? nature.intern
+    elsif stat == :defense
+      [:lonely, :hasty, :mild, :gentle].include? nature.intern
+    elsif stat == :speed
+      [:brave, :relaxed, :quiet, :sassy].include? nature.intern
+    elsif stat == :special_attack
+      [:adamant, :impish, :jolly, :careful].include? nature.intern
+    elsif stat == :special_defense
+      [:naughty, :lax, :naive, :rash].include? nature.intern
+    else
+      false
+    end
+  end
+
+  def pokeball_icon_path
+    "items/#{Pokemon.pokeball.values.find_index(pokeball) + 1}.png"
+  end
+
+  def gift_ribbon_description(ribbon)
+    if trainer.nil?
+      ""
+    else
+      trainer.gift_ribbon_description(ribbon)
+    end
+  end
+
+  def gender_symbol
+    case gender.intern
+    when :female
+      "♀"
+    when :male
+      "♂"
+    when :genderless
+      ""
+    end
+  end
+
+  private
+
+    def set_uuid
+      self.uuid = SecureRandom.uuid
+    end
+
+    def uuid_is_constant
+      errors.add(:uuid, "can't be changed") if self.uuid_changed?
+    end
+
+    def current_is_cached
+      if self.revisions.empty?
+        unless self.current_id.nil?
+          errors.add(:current, "must be null when there are no revisions")
+        end
+      else
+        unless self.current_id = self.revisions.last.id
+          errors.add(:current, "is not up-to-date")
+        end
+      end
+    end
+end
@@ -1,7 +0,0 @@
-module Pokeviewer
-  class Ability < ApplicationRecord
-    validates :name, presence: true, uniqueness: true
-
-    validates :description, presence: true
-  end
-end
@@ -1,5 +0,0 @@
-module Pokeviewer
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end
@@ -1,5 +0,0 @@
-module Pokeviewer
-  class GiftRibbon < ApplicationRecord
-    validates :description, presence: true
-  end
-end
@@ -1,43 +0,0 @@
-module Pokeviewer
-  class Item < ApplicationRecord
-    validates :name, presence: true
-
-    belongs_to :move, optional: true
-    validates :move, presence: true, if: :tm?
-
-    validates :rs_description, presence: true, unless: :tm?
-    validates :frlg_description, presence: true, unless: :tm?
-
-    def description(game)
-      if game == :emerald
-        if not emerald_description.nil?
-          emerald_description
-        elsif not rs_description.nil?
-          rs_description
-        else
-          move.description game
-        end
-      elsif game == :firered or game == :leafgreen
-        if not frlg_description.nil?
-          frlg_description
-        else
-          move.description game
-        end
-      else
-        if not rs_description.nil?
-          rs_description
-        else
-          move.description game
-        end
-      end
-    end
-
-    def icon_path
-      if tm?
-        "pokeviewer/items/tms/#{move.move_type}.png"
-      else
-        "pokeviewer/items/#{id}.png"
-      end
-    end
-  end
-end
@@ -1,7 +0,0 @@
-module Pokeviewer
-  class Location < ApplicationRecord
-    has_many :pokemon, dependent: :nullify
-
-    validates :name, presence: true
-  end
-end
@@ -1,33 +0,0 @@
-module Pokeviewer
-  class Move < ApplicationRecord
-    extend Enumerize
-
-    has_many :revision_moves
-    has_many :revisions, through: :revision_moves
-
-    validates :name, presence: true, uniqueness: true
-
-    validates :pp, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    TYPES = [:normal, :fighting, :flying, :poison, :ground,
-      :rock, :bug, :ghost, :steel, :mystery, :fire, :water, :grass, :electric,
-      :psychic, :ice, :dragon, :dark]
-
-    validates :move_type, presence: true
-    enumerize :move_type, in: TYPES, predicates: true
-
-    validates :rs_description, presence: true
-    validates :frlg_description, presence: true
-
-    def description(game)
-      if game == :emerald and not emerald_description.nil?
-        emerald_description
-      elsif game == :firered or game == :leafgreen
-        frlg_description
-      else
-        rs_description
-      end
-    end
-  end
-end
@@ -1,6 +0,0 @@
-module Pokeviewer
-  class PokedexEntry < ApplicationRecord
-    belongs_to :trainer
-    belongs_to :species
-  end
-end
@@ -1,167 +0,0 @@
-module Pokeviewer
-  class Pokemon < ApplicationRecord
-    extend Enumerize
-    extend ActiveModel::Naming
-
-    has_many :revisions, -> { order "sequential_id ASC" }, dependent: :destroy
-
-    belongs_to :current, class_name: "Revision", optional: true
-    validate :current_is_cached
-
-    belongs_to :trainer, optional: true
-
-    validates :box, numericality: {
-        greater_than_or_equal_to: 1,
-        less_than_or_equal_to: 14,
-        only_integer: true },
-      allow_nil: true
-
-    validates :slot, presence: true,
-      uniqueness: { scope: [:trainer_id, :box] },
-      numericality: {
-        greater_than_or_equal_to: 0,
-        only_integer: true },
-      unless: Proc.new { |a| a.trainer_id.nil? }
-
-    validates :slot,
-      numericality: { less_than: 30 },
-      unless: Proc.new { |a| a.trainer_id.nil? or a.box.nil? }
-
-    validates :slot,
-      numericality: { less_than: 6 },
-      unless: Proc.new { |a| a.trainer_id.nil? or not a.box.nil? }
-
-    scope :party, -> { where(box: nil) }
-    scope :box, ->(n) { where(box: n) }
-    scope :unaccounted, -> { where(trainer_id: nil) }
-
-    validate :uuid_is_constant, on: :update
-    before_create :set_uuid
-
-    validates :ot_name, presence: true
-
-    validates :ot_number, presence: true,
-      numericality: { greater_than_or_equal_to: 0, only_integer: true }
-
-    validates :ot_gender, presence: true
-    enumerize :ot_gender, in: [:female, :male]
-
-    validates :met_level, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true },
-      if: Proc.new { |a| a.met_type == :normal }
-
-    validates :met_type, presence: true
-    enumerize :met_type,
-      in: [:normal, :hatched, :npc_trade, :fateful_encounter, :orre]
-
-    belongs_to :location, optional: true
-    validates :location, presence: true,
-      if: Proc.new { |c| c.met_type == :normal or c.met_type == :hatched}
-
-    validates :gender, presence: true
-    enumerize :gender, in: [:genderless, :female, :male]
-
-    validates :nature, presence: true
-    enumerize :nature, in: [:hardy, :lonely, :brave, :adamant, :naughty, :bold,
-      :docile, :relaxed, :impish, :lax, :timid, :hasty, :serious, :jolly,
-      :naive, :modest, :mild, :quiet, :bashful, :rash, :calm, :gentle, :sassy,
-      :careful, :quirky]
-
-    enumerize :unown_letter, in: [:a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k,
-      :l, :m, :n, :o, :p, :q, :r, :s, :t, :u, :v, :w, :x, :y, :z,
-      :question, :exclamation]
-
-    validates :pokeball, presence: true
-    enumerize :pokeball, in: [:master, :ultra, :great, :poke, :safari, :net,
-      :dive, :nest, :repeat, :timer, :luxury, :premier]
-
-    def to_param
-      uuid
-    end
-
-    def outsider?
-      (trainer.nil?) or (ot_name != trainer.name) or (ot_number != trainer.number)
-    end
-
-    def display_ot_number
-      ot_number.to_s.rjust(5, '0')
-    end
-
-    def nature_benefits?(stat)
-      if stat == :attack
-        [:lonely, :brave, :adamant, :naughty].include? nature.intern
-      elsif stat == :defense
-        [:bold, :relaxed, :impish, :lax].include? nature.intern
-      elsif stat == :speed
-        [:timid, :hasty, :jolly, :naive].include? nature.intern
-      elsif stat == :special_attack
-        [:modest, :mild, :quiet, :rash].include? nature.intern
-      elsif stat == :special_defense
-        [:calm, :gentle, :sassy, :careful].include? nature.intern
-      else
-        false
-      end
-    end
-
-    def nature_hinders?(stat)
-      if stat == :attack
-        [:bold, :timid, :modest, :calm].include? nature.intern
-      elsif stat == :defense
-        [:lonely, :hasty, :mild, :gentle].include? nature.intern
-      elsif stat == :speed
-        [:brave, :relaxed, :quiet, :sassy].include? nature.intern
-      elsif stat == :special_attack
-        [:adamant, :impish, :jolly, :careful].include? nature.intern
-      elsif stat == :special_defense
-        [:naughty, :lax, :naive, :rash].include? nature.intern
-      else
-        false
-      end
-    end
-
-    def pokeball_icon_path
-      "pokeviewer/items/#{Pokemon.pokeball.values.find_index(pokeball) + 1}.png"
-    end
-
-    def gift_ribbon_description(ribbon)
-      if trainer.nil?
-        ""
-      else
-        trainer.gift_ribbon_description(ribbon)
-      end
-    end
-
-    def gender_symbol
-      case gender.intern
-      when :female
-        "♀"
-      when :male
-        "♂"
-      when :genderless
-        ""
-      end
-    end
-
-    private
-
-      def set_uuid
-        self.uuid = SecureRandom.uuid
-      end
-
-      def uuid_is_constant
-        errors.add(:uuid, "can't be changed") if self.uuid_changed?
-      end
-
-      def current_is_cached
-        if self.revisions.empty?
-          unless self.current_id.nil?
-            errors.add(:current, "must be null when there are no revisions")
-          end
-        else
-          unless self.current_id = self.revisions.last.id
-            errors.add(:current, "is not up-to-date")
-          end
-        end
-      end
-  end
-end
@@ -1,496 +0,0 @@
-require 'active_record/diff'
-
-module Pokeviewer
-  class Revision < ApplicationRecord
-    include ActiveRecord::Diff
-
-    diff :species_id, :nickname, :level, :hp, :attack, :defense,
-      :special_attack, :special_defense, :speed, :coolness, :beauty, :cuteness,
-      :smartness, :toughness, :sheen, :item_id, :move_1_id, :move_2_id,
-      :move_3_id, :move_4_id, :move_1_pp_bonuses, :move_2_pp_bonuses,
-      :move_3_pp_bonuses, :move_4_pp_bonuses, :cool_ribbons, :beauty_ribbons,
-      :cute_ribbons, :smart_ribbons, :tough_ribbons, :champion_ribbon,
-      :winning_ribbon, :victory_ribbon, :artist_ribbon, :effort_ribbon,
-      :marine_ribbon, :land_ribbon, :sky_ribbon, :country_ribbon,
-      :national_ribbon, :earth_ribbon, :world_ribbon
-
-    belongs_to :pokemon
-    acts_as_sequenced scope: :pokemon_id
-
-    after_create :cache_pokemon_current
-
-    belongs_to :species
-
-    validates :nickname, presence: true
-
-    validates :experience, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :level, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :hp, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :attack, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :defense, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :special_attack, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :special_defense, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :speed, presence: true,
-      numericality: { greater_than_or_equal_to: 1, only_integer: true }
-
-    validates :coolness, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 10,
-        only_integer: true }
-
-    validates :beauty, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 10,
-        only_integer: true }
-
-    validates :cuteness, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 10,
-        only_integer: true }
-
-    validates :smartness, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 10,
-        only_integer: true }
-
-    validates :toughness, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 10,
-        only_integer: true }
-
-    validates :sheen, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 10,
-        only_integer: true }
-
-    belongs_to :item, optional: true
-
-    belongs_to :move_1, class_name: "Move"
-    belongs_to :move_2, class_name: "Move", optional: true
-    belongs_to :move_3, class_name: "Move", optional: true
-    belongs_to :move_4, class_name: "Move", optional: true
-
-    validates :move_1_pp_bonuses, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 3,
-        only_integer: true}
-
-    validates :move_2_pp_bonuses, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 3,
-        only_integer: true}
-
-    validates :move_3_pp_bonuses, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 3,
-        only_integer: true}
-
-    validates :move_4_pp_bonuses, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 3,
-        only_integer: true}
-
-    validates :cool_ribbons, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 4,
-        only_integer: true}
-
-    validates :beauty_ribbons, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 4,
-        only_integer: true}
-
-    validates :cute_ribbons, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 4,
-        only_integer: true}
-
-    validates :smart_ribbons, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 4,
-        only_integer: true}
-
-    validates :tough_ribbons, presence: true,
-      numericality: {
-        greater_than_or_equal_to: 0,
-        less_than_or_equal_to: 4,
-        only_integer: true}
-
-    def icon_path
-      form = ""
-      if species_id == 201
-        # Handle Unown form
-        form = "-#{pokemon.unown_letter}"
-      elsif species_id == 386
-        # Handle Deoxys forms
-        if pokemon.trainer.firered?
-          form = "-attack"
-        elsif pokemon.trainer.leafgreen?
-          form = "-defense"
-        elsif pokemon.trainer.emerald?
-          form = "-speed"
-        end
-      end
-
-      "pokeviewer/icons/#{species_id}#{form}.png"
-    end
-
-    def sprite_path
-      shininess = "normal"
-      if pokemon.shiny
-        shininess = "shiny"
-      end
-
-      game = "ruby-sapphire"
-      unless pokemon.trainer.nil?
-        if (pokemon.trainer.firered? or pokemon.trainer.leafgreen?) and (species_id <= 151 or species_id == 216 or species_id == 386)
-          game = "firered-leafgreen"
-        elsif pokemon.trainer.emerald?
-          game = "emerald"
-        end
-      end
-
-      form = ""
-      if species_id == 201
-        # Handle Unown forms
-        form = "-#{pokemon.unown_letter}"
-      elsif species_id == 386
-        # Handle Deoxys forms
-        if pokemon.trainer.firered?
-          form = "-attack"
-        elsif pokemon.trainer.leafgreen?
-          form = "-defense"
-        elsif pokemon.trainer.emerald?
-          form = "-speed"
-        end
-      end
-
-      if game == "emerald"
-        "pokeviewer/sprites/emerald/#{shininess}/#{species_id}#{form}.gif"
-      else
-        "pokeviewer/sprites/#{game}/#{shininess}/#{species_id}#{form}.png"
-      end
-    end
-
-    def ability
-      if pokemon.second_ability
-        species.ability_2
-      else
-        species.ability_1
-      end
-    end
-
-    def move_1_pp
-      move_1.pp * (5 + move_1_pp_bonuses) / 5
-    end
-
-    def move_2_pp
-      move_2.pp * (5 + move_2_pp_bonuses) / 5
-    end
-
-    def move_3_pp
-      move_3.pp * (5 + move_3_pp_bonuses) / 5
-    end
-
-    def move_4_pp
-      move_4.pp * (5 + move_4_pp_bonuses) / 5
-    end
-
-    def ribbons
-      result = []
-
-      if cool_ribbons >= 1
-        result << {
-          filename: "cool-ribbon.png",
-          name: "Cool Ribbon",
-          description: "Cool Contest Normal Rank Winner!"
-        }
-      end
-
-      if cool_ribbons >= 2
-        result << {
-          filename: "cool-ribbon-super.png",
-          name: "Cool Ribbon Super",
-          description: "Cool Contest Super Rank Winner!"
-        }
-      end
-
-      if cool_ribbons >= 3
-        result << {
-          filename: "cool-ribbon-hyper.png",
-          name: "Cool Ribbon Hyper",
-          description: "Cool Contest Hyper Rank Winner!"
-        }
-      end
-
-      if cool_ribbons == 4
-        result << {
-          filename: "cool-ribbon-master.png",
-          name: "Cool Ribbon Master",
-          description: "Cool Contest Master Rank Winner!"
-        }
-      end
-
-      if beauty_ribbons >= 1
-        result << {
-          filename: "beauty-ribbon.png",
-          name: "Beauty Ribbon",
-          description: "Beauty Contest Normal Rank Winner!"
-        }
-      end
-
-      if beauty_ribbons >= 2
-        result << {
-          filename: "beauty-ribbon-super.png",
-          name: "Beauty Ribbon Super",
-          description: "Beauty Contest Super Rank Winner!"
-        }
-      end
-
-      if beauty_ribbons >= 3
-        result << {
-          filename: "beauty-ribbon-hyper.png",
-          name: "Beauty Ribbon Hyper",
-          description: "Beauty Contest Hyper Rank Winner!"
-        }
-      end
-
-      if beauty_ribbons == 4
-        result << {
-          filename: "beauty-ribbon-master.png",
-          name: "Beauty Ribbon Master",
-          description: "Beauty Contest Master Rank Winner!"
-        }
-      end
-
-      if cute_ribbons >= 1
-        result << {
-          filename: "cute-ribbon.png",
-          name: "Cute Ribbon",
-          description: "Cute Contest Normal Rank Winner!"
-        }
-      end
-
-      if cute_ribbons >= 2
-        result << {
-          filename: "cute-ribbon-super.png",
-          name: "Cute Ribbon Super",
-          description: "Cute Contest Super Rank Winner!"
-        }
-      end
-
-      if cute_ribbons >= 3
-        result << {
-          filename: "cute-ribbon-hyper.png",
-          name: "Cute Ribbon Hyper",
-          description: "Cute Contest Hyper Rank Winner!"
-        }
-      end
-
-      if cute_ribbons == 4
-        result << {
-          filename: "cute-ribbon-master.png",
-          name: "Cute Ribbon Master",
-          description: "Cute Contest Master Rank Winner!"
-        }
-      end
-
-      if smart_ribbons >= 1
-        result << {
-          filename: "smart-ribbon.png",
-          name: "Smart Ribbon",
-          description: "Smart Contest Normal Rank Winner!"
-        }
-      end
-
-      if smart_ribbons >= 2
-        result << {
-          filename: "smart-ribbon-super.png",
-          name: "Smart Ribbon Super",
-          description: "Smart Contest Super Rank Winner!"
-        }
-      end
-
-      if smart_ribbons >= 3
-        result << {
-          filename: "smart-ribbon-hyper.png",
-          name: "Smart Ribbon Hyper",
-          description: "Smart Contest Hyper Rank Winner!"
-        }
-      end
-
-      if smart_ribbons == 4
-        result << {
-          filename: "smart-ribbon-master.png",
-          name: "Smart Ribbon Master",
-          description: "Smart Contest Master Rank Winner!"
-        }
-      end
-
-      if tough_ribbons >= 1
-        result << {
-          filename: "tough-ribbon.png",
-          name: "Tough Ribbon",
-          description: "Tough Contest Normal Rank Winner!"
-        }
-      end
-
-      if tough_ribbons >= 2
-        result << {
-          filename: "tough-ribbon-super.png",
-          name: "Tough Ribbon Super",
-          description: "Tough Contest Super Rank Winner!"
-        }
-      end
-
-      if tough_ribbons >= 3
-        result << {
-          filename: "tough-ribbon-hyper.png",
-          name: "Tough Ribbon Hyper",
-          description: "Tough Contest Hyper Rank Winner!"
-        }
-      end
-
-      if tough_ribbons == 4
-        result << {
-          filename: "tough-ribbon-master.png",
-          name: "Tough Ribbon Master",
-          description: "Tough Contest Master Rank Winner!"
-        }
-      end
-
-      if champion_ribbon
-        result << {
-          filename: "champion-ribbon.png",
-          name: "Champion Ribbon",
-          description: "Champion-beating, Hall of Fame Member Ribbon"
-        }
-      end
-
-      if winning_ribbon
-        result << {
-          filename: "winning-ribbon.png",
-          name: "Winning Ribbon",
-          description: "Ribbon for clearing LV50 at the Battle Tower."
-        }
-      end
-
-      if victory_ribbon
-        result << {
-          filename: "victory-ribbon.png",
-          name: "Victory Ribbon",
-          description: "Won for clearing LV100 at the Battle Tower."
-        }
-      end
-
-      if artist_ribbon
-        result << {
-          filename: "artist-ribbon.png",
-          name: "Artist Ribbon",
-          description: "Ribbon for being chosen as a super sketch model."
-        }
-      end
-
-      if effort_ribbon
-        result << {
-          filename: "effort-ribbon.png",
-          name: "Effort Ribbon",
-          description: "Ribbon awarded for being a hard worker."
-        }
-      end
-
-      if marine_ribbon
-        result << {
-          filename: "marine-ribbon.png",
-          name: "Marine Ribbon",
-          description: pokemon.gift_ribbon_description(:marine_ribbon)
-        }
-      end
-
-      if land_ribbon
-        result << {
-          filename: "land-ribbon.png",
-          name: "Land Ribbon",
-          description: pokemon.gift_ribbon_description(:land_ribbon)
-        }
-      end
-
-      if sky_ribbon
-        result << {
-          filename: "sky-ribbon.png",
-          name: "Sky Ribbon",
-          description: pokemon.gift_ribbon_description(:sky_ribbon)
-        }
-      end
-
-      if country_ribbon
-        result << {
-          filename: "country-ribbon.png",
-          name: "Country Ribbon",
-          description: pokemon.gift_ribbon_description(:country_ribbon)
-        }
-      end
-
-      if national_ribbon
-        result << {
-          filename: "national-ribbon.png",
-          name: "National Ribbon",
-          description: pokemon.gift_ribbon_description(:national_ribbon)
-        }
-      end
-
-      if earth_ribbon
-        result << {
-          filename: "earth-ribbon.png",
-          name: "Earth Ribbon",
-          description: pokemon.gift_ribbon_description(:earth_ribbon)
-        }
-      end
-
-      if world_ribbon
-        result << {
-          filename: "world-ribbon.png",
-          name: "World Ribbon",
-          description: pokemon.gift_ribbon_description(:world_ribbon)
-        }
-      end
-
-      result
-    end
-
-    private
-
-      def cache_pokemon_current
-        self.pokemon.current_id = self.id
-        self.pokemon.save!
-      end
-  end
-end
@@ -1,26 +0,0 @@
-module Pokeviewer
-  class Species < ApplicationRecord
-    extend Enumerize
-
-    has_many :revisions, dependent: :restrict_with_exception
-
-    has_many :pokedex_entries, dependent: :destroy
-
-    validates :name, presence: true, uniqueness: true
-
-    validates :type_1, presence: true
-
-    enumerize :type_1, in: Move::TYPES
-    enumerize :type_2, in: Move::TYPES
-
-    belongs_to :ability_1, class_name: "Ability"
-    belongs_to :ability_2, class_name: "Ability", optional: true
-
-    def current_revisions
-      revisions.
-        where("pokeviewer_pokemon.current_id = pokeviewer_revisions.id").
-        includes(:pokemon).
-        references(:pokemon)
-    end
-  end
-end
@@ -1,95 +0,0 @@
-module Pokeviewer
-  class Trainer < ApplicationRecord
-    extend Enumerize
-
-    has_many :pokemon, dependent: :nullify
-
-    has_many :pokedex_entries, dependent: :destroy
-
-    validates :number, presence: true,
-      numericality: { greater_than_or_equal_to: 0, only_integer: true }
-
-    validates :name, presence: true, uniqueness: {
-      scope: :number,
-      message: "and number should be pairwise unique" }
-
-    validates :game, presence: true
-    enumerize :game, in: [:ruby, :sapphire, :firered, :leafgreen, :emerald],
-      predicates: true
-
-    belongs_to :marine_ribbon, class_name: "GiftRibbon", optional: true
-    belongs_to :land_ribbon, class_name: "GiftRibbon", optional: true
-    belongs_to :sky_ribbon, class_name: "GiftRibbon", optional: true
-    belongs_to :country_ribbon, class_name: "GiftRibbon", optional: true
-    belongs_to :national_ribbon, class_name: "GiftRibbon", optional: true
-    belongs_to :earth_ribbon, class_name: "GiftRibbon", optional: true
-    belongs_to :world_ribbon, class_name: "GiftRibbon", optional: true
-
-    validates :box_1_name, presence: true
-    validates :box_2_name, presence: true
-    validates :box_3_name, presence: true
-    validates :box_4_name, presence: true
-    validates :box_5_name, presence: true
-    validates :box_6_name, presence: true
-    validates :box_7_name, presence: true
-    validates :box_8_name, presence: true
-    validates :box_9_name, presence: true
-    validates :box_10_name, presence: true
-    validates :box_11_name, presence: true
-    validates :box_12_name, presence: true
-    validates :box_13_name, presence: true
-    validates :box_14_name, presence: true
-
-    def party
-      pokemon.party.includes(current: [:species])
-    end
-
-    def box(n)
-      pokemon.box(n).includes(current: [:species])
-    end
-
-    def box_name(n)
-      if n > 0 and n <= 14
-        send "box_#{n}_name".intern
-      else
-        nil
-      end
-    end
-
-    def box_contents(n)
-      pokes = box(n).to_a
-
-      result = []
-      (0..29).each do |i|
-        if pokes.empty? or (pokes.first.slot == i)
-          result << pokes.shift
-        else
-          result << nil
-        end
-      end
-
-      result
-    end
-
-    def boxes
-      (1..14).map { |n| {
-        name: box_name(n),
-        pokemon: box_contents(n)
-      }}
-    end
-
-    def display_number
-      number.to_s.rjust(5, '0')
-    end
-
-    def gift_ribbon_description(ribbon)
-      gift_ribbon = send ribbon
-
-      if gift_ribbon.nil?
-        ""
-      else
-        gift_ribbon.description
-      end
-    end
-  end
-end
@@ -0,0 +1,494 @@
+require 'active_record/diff'
+
+class Revision < ApplicationRecord
+  include ActiveRecord::Diff
+
+  diff :species_id, :nickname, :level, :hp, :attack, :defense,
+    :special_attack, :special_defense, :speed, :coolness, :beauty, :cuteness,
+    :smartness, :toughness, :sheen, :item_id, :move_1_id, :move_2_id,
+    :move_3_id, :move_4_id, :move_1_pp_bonuses, :move_2_pp_bonuses,
+    :move_3_pp_bonuses, :move_4_pp_bonuses, :cool_ribbons, :beauty_ribbons,
+    :cute_ribbons, :smart_ribbons, :tough_ribbons, :champion_ribbon,
+    :winning_ribbon, :victory_ribbon, :artist_ribbon, :effort_ribbon,
+    :marine_ribbon, :land_ribbon, :sky_ribbon, :country_ribbon,
+    :national_ribbon, :earth_ribbon, :world_ribbon
+
+  belongs_to :pokemon
+  acts_as_sequenced scope: :pokemon_id
+
+  after_create :cache_pokemon_current
+
+  belongs_to :species
+
+  validates :nickname, presence: true
+
+  validates :experience, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :level, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :hp, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :attack, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :defense, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :special_attack, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :special_defense, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :speed, presence: true,
+    numericality: { greater_than_or_equal_to: 1, only_integer: true }
+
+  validates :coolness, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 10,
+      only_integer: true }
+
+  validates :beauty, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 10,
+      only_integer: true }
+
+  validates :cuteness, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 10,
+      only_integer: true }
+
+  validates :smartness, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 10,
+      only_integer: true }
+
+  validates :toughness, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 10,
+      only_integer: true }
+
+  validates :sheen, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 10,
+      only_integer: true }
+
+  belongs_to :item, optional: true
+
+  belongs_to :move_1, class_name: "Move"
+  belongs_to :move_2, class_name: "Move", optional: true
+  belongs_to :move_3, class_name: "Move", optional: true
+  belongs_to :move_4, class_name: "Move", optional: true
+
+  validates :move_1_pp_bonuses, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 3,
+      only_integer: true}
+
+  validates :move_2_pp_bonuses, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 3,
+      only_integer: true}
+
+  validates :move_3_pp_bonuses, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 3,
+      only_integer: true}
+
+  validates :move_4_pp_bonuses, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 3,
+      only_integer: true}
+
+  validates :cool_ribbons, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 4,
+      only_integer: true}
+
+  validates :beauty_ribbons, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 4,
+      only_integer: true}
+
+  validates :cute_ribbons, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 4,
+      only_integer: true}
+
+  validates :smart_ribbons, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 4,
+      only_integer: true}
+
+  validates :tough_ribbons, presence: true,
+    numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: 4,
+      only_integer: true}
+
+  def icon_path
+    form = ""
+    if species_id == 201
+      # Handle Unown form
+      form = "-#{pokemon.unown_letter}"
+    elsif species_id == 386
+      # Handle Deoxys forms
+      if pokemon.trainer.firered?
+        form = "-attack"
+      elsif pokemon.trainer.leafgreen?
+        form = "-defense"
+      elsif pokemon.trainer.emerald?
+        form = "-speed"
+      end
+    end
+
+    "icons/#{species_id}#{form}.png"
+  end
+
+  def sprite_path
+    shininess = "normal"
+    if pokemon.shiny
+      shininess = "shiny"
+    end
+
+    game = "ruby-sapphire"
+    unless pokemon.trainer.nil?
+      if (pokemon.trainer.firered? or pokemon.trainer.leafgreen?) and (species_id <= 151 or species_id == 216 or species_id == 386)
+        game = "firered-leafgreen"
+      elsif pokemon.trainer.emerald?
+        game = "emerald"
+      end
+    end
+
+    form = ""
+    if species_id == 201
+      # Handle Unown forms
+      form = "-#{pokemon.unown_letter}"
+    elsif species_id == 386
+      # Handle Deoxys forms
+      if pokemon.trainer.firered?
+        form = "-attack"
+      elsif pokemon.trainer.leafgreen?
+        form = "-defense"
+      elsif pokemon.trainer.emerald?
+        form = "-speed"
+      end
+    end
+
+    if game == "emerald"
+      "sprites/emerald/#{shininess}/#{species_id}#{form}.gif"
+    else
+      "sprites/#{game}/#{shininess}/#{species_id}#{form}.png"
+    end
+  end
+
+  def ability
+    if pokemon.second_ability
+      species.ability_2
+    else
+      species.ability_1
+    end
+  end
+
+  def move_1_pp
+    move_1.pp * (5 + move_1_pp_bonuses) / 5
+  end
+
+  def move_2_pp
+    move_2.pp * (5 + move_2_pp_bonuses) / 5
+  end
+
+  def move_3_pp
+    move_3.pp * (5 + move_3_pp_bonuses) / 5
+  end
+
+  def move_4_pp
+    move_4.pp * (5 + move_4_pp_bonuses) / 5
+  end
+
+  def ribbons
+    result = []
+
+    if cool_ribbons >= 1
+      result << {
+        filename: "cool-ribbon.png",
+        name: "Cool Ribbon",
+        description: "Cool Contest Normal Rank Winner!"
+      }
+    end
+
+    if cool_ribbons >= 2
+      result << {
+        filename: "cool-ribbon-super.png",
+        name: "Cool Ribbon Super",
+        description: "Cool Contest Super Rank Winner!"
+      }
+    end
+
+    if cool_ribbons >= 3
+      result << {
+        filename: "cool-ribbon-hyper.png",
+        name: "Cool Ribbon Hyper",
+        description: "Cool Contest Hyper Rank Winner!"
+      }
+    end
+
+    if cool_ribbons == 4
+      result << {
+        filename: "cool-ribbon-master.png",
+        name: "Cool Ribbon Master",
+        description: "Cool Contest Master Rank Winner!"
+      }
+    end
+
+    if beauty_ribbons >= 1
+      result << {
+        filename: "beauty-ribbon.png",
+        name: "Beauty Ribbon",
+        description: "Beauty Contest Normal Rank Winner!"
+      }
+    end
+
+    if beauty_ribbons >= 2
+      result << {
+        filename: "beauty-ribbon-super.png",
+        name: "Beauty Ribbon Super",
+        description: "Beauty Contest Super Rank Winner!"
+      }
+    end
+
+    if beauty_ribbons >= 3
+      result << {
+        filename: "beauty-ribbon-hyper.png",
+        name: "Beauty Ribbon Hyper",
+        description: "Beauty Contest Hyper Rank Winner!"
+      }
+    end
+
+    if beauty_ribbons == 4
+      result << {
+        filename: "beauty-ribbon-master.png",
+        name: "Beauty Ribbon Master",
+        description: "Beauty Contest Master Rank Winner!"
+      }
+    end
+
+    if cute_ribbons >= 1
+      result << {
+        filename: "cute-ribbon.png",
+        name: "Cute Ribbon",
+        description: "Cute Contest Normal Rank Winner!"
+      }
+    end
+
+    if cute_ribbons >= 2
+      result << {
+        filename: "cute-ribbon-super.png",
+        name: "Cute Ribbon Super",
+        description: "Cute Contest Super Rank Winner!"
+      }
+    end
+
+    if cute_ribbons >= 3
+      result << {
+        filename: "cute-ribbon-hyper.png",
+        name: "Cute Ribbon Hyper",
+        description: "Cute Contest Hyper Rank Winner!"
+      }
+    end
+
+    if cute_ribbons == 4
+      result << {
+        filename: "cute-ribbon-master.png",
+        name: "Cute Ribbon Master",
+        description: "Cute Contest Master Rank Winner!"
+      }
+    end
+
+    if smart_ribbons >= 1
+      result << {
+        filename: "smart-ribbon.png",
+        name: "Smart Ribbon",
+        description: "Smart Contest Normal Rank Winner!"
+      }
+    end
+
+    if smart_ribbons >= 2
+      result << {
+        filename: "smart-ribbon-super.png",
+        name: "Smart Ribbon Super",
+        description: "Smart Contest Super Rank Winner!"
+      }
+    end
+
+    if smart_ribbons >= 3
+      result << {
+        filename: "smart-ribbon-hyper.png",
+        name: "Smart Ribbon Hyper",
+        description: "Smart Contest Hyper Rank Winner!"
+      }
+    end
+
+    if smart_ribbons == 4
+      result << {
+        filename: "smart-ribbon-master.png",
+        name: "Smart Ribbon Master",
+        description: "Smart Contest Master Rank Winner!"
+      }
+    end
+
+    if tough_ribbons >= 1
+      result << {
+        filename: "tough-ribbon.png",
+        name: "Tough Ribbon",
+        description: "Tough Contest Normal Rank Winner!"
+      }
+    end
+
+    if tough_ribbons >= 2
+      result << {
+        filename: "tough-ribbon-super.png",
+        name: "Tough Ribbon Super",
+        description: "Tough Contest Super Rank Winner!"
+      }
+    end
+
+    if tough_ribbons >= 3
+      result << {
+        filename: "tough-ribbon-hyper.png",
+        name: "Tough Ribbon Hyper",
+        description: "Tough Contest Hyper Rank Winner!"
+      }
+    end
+
+    if tough_ribbons == 4
+      result << {
+        filename: "tough-ribbon-master.png",
+        name: "Tough Ribbon Master",
+        description: "Tough Contest Master Rank Winner!"
+      }
+    end
+
+    if champion_ribbon
+      result << {
+        filename: "champion-ribbon.png",
+        name: "Champion Ribbon",
+        description: "Champion-beating, Hall of Fame Member Ribbon"
+      }
+    end
+
+    if winning_ribbon
+      result << {
+        filename: "winning-ribbon.png",
+        name: "Winning Ribbon",
+        description: "Ribbon for clearing LV50 at the Battle Tower."
+      }
+    end
+
+    if victory_ribbon
+      result << {
+        filename: "victory-ribbon.png",
+        name: "Victory Ribbon",
+        description: "Won for clearing LV100 at the Battle Tower."
+      }
+    end
+
+    if artist_ribbon
+      result << {
+        filename: "artist-ribbon.png",
+        name: "Artist Ribbon",
+        description: "Ribbon for being chosen as a super sketch model."
+      }
+    end
+
+    if effort_ribbon
+      result << {
+        filename: "effort-ribbon.png",
+        name: "Effort Ribbon",
+        description: "Ribbon awarded for being a hard worker."
+      }
+    end
+
+    if marine_ribbon
+      result << {
+        filename: "marine-ribbon.png",
+        name: "Marine Ribbon",
+        description: pokemon.gift_ribbon_description(:marine_ribbon)
+      }
+    end
+
+    if land_ribbon
+      result << {
+        filename: "land-ribbon.png",
+        name: "Land Ribbon",
+        description: pokemon.gift_ribbon_description(:land_ribbon)
+      }
+    end
+
+    if sky_ribbon
+      result << {
+        filename: "sky-ribbon.png",
+        name: "Sky Ribbon",
+        description: pokemon.gift_ribbon_description(:sky_ribbon)
+      }
+    end
+
+    if country_ribbon
+      result << {
+        filename: "country-ribbon.png",
+        name: "Country Ribbon",
+        description: pokemon.gift_ribbon_description(:country_ribbon)
+      }
+    end
+
+    if national_ribbon
+      result << {
+        filename: "national-ribbon.png",
+        name: "National Ribbon",
+        description: pokemon.gift_ribbon_description(:national_ribbon)
+      }
+    end
+
+    if earth_ribbon
+      result << {
+        filename: "earth-ribbon.png",
+        name: "Earth Ribbon",
+        description: pokemon.gift_ribbon_description(:earth_ribbon)
+      }
+    end
+
+    if world_ribbon
+      result << {
+        filename: "world-ribbon.png",
+        name: "World Ribbon",
+        description: pokemon.gift_ribbon_description(:world_ribbon)
+      }
+    end
+
+    result
+  end
+
+  private
+
+    def cache_pokemon_current
+      self.pokemon.current_id = self.id
+      self.pokemon.save!
+    end
+end
@@ -0,0 +1,24 @@
+class Species < ApplicationRecord
+  extend Enumerize
+
+  has_many :revisions, dependent: :restrict_with_exception
+
+  has_many :pokedex_entries, dependent: :destroy
+
+  validates :name, presence: true, uniqueness: true
+
+  validates :type_1, presence: true
+
+  enumerize :type_1, in: Move::TYPES
+  enumerize :type_2, in: Move::TYPES
+
+  belongs_to :ability_1, class_name: "Ability"
+  belongs_to :ability_2, class_name: "Ability", optional: true
+
+  def current_revisions
+    revisions.
+      where("pokemon.current_id = revisions.id").
+      includes(:pokemon).
+      references(:pokemon)
+  end
+end
@@ -0,0 +1,93 @@
+class Trainer < ApplicationRecord
+  extend Enumerize
+
+  has_many :pokemon, dependent: :nullify
+
+  has_many :pokedex_entries, dependent: :destroy
+
+  validates :number, presence: true,
+    numericality: { greater_than_or_equal_to: 0, only_integer: true }
+
+  validates :name, presence: true, uniqueness: {
+    scope: :number,
+    message: "and number should be pairwise unique" }
+
+  validates :game, presence: true
+  enumerize :game, in: [:ruby, :sapphire, :firered, :leafgreen, :emerald],
+    predicates: true
+
+  belongs_to :marine_ribbon, class_name: "GiftRibbon", optional: true
+  belongs_to :land_ribbon, class_name: "GiftRibbon", optional: true
+  belongs_to :sky_ribbon, class_name: "GiftRibbon", optional: true
+  belongs_to :country_ribbon, class_name: "GiftRibbon", optional: true
+  belongs_to :national_ribbon, class_name: "GiftRibbon", optional: true
+  belongs_to :earth_ribbon, class_name: "GiftRibbon", optional: true
+  belongs_to :world_ribbon, class_name: "GiftRibbon", optional: true
+
+  validates :box_1_name, presence: true
+  validates :box_2_name, presence: true
+  validates :box_3_name, presence: true
+  validates :box_4_name, presence: true
+  validates :box_5_name, presence: true
+  validates :box_6_name, presence: true
+  validates :box_7_name, presence: true
+  validates :box_8_name, presence: true
+  validates :box_9_name, presence: true
+  validates :box_10_name, presence: true
+  validates :box_11_name, presence: true
+  validates :box_12_name, presence: true
+  validates :box_13_name, presence: true
+  validates :box_14_name, presence: true
+
+  def party
+    pokemon.party.includes(current: [:species])
+  end
+
+  def box(n)
+    pokemon.box(n).includes(current: [:species])
+  end
+
+  def box_name(n)
+    if n > 0 and n <= 14
+      send "box_#{n}_name".intern
+    else
+      nil
+    end
+  end
+
+  def box_contents(n)
+    pokes = box(n).to_a
+
+    result = []
+    (0..29).each do |i|
+      if pokes.empty? or (pokes.first.slot == i)
+        result << pokes.shift
+      else
+        result << nil
+      end
+    end
+
+    result
+  end
+
+  def boxes
+    (1..14).map { |n| {
+      name: box_name(n),
+      pokemon: box_contents(n)
+    }}
+  end
+
+  def display_number
+    number.to_s.rjust(5, '0')
+  end
+
+  def gift_ribbon_description(ribbon)
+    gift_ribbon = send ribbon
+
+    if gift_ribbon.nil?
+      ""
+    else
+      gift_ribbon.description
+    end
+  end
+end
@@ -0,0 +1,11 @@
+!!! 5
+%html
+  %head
+    %title Pokeviewer
+    %meta{ name: "viewport", content: "width=device-width,initial-scale=1" }
+    = stylesheet_link_tag "application", media: "all"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+    = csp_meta_tag
+  %body
+    #content= yield
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
@@ -0,0 +1 @@
+<%= yield %>
@@ -1,9 +0,0 @@
-!!! 5
-%html
-  %head
-    %title Pokeviewer
-    = stylesheet_link_tag "pokeviewer/application", media: "all"
-    = javascript_include_tag "pokeviewer/application"
-    = csrf_meta_tags
-  %body
-    #content= yield
@@ -2,9 +2,11 @@
 %html
   %head
     %title Pokeviewer
-    = stylesheet_link_tag "pokeviewer/application", media: "all"
-    = javascript_include_tag "pokeviewer/application"
+    %meta{ name: "viewport", content: "width=device-width,initial-scale=1" }
+    = stylesheet_link_tag "application", media: "all"
+    = javascript_include_tag "application"
     = csrf_meta_tags
+    = csp_meta_tag
   %body#pokemon-embed
     %ul#pokemon-embed-tabs
       %li.ptabe-button.ptabe-details= link_to "Details", "\#", data: {tab: "details"}
@@ -9,7 +9,7 @@
       .pokemon-image-wrap
         = image_tag @revision.sprite_path, class: "pokemon-sprite"
         - if @revision.pokemon.shiny?
-          = image_tag "pokeviewer/ShinyIVStar.png", class: "pkv-shiny-star"
+          = image_tag "ShinyIVStar.png", class: "pkv-shiny-star"
     - if @revision.item.nil?
       .pokemon-item-label Item
       .pokemon-item None
@@ -129,7 +129,7 @@
     %ul
       - @revision.ribbons.each do |ribbon|
         %li.pkv-has-hover
-          = image_tag("pokeviewer/ribbons/#{ribbon[:filename]}")
+          = image_tag("ribbons/#{ribbon[:filename]}")
           .pkv-hover
             .pc-data-name= ribbon[:name]
             = ribbon[:description]